8179-testToMaster #3176

Merged

alexm merged 407 commits from 8179-testToMaster into master 2024-11-12 06:41:52 +00:00

Conversation 0 Commits 407 Files Changed 335 +1800 -13764

alexm commented 2024-11-11 13:12:18 +00:00

Member

Copy Link

No description provided.

alexm added 401 commits 2024-11-11 13:12:18 +00:00

6b1001ec6a feat: refs #7353 drop section

5a22f009f2 refactor: refs #7817 itemShelving_addList change

3d69d1ad62 fix: refs #6896 remove files

0ab490f9b9 Merge branch 'dev' into 6896-ordersMigration

943c27142f feat: refs #7354 deleted code and redirect to Lilium

4c29ef862f refactor: refs #7354 deleted test

0e849086a0 Merge branch 'dev' into 7354_ZoneMigration_End

0ca1db7633 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets

08c7bd2c42 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets

30c7475fcb Merge branch 'dev' into 7353-takeoutMonitor

3e9f472447 Merge branch 'dev' into 7354_ZoneMigration_End

97b07ea561 fix: refs #7356 ticket weekly filter

662ede981b Merge branch 'dev' into 7356-FixTicketWeekly

f696c4043d Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix into 7354_ZoneMigration_End

757cd78cfc fix: refs #7354 fix files

cfbc3692e9 feat: refs #7874 clientObservationType

b083b267b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

d7e7647b52 Merge branch 'dev' into 7817-isChecked

738a390ef7 refactor: refs #7886 Deleted proc buy_getVolumeByAgency

4d0bb81632 fix: refs #7323 worker/filter

1d47690bb4 feat: refs #7884 added new filter field

e293dff7c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

acdaa96211 refactor: refs #7817 Requested changes

be30e5ae1f Merge branch 'dev' into 7817-isChecked

71362baa66 feat: refs #7884 added filter when daysOnward and daysAgo have value and refactor ifs block

33c3ceaf33 Merge branch 'dev' into 7884-AddLabelerField

24780c4511 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

59c6d316dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField

eb430ea5c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

75b7e603c9 fix: refs #7323 drop acl

35358834d9 Merge branch 'dev' into 7884-AddLabelerField

c0c8548216 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

6b90690924 Merge branch 'dev' into 7354_ZoneMigration_End

b642147d82 feat: refs #7356 added new filter field

fa4f75fbb9 Merge branch '7356-FixTicketWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 7356-FixTicketWeekly

2fc07e651f Merge branch 'dev' into 7884-AddLabelerField

fb1e77f9c4 fix: refs #7404 fix back data source

1ec8d8d5a0 feat: refs #7994 update sale.originalQuantity

753f6d7866 feat: refs #7994 add schema

0bf2935c23 Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity

6650673c7d Merge branch 'dev' into 7884-AddLabelerField

8ff0dc06fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

459f6601b7 fix: refs #7404 add transaction on detail calculate

80985fbd56 fix: refs #7404 round data and fix specs

ab89c8f3ba Merge branch 'dev' into 7404-fixStockBought

9a0b487d20 feat: refs #8030 new table

6ff76fd74b feat: refs #7207 show queue in worker summary

3988eb0d97 fix: refs #7404 back and e2e

166ca42e32 Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought

bfd52b8773 Merge branch 'dev' into 7404-fixStockBought

acabd3e154 feat(catalog_componentCalculate): refs #8030 new component improved ...

The procedure has now the component "bonus", a special price increasing for a group of items

Refs: #8030

a5f3dbc15a fix: refs #7404 last entries spec

f9b37541eb Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought

fb7208d898 fix: refs #8030 warehouse filter ...

Warehouse is also needed to make the filter

Refs: #8030

c6a3004d12 feat: refs #7207 allocate new queue on dept change

78b500e452 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

91801b1979 fix: refs #8030 redmine revision updates ...

Changes recomended by the reviewer

Refs: #8030

11b54666d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

5c8f42a3ae fix: refs #8030 redmine revision updates ...

Changes recomended by the reviewer

Refs: #8030

a39b28f1a8 Merge branch '8030-newPriceComponent' of https://gitea.verdnatura.es/verdnatura/salix into 8030-newPriceComponent

5c4849b60d Merge pull request '8030-newPriceComponent' (!3010) from 8030-newPriceComponent into dev ...

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

