8179-testToMaster #909

Merged

alexm merged 448 commits from 8179-testToMaster into master 2024-11-12 07:01:12 +00:00

Conversation 0 Commits 448 Files Changed 167 +6224 -2124

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

Member

Copy Link

No description provided.

alexm added 448 commits 2024-11-11 13:24:18 +00:00

3f1c0b95fa fix: proposal to avoid notify error

2ab7d48b0c feat: refs #7553 added VnTable in Expedition, new field & minor changes in rest of section

1dace39882 refactor: refs #7553 changed isScanned field & fixed cardDescriptor warning

7c5f5aee77 Merge branch 'dev' into 7553_FixTicketExpedition

61f1eae282 fix: deleted branch cloned wrongly

3330e43e25 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

954a6ff6c0 refacotr: refs #7553 refactor sales, purchaseRequest and saleTracking

4a57c53c3d fix: refs #7553 & #7356 migration

23e5072d38 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

574a2efc92 feat: refs #7553 added transferClient function

511d53d109 feat: refs #7553 added refund and add turn functions to descriptor

85bc610298 feat: refs #7553 refs #7356 & #7553 added rest of missing functions in the descriptor menu

5f63a9b058 refactor: refs #7553 & #7356 changed makeInvoice function and dialogs

79a26d7b94 feat: refs #7553 refs #7356 added VnTable in TicketVolume & fixed QBadge in summary

87eca93ef8 fix: use class link

6218463e7e perf: rename component

56c461f085 refactor: refs #7553 refs #7356 changed generatePdf name, fixed changeTime & added order in TicketVolume

6b2df03b06 Merge branch '7553_FixTicketExpedition' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

ffa6ef57fe fix: refs #7553 refs #7356 fix generatePdf function

14961d0aec fix: change order column by default

390ab9cfd1 feat: CustomerConsumptionFilter

071f3ba4d0 perf: TicketSummary issues

b8dea8551d perf: TicketTransferSale

45d9322892 feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes

8bcecb91c6 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

b622f6ef96 fix: refs #7553 fixed QChips like Salix

3d683c1da3 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

d18ca14b4e fix: refs #7553 merge changes

f35e33cf10 fix: refs #7553 fixed TicketTransfer

cb7d729b0f fix: refs #7553 fixed details in summary and data-key in TicketList

5471607d32 refactor: refs #7553 added order to Expedition table and tootltip in delete button

4bc148f16b Merge branch 'dev' into 7553_FixTicketExpedition

0d9773a30f refactor: refs #7553 added default date in new expedition modal

5edea7cad1 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

1889aa85b5 refactor: refs #7553 deleted expedition code and slot in VnTable

f5eacea483 refactor: refs #7553 modified QDrawer and table columns

65e3fd874d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

db6f4fd15a refactor: refs #7553 deleted logs

9f24a7bc29 Merge branch 'dev' into 7553_FixTicketExpedition

102f7fb13e Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

8ff9dae1d8 refactor: refs #7553 requested changes

e962063753 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

0e5607d685 feat: refs #7553 ticket component to vntable and fixed minor errors

04f4521a59 Merge branch 'dev' into 7553_FixTicketExpedition

4636e2f2e6 Merge branch 'dev' into 7553_FixTicketExpedition

4630496361 refactor: refs #7553 changed fields in ticket component & ticket filter

94ae74ca7f Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

0b961050a0 refactor: refs #7553 rollback ticket advance due to slot problems

6248a4117d refactor: refs #7553 requested changes

8f8462db94 Merge branch 'dev' into 7553_FixTicketExpedition

e7a89138ba fix: refs #7553 fix conflicts

8e35737c8e Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

ff7bcfb00a refactor: refs #7553 modified ticket sale to create a row in the table

d1138529b2 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

422907447b refactor: refs #7553 merge conflicts

6a5f31ff1e fix: refs #7553 fixed conflicts

4a1f5e922c refactor: refs #7553 align ticket sale qdrawer fields

b4c46dc153 refactor: refs #7553 modified ticketSummary QChips, deleted useless code

bb1eb30a25 fix: refs #7553 changed fields in order in purchase request table

4a0b92eded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

c291ea267c refactor: refs #7553 added clickable event in transfer sales like Salix

