master into test #1546

Merged

juan merged 44 commits from master into test 2023-05-22 17:04:33 +00:00

Conversation 0 Commits 44 Files Changed 99 +567 -385

juan commented 2023-05-22 17:04:23 +00:00

Owner

Copy Link

No description provided.

juan added 44 commits 2023-05-22 17:04:24 +00:00

ed6b2cf25b refs #5615

659d76f022 Merge pull request 'refs #5615' (!1493) from 5615-getShipped into master ...

Reviewed-on: #1493
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

30e71a9d5e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 231801_test_to_master

1d6a541b02 test into master

598fe7ac0d Merge pull request '231801_test_to_master' (!1519) from 231801_test_to_master into master ...

Reviewed-on: #1519
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

f6e1ffa849 refs #5517 Log loader fix

4abc8521d3 refs #5517 Style fixes

0aa12a5efb hotFix(worker_new): use postcode not postalCode

7d589d5101 Merge pull request 'hotFix(worker_new): use postcode not postalCode' (!1520) from hotFix_worker_new_postcode into master ...

Reviewed-on: #1520
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

a1a3f910d3 hotFix(reset-passowrd): use model vnUser

504791fd6d typo

1dcce0f3ee Merge pull request 'hotFix(reset-passowrd): use model vnUser' (!1523) from hotFix_vnUser_reset-password into master ...

Reviewed-on: #1523
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

30d6f56c39 refs #5667 Style fixes, model translations

d8eeacb371 refs #5667 Translation improved

dd9699e120 refs #5667 Translation fix

fa40bd9811 refs #5667 Style & translation fixes

f55e5f9f74 refs #5667 Business translations

058f828b92 refs #4548 fix(invoiceIn): report use invoiceIn.issued

c8c7f52408 Merge branch 'master' into hotFix_invoiceIn_issued

f9fdf80350 refs #5667 Item translations added

0d51987d47 refs #5667 Client sample translations

e7f9984b4b refs #5667 Fix decimal places

c31eee4906 refs #5696 landed

69a25d8d03 refs #5696 horas a 00

02451818ef typo

1933341220 Merge pull request '5696-ReclamacionesFueraDePlazoLanded' (!1532) from 5696-ReclamacionesFueraDePlazoLanded into master ...

Reviewed-on: #1532
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

e8e04423f0 refs #5667 Atrs ordered by name

14d353f44e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

48da4b13ff refs #5667 Ticket translation fixes

975154c929 Merge branch 'master' into hotFix_invoiceIn_issued

8b0d7eb26c Merge pull request 'refs #4548 hotFix(invoiceIn): report use invoiceIn.issued' (!1527) from hotFix_invoiceIn_issued into master ...

Reviewed-on: #1527
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI

c7febc9699 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

29610e52cc refs #5667 No detail label fix

a190f2152b refs #5667 Fixes: Translations, help

20b3c4f5b8 refs #5667 Style improved

c1e222db83 refs #5667 Style fixes

718002d5aa refs #5667 Style fixes

1160cbc279 refs #5667 Fixes: Style, translations, icons

35331e355f refs #5667 Fixes: Colors, translation

08e0bf7ddd refs #5667 Color fixes

a4beb84e66 refs #5667 Translations fixes

69b892f2fd refs #5667 Translations

e08f848812 refs #5667 Model id html fix

juan merged commit 26c2ab867d into test 2023-05-22 17:04:33 +00:00

juan referenced this issue from a commit 2023-05-22 17:04:34 +00:00

Merge pull request 'master into test' (!1546) from master into test

Sign in to join this conversation.

Reviewers

No reviewers

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

1 Participants

Notifications

Subscribe

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#1546

No description provided.