1e07a2fc59 Merge branch 'dev' into 7884-AddLabelerField

1be5fced3c fix: refs #8030 little bugs

1dbf29ccd1 Merge branch 'dev' into 8030-newPriceComponent

47f4b2f3d4 Merge pull request 'fix: refs #8030 little bugs' (!3011) from 8030-newPriceComponent into dev ...

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

d608b3b9c8 Merge pull request '7404-fixStockBought' (!3004) from 7404-fixStockBought into dev ...

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

d221611382 Merge branch 'dev' into 7356-FixTicketWeekly

7e449c5716 fix: refs #8030 bugs

f6e1880634 fix: refs #8030 test change

ed656836b1 Merge branch 'dev' into 8030-newPriceComponent

4ed6f35912 build: init version 24.42

63a4cb1847 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

403637dd8c Merge branch 'dev' into 8030-newPriceComponent

0822996f20 Merge pull request '8030-newPriceComponent' (!3012) from 8030-newPriceComponent into dev ...

Reviewed-on: #3012
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

ae039d6ce2 Merge branch 'dev' into 7356-FixTicketWeekly

7a343d60e6 feat: refs #8030 new fields for vn.priceDelta

142ee2b96f Merge branch 'dev' into 8030-newPriceComponent

e33429f474 fix: refs #8030 grant actions to buyer

785778e58a fix: refs #8030 database selected for grant

b82b3bd004 Merge pull request 'feat: refs #8030 new fields for vn.priceDelta' (!3013) from 8030-newPriceComponent into dev ...

Reviewed-on: #3013
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

64376b7503 fix: refs #8030 new table version

ac1d2ee48b Merge branch 'dev' into 8030-newPriceComponent

171033f870 Merge pull request 'fix: refs #8030 new table version' (!3014) from 8030-newPriceComponent into dev ...

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

0f8db9ee7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx

02e837ebb6 feat: refs #7207 add queue on department change

16b059a14a refactor: refs #7207 tab

3f81d624cb feat: refs #7981 deprecated showAgencyName

fe178ea396 Merge branch 'dev' into 7356-FixTicketWeekly

6d4614d56f Merge pull request 'fix: refs #7356 ticket weekly filter' (!2939) from 7356-FixTicketWeekly into dev ...

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

26d7866ec8 Merge branch 'dev' into 7884-AddLabelerField

b776788714 feat: refs #7855 delete isChecked

eb85181ea0 feat: refs #7855 delete isChecked

112aeaba91 Merge pull request 'feat: refs #7855 delete isChecked' (!3017) from 7855-BoxPicking into dev ...

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

eb0f8ec23c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx

1c42303a75 chore: refs #7207 drop useless relation

ddebd31648 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

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

3e270befa5 chore: refs #7874 refactor table

0cd20503d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

9ef44d8d8d feat: refs #6722 refactor createThermograph

80c6497d3c feat: refs #6722 traduccion

6ce4ff1311 Merge branch 'dev' into 6722-thermograph

40f3b6b67a Merge pull request '6722-thermograph' (!3019) from 6722-thermograph into dev ...

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

7c23acde64 feat: refs #7874 add observationTypeFk col

d1529c808e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

f62d11dab2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

5e56034105 fix: refs #7323 rollback

eb2a30f0d9 fix: refs #7779 refactor collection

0851c6fb97 fix: refs #7779 refactor collection

4ebda1a06f feat: refs #7010 added filter fields to show packing type field in ticket list

c825191823 feat: refs #9722 fixtures

f68ed48081 feat: refs #9722 testFixed

20e894257d fix: refs #7874 rollback

6b4b5f2338 fix: e2e not necesary

f3bf0b7432 feat: refs #7874 validate required field

0ad1d838d9 fix: refs #7779 refactor collection

5270db2abe fix: refs #7779 refactor collection

b547858820 perf: refs #7010 showing field correctly

a7c858dbba Merge branch 'dev' into 7981-showAgencyName

4156a0f0fe Merge pull request 'fix: refs #7779 refactor collection' (!3021) from 7779-refactor-collection into dev ...

Reviewed-on: #3021
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>

95601b139b feat(priceDelta): refs #8030 new field zoneGeoFk ...

Buyers need zone restriction field for the new component bonus

Refs: #8030

