7773-testToMaster_2430 #2774

Merged

alexm merged 368 commits from 7773-testToMaster_2430 into master 2024-07-23 06:21:03 +00:00

Conversation 0 Commits 368 Files Changed 248 +2119 -2502

alexm commented 2024-07-23 06:06:20 +00:00

Member

Copy Link

No description provided.

alexm added 368 commits 2024-07-23 06:06:21 +00:00

3a6d4753db feat: refs #5855 drop temporary table

504c78fd26 Merge branch 'dev' into 5855-temporaryTable

0cead58f44 Merge branch 'dev' into 5855-temporaryTable

bb86c27202 feat: refs #7116 create table agencyIncoming

634bde1c9c refs #7116

a5d262671d refs #6436 feat: extend BeforeAll

48cc499f37 refs #6436 perf: example to use

cb55740b68 refs #6436 rollback

d6ee5d571e refs #6436 feat: jasmine helper

8ab9063b50 refs #6436 feat: use mocks

6fab793184 Merge branch 'dev' into 5855-temporaryTable

4574f1afcd Merge branch 'dev' into 5855-temporaryTable

914d3b2c67 feat: refs #6449 add showId column

86ba8c9fcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables

841a5fcd5b feat: refs #6449 add summaryId column

c161c122d0 feat: refs #6449 add column

9ee3e76594 Merge branch 'dev' into 5855-temporaryTable

74b04d98f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables

a21e335774 feat: refs #6449 Add display of item ID in Ticket Logs

67bd95ea32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables

03f0de489e Merge branch 'dev' into 6436_jasmine_beforeAll

5ee550ebf7 Merge branch 'dev' into 6436_jasmine_beforeAll

d0bb9d7690 Merge branch 'dev' into 6436_jasmine_beforeAll

2985e1c9e8 feat: roadMap refs #7195

b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps

882d5bf036 feat: roadMap refs #7195

94aef434a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps

f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps

7f23c81756 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable

1c6e881273 feat: refs #7544 crear evento claim_changeState

ef50d493f1 feat: refs #7544

b86e76373f test

d8e6a94797 Merge branch 'dev' into 7544-claimChangeState

f0ad012835 refactor: refs #6436 first wave

7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll

b3fa869757 refactor: refs #6436 second wave

902a9ee51b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables

093eaeb475 refactor: refs #6436 third wave

96366c475a fix: refs 6449 update changelog

bd45352215 refactor: refs #6436 fourth wave

665d03f048 refactor: refs #6436 user-config and some sections tests

9f9063567a refactor: refs #7505 item_getVisible refactor

a9aad7406a refactor: refs #7505 Minor change

944355d54f refactor: refs #6436 end first wave of changes in modules

4f10a93584 refactor: refs #7505 Minor change

3bd596e5fd refactor: refs #7505 Added description

aa0e06cfec refactor: refs #7505 Changed name

ee32bc1008 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables

d7d6de73c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables

2b45c2c61a feat: refs #6436 new test changes, rollback order/filter and /ticket/clone

84a51d3e8d feat: refs #6436 changed tests

324d7ef7ae refactor: refs #6436 changed test config

831b2c39f6 Merge branch 'dev' into 5855-temporaryTable

828908a522 Merge branch 'dev' into 5855-temporaryTable

741ea57b43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable

08cf849b7a Merge branch '5855-temporaryTable' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable

61a588b57c refactor: refs #6436 fixed test

ee75068e9c refactor: refs #6436 fixed test

d3f23a6d7a fix: refs #6436 fix filter test

0bf384b2ce Merge branch 'dev' into 6436_jasmine_beforeAll

a42562b0ca fear: refs #5855 claim_ratio_routine

1e3376f908 Merge branch 'dev' into 5855-temporaryTable

0128dfd967 feat: refs #5855 changes required

c4d297f766 Merge branch 'dev' into 5855-temporaryTable

419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll

9022f62116 feat: refs #5855 changes required

a170edcdef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable

205d79f0a6 Merge branch 'dev' into 5855-temporaryTable

2797a731c5 refs #6952 subName

95a23ad9fc Merge branch 'dev' into 6436_jasmine_beforeAll

c4eb7670fe Merge branch 'dev' into 5855-temporaryTable

b4afb883fc feat(salix): refs #6436 #6436 remove unnecessary object.assign

bd5a9b5ec0 Merge branch 'dev' into 6952-productorItemPDF

0379142fb5 Merge branch 'dev' into 5855-temporaryTable