6983245d7d Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword

e90b78c4c5 fix: refs #7702 rollback

4bf8e1224d chore: refs #7702 rollback

6f9e46f7a0 fix: refs #7553 deleted log

98cdeabe9f feat: refs #7702 vnChangePassword

153c9b743f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword

9ec2fb4c77 feat: refs #7702 fine tunning

91dccd10d3 feat: refs #7702 drop old components

b015397822 feat: refs #7702 test wip

1ff15da8ca fix: refs #7323 workerList

da7d0326c0 fix: refs #7323 workerBalance & arrayData setUserParams

479f2a8e53 feat: refs #7884 added new filter field

6edabd856c Merge branch 'dev' into 7884-AddLabelerField

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

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

41c43fde76 feat: refs #7323 hide log section

566d657f70 feat: refs #7884 added default params and chip translations

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

98faf22e73 Merge branch 'dev' into 7884-AddLabelerField

07cd9d5aae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

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

34f70d026e feat: refs #7553 added new field in list and translations

44d98865fe fix: refs #7553 requested changes

2c15f79a2d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

d7fb8bdaf5 Merge branch 'dev' into 7884-AddLabelerField

271e33a999 feat: formatLocation when field is null

edea17340d refactor: refs #7553 adjust ticket notes view in summary

fc23f9a8dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword

6cc8ca6731 chore: refs #7702 add tests

4c071aea8b Merge branch 'dev' into 7884-AddLabelerField

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

f025b4361e refactor: refs #7553 last requested changes

0dd79ed708 Merge branch 'dev' into 7553_FixTicketExpedition

7bbad14f53 feat: refs #7323 delete btn

f06723a919 test: VnLocation

013a76cbce test: VnLocation

7713e33c67 Merge branch 'dev' into 8018_location_label

f809e0fb31 fix: refs #7323 show prev month week color

3716507f93 perf: refs #7553 removeSales function

b728b7c5bd Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

4fc3f08f77 Merge branch 'dev' into 7553_FixTicketExpedition

ac8aa6bcc1 fix: table order

e9e2caee85 feat: autofocus after clear

b4b31c0c92 fix: enable autofocus

2cb9899de1 feat: refs #7207 show queue

55e017b0cc Merge branch 'dev' into 7553_FixTicketExpedition

a5c6d628ca feat: enable notify positive when user update self data

8124a341a0 feat: refs #7129 route extended list and simplify route list

c400929c99 fix: refs #7129 translate page title

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

6e57306026 Merge branch 'dev' into 7671_dense_itemFixedPrices

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

cd96003c0e refactor: refs #7553 requested changes and added keyup.enter

f34e81038e Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition

21f7613f21 Merge branch 'dev' into 7553_FixTicketExpedition

8ac0083b9c Merge branch 'dev' into 7884-AddLabelerField

3affd8712c Merge branch 'dev' into 7671_dense_itemFixedPrices

41f168ebbe Merge pull request '#7671 - Default Table Order by Description DESC' (!745) from 7671_dense_itemFixedPrices into dev ...

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

8315eb2b4c Merge branch 'dev' into 7553_FixTicketExpedition

c9e4ab490d build: init version 2442

32328da370 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

67a1c28670 Merge branch 'dev' into 7553_FixTicketExpedition

70d640dc37 fix: refs #7129 some style issues

f0c2baa60e fix: refs #7129 remove consoleLog

d35b40a891 fix: vnTable color

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

2a64d9643e Merge branch 'dev' into vnInput_autoFocus

bc37e372f5 Merge branch 'dev' into 8031_notify_dataSaved

ff3ab83727 Merge branch 'dev' into 7553_FixTicketExpedition

e8a0d44292 Merge pull request 'feat: autofocus after clear' (!747) from vnInput_autoFocus into dev ...

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

c1087614c6 Merge branch 'dev' into 7553_FixTicketExpedition

4ff068aa8a Merge pull request '#7553 modified TicketExpedition & changes in ticket section' (!571) from 7553_FixTicketExpedition into dev ...

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

a14eb53f14 Merge branch 'dev' into 7884-AddLabelerField

1ee3691cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues

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

8c7ee3024f Merge branch 'dev' into 8031_notify_dataSaved