f7e13e8ac9 Merge branch 'dev' into 8030-newPriceComponent

c2aa33bf3c Merge pull request 'feat(priceDelta): refs #8030 new field zoneGeoFk' (!3032) from 8030-newPriceComponent into dev ...

Reviewed-on: #3032
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

e6d950e33f Merge branch 'dev' into 7981-showAgencyName

2d289bc8ac Merge pull request 'feat: refs #7981 deprecated showAgencyName' (!3016) from 7981-showAgencyName into dev ...

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

e7d07e496e fix: refs #7404 add rounding to volume detail

751c0ee39e Merge branch 'dev' into 7404-roundDetailVolume

25680994dd feat(previaDelta): refs #8030 new algorithym for coincident records ...

when many records target the same zoneGeoFk, the deepest must be chosen

Refs: #8030

1e64028b02 Merge branch 'dev' into 8030-newPriceComponent

de93e477f8 Merge pull request 'feat(previaDelta): refs #8030 new algorithym for coincident records' (!3036) from 8030-newPriceComponent into dev ...

Reviewed-on: #3036
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

2962bd13c7 fix: refs #8030 buyer prefers to add multiple zoneGeoFk ...

Instead of choosing the deepest zoneGeo, buyer wants all to be merged

Refs: #8030

c680c4a059 refactor: refs #7884 modified sql

eacc2d5d2a Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField

e6e7876fb1 Merge branch 'dev' into 8030-newPriceComponent

477c7f7903 Merge pull request 'fix: refs #8030 buyer prefers to add multiple zoneGeoFk' (!3037) from 8030-newPriceComponent into dev ...

Reviewed-on: #3037
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

c4f26094d5 fix: refs #7884 fixed filter

54d9125c21 feat(collection_new): refs #8058 urgent state ...

Urgent tickets will be priorized as asigned ones

Refs: #8058

de3d7fc925 Merge pull request 'feat(collection_new): refs #8058 urgent state' (!3038) from 8058-Tickets-Urgentes into dev ...

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

b55db4bdc0 feat: refs #7010 added subquery to avoid using group by in sql

41af809917 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets

61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

36e1cfd51a fix: myOptions error

94636e1c19 Merge branch 'dev' into 7817-isChecked

45e87a5d94 Merge branch 'test' into dev

f94ace05cc Merge branch 'dev' into 7817-isChecked

4243cdbf50 fix: refs #7817 Tests back

19dcedbce5 fix: refs #7935 Fix boolens

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

ca8cffff94 Merge branch 'dev' into 7354_ZoneMigration_End

6685ade299 fix: getSimilar daysInforward

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

48ade26595 Merge branch 'dev' into 7354_ZoneMigration_End

f54a9a1348 fix(fixtures): revert bad merge master to test

4c9a199418 Merge branch 'dev' into 9722-travelThermographTrigger

9b41b3e54b Merge branch 'dev' into 7354_ZoneMigration_End

5c3d1ca531 Merge pull request 'feat: refs #7354 deleted code and redirect to Lilium' (!2906) from 7354_ZoneMigration_End into dev ...

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

0740acfb91 fix: refs #7366 remove back Travel

99bd78db36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration

aba70f4a82 Merge pull request 'feat: refs #6722 fixtures' (!3027) from 9722-travelThermographTrigger into dev ...

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

0525081c52 Merge branch 'dev' into 7935-fixBool

e2d30ef933 Merge pull request 'fix: refs #7935 Fix boolens' (!3044) from 7935-fixBool into dev ...

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

304992e7cf feat: refs #8069 starting branch

fd262e32c1 feat: refs #8069 new trigger hedera.orderRow_afterInsert

03ea7580d8 feat: refs #8069 new proc

435fec03da refactor: refs #7404 deprecated stockBuyed

c6a823e6aa Merge branch 'dev' into 7404-deprecateStockBuyedAndRelatedProcs

b7b5334a99 refactor: refs #7884 modified filter

d73f790221 Merge branch 'dev' into 7884-AddLabelerField

40512ca67e feat: existingRefund without ticketRefunds

48c387be75 Merge pull request 'refactor: refs #7404 deprecated stockBuyed' (!3046) from 7404-deprecateStockBuyedAndRelatedProcs into dev ...

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

2267b2c6b1 Merge branch 'dev' into 7884-AddLabelerField