cbd46330b3 feat: Turn issues into calculated columns refs#7213

7b3d51dfca Merge branch 'dev' into 7116-agencyIncoming

8b617df13d feat: refs #7116 create table

b8af48dff4 Merge branch 'dev' into 7116-agencyIncoming

00f3755de7 feat: refs #7116 agencyIncoming

a23f485296 refactor: refs #7424 Component type refactor

22959db0ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2

0240734a4b refs #6897 fix filter

9e5f416d55 refactor: refs #7418 Item type refactor

0e84749c07 Merge branch 'dev' into 6436_jasmine_beforeAll

2ed31ee1d3 refs #7651 Add editorFk and triggers

f47197cd80 Merge branch '7648_customerEntries' into 7648_dev_customerEntries

f0326860ba feat(salix): refs #7648 #7648 add new fields

0035967b11 Merge branch 'dev' into 7648_dev_customerEntries

29aecd62a5 refs #7651 add afterDelete trigger

da9ff6f22c Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount

d9742afc9b feat roadmap refs #7195

a0185dca04 feat(salix): refs #7648 #7648 new supplier role

f27bdec758 feat(salix): refs #7648 #7648 changes requested

08cf79b09b feat roadmap refs #7195

f41c2489d9 Merge branch 'dev' into 7648_dev_customerEntries

89a394a10d test(salix): refs #7648 #7648 entry.filter

30520cbe48 test(salix): refs #7648 #7648 getBuys.filter

08612fc70c perf(salix): refs #7648 #7648 fixtures and firstScript

3539b5a33e test(salix): refs #7648 #7648 remove fdescribe

2fe995d3ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF

7f213a7435 refs #6952 fix producer

e1b6ba4276 feat roadmap refs #7195

62bdc13807 Merge branch '6952-productorItemPDF' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF

99beb21927 Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount

4ad6c440e0 Merge pull request 'refs #7651 Add editorFk and triggers' (!2661) from 7651-Add_editorFk_mailAliasAccount into dev ...

Reviewed-on: #2661
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

9708e79e55 build: increase version 2430

872ab1a758 Merge branch 'dev' into 5855-temporaryTable

e8a35764fd Merge pull request 'feat: refs #5855 drop temporary table' (!2040) from 5855-temporaryTable into dev ...

Reviewed-on: #2040
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

61265a45e3 Merge branch 'dev' into 7195_roadmap2

0bb4439f85 refs #7443 Deleted ekt barcode

0d70cb8929 fix: informatica no necesita este correo

0e4db6c3d3 Merge branch 'dev' into 7648_dev_customerEntries

cc004a864a feat(salix): refs #7648 #7648 rename some travel fields

adbbe4aef9 fix(salix): refs #7648 #7648 solve big bug

00b33df802 Merge branch 'dev' into 6952-productorItemPDF

18b7fb48c7 Merge pull request 'refs #7443 Deleted ekt barcode' (!2665) from 7443-deleteEktBarcode into dev ...

Reviewed-on: #2665
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

1afce8124f Merge pull request 'refactor: refs #7418 Item type refactor' (!2658) from 7418-itemType into dev ...

Reviewed-on: #2658
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

d1a38ec589 Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ...

Reviewed-on: #2656
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

946d6f553a perf(salix): refs #7648 #7648 sql conventions

5c73a20f43 Merge branch 'dev' into 7648_dev_customerEntries

7677ada925 Merge branch 'dev' into 7195_roadmap2

19c378d6bd feat: refs #7116 añadir comentario

f1c9c71f4f Merge branch 'dev' into 7116-agencyIncoming

797a4e5df6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2

beff905e02 perf(salix): refs #7648 #7648 remove change role for user 2

3710c7c9c8 Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries

947c28b988 Merge pull request '7195_roadmap2' (!2554) from 7195_roadmap2 into dev ...

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

1c6dd17f90 Merge branch 'dev' into 6449-addColumnLogTables

4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll

d72a52d6b1 Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev ...

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

d1ef1c80f8 feat: refs #7382 Added unique key

d01820c751 Merge branch 'dev' into 6436_jasmine_beforeAll

77d86c9fd9 feat: refs #7664 Added created in calendar table

743fdb16da Merge pull request '#6436 Definir funcion global que añada ctx' (!2232) from 6436_jasmine_beforeAll into dev ...

Reviewed-on: #2232
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

39f95e376b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

4535795515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

aaca2d12c5 refactor: refs #7504 Rename id greuge