b54d358617 fix: refs #7207 use right locale

45b3ed6e17 fix: refs #7207 te2e

72ddeaa90a test: refs #8031 e2e

a0c324c339 Merge branch '8031_notify_dataSaved' of https://gitea.verdnatura.es/verdnatura/salix-front into 8031_notify_dataSaved

27b699ebf4 fix: refs #7129 some component styles

ca568c31ca fix: refs #7129 clone post

cea5edd506 fix: refs #7129 translate

8dd2c44832 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

8c13ceb3fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

bd2fa37450 feat: maxTemperature and minTemperature

eb0e18bf58 Merge branch 'dev' into 6722-thermograph

68ebda625b fix: refs #7874 refs #6943 ui

73c45b8c4a Merge branch 'dev' into 8031_notify_dataSaved

dcfdabde32 feat: tabulation

56af4d3736 feat: refs #7010 added packing type field in customer summary and ticket list

c388d5ab2a Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues

9095c579db Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev ...

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

6e6b65771a Merge branch 'dev' into 7129-fixMigrationIssues

709a662ceb feat: refs #7874 select observation type

0cffe0b586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

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

e827d3aabf fix: refs #7323 rollback

c2b52473a1 fix: refs #7323 align tables

6d5a8cba6f refactor: refs #7010 modified customer summary table

51aae0f726 Merge branch 'dev' into 7010-AddPackingField

1c99c01d1d refactor: refs #7010 modified front

9386d648d0 Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField

a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved

01b62adba9 fix: refs #7524 dynamic fetch

428c6966f2 Merge branch 'dev' into 8018_location_label

6e6b88d340 Merge pull request '7129-fixMigrationIssues' (!754) from 7129-fixMigrationIssues into dev ...

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

18ea23adf1 refactor: refs #7323 pr request

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

7eb951ef13 fix: refs #7323 use right locale

ba9f1407ac Merge branch 'dev' into 7524-dynamicFetch

11c135e8c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

a2b7e81982 feat: warehouse

71201f1007 feat: refs #7874 required fields banner

3caeb9e738 Merge branch 'dev' into 7323-fineTunningWorker

d2067c633d feat: refs #7679 #7679 use country or province to retrieve cities

6b2e0df9c2 test: refs #7679 #7679 improve test

e06d567e3c test: refs #7679 #7679 remove comment

157370ec26 Merge branch 'dev' into 8018_location_label

bec50d6eed perf: refs #7679 #7679 comments

cffd97a521 Merge branch 'dev' into 8018_location_label

12a452d774 Merge branch 'dev' into 8031_notify_dataSaved

9d7db2020b Merge pull request '#7679 Filter data from others filters' (!769) from 7679_improve_filters into dev ...

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

fd202f30d2 Merge branch '8018_location_label' of https://gitea.verdnatura.es/verdnatura/salix-front into 8018_location_label

cb0d3c5bca fix: refs #7404 sticky footer and transparent header for vnTable

868e6a312f fix: refs #7404 class name

c815177be9 fix: refs #7404 translate and width problem

37d32a7934 Merge branch 'dev' into 7404-fixSomeStyleIssues

63d2b06b70 Merge branch 'dev' into 8031_notify_dataSaved

7fa0a5b28c fix: refs #7404 path name

90762f1d1c Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues

cf67865b0b feat: refs #7404 updates

b41026806f style: refs #7404 compress spaces

b3c36e555f style: refs #7404 compress spaces

cf509d608a Merge branch 'dev' into 8018_location_label

d4dc12ebe3 Merge pull request '#8018 - Show fields instead null/undefined' (!737) from 8018_location_label into dev ...

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

da78edb6d2 Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues

7001a707b9 Merge branch 'dev' into 8031_notify_dataSaved

2d9dbbd23d Merge pull request '#8031 - Enable notify positive when user update self data' (!750) from 8031_notify_dataSaved into dev ...

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

deb608cc96 Merge branch 'dev' into 7404-fixSomeStyleIssues

6014ccebb4 Merge pull request '7404-fixSomeStyleIssues' (!774) from 7404-fixSomeStyleIssues into dev ...

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

76a77dcee9 fix: duplicate call

3c5a5c3905 Merge branch 'dev' into Fix-TicketSale