2fbf8478c0 Merge pull request '#7884 added new filter field' (!2981) from 7884-AddLabelerField into dev ...

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

dc0a4f35f3 Merge branch 'dev' into 7886-buy_getVolumeByAgency

9d84c39fce feat: refs #8069 orderRow_updateOverstocking

b53f6d4008 Merge branch 'dev' into 8069-Overstocking

9ba017d352 feat: refs #7902 Changed definer and throw msg

2baf433d1a Merge branch 'dev' into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado

b556903d6d feat: refs #7902 Changed definer and throw msg

26a9e8ca50 Merge branch '7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado' of https://gitea.verdnatura.es/verdnatura/salix into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado

c15b4f1bdf Merge pull request 'feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets' (!2908) from 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado into dev ...

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

724ddd5fe8 refactor: refs #7980 Deleted table buyMark

c8abf153e5 Merge branch 'dev' of https: refs #7366//gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration

47ed9a8f4e Merge pull request 'test' (!3056) from test into dev ...

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

62bd2ae03b refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale

c4c08934a7 Merge branch 'dev' into 6824-itemShelvingSaleNoDelete

1b78aa1985 Merge branch 'dev' into 7366-travelMigration

5b75ffdbba Merge pull request '7366-travelMigration' (!3054) from 7366-travelMigration into dev ...

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

2655e20ef6 refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale

a49d6aaf12 Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete

fc1ea280fa fix: refs #8069 new conception

abb39ec0e7 Merge branch 'dev' into 8069-Overstocking

3a5eb00a45 Merge pull request '8069-Overstocking' (!3051) from 8069-Overstocking into dev ...

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

43df98598c feat: refs #7346 manual invoice with address

ee52c8b45f fix: refs #7346 findByid con fields

5f695f63b3 Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev ...

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

91d9a6e417 Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev ...

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

b34727a436 fix: refs #8069 wrong field name

1b254b138e Merge branch 'dev' into 8069-Overstocking

cbc8cc6210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7010-AddPackingField

0311069f00 Merge branch 'dev' into 7323-fineTunningWorker

546bb85484 Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

a994f0c1c1 Merge pull request 'refactor: refs #7980 Deleted table buyMark' (!3052) from 7980-byeBuyMark into dev ...

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

0c4637030c Merge pull request 'refactor: refs #7886 Deleted proc buy_getVolumeByAgency' (!2965) from 7886-buy_getVolumeByAgency into dev ...

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

616c328681 Merge branch 'dev' into 7404-roundDetailVolume

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

530617ce6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

1930bc450f Merge branch 'dev' into 7323-fineTunningWorker

fd877119a9 chore: refs #7874 drop useless locale

2071518f57 fix: refs #7874 rollback

57cd6cc882 Merge branch 'dev' into 8069-Overstocking

3f325d865f fix: refs #7404 test for lasEntriesFilter

02f74e4215 Merge branch 'dev' into 7404-roundDetailVolume

9499819eec Merge branch 'test' into dev

46e2ffd6c2 fix: refs #7404 add fixtures

3f1de126c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

5416d38255 feat: refs #7874 redirect to lilium

23d2d2b1ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx

3638e9abb6 refactor: refs #7207 simplify code

db6cea6cbb Merge branch 'dev' into 6896-ordersMigration

229d5369a1 fix: refs #7404 spec for new entry fixture

f019214002 Merge branch 'dev' into 7404-roundDetailVolume

c01e5aee27 Merge pull request 'fix: refs #7404 add rounding to volume detail' (!3035) from 7404-roundDetailVolume into dev ...

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

3385f4136d Merge branch 'dev' into 6896-ordersMigration

a6cc7cd2a5 Merge branch 'dev' into 8069-Overstocking

505fff82a9 Merge pull request 'fix: refs #6896 remove files' (!2899) from 6896-ordersMigration into dev ...

Reviewed-on: #2899
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

0b1756ff3a Merge branch 'test' into dev

70a2189e30 Merge branch 'dev' into 7207-showPbx

c4faac7446 Merge branch 'dev' into 7323-fineTunningWorker

f8f205a4f8 feat: update myt version

e4d386c65f Merge branch 'dev' into 8069-Overstocking

5d00eb793c Merge pull request 'fix: refs #8069 wrong field name' (!3063) from 8069-Overstocking into dev ...

