7336_devToTest #2414

Merged

alexm merged 220 commits from 7336_devToTest into test 2024-05-07 06:26:53 +00:00

Conversation 0 Commits 220 Files Changed 168 +2093 -2568

alexm commented 2024-05-07 06:05:39 +00:00

Member

Copy Link

No description provided.

alexm added 220 commits 2024-05-07 06:05:40 +00:00

dc1ef34aba feat: refs #6493 refactorizar procedimientos vn2008 parte2

923d6a610a Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2

ecd7e8eb98 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2

e047d445d3 feat: refs#6493 modificado entry_getTransfer

c889353459 feat: refs#6493 modificar procedimiento balance_create

517aeebe8b refs #7019 fix(createManualInvoice): add throw error

84f544dd2b Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2

f2a1d401ca refs#6493 update

f4b50dec3e feat: refs#6493 modificar procedimiento balance_create

9a628869cd Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2

46f60615bd feat: refs#6493 modificar procedimiento available_traslate

a911d7fc88 Merge branch '6493-refactorizar-procedimientos-vn2008-parte2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte2

4389cd5d74 feat: refs#6493 modificar procedimiento available_traslate

4767b98442 Merge branch '6493--refactorizar-procedimientos-vn2008-parte2' into 6493-refactorizar-procedimientos-vn2008-parte_2

2efd1945f8 feat: refs #4988 add agency

f316ca6974 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

c74aea74bc feat: refs#6493 modificaciones solicitadas.

07b45748f0 Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2

f06bbef0eb Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

55949d0979 feat: refs#6493 Cambios solicitados procedimientos

e721023184 Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2

92cd61460e feat: refs#6493 Cambios solicitados procedimientos

957b0c71ca refs #6574 feat: add order

42b033dde2 refs #6574 feat: add order

a29dcdd33b Merge branch 'dev' into 6574_itemGetBalance

eab1bfe6ab Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

d3df3e3376 feat: refs#6493 Cambios solicitados procedimientos

351d5b5ba3 Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2

2f7f237422 refs #6574 feat: add order

1534402640 feat: refs#6493 Cambios solicitados procedimientos

9d70839b4c Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

84997eacd5 refs: 6697 remove claim quantity

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

9da7cdfa39 Merge branch 'dev' into 6574_itemGetBalance

2d4524a34c feat: refs#6493 Cambios solicitados procedimientos

aee638c3a9 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

db8d48ccee refs #6976 changes sql

bc9149ec37 feat: tipo de cambio php to js

aaef10b8d8 feat(collection-label): refs #6602 add qr to the report

bb6ea31bf7 feat: funcional a falta de test

b706d1c1c6 refs #6976 changes back supplier consumption

e8001b72e4 feat: minor changes

336c3274ea feat(agency): refs #4988 add summary

0418540ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency

77a1aa4de6 feat: @7108 test

58baa45e09 Merge branch 'dev' into 7108-exchange-rate

d0dfdc668b feat(agency): refs #4988 add new agency

81b2e89fd8 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

187c918a21 feat: refs#6493 Cambios solicitados procedimientos

97c0db62ac Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2

3950d60387 feat: refs#6493 Cambios solicitados procedimientos

f41177643f refactor: refs #6899 corrected Lilium styles and functionalities

77f7348acb feat(workcenter): refs #4988 add workcenter config menu

7e488ee601 refs #7191 check isBooked in entry_BeforeUpdate

27d59f4a8f fix: descuentos en bs.ventas refs #6974

f40c730f6e refactor: refs #6899 changed comercial value in negativeBases

9dedd5383c Merge branch 'dev' into 6899-endInvoiceOutMigration

da7ab00c73 Merge branch 'dev' into 6899-endInvoiceOutMigration

d2aba88a34 feat(salix): refs #7190 minor change salix-back

329f875640 feat(salix): refs #7190 Call renewtoken with tokenMultimedia

00ce018ee3 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked

fd903f27c0 fix: descuentos en bs.ventas refs #6974

9759ee4bd0 refactor: refs #6899 requested changes

fa653f630c Merge branch '6899-endInvoiceOutMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6899-endInvoiceOutMigration

ac57fed1c8 Merge branch 'dev' into 6899-endInvoiceOutMigration

5e8310f5e1 Merge branch 'dev' into 7190_renewTokenMultimedia

4416790ce1 Merge branch 'dev' into 7108-exchange-rate

b0c4f7fd3c feat: moved files to invoiceIn

0537a3eca3 refs #6976 entity quantity price

0284b138d7 refs #7191 requested modifications

f03a431ea2 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked

adc3b413f5 feat: refs #4988 agency add module

9899efab97 refs #7032 Delete vn.recipe_Cook

8bb331f0ed feat: Varias líneas farming en albaranes refs #7020

eaf2762922 feat: #6382 chekCodeFormat

d7e4dd4fc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2

7fd7acbb56 deploy: refs #7253 init version 2420

34bb0e9052 refs #6976 fix pdf

83d89d13ad Merge branch 'dev' into 7190_renewTokenMultimedia

27354e452f Merge pull request '#7190 - RenewTokenMultimedia' (!2335) from 7190_renewTokenMultimedia into dev ...

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

1044a24bc7 refactor: #6997 Deleted vn.client.eypbc

2d5daf55c2 Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev ...

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

79172ef288 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

e7055e2428 Merge branch 'dev' into 7032-Delete-vn.recipeCook

2291a92a43 Merge pull request 'refs #7032 Delete vn.recipe_Cook' (!2348) from 7032-Delete-vn.recipeCook into dev ...

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

69ea518a49 Merge branch 'dev' into 6697-removeClaimQuantity

1d5d6141d1 Merge branch 'dev' into 6997-eypbc

afe2669b27 Merge branch 'test' into dev

9b2bb4be0e Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

d1c72a0be3 feat: refs#6493 Cambios solicitados procedimientos

022264ffff Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2

0fd120676d Actualizar modules/ticket/back/methods/ticket-request/filter.js

e0393a6e72 Merge branch 'test' into dev

5efb6acafe feat: refs#6493 Cambios solicitados procedimientos

9c306d4cc2 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

26fd1ae6c9 Merge pull request 'test' (!2359) from test into dev ...

Reviewed-on: #2359

be8e55a905 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2

a6c57ef3df Merge branch 'dev' into 6997-eypbc

8439125655 Merge pull request 'refs #6493 refactorizar-procedimientos-vn2008-parte_2' (!2235) from 6493-refactorizar-procedimientos-vn2008-parte_2 into dev ...

Reviewed-on: #2235
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

dcc46494bc Merge branch 'dev' into 7108-exchange-rate

41e1a57d2e Merge branch 'dev' into fix_itemFk_ticketRequest_filter

e36e997844 feat: refs #6223 ticketCalculateClon

ec7dc390b9 Merge branch 'dev' into 6223-ticketCalculateClon

73f7d09b0e feat: #7108 acl a invoiceIn

88ba6833be Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!2322) from 6899-endInvoiceOutMigration into dev ...

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

f7ebd071bf refactor: #7258 Deleted all dependences of vn2008 schema

4cc6b2f4f2 Merge branch 'dev' into 7258-lastChangesMigrationVn2008

f7d9cc8102 Merge pull request 'FIX bug Ticket-Request Filter' (!2355) from fix_itemFk_ticketRequest_filter into dev ...

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

7a1c8ebc7f Merge branch 'dev' into 7258-lastChangesMigrationVn2008

6706974784 fix: refs #6731 fix ticketRequest

71e1e53ccd refactor: #7258 Fixes

fda2298f7a Merge branch '7258-lastChangesMigrationVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 7258-lastChangesMigrationVn2008

d1659ce04c refs #6697 fix claimQuantity