a8d663bee4 feat: refs #7348 hasDailyInvoice field

12f29aa50e Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev ...

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

cf63d6e71c feat: refs #7378 Added productionConfigLog

2c39c2a6ba Merge pull request 'feat: refs #7664 Added created in calendar table' (!2668) from 7664-createdCalendar into dev ...

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

dd3a8d4b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2

fafebb4339 refs #6897 fix filter

92163231b1 Merge pull request 'refs #6897 fix filter' (!2657) from 6897-entryMigration2 into dev ...

Reviewed-on: #2657
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

dbc3bdbc97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF

e6c1ec11d3 Merge branch '6952-productorItemPDF' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF

900fa2de5e fix: refs #7648 add myOpts

c7f6ca6db9 Merge pull request '#7648 add myOpts' (!2672) from 7648-fix-addOpts into dev ...

Reviewed-on: #2672
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

a0d524b22b Merge pull request 'refactor: refs #7504 Rename id greuge' (!2669) from 7504-greugeId into dev ...

Reviewed-on: #2669
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

420daeba9f Merge branch 'dev' into 6952-productorItemPDF

4f9552379e feat: refs #7654 entry_splitByShelving

2278b9a05a feat: refs #7382 Changes

246b34571d feat: refs #7382 Fix

0c27ac6e71 Merge branch 'dev' into 7382-triggerInvoiceInTax

5500a6f085 Merge pull request 'refs #6952 subName' (!2636) from 6952-productorItemPDF into dev ...

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

d65af6aaaa feat: Avisar cuando no hay posibilidad de fichar refs #7669

989fa5ac5a feat: Avisar cuando no hay posibilidad de fichar refs #7669

d59cab13d8 feat(salix): refs #7380 #7380 client.substitutionAllowed new field

17e7dc8c7e feat(salix): refs #7380 #7380 new typeObservation

ac01543b00 Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn

5f7c7ae5dd Merge branch 'test' into dev

68871e6345 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn

e897cdc35b Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn

c696be4dda Merge branch '7654-entry_splitByShelvingCreateColumn' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn

897da1e48a feat: refs #7654

a7895ab0a4 refs #6769 First commit

58ba6d0f4c Merge branch 'test' into dev

58fab284f4 Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn

c2d899cd6a Merge branch 'test' into dev

9819744caf Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn

87e4a78092 Merge pull request 'feat: refs #7654 entry_splitByShelving' (!2673) from 7654-entry_splitByShelvingCreateColumn into dev ...

Reviewed-on: #2673
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

cf7de14de6 refs #6769 Changes, with error no database selected

1fff3aa681 feat: refs #7670 addSale

776fd05648 fix: send rocket after commit cau 199307

d6f6df48f2 Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev ...

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

6f0196d656 refs #6769 Changes

1e109a493d Merge branch 'dev' into 7116-agencyIncoming

50c9ded103 refs #6769 Fix

e3db143b44 feat: refs #7348 campo en json

d4b4c0fafe feat: refs #7348 campos a modificar

aafe764d9d Merge pull request 'fix: send rocket after commit cau 199307' (!2680) from warmFix_deleteSales_rocket into dev ...

Reviewed-on: #2680
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

aa46d7a536 refs #6769 item_getBalance optimization

182273d3b3 refs #7450 Modified msg throw

6bb3f1e4ff Merge branch 'dev' into 7116-agencyIncoming

706288f227 Merge pull request 'test' (!2687) from test into dev ...

Reviewed-on: #2687
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

03854a42c9 Merge pull request 'refs #7450 Modified msg throw' (!2684) from 7450-entryIsEditableMsg into dev ...

Reviewed-on: #2684
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

481d57042f Merge pull request 'feat: refs #7382 Added unique key' (!2667) from 7382-triggerInvoiceInTax into dev ...

Reviewed-on: #2667
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

1799b52f8b feat: refs #7622 Added type column addressWaste

b9e986c962 feat: refs #7622 Fix

1d59883d19 feat: refs #7644 Minor change

fb07cdccc3 Merge branch 'test' into dev

3508cf3a9e refs #7561 add fk en userFk

f07964be20 Merge pull request 'refs #7561 add fk en userFk' (!2690) from 7561-userFk-expeditionState into dev ...

Reviewed-on: #2690
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

5192bfd8ea fix(salix): refs #7648 #7648 entryFilter and getBuys by fi