Reviewed-on: #3063
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

c799a9d894 Merge branch 'dev' into 7323-fineTunningWorker

e1133bcc07 Merge branch 'dev' into 7207-showPbx

3d831e290b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

6766cebd2a fix: refs #8069 call moved upper than transaction start

04e5018bc9 Merge branch 'dev' into 8069-Overstocking

4411f0cfb3 Merge branch 'dev' into 7353-takeoutMonitor

9f97de021a chore: refs #7874 fix e2e

49305f77df Merge pull request '#7353 takeout monitor' (!2866) from 7353-takeoutMonitor into dev ...

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

475d0bde38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

6fcd883f4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx

e0d0b66963 feat: refs #7207 add transaction

cf29b1bd82 Merge branch 'dev' into 8069-Overstocking

4b497108dc Merge pull request 'fix: refs #8069 call moved upper than transaction start' (!3075) from 8069-Overstocking into dev ...

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

12bf7f07c5 Merge branch 'test' into dev

ba9d0743b5 refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale

9a327a1c39 Merge branch 'dev' into 6824-itemShelvingSaleNoDelete

7fc2e34af9 refactor: refs #6824 Fix tests

1ae60f51dd Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete

7b4d15cb23 refactor: refs #6824 Requested changes

eb5da0f9cc Merge branch 'test' into dev

d6e2200227 Merge branch 'test' into dev

701b8d3c14 Merge pull request 'refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale' (!3057) from 6824-itemShelvingSaleNoDelete into dev ...

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

53f590af61 Merge branch 'dev' into 7207-showPbx

4fb0936399 Merge branch 'dev' into 7323-fineTunningWorker

542d0dcbd2 feat(itemShelving): refs #8075 new field ...

isMoving indicates the record must be transferred to another sector

Refs: #8075

6d973fd4ff Merge pull request '#7323 worker/filter' (!2978) from 7323-fineTunningWorker into dev ...

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

3cc31b7779 Merge branch 'dev' into 8075-itemShelvingMoving

2871810ec6 Merge pull request 'feat(itemShelving): refs #8075 new field' (!3077) from 8075-itemShelvingMoving into dev ...

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

de769efc0f feat: refs #8075 autoupdating

df0db41994 Merge branch 'dev' into 8075-itemShelvingMoving

ed4dff1914 Merge pull request 'feat: refs #8075 autoupdating' (!3078) from 8075-itemShelvingMoving into dev ...

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

e105fba227 feat: refs #8075 itemShelving ...

new field movingState

12a1a065f6 Merge branch 'dev' into 8075-itemShelvingMoving

22719820fd feat: refs #8069 overStocking protocol

3755c5a15b Merge branch 'dev' into 7207-showPbx

0358157b2c Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity

249e37f605 Merge pull request 'feat: refs #7994 update sale.originalQuantity' (!3000) from 7994-UpdateSale.OriginalQuantity into dev ...

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

ebe763dc9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx

330c1f3de6 chore: refs #7207 drop transaction

34f85fdcc4 Merge pull request 'feat: refs #8069 overStocking protocol' (!3082) from 8069-test-overStocking into test ...

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

ff43533b5a Merge branch 'dev' into 8075-itemShelvingMoving

c7269e77a6 Merge pull request 'feat: refs #8075 itemShelving' (!3081) from 8075-itemShelvingMoving into dev ...

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

023842ac33 feat: refs #7994 comment changes

b4dc5276dd fix: refs #7986 create fk

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

5cdb0b7eb6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

02adc6473a fix: duplicate variable

d497ffc781 Actualizar modules/ticket/back/methods/ticket/closure.js

39e808bca7 fix: refs #7986 fix model

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

040304d04f fix: merge

5eda0af20f feat: refs #8075 itemShelvingMoving

209e65180e Merge pull request 'feat: refs #8075 itemShelvingMoving' (!3089) from 8075-test-itemShelvingMoving into test ...

Reviewed-on: #3089
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

f5a43962fd Merge branch 'dev' into 7207-showPbx

9a7aa315e5 Merge pull request 'feat: refs #7207 show queue in worker summary' (!3007) from 7207-showPbx into dev ...

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

2b17e6da4c Merge branch 'dev' into 7874-createObservationType

295c31a5f0 feat: refs #7874 add finance obs type