e7a2d3aa85 fix: refs #7354 ZonLocation filter

41acf0e1e2 feat: #7679 show country provinces

10bada7463 fix: deleted useless button

86ab9f9540 Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale

778e6299ce fix: solve conflicts from test to dev

e9364f69d4 feat: #7679 show tooltips

d6efd21db6 style: remove space between value and label

30767b110f Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale

8fa82c818d fix: remove limit

e64e6eefe3 refs #7355 add role

de01dda2ed refactor: refs #7884 modified icon color

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

27b2d0232c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev

696c9ca9b3 fix: solve conflicts with stockBought

7ae90908c4 Merge pull request 'fix: solve conflicts from test to dev' (!780) from fixConflicts_testToDev into dev ...

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

ddffd5b1c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

6e4677848f Merge branch 'dev' into Fix-TicketSale

21edf4b5d9 Merge pull request 'fix: duplicate call' (!775) from Fix-TicketSale into dev ...

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

7b63bb38f2 fix: deleted code

ea7c799909 Merge pull request 'Fix: deleted code in sales' (!781) from FixSales into dev ...

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

589c672ab2 fix: show degrees

4399a91e99 fix: misSpelling

d69336c82a refs #7366 make travelFilter, travelList

1a697aa018 feat: refs #7679 #7679 add sortBy and limit

209c88884f Merge branch 'dev' into 7884-AddLabelerField

2ca99a51ae fix: refs #7356 transfer ticket method

2f5358d439 Merge pull request '#7356 - transfer ticket method' (!784) from 7356_ticket_migration into dev ...

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

36457f704d Merge branch 'dev' into 6722-showDegrees

38599be9bd Merge pull request '6722-showDegrees' (!782) from 6722-showDegrees into dev ...

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

c0fd5a1c21 fix: refs #7404 fix style

6b38bdf868 style: improve ZoneLocationTree height

2bd004f52b perf: refs #7679 add sortBy & limit whe retrieve Autonomies

03a3d6bd50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField

692c649b8c perf: refs #7679 #7679 improve watch

c987a1151c Merge pull request 'Improve ZoneLocationTree height' (!786) from fix_height_zoneLocationTree into dev ...

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

c2c4acfc30 refs #6899 fix filters, date from to socialName

7db166974f feat: refs #7884 use VnTable prop for chip label filters and modified translations

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

12727e93eb Merge branch 'dev' into 7884-AddLabelerField

49da7168ab Merge branch 'dev' into 6899-fixInvoiceOutNegative

98df741f1b fix: refs #7884 deleted useless translations

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

e374059f41 Merge pull request 'refs #6899 fix filters, date from to socialName' (!789) from 6899-fixInvoiceOutNegative into dev ...

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

375adfab76 Merge branch 'dev' into 7884-AddLabelerField

e6dc2f16b8 Merge pull request '#7884 added new filter field' (!720) from 7884-AddLabelerField into dev ...

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

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

ba3b2198b8 Merge branch 'dev' into warmFix-userListFixRole

f9e3c92e68 Merge pull request 'warmFix-userListFixRole' (!788) from warmFix-userListFixRole into dev ...

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

0b76d0d556 refactor: refs #7010 added function to get item packaging type

be53b466b9 Merge branch 'dev' into 7010-AddPackingField

5e59ecdb43 fix: refs #7404 with on stockBought mobile version

fef875270e Merge branch 'dev' into 7679_improve_newPostcode_form

b08a5e63e9 fix: inheritWarehouse

ed5cf137b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

8ee4edc5d5 perf: refs #7010 customer summary packaging type field

6a1bb6d41f Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField

b93375f5a4 Merge branch 'dev' into 7010-AddPackingField

1536cbe205 Merge branch 'dev' into 7323-fineTunningWorker

739671a6da Merge branch 'dev' into 7524-dynamicFetch

06fa5b13a4 Merge branch 'dev' into 7404-fixStyle

9b8e388525 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

629524d63f Merge pull request 'fix: refs #7404 fix style' (!785) from 7404-fixStyle into dev ...

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

30e34ea299 Merge branch 'dev' into 7323-fineTunningWorker

a8c48789ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

01dc25da8c refactor: refs #7874 create element if condition