0e0d07c4fe Merge pull request 'WARMFIX #7648 entryFilter and getBuys by fi' (!2691) from 7648_warmFix_filterByFI into dev ...

Reviewed-on: #2691
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

2f10066290 feat(salix): refs #7380 #7380 remove new field

570b06bd18 Merge branch 'dev' into 7380_substitutionCondition

3c2a44eb53 feat(salix): refs #7380 #7380 add value to fixtures

e64f56cff1 Merge branch 'test' into dev

e9d2ff1476 feat: refs #7582 claimDestination addColumn code

9f57e50f89 feat(salix): refs #7380 #7380 add value to fixtures

9f4680325b feat(salix): refs #7380 #7380 rename extension file

8355d544c3 Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition

a9b4b3ee16 Merge branch 'dev' into 7380_substitutionCondition

4b0a08d965 refactor: refs #7684 vehicle warehouseFk fix

3fa0823d93 feat: refs #7582 quitar vn

a796787cb5 feat: refs #7582

d0e4decf1e refs #6952 add producer sql trad

0722a97c60 feat: refs #7582

663f78e684 Merge pull request 'feat: refs #7582 claimDestination addColumn code' (!2695) from 7582-claimDestinationAddColumn into dev ...

Reviewed-on: #2695
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

eb60a1ed77 Merge branch 'dev' into 7378-productionLogConfig

f79b2378af Merge branch 'dev' into 7622-addressWaste

938037d67a Merge branch 'dev' into 7348-client-hasDailyInvoice

f57ab72482 refactor: refs #7580 Fix and improvement

73b43aa254 refactor: refs #7580 Fixes

86859c98e3 refactor: refs #7662 Added transaction

32793990ec refactor: refs #7662 Minor change

f009e8f8ad Merge branch 'dev' into 7380_substitutionCondition

eaca342777 refactor: refs #7662 Minor change

1866c16727 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

9892b37ed0 Merge branch 'dev' into 7116-agencyIncoming

4d52e32718 Merge branch 'dev' into 7380_substitutionCondition

cb5c660e13 Merge pull request '#7116 agencyIncoming' (!2178) from 7116-agencyIncoming into dev ...

Reviewed-on: #2178
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

3f0335cf37 feat: refs #7644 Added with recursive buy-label

6430fb5b51 refactor: refs #7662 Requested changes

c9e9d95cff Merge branch 'dev' into 7505-item_calcVisible

7279feab12 feat: refs #7505 Changes

86acc644fe feat: refs #7505 Changes

29f9fa0ce3 feat: refs #7505 Optimization

725cbb5aa4 Merge pull request '#7380 - Substitution field' (!2677) from 7380_substitutionCondition into dev ...

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

40461fb89e Merge pull request 'refactor: refs #7662 Added transaction' (!2702) from 7662-ticketSplitPackingType into dev ...

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

4dcc8b02a5 feat: refs #7685 delivery coordinates

85a8009034 Merge branch 'dev' into 7685-delivery_beforeDeadlock

928dc977b0 Merge branch 'dev' into 7544-claimChangeState

248000bdcd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

35ca968d88 Merge branch 'test' into dev

be83fa6729 fix: refs #7622 Fix

775ceabe77 Merge branch 'dev' into 7544-claimChangeState

5b9e6f0e59 Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev ...

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

f8169b3034 feat: refs #7544 chages required

f8efecd7c4 Merge branch 'dev' into 7544-claimChangeState

4cc6fd3d8b Merge branch 'dev' into 6952-fixProducerNameInvoice

c2e9095ccd feat: refs #7505 Requested changes

470c9bc872 feat: refs #7505 Minor changes

e2b6473831 feat: refs #7505 Minor changes

daec922c5c Merge branch 'dev' into 7505-item_calcVisible

0b61a175ef Merge branch 'test' into dev

1ca95678df Fix

9d4db0d408 Merge pull request 'refactor: refs #7505 item_getVisible refactor' (!2573) from 7505-item_calcVisible into dev ...

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

004dcb67ff feat: refs #7116 insert into agencyIncoming

5bfabee6e3 Merge branch 'dev' into 7116-agencyIncoming

4f4d12c76a Merge branch 'dev' into 7544-claimChangeState

57500f100e Merge pull request 'feat: refs #7544 crear evento claim_changeState' (!2552) from 7544-claimChangeState into dev ...

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

5264888f06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7116-agencyIncoming

bfb2866833 Merge pull request 'feat: refs #7116 insert into agencyIncoming' (!2710) from 7116-agencyIncoming into dev ...