770c604d6b chore: refs #7919 delete if ticketRefund

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

b39a749bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

4ee6a46bd5 feat: added new filter param

07849ebeb8 fix: myTeam param

68469e2ba8 Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto

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

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

f3b5a70b67 feat: refs #7323 show right error

cedb1b570d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-showRightError

d02e942dd2 Merge pull request 'feat: refs #7323 show right error' (!3096) from 7323-showRightError into dev ...

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

0549e22720 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType

48e4c68561 Merge pull request '#7874 clientObservationType' (!2960) from 7874-createObservationType into dev ...

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

32756dabae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund

ccf9dbde8e feat: refs #7919 test

a35208d903 feat: refs #7919 test

6d4c71d465 feat: refs #7919 test

f27566ac0f Merge pull request 'master' (!3098) from master into test ...

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

5b938a6f78 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

f2d1aa5f16 feat: refs #8098 closureDaysAgo

63f062a069 fix(renewToken): refs #8093 test & fix(sql) addClientObservationType

5e2edad6de Merge branch 'dev' into 8098-closureTransation

4526873bbe feat: refs #8098 without Date

976e50b566 feat: refs #8098 identation

c5f987d04c fix: refs #8098 renew token test fixed

f61c2fa083 Merge pull request '8093-devToTest_2442_3' (!3100) from 8093-devToTest_2442_3 into test ...

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

a2b9a59eb5 fix(sql): addClientObservationType

e334152acc refactor: deleted comment

8ff06d63c5 fix(sql): addClientObservationType

cf78a12f3a fix(sql): addClientObservationType

36bf2f89c7 Merge pull request '8098-closureTransation' (!3101) from 8098-closureTransation into dev ...

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

6eab66340f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

85f8b6fd20 build: init version 24.44

c73fd51a9c fix: refs #7986 add acl

536c2fa5b5 feat: refs #7994 update sale.originalQuantity

6cb8bea783 Merge pull request 'feat: refs #7994 update sale.originalQuantity' (!3104) from 7994-sale.originalQuantity into test ...

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

5a2058865d Merge branch 'test' into dev

099fe8f950 fix: refs #7986 fix model

4a88ba5078 feat: refs #7744 closeAll Test

6f8a005726 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund

d57f4fc44a chore: refs #7919 refactor, drop relation on back

a989bef78c Merge pull request 'master' (!3108) from master into test ...

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

46e657675b fix: refs #7906 remake method

c6e764b478 feat: refs #7348 hasDailyInvoice from client

aac4dd0a6d feat: refs #7348 minor bug

f78aad0874 Merge branch 'dev' into 7744-closeAllTest

8ca097d4a9 chore: refs #7919 change var name

c5aa7dc44e fix: refs #7906 edit test

8f01e4d110 fix: refs #7353 redirect to lilium

cb7575d821 Merge pull request 'fix: refs #7353 redirect to lilium' (!3111) from 7353-fixRedirect into dev ...

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

a282170016 fix: refs #7906 fix method

3e443ad5ce fix: refs #7230 producer fix

5de4a11e8b fix: refs #7230 fix line

3f3b936255 fix: refs #7906 remove code

37d3ef5f16 Merge branch 'dev' into 7986-workerMoto

681f82a3ae feat: refs #7744 test back ok

a188efb1e3 refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile

28e957fecd refactor: refs #8106 refs #1406 Optimized ticket_getTax

7dc35458e8 refactor: refs #7865 delete client.gestdocFk from TPV

5017b344d4 Merge pull request 'refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile' (!3118) from 7930-healthcheckDockerfile into dev ...

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

08e22db950 Merge pull request 'master' (!3125) from master into test ...

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

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

865da7bba2 refactor: refs #8106 Requested changes

541990efb7 Merge branch 'dev' into 7230-deliveryNoteProducer

b15b2d578d Merge pull request 'fix: refs #7230 producer fix' (!3112) from 7230-deliveryNoteProducer into dev ...

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

93494c3eb0 refactor: refs #7811 Deleted pm2

44dc84be9f Merge branch 'dev' into 7811-byePm2

f4b041c9b1 Merge branch 'dev' into 7865-deleteClientGestdocFkTPV

d7fd1b7ee5 Merge pull request 'refactor: refs #7865 delete client.gestdocFk from TPV' (!3123) from 7865-deleteClientGestdocFkTPV into dev ...

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