05a1d0e8fb fix: refs #7129 translates from globals to module locals

fadfafbb1d Merge branch 'dev' into 7524-dynamicFetch

c78e816f0c Merge pull request 'fix: refs #7524 dynamic fetch' (!767) from 7524-dynamicFetch into dev ...

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

e10088ed06 Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword

c04dad38f1 feat: refs #7404 change travel name and remove buyer filter

aca10b81af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

cd20db637c fix: refs #7874 btn ui

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

c64fe8c044 chore: refs #7207 refactor locale

99ba7a39fa Merge branch 'dev' into 7129--fixTranslates

4a357c5be6 Merge branch 'dev' into 7404-addSomeLogisticPreferences

7d0e3e6fd4 Merge pull request 'fix: refs #7129 translates from globals to module locals' (!794) from 7129--fixTranslates into dev ...

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

4ba52f1a56 Merge branch 'dev' into 7404-addSomeLogisticPreferences

4b9588c189 refactor: refs #7825 modified worker list form to fill the field when a bank entity is created

222e83cad8 Merge pull request 'feat: refs #7404 change travel name and remove buyer filter' (!796) from 7404-addSomeLogisticPreferences into dev ...

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

cebb3b2b16 Merge branch 'dev' into 7323-fineTunningWorker

e43ba9b58a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword

0d31adaa4b refs #7767 check holiday

67c2e284ba feat: refs #7702 ask old pass

ae8e4ba4b9 chore: refs #7702 fix tests

7dc019cfbb fix: refs #4988 selector on e2e

1869e3315a fix: refs #4988 remove id

9f433afb51 Merge pull request '#7702 - FIX Change password error' (!542) from 7702_fix_setPassword into dev ...

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

efe5208d30 Merge branch 'dev' into 4988-fixE2e

b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker

9fe3de22ac Merge branch '7323-fineTunningWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker

905841e0d6 Merge branch 'dev' into 7207-showPbx

9c5ce6dbfd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

d325459beb Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev ...

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

aee23c75e8 fix: order module

055b1b0a88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

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

355b1357b7 Merge branch 'dev' into Fix-OrderCatalog

a69a4577a3 Merge pull request 'Fix:: order module' (!802) from Fix-OrderCatalog into dev ...

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

355c84ad06 Merge branch 'dev' into 7323-fineTunningWorker

120f96fedc Merge pull request '#7323 workerList' (!719) from 7323-fineTunningWorker into dev ...

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

426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

b8407140f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

bd3de77cbd fix: changes in list and filter to fix section

33d6d529c5 Merge branch 'dev' into Fix-TicketsModule

ef5ae0f723 refactor(ticketNotes): translations

947f913679 refactor: refs #8019 create VnDate

5c5a359986 refactor: refs #8019 create VnTime

4f3e7e2630 feat: refs #7893 Added waste recalc section

f98739f0ed Merge branch 'dev' into 7893-wasteRecalc

b1385cf08a Merge pull request 'refactor(ticketNotes): translations' (!807) from fix_ticketNotes_translations into dev ...

Reviewed-on: #807
Reviewed-by: Jon Elias <jon@verdnatura.es>

178fa8cd21 feat: refs #7893 Requested changes

c3eaab44ed Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc

a6944561de Merge branch 'dev' into 7893-wasteRecalc

d88fadca55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs

afc52f6cea fix: changes in sale and summary

27dca7c35f Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule

d1b3e01d87 chore: refs #8019 refactor css scoped

50eed83d05 feat: refs #7893 Requested changes

26b4110d22 Merge pull request 'feat: refs #7893 Added waste recalc section' (!809) from 7893-wasteRecalc into dev ...

Reviewed-on: #809
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

c815066953 feat: refs #8019 fine-tunning vnDate

4344458bb0 feat: refs #8019 fine-tunning vnTime

e6535a5dd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs

1723331615 Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx

73e5039ec3 refs #7986 create front

68a54ebe22 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

3dad27e463 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

e0f60ed118 test: fix VnLocation

6a79746080 test: fix TicketDescriptor

855032e4a6 refs #7986 fix front

9edf35fba2 Merge branch 'dev' into 7679_improve_newPostcode_form

801b6585e8 perf: refs #7679 change limit value

2dd3e09928 refactor: requested changes

00dc2c6edc Merge branch 'dev' into 7207-showPbx

480f243205 Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev ...

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

830decb6db Merge branch 'dev' into 7874-addObservationType

44c4c378f9 chore: refs #7874 add default ob type

5af14b1b52 chore: refs #7874 fix test

3dfb836f8e revert: rollback compress spacestyle

2ff99d3faa feat: define as global dense value

f72761f36c Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev ...

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

6d674f2a2b Merge branch 'dev' into 7874-addObservationType

50042ed45b feat: refs #7874 prevent submit if empty fields

3d9d08146c test: refs #6943 add customer test

64c8d264af warmFix(TravelList): add daysOnward in travelFilter

db5449444a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

eebac7b36c fix: fixed e2e test

55b9fb1a87 Merge pull request 'fix: MyEntry e2e test' (!823) from Fix-EntryTest into dev ...

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

914f6022be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_test_jsegarra

adbb745f0f Merge pull request 'Fix own test' (!816) from fix_test_jsegarra into dev ...

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

b6bce0c2f3 Merge branch 'dev' into 7679_improve_newPostcode_form

2edeb1043e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded

fdbae5c0b5 Merge branch 'dev' into 8019-makeResponsiveInputs

12392444b9 Merge pull request '#8019 make responsive inputs' (!812) from 8019-makeResponsiveInputs into dev ...

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

0fae36c239 Merge branch 'dev' into 7679_improve_newPostcode_form

720042bed9 feat: added new filter param and refactored link colors

6f2187cb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType

4ff3c18f33 feat: refs #7874 use badge type

b225f6a4c8 refs #7767 fix contractHolidays

8258fbb91e refs #7767 remove onMounted

1a2c5c96fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto

0fb9b22935 chore: refs #7874 refactor code

6633e65ee2 Merge branch 'dev' into 6943_customer_spec

245c027357 chore: refs #7874 refactor imports

523423cce6 Merge pull request '#7874 add observation type' (!765) from 7874-addObservationType into dev ...

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

dfceb9403c fix: refs #7986 fix front

bc581caa4e fix: refs #7767 console remove

a68416244c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

d87e8ec4ae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

3bb5f66ce7 fix(claimNotes): refs #8093 $props.selectType && !newNote.observationTypeFk

d416a34560 refactor: use docuware in ticket descriptor menu

cdce0771c9 Merge branch 'dev' into Fix-TicketsModule

a33dde3dcf Merge pull request '8093-devToTest_2442_3' (!831) from 8093-devToTest_2442_3 into test ...

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

0f84baf1a8 build: init version 24.44

af830591b3 fix: refs #7986 front fixed

3badfbcff9 Merge branch 'dev' into 7767-holidayDaysExceeded

22cc9d689d Merge pull request 'refs #7767 check holiday' (!800) from 7767-holidayDaysExceeded into dev ...

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

b4245d05fb fix: refs #7986 crudModel

15f171da0f perf: refs #7825 create bank entity

c4670b57de Merge branch 'dev' into 7825-FixCreatebankEntity

4fb3e0dadf Merge pull request '#7825: Fill the bank field when a new entity is created' (!798) from 7825-FixCreatebankEntity into dev ...

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

a30915f99e fix: refs #7986 fix operator, fix crudmodel update

cad3fddc3e fix: refs #7986 descriptor fix

e06ce4f8a4 fix: refs #7986 clean code

e0c294bce6 test(claimDevelopment): skip intermitent e2e

3069ac27d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

8262406eda perf: refs #6943 Remove handle term

6b9dc8f3a6 Merge branch '6943_customer_spec' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_customer_spec

4115b1b303 Merge branch 'dev' into 6943_customer_spec

70ae50a5f1 Merge branch 'dev' into 7679_improve_newPostcode_form

3cdba5dafa Merge branch 'dev' into 7986-workerMoto

c42c811444 fix: refs #7353 load on scroll end

1f4b681b5b fix: refs #7986 clean code

8bc06593c5 Merge branch '7986-workerMoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto

da3364b424 Merge pull request '7986-workerMoto' (!830) from 7986-workerMoto into dev ...

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

7d78ce7781 Merge branch 'dev' into 7010-AddPackingField

5c5393db6d Merge pull request '#7010 added packing type field' (!762) from 7010-AddPackingField into dev ...

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

0c2d9e6ec6 fix: refs #7353 load on scroll end 80% zoom

2aaba93c3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fixLoadOnScroll

55f8b78eba Merge pull request 'fix: refs #7353 load on scroll end' (!841) from 7353-fixLoadOnScroll into dev ...

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

175ebbc343 feat(navBar): refs #7632 isLoading

f4caf6aecc test: refs #7632 not use hash word

64c0496f7a Merge branch 'dev' into Fix-ItemRequest

11092866b8 fix: merge conflicts

fbfb1c654a Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule

0cc1090739 Merge branch 'dev' into 7632-axios_isLoading

f2147311d3 fix(TicketBasicData_zone): refs #6233 add acls and fix get zones

2a7bebb0b6 Merge pull request 'Added new filter param and refactored link colors in item request' (!827) from Fix-ItemRequest into dev ...

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

fcc213f307 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7632-axios_isLoading

d221b8e3c4 chore: refs #7632 change requests

d61c690a70 Merge pull request 'feat(navBar): refs #7632 isLoading' (!844) from 7632-axios_isLoading into dev ...

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

0afcba0b07 Merge branch 'dev' into 6233-fix_ticketBasicData_zone

fbd6633bdb Merge pull request 'fix(TicketBasicData_zone): refs #6233 add acls and fix get zones' (!847) from 6233-fix_ticketBasicData_zone into dev ...

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

cdce4d063c Merge branch 'dev' into 6943_customer_spec

76b69a7588 Merge pull request '#6943 - Customer specs' (!822) from 6943_customer_spec into dev ...

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

e5064e8a37 Merge branch 'dev' into 7679_improve_newPostcode_form

bc1a082fe1 Merge pull request '#7679 Improve NewPostCodeForm' (!787) from 7679_improve_newPostcode_form into dev ...

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

cd4b17048c Merge branch 'dev' into Fix-TicketsModule

665e84d338 Merge pull request '#7356: Changes to fix ticket section' (!806) from Fix-TicketsModule into dev ...

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

b4d4844100 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

36221121f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

c799d17e19 Merge pull request '8144-devToTest_2444' (!852) from 8144-devToTest_2444 into test ...

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

aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

735ee09ef8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

4bde0dffa7 fix: fixed item packaging type field showing repetitive values

e7acdfd4f7 fix: refs #8010 footer class

0528474250 chore: refs #8010 kebab-case

5d4b5ad598 Merge pull request 'fix: refs #8010 footer class' (!857) from 8010-fix_vnTable_footer_class into test ...

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

f26976b744 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

2779e7ac8d Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-warmfix-useVnTable

f1350dece5 fix: refs #7524 changes

48fdc9e624 Merge pull request '#7524 warmfix-useVnTable' (!862) from 7524-warmfix-useVnTable into test ...

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

70dcadc57d Actualizar src/components/CreateNewPostcodeForm.vue

26de0cf72f perf: remove limit

9daed096db Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

9a518ed990 Merge branch 'test' into warmfix_createNewPostcodeForm

791af46202 Merge pull request 'Warmfix: CreateNewPostcodeForm sync fields and sort selects' (!867) from warmfix_createNewPostcodeForm into test ...

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

1daa8be635 perf: optimize get packing type function

139744d90b Merge branch 'test' into Fix-CustomerSummaryTable

88fe60e296 Merge pull request 'Warmfix: packaging type field showing repetitive values' (!856) from Fix-CustomerSummaryTable into test ...

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

c1e4c45318 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

6c9627c6c5 fix(worker): add searchurls

dd2ee2a7de Merge pull request 'fix(worker): add searchurls' (!901) from warmFix_worker_searchUrls into test ...

Reviewed-on: #901
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

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

alexm merged commit 87b7fd6db4 into master 2024-11-12 07:01:12 +00:00

alexm deleted branch 8179-testToMaster 2024-11-12 07:01:12 +00:00

alexm referenced this issue from a commit 2024-11-12 07:01:14 +00:00

Merge pull request '8179-testToMaster' (!909) from 8179-testToMaster into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

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-front#909

No description provided.