Reviewed-on: #2710
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

a003cd24f6 Merge pull request 'refactor: refs #7684 vehicle warehouseFk fix' (!2697) from 7684-vehicleFixFk into dev ...

Reviewed-on: #2697
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

c7d9fae17b Merge branch 'dev' into 7348-client-hasDailyInvoice

3c975aa9c4 refactor: refs #7580 Requested changes

27f9001e34 refactor: refs #7378 Requested changes

36b1beeebf Merge branch 'dev' into 7670-addSaleRenewPrice

a82f7bc025 Merge branch 'dev' into 6769-itemDiary

203db3ec3a feat solvePrintLabel refs #7269

5304929f57 feat: #refs 7348 schema

c45c920dbb Merge branch '7348-client-hasDailyInvoice' of https://gitea.verdnatura.es/verdnatura/salix into 7348-client-hasDailyInvoice

02bcfd9be3 feat: refs #7704 Major changes

61a746c2d8 feat: refs #7704 Fixes

7ba2e8d4c5 feat: refs #7704 Fix tests

0416ebedb5 feat: refs #7704 Added grant

b3a98226c0 feat: refs #7685 chages required

1669944286 Merge branch 'dev' into 7685-delivery_beforeDeadlock

823756d71a feat: refs #7704 Optimization

ec356423bb Merge branch 'dev' into 6952-fixProducerNameInvoice

3305d2897c Merge pull request 'refs #6952 add producer sql trad' (!2698) from 6952-fixProducerNameInvoice into dev ...

Reviewed-on: #2698
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f3d96f178f Merge branch 'dev' into 7685-delivery_beforeDeadlock

2e48263636 feat: refs #7704 Fix

b25cf67036 Merge branch 'dev' into 7670-addSaleRenewPrice

90802bd330 feat: refs #7704 Minor changes

7bdc242fc7 feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem

cb0461b241 feat: refs #7685 changes required

f1b0b95442 feat: refs #7704 Refactor

9b2ebe7bd9 feat: refs #7685

fb1c66633c feat: refs #7685

c770d17c25 feat: refs #7685

ca1933cb83 feat: refs #7704 Fixtures hedera

0d30331c9a feat: refs #7704 Fixtures hedera

d9bd7ad84e feat: refs #7704 Fix

443a752cfe feat: refs #7704 Added check

9e3baeffa6 feat: refs #7704 Added tests

69e0d78537 feat: refs #7704 Fix tests

0fd0302545 Merge pull request 'feat: refs #7378 Added productionConfigLog' (!2671) from 7378-productionLogConfig into dev ...

Reviewed-on: #2671
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

dab386326f feat: refs #6769 Requested changes

6702ff8616 feat: refs #7580 Requested changes

96a157d2f7 Merge branch 'dev' into 7580-setParkingfIX

485404d68f feat solvePrintLabel refs #7269

ca48ad9777 feat(salix): refs #7648 #7648 add new entries and travels

b28a8a34dc feat(salix): refs #7648 #7648 add new filter

1c5ab395e6 Merge branch 'dev' into 7648_myEntries_filter

1c675ca43f Merge branch 'dev' into 7685-delivery_beforeDeadlock

77b1facf46 Merge branch 'dev' into 7670-addSaleRenewPrice

28b6dc901f feat: refs #6769 Requested changes

880b332575 Merge pull request 'feat: refs #7685 delivery coordinates' (!2706) from 7685-delivery_beforeDeadlock into dev ...

Reviewed-on: #2706
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

31530d6d3d feat: refs #6769 Fix tests

bf49b3f318 Merge branch 'dev' into 7269_printLabel

21cc43b690 Merge pull request 'feat: refs #7269 printLabel' (!2720) from 7269_printLabel into dev ...

Reviewed-on: #2720
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

5c80a99543 feat: refs #7704 Requested changes

bfe79eb1d1 Merge branch 'dev' into 7670-addSaleRenewPrice

05202e0b76 refactor: refs #7680 Added cursors

5a8634356a Merge branch 'dev' into 7648_myEntries_filter

47cff3f894 feat(ssalix): refs #7648 remove select field

bb787b1581 refactor: refs #7704 Requested changes

b1290a539b Merge pull request 'refactor: refs #7680 Added cursors' (!2723) from 7680-saleTicketSetProblem into dev ...

Reviewed-on: #2723
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

910071bde0 refactor: refs #7704 Requested changes

186cd4c7dd refactor: refs #6769 Requested changes