02dc952024 fix: refs #7906 add test

f68584b3fa Merge branch 'dev' into Fix-ItemRequest

50a2f6081e Merge branch 'dev' into 7986-workerMoto

8609e85ba1 Merge pull request '7986-workerMoto' (!3095) from 7986-workerMoto into dev ...

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

1273e895af fix: refs #7906 fix test back

46993ad103 refactor: refs #7010 deleted distinct

46c7745128 Merge pull request 'refactor: refs #7811 Deleted pm2' (!3127) from 7811-byePm2 into dev ...

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

3139d99130 Merge branch 'dev' into 7010-AddPackingField

5a14aed73a Merge branch 'dev' into 7906-notDeleteZone

35621e9051 Merge pull request '#7010 added filter fields to show packing type field in ticket list' (!3024) from 7010-AddPackingField into dev ...

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

939f083671 Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ...

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

ed69604767 Merge branch 'dev' into 7906-notDeleteZone

a5bbdd7a01 Merge pull request 'fix: refs #7906 remake method' (!3109) from 7906-notDeleteZone into dev ...

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

9e9773578a Merge branch 'dev' into Fix-ItemRequest

b8e782d3a5 fix: refs #6831 filter observation

b88dc1c70f fix: refs #6850 remove notifyPickUp

da772cf504 Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ...

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

19fbb836a6 fix: refs #6850 fix model

be9f711cc1 Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ...

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

eea09a9d4a fix: refs #6850 add code

dead904c19 Merge branch 'master' into test

5d55fb287d Merge branch 'test' into dev

bf0cc687e1 Merge branch 'dev' into 6850-removeChandgeUpdateClaim

158f701f1e Merge branch 'dev' into Fix-ItemRequest

d75a032d75 Merge pull request 'Added new filter param in item request' (!3094) from Fix-ItemRequest into dev ...

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

e38c061deb fix: add date format on insert data

92f699aac3 Merge branch 'dev' into fixNightProc

e479873547 fix: restore cursor

1731af13ea Merge branch 'fixNightProc' of https://gitea.verdnatura.es/verdnatura/salix into fixNightProc

69a34ab0fa Merge pull request 'fix: add date format on insert data' (!3135) from fixNightProc into dev ...

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

2f77359892 Merge branch 'dev' into 7919-deleteTicketRefund

b76b1c6d50 Merge pull request '#7919 delete if ticketRefund' (!3091) from 7919-deleteTicketRefund into dev ...

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

c3ffb31348 Merge branch 'dev' into 6831-observationDefaulterEmail

f8c83c8f68 Merge pull request 'fix: refs #6831 filter observation' (!3131) from 6831-observationDefaulterEmail into dev ...

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

aad616ff83 Merge branch 'dev' into 6850-removeChandgeUpdateClaim

56cba385cf Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev ...

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

db8573dd40 Merge pull request '8144-devToTest_2444' (!3137) from 8144-devToTest_2444 into test ...

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

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

fe3e7342bc fix: refs #7935 version

fc56dbc5fb Merge branch 'master' into test

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

765d125219 Merge branch 'master' into test

d95e455ccf fix: refs #7935 sin modificar autonomy

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

alexm added 6 commits 2024-11-12 06:39:09 +00:00

f8c3d69c5d fix: refs #7404 remove volume from ticket sold on holland

82e62e8ee7 Merge branch 'test' into 7404-fix-remove-tickets-volume

2dd3ae1c75 fix: refs #7404 empty commit

395e6997dd Merge branch '7404-fix-remove-tickets-volume' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fix-remove-tickets-volume

3d3bc0dbaa Merge branch 'test' into 7404-fix-remove-tickets-volume

ffe947c73d Merge pull request 'fix: refs #7404 remove volume from ticket sold on holland' (!3169) from 7404-fix-remove-tickets-volume into test ...

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

guillermo approved these changes 2024-11-12 06:40:37 +00:00

alexm merged commit 732dd02a19 into master 2024-11-12 06:41:52 +00:00

alexm deleted branch 8179-testToMaster 2024-11-12 06:41:52 +00:00

alexm referenced this issue from a commit 2024-11-12 06:41:53 +00:00

Merge pull request '8179-testToMaster' (!3176) from 8179-testToMaster 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#3176

No description provided.