verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5949 itemRecycle #1656

Merged
carlossa merged 5 commits from 5949-recycledPlasticItem into dev 2023-07-13 11:59:33 +00:00
Conversation 0 Commits 5 Files Changed 6 +76 -36
carlossa commented 2023-07-11 05:39:15 +00:00
Member
Copy Link
No description provided.
carlossa added the
CR / Tests passed
 label 2023-07-11 05:39:15 +00:00
carlossa added 1 commit 2023-07-11 05:39:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
d1c8f0ff11 refs #5949 itemRecycle
carlossa requested review from jgallego 2023-07-11 05:39:26 +00:00
jgallego requested changes 2023-07-11 05:46:55 +00:00
modules/item/front/basic-data/index.html Outdated
@ -170,0 +170,4 @@
</vn-input-number>
<vn-input-number
min="0"
label="Plastico reciclado"
jgallego commented 2023-07-11 05:43:48 +00:00
Owner
Copy Link

traduccions no has posat?

traduccions no has posat?
carlossa commented 2023-07-11 05:59:07 +00:00
Author
Member
Copy Link

Si si, en el nou commit estan, que estaven en stash

Si si, en el nou commit estan, que estaven en stash
modules/item/front/basic-data/index.html Outdated
@ -170,0 +172,4 @@
min="0"
label="Plastico reciclado"
ng-model="$ctrl.item.recycledPlastic"
vn-name="recycledPlastic "
jgallego commented 2023-07-11 05:44:01 +00:00
Owner
Copy Link

espai

espai
carlossa marked this conversation as resolved
carlossa added 1 commit 2023-07-11 05:58:29 +00:00
gitea/salix/pipeline/head This commit looks good Details
ba109dccc5 refs #5949 trad
carlossa requested review from jgallego 2023-07-11 06:00:44 +00:00
jgallego requested changes 2023-07-11 06:34:41 +00:00
modules/item/front/basic-data/index.html Outdated
@ -170,0 +170,4 @@
</vn-input-number>
<vn-input-number
min="0"
label="Recyled Plastic"
jgallego commented 2023-07-11 06:33:13 +00:00
Owner
Copy Link

fixat be..has posat Recyled

fixat be..has posat Recyled
carlossa marked this conversation as resolved
modules/item/front/basic-data/index.html Outdated
@ -170,0 +177,4 @@
</vn-input-number>
<vn-input-number
min="0"
label="No recycled plastic"
jgallego commented 2023-07-11 06:32:23 +00:00
Owner
Copy Link

Non

Non
carlossa marked this conversation as resolved
modules/item/front/basic-data/locale/es.yml Outdated
@ -16,1 +15,4 @@
Do photo: Hacer foto
Recyled Plastic: Plástico reciclado
No recycled plastic: Plástico no reciclado
jgallego commented 2023-07-11 06:32:33 +00:00
Owner
Copy Link

Non

Non
carlossa marked this conversation as resolved
carlossa added 1 commit 2023-07-11 06:41:56 +00:00
gitea/salix/pipeline/head This commit looks good Details
7291b793ae refs #5949 fix traduct
carlossa requested review from jgallego 2023-07-11 06:44:38 +00:00
jgallego approved these changes 2023-07-11 07:06:54 +00:00
carlossa added 24 commits 2023-07-13 05:10:12 +00:00
gitea/salix/pipeline/head This commit looks good Details
7030be3efa fix
gitea/salix/pipeline/head This commit looks good Details
6fa6c21cb1 remove fixtures
gitea/salix/pipeline/head This commit looks good Details
0afddb546b Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test 
Reviewed-on: #1650
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
9f2ef5c2c0 change ref master
gitea/salix/pipeline/head This commit looks good Details
ce8927a714 Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master 
Reviewed-on: #1653
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
1bcd3039cd refs #5475 redesign 2FA email
gitea/salix/pipeline/head This commit looks good Details
43bf7ce707 Merge pull request 'refs #5475 redesign 2FA email' (!1657) from 5475_redesign_2FA_email into test 
Reviewed-on: #1657
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6978339fd3 refs #5475 fix email translations
gitea/salix/pipeline/head This commit looks good Details
56247b5012 add acl
gitea/salix/pipeline/head This commit looks good Details
da13f0811c refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good Details
810021e23a Merge pull request 'refs #5874 feat: refactorizado proceso facturación' (!1658) from hotfix_makeInvoice-refactor into master 
Reviewed-on: #1658
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
e1f12bea02 a
gitea/salix/pipeline/head This commit looks good Details
5a5a1ed20b refs #5887 feat: addback test
gitea/salix/pipeline/head There was a failure building this commit Details
a215797390 tranalstion
gitea/salix/pipeline/head This commit looks good Details
808a9976ab refs #5887 fix: back etst
gitea/salix/pipeline/head This commit looks good Details
83698522ca Merge pull request '5887-mailAlias_refactor' (!1659) from 5887-mailAlias_refactor into master 
Reviewed-on: #1659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d7ac20dc6a hotFix(supplier): fix accessToken in before save
gitea/salix/pipeline/head There was a failure building this commit Details
219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
carlossa added 9 commits 2023-07-13 09:44:18 +00:00
gitea/salix/pipeline/head This commit looks good Details
e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head There was a failure building this commit Details
4369d275f8 refs #4770 feat: add test
gitea/salix/pipeline/head Build queued... Details
6655807d80 refs #4770 refactor: change acl
gitea/salix/pipeline/head There was a failure building this commit Details
a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
392dc5060a refs #4770 delete test
gitea/salix/pipeline/head This commit looks good Details
c91db1b429 a
gitea/salix/pipeline/head This commit looks good Details
c88a753865 Merge pull request '4770-routes_roadmap2' (!1647) from 4770-routes_roadmap2 into dev 
Reviewed-on: #1647
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
carlossa merged commit 0d308ec8ad into dev 2023-07-13 11:59:33 +00:00
carlossa deleted branch 5949-recycledPlasticItem 2023-07-13 11:59:33 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1656
No description provided.
Delete Branch "5949-recycledPlasticItem"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?