8f2185e85a Merge branch 'dev' into 7670-addSaleRenewPrice

5ed8b33cef Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev ...

Reviewed-on: #2700
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

f3612c7ee3 fix: refs #7580

9b8e2e1279 Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev ...

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

1531e27911 fix: refs #7704 Restored minimum quantity label

f8f6950de1 Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ...

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

4da811cba6 Merge branch 'dev' into 7670-addSaleRenewPrice

58f8b4f714 Merge pull request 'feat: refs #7670 addSale' (!2679) from 7670-addSaleRenewPrice into dev ...

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

1e264c2102 fix: refs #7704 Warehouse priority

dcde6bb37a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

49183c79f1 feat: Turn issues into calculated columns refs#7213

bedff9f290 Merge branch 'dev' into 7648_myEntries_filter

c70824535a feat(ssalix): refs #7648 clean fixtures

5dcabd687e feat(ssalix): refs #7648 clean test !entry.filter

1d23554508 perf(ssalix): refs #7648 remove default value

0ca4bffaf0 Perf: improve condition days filter

fb8b31b397 perf: refs #7648 #7648 clean fixtures and SQL filter

199d8e0034 Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter

eca89c1c4e Merge branch 'dev' into 7348-client-hasDailyInvoice

87a3fb57fe Merge pull request '#7648 - Filter entries by days' (!2722) from 7648_myEntries_filter into dev ...

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

31f537ae28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas

f25d5c3bb5 Merge branch 'dev' into 7348-client-hasDailyInvoice

ac58b7a9e9 Merge pull request 'feat: Turn issues into calculated columns refs#7213' (!2646) from 7213-problemas-columnas into dev ...

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

2baff02443 Merge pull request 'master' (!2716) from master into test ...

Reviewed-on: #2716
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

3698651306 Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev ...

Reviewed-on: #2670
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

87b0d3e8d1 refs newStatePartial refs #7642

dc5903421b refs newStatePartial refs #7642

4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

8a9a74a7eb test: fix ticket e2e

945f20bfcf Merge pull request '7729-devToTest_2430' (!2739) from 7729-devToTest_2430 into test ...

Reviewed-on: #2739
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

dbb893c723 Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test ...

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

b871615e8f fix: worker new if not has provinceFk

1cf0ab1654 Merge branch 'test' into warmFix_worker_new

4795b1ad88 Merge pull request 'fix: worker new if not has provinceFk' (!2741) from warmFix_worker_new into test ...

Reviewed-on: #2741
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

2181664c25 fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213

3e76fa4258 Merge pull request 'fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213' (!2745) from fix-ticket_setRisk-ticket_setProblemTooLittleItemCost into test ...

Reviewed-on: #2745
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

ae2ddcb8c7 add console.log

a1f481deb1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

0181764744 Merge pull request 'master' (!2750) from master into test ...

Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

fa07d03b8c Merge pull request 'master' (!2753) from master into test ...

Reviewed-on: #2753
Reviewed-by: Robert Ferrús <robert@verdnatura.es>

f18b165e4a Merge branch 'master' into test

dbf91293f8 Merge pull request 'master' (!2761) from master into test ...

Reviewed-on: #2761
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

fd2bac713d fix: #6184 Deleted unused params

ae18a52a89 fix: refs #7129 fix filter

ce59a2bbbf fix: refs #6769 Item diary redirection to Lilium

c3d3a21b23 feat: refs #7129 add fields

c18765f22f fix: refs #7129 fix return

ab45b988c8 feat: refs #7704 Added itemMinimumQuantity_check

b58cdcc590 Merge branch 'master' into test

62ab72d6d5 Merge branch 'test' into 7129-fixFilter

b73eceb1c8 fix: refs #7129 fix backFilters

d152a58dda Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter

296fe3442d Merge pull request 'master' (!2773) from master into test ...

Reviewed-on: #2773
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

aeb8d4dbea Merge pull request '7129-fixFilter' (!2766) from 7129-fixFilter into test ...

Reviewed-on: #2766
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

guillermo approved these changes 2024-07-23 06:18:45 +00:00

alexm merged commit 7c4032c859 into master 2024-07-23 06:21:03 +00:00

alexm deleted branch 7773-testToMaster_2430 2024-07-23 06:21:03 +00:00

alexm referenced this issue from a commit 2024-07-23 06:21:04 +00:00

Merge pull request '7773-testToMaster_2430' (!2774) from 7773-testToMaster_2430 into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

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

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

No description provided.