87d5e0a311 Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity

6fb87531c4 refactor: #7258 Deprecated last tables vn2008

aeee012c2b refs #6697 fix sql test

b7b9035f72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6976-supplierConsumption

917592cdad Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev ...

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

8bb2fa93a7 Merge branch 'dev' into 6574_itemGetBalance

b8fdd7d726 Merge pull request 'refs #6574 feat: add order' (!2264) from 6574_itemGetBalance into dev ...

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

60a3ec99d0 Merge branch 'dev' into 7258-lastChangesMigrationVn2008

88b06ebef5 feat: refs #7211 check if there's available clockIn

1b34822fb7 Merge branch 'dev' into 6382-regularizar-Shelving-Parking

c9dfccbc53 feat: refs #7211 add test & changelog

42591af5c7 fix: refs #4988 create table

c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency

6749722634 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice

4e11e46fff feat: refs #4988 capture error on duplicate

c2888e4f97 fix: refs #4988 correct yml

00359a0a6b fix: refs #4988 traduction

48d3ee373e fix: refs #4988 yml

a4f1183df6 feat: refs #7108 pascalCase

931c2c4f5e feat: refs #7211 error & locale

a9e4b2cd36 Merge branch 'dev' into 6697-removeClaimQuantity

89ffdbfdf7 Merge pull request '#6697 - removeClaimQuantity' (!2363) from 6697-removeClaimQuantity into dev ...

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

7d3870e4a1 feat: refs#6382 test fixed

4f20224acc Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking

2e2bc3d594 Merge branch 'dev' into 6382-regularizar-Shelving-Parking

4e864fed52 fix: refs #7211 tests

edeed037a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl

f7cdbd39f0 fix: refs #7211 tests

180a484c55 fix: refs #7211 rollback

5c45dd6c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency

32da39899a fix: refs #7211 test e2e

b9de2b3ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice

af1abe934f fix: refs #4988 translates

d25c5eb327 fix: refs #4988 translates

b09fa1e2fb feat: refs #7019 changelog

dd4762ad6e Merge pull request '#7211 check if there's available clockIn' (!2368) from 7211-fixWorkerTimeControl into dev ...

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

86d8bc877a Merge pull request '#7019 fix(createManualInvoice): add throw error' (!2175) from 7019_fix_createManualInvoice into dev ...

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

a4417dde6c Merge branch 'test' into dev

94e04c1c2f Merge branch 'dev' into 7108-exchange-rate

63320af4c7 Merge pull request '#7108 - exchange-rate' (!2295) from 7108-exchange-rate into dev ...

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

30a905f40b Merge branch 'dev' into 6223-ticketCalculateClon

2cdc64cbe7 Merge pull request 'feat: refs #6223 ticketCalculateClon' (!2360) from 6223-ticketCalculateClon into dev ...

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

e78b23a849 refs #6976 remove css

4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency

51c42d09b2 fix: refs #4988 agency hook

bc94850cc8 refs #6976 fix pr

e2696cd883 Merge branch 'dev' into 6976-supplierConsumption

dab69cc9a3 Merge pull request '6976-supplierConsumption' (!2365) from 6976-supplierConsumption into dev ...

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

17ed4b7f08 Merge pull request '#4988 - new-module-agency' (!2303) from 4988-new-module-agency into dev ...

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

1e5c90e921 fix: refs #7019 e2e

7ee279cb31 Merge pull request '#7019 warmfix e2e' (!2376) from 7019-warmfix-createInvoiceOut into dev ...

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

f3c7b1e89c refs #6870 add observationEmail

ace39b92ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification

30f6a9324d refs #7191 SQL conventions mod

a33cbb0a7c Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked

80b44ccace Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev ...

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

110cae3171 Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ...

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

f10ecf4f00 Merge branch 'test' into dev

2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ...

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

e546a13e5d refs #6895 redirect lilium

b0b8f12ca9 refs #6895 remove code

b66111a032 refs #6895 remove tfront

3167bdcdd0 refs #7191 message modification

de5e43fb05 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked

a40545264b fix: descuentos en bs.ventas refs #6974

cc4081d25f fix: refs #7165 css

d26692aceb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet

a9bdfd8821 feat: refs #7165 add changeLog

0ab79728b5 Merge branch 'test' into dev

d4a8dc7731 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet

bd1499a6f7 feat(collection-label): new option barcode-qr

d45d53d665 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr

6868863e54 fix: refs #6602 refactor code

ae15f4b5d1 refs #6870 markdown

def1521131 refs #6870 defaulter id

a43593f63b Merge branch 'dev' into 6870-modifyDefaulterNotification

9e2332ca4a refs #6895 state home

ee41e5b6ac Merge branch 'dev' into 6895-removeShelving

7ced8dc54a Merge pull request '6870-modifyDefaulterNotification' (!2383) from 6870-modifyDefaulterNotification into dev ...

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

11ffc3a652 Merge branch 'dev' into 6895-removeShelving

6e5c791a51 Merge pull request '6895-removeShelving' (!2388) from 6895-removeShelving into dev ...

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

ddc4d4a08e Merge branch 'dev' into 6602-barcode-to-qr

d994a682f9 refs #6799 feat: french and portuguese

b6e4130184 feat: refs #7325 item_getBalance

cdb0bf28c2 Merge pull request 'feat: refs #7325 item_getBalance' (!2397) from 7325-item_getBalance into dev ...

Reviewed-on: #2397
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

3b46f67b9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet

b5402a3f2f defaultSector

c3b9e76cd6 Merge branch 'dev' into 6799_translations

98d366cd06 Merge pull request 'refs #6799 feat: french and portuguese' (!2395) from 6799_translations into dev ...

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

19841f0e12 Merge branch 'dev' into 7165-fixEmptySheet

38af3156ff Merge branch 'dev' into productionConfig.defaultSectorFk

a9d434989d Merge pull request '#7165 fix delivery-note css report' (!2389) from 7165-fixEmptySheet into dev ...

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

7d5b1708c1 Merge pull request 'defaultSector' (!2398) from productionConfig.defaultSectorFk into dev ...

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

4c55ae40ef Merge pull request 'test' (!2402) from test into dev ...

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

95aba9e7b3 Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev ...

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

432b696305 feat: create isInformal

5d3235977f Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked

5643a2e9e2 Merge pull request 'refs #7191 check isBooked in entry_BeforeUpdate' (!2329) from 7191-entry_BeforeUpdate-isBooked into dev ...

Reviewed-on: #2329
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

e979defd92 fix: descuentos en bs.ventas refs #6974

166f4da934 Merge pull request 'fix: descuentos en bs.ventas refs #6974' (!2331) from 6974-descuentos-bs.ventas into dev ...

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

fe025b510d Merge pull request 'feat: create isInformal' (!2405) from 7109-entry-isInformal into dev ...

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

633a3c481c Merge branch 'dev' into 6382-regularizar-Shelving-Parking

faa4496d81 Merge pull request 'feat: #6382 chekCodeFormat' (!2351) from 6382-regularizar-Shelving-Parking into dev ...

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

f9348b41ea feat: #7109 inventoryType

69766bbfeb Merge pull request 'feat: #7109 inventoryType' (!2409) from 7109-inventoryType into dev ...

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

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

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

guillermo approved these changes 2024-05-07 06:17:55 +00:00

alexm merged commit 834d58c449 into test 2024-05-07 06:26:53 +00:00

alexm deleted branch 7336_devToTest 2024-05-07 06:26:53 +00:00

alexm referenced this issue from a commit 2024-05-07 06:26:54 +00:00

Merge pull request '7336_devToTest' (!2414) from 7336_devToTest into test

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

No description provided.