Commit Graph

2203 Commits

Author SHA1 Message Date
Guillermo Bonet 45fa615daf Merge branch 'dev' into 7712-sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 08:28:19 +00:00
Javi Gallego 340348a38e feat: refs #7346 backTest checks new implementation 2024-08-20 10:11:42 +02:00
Guillermo Bonet 6acd3e0b1d feat: refs #7759 Changed defined only of vn objects
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:10:46 +02:00
Guillermo Bonet 3087a14248 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:07:33 +02:00
Guillermo Bonet 8e63d85964 feat: refs #7759 Changed name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:06:10 +02:00
Guillermo Bonet f9d0afa5da feat: refs #7712 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 09:30:25 +02:00
Jorge Penadés cf977ce06d fix: refs #7831 sql
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-20 09:12:10 +02:00
Javi Gallego ccfb53891f Merge branch 'dev' into 7346
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-19 09:10:06 +02:00
Javi Gallego 575577d29b feat: refs #7346 add multiple feature
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-16 10:08:58 +02:00
Guillermo Bonet 8d35e95731 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:52 +02:00
Guillermo Bonet 5e0bf4c739 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:22 +02:00
Javi Gallego f21c292e20 Merge branch 'dev' into 7346 2024-08-14 12:19:40 +02:00
Javi Gallego 7f543e8d3a Merge branch 'dev' into 7346 2024-08-14 10:32:32 +02:00
Javier Segarra befcf89534 fix(salix): #7867 apply SQL conventions
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-13 11:18:23 +00:00
Javier Segarra a178c285c0 fix(salix): #7867 avoid deactivate user when is supplier
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-13 10:44:54 +00:00
Guillermo Bonet 38cf5af23e feat: refs #7842 Added editorFk in vn.host
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:21:03 +02:00
Guillermo Bonet d9f64dea08 fix: refs #7713 ACL Log
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:15:30 +02:00
Sergio De la torre 32d5ca0d5c fix: refs #6861 refs#6861 bySectorCollection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-13 11:37:08 +02:00
Jorge Penadés 82da7bff9b Merge branch 'dev' into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:28:11 +00:00
Jorge Penadés 1602c12200 fix: refs #7283 sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-12 09:13:30 +02:00
Guillermo Bonet 931c13d8ab feat: refs #7774 #7774 Changes ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:06:24 +02:00
Guillermo Bonet 3cf2cec946 feat: refs #7774 #7774 Changes ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:02:38 +02:00
Guillermo Bonet c4e8202261 feat: refs #7774 #7774 Changes ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 08:53:24 +02:00
Guillermo Bonet 5b2200a134 Merge branch 'dev' into 7774-ticket_cloneWeekly 2024-08-12 08:53:02 +02:00
Jorge Penadés 9ece46ee46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 15:29:21 +02:00
Guillermo Bonet 5339dcbf19 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 13:53:56 +02:00
Guillermo Bonet 38dbe6e966 fix: #7126 waste_addSales
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 13:53:28 +02:00
Jorge Penadés a512fe75ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 12:12:25 +02:00
Guillermo Bonet 4fc43df11b feat: refs #6650 new itemShelvingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 11:28:30 +02:00
Guillermo Bonet d60f8a5319 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:26:22 +02:00
Guillermo Bonet cf13aa917e feat: refs #7126 saleQuantity to saleWasteQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:18:30 +02:00
Pako Natek cd1eec7e29 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 06:14:15 +00:00
Pako Natek 98f4cb1de5 dropping proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 08:04:36 +02:00
Pablo Natek 9f2057fdd0 fix: refs #7781 pallet merge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-08 12:46:10 +02:00
Alex Moreno 17d05ecfe2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-08 10:07:26 +02:00
Pako Natek a9cdbb1255 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 06:01:35 +00:00
Guillermo Bonet 4cbea3bf7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 13:51:00 +02:00
Guillermo Bonet 8aa06e12b3 refs #7844 Fix tests part 1/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 12:39:18 +02:00
Robert Ferrús 03cc32a525 Merge branch 'master' into 7818-entry_splitByShelvingFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-07 10:01:32 +00:00
Pako Natek 9b2cbcd5cc reviewed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:42:14 +02:00
Guillermo Bonet 4f2e343d0c refs #7844 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:40:10 +02:00
Guillermo Bonet ea75446982 refs #7844 Change in problems calc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:32:47 +02:00
Jorge Penadés 4b8b7e3a18 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-07 10:16:53 +02:00
Robert Ferrús 41e44b747a fix: refs #7685 hotFixAddress_updateCoordinates
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-07 10:12:39 +02:00
Robert Ferrús f385b9a8a3 feat: refs #7818 entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-07 07:12:29 +02:00
Pablo Natek 9d49d23be8 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 15:00:13 +00:00
Guillermo Bonet fc102eff7b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 14:12:32 +02:00
Guillermo Bonet 03358170d3 fix: refs #7740 ticket route throw
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 14:10:16 +02:00
Pako Natek fc7c7beef7 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 11:23:56 +00:00
Guillermo Bonet 184cbb2800 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 12:58:08 +02:00
Guillermo Bonet ffa775a8a5 Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2832
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-08-06 10:56:10 +00:00
Guillermo Bonet d1bb77d6ed fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 12:51:55 +02:00
Guillermo Bonet 28b848930e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 12:45:55 +02:00
Guillermo Bonet c7c711ac1a fix: refs #7728 duaInvoiceInBooking
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 12:43:51 +02:00
Jorge Penadés eaea1f3559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-06 08:47:23 +02:00
Guillermo Bonet 54e6c63b8b fix: refs #7834 SELECT
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:29:32 +02:00
Guillermo Bonet e03a1914d9 fix: refs #7834 Throw
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:27:36 +02:00
Guillermo Bonet 1e41f5d533 Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2783
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-06 05:05:19 +00:00
Pablo Natek f148635c68 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed 2024-08-05 15:41:41 +02:00
Pablo Natek 961fafb33e feat: refs #7404 stockBought add and calculate 2024-08-05 15:32:36 +02:00
Pako Natek dcdbb0bf93 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:29:30 +00:00
Pako Natek be5859b8cf prototipo
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-05 14:28:29 +02:00
Guillermo Bonet 967443b427 fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:26:16 +02:00
Guillermo Bonet 21423d3b48 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:00:01 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 11:59:46 +02:00
Jorge Penadés 09783ae576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 15:38:49 +02:00
Jorge Penadés bf7cd1530c feat: refs #7283 order by desc date
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 15:36:02 +02:00
Carlos Andrés f431d6c37f Hotfix changes whit conficts merged incorrectly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 13:45:58 +02:00
Guillermo Bonet abd8bc9639 fix: refs #6453 order_confirmWithUser
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:20:50 +02:00
Guillermo Bonet ae9472e092 Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2694
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-02 10:14:58 +00:00
Guillermo Bonet 6acba08a91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:08:40 +02:00
Guillermo Bonet f6db62945d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 12:08:22 +02:00
Guillermo Bonet dead585a1b Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2810
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-02 10:01:55 +00:00
Guillermo Bonet afb2f8d111 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:26 +02:00
Guillermo Bonet 4c67daedec Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:16 +02:00
Carlos Andrés 69d4c8bd6e Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2828
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-02 09:45:06 +00:00
Carlos Andrés 29a50caaca fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 11:43:30 +02:00
Carlos Andrés ddd5e4ffa4 fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 10:28:50 +02:00
Guillermo Bonet 879d48eb27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 10:00:35 +02:00
Guillermo Bonet 01df29b47c Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 10:00:12 +02:00
Guillermo Bonet d852d16ae4 feat: refs #7382 Changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 08:11:38 +02:00
Guillermo Bonet b56260af36 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 07:58:45 +02:00
Alex Moreno 20caa5d9a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-01 14:11:00 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre 94d89f9c99 Merge branch 'master' into 6861_triggerItemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 19:51:36 +00:00
Carlos Andrés 77f6e80066 Actualizar db/routines/vn/procedures/ticket_setRisk.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 17:38:50 +00:00
Sergio De la torre 65e9ed301f hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:11:03 +02:00
Carlos Andrés 6c0aae04c0 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:59:12 +02:00
Carlos Andrés 77fa4dd497 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:38:12 +02:00
Robert Ferrús dca7900ab2 fix: refs #7818 entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 11:31:02 +02:00
Guillermo Bonet cc78355aad fix: refs #7821 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 09:26:55 +02:00
Sergio De la torre eec7790a02 Merge pull request 'test' (!2815) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2815
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 16:13:13 +00:00
Carlos Andrés a61f68cbc9 Merge pull request 'master' (!2811) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2811
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-30 14:49:38 +00:00
Guillermo Bonet 961d05ab35 fix: refs #7821 Added orders in item_getMinacum
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 14:19:04 +02:00
Guillermo Bonet 4ef57e6869 fix: refs #7821 Added orders in item_getMinacum
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 14:17:41 +02:00
Guillermo Bonet 057174ae6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 13:53:58 +02:00
Sergio De la torre 9e486e4aff hotFix reallocate iss refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 13:04:33 +02:00
Carlos Andrés 01562420d4 Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:14:15 +00:00
Guillermo Bonet bcf08db6d6 Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2675
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-30 10:02:10 +00:00
Carlos Andrés 495bb7e36e Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-30 10:46:00 +02:00
Guillermo Bonet 857b1e9939 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:26:33 +02:00
Guillermo Bonet e2c3539dfc Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-30 10:26:17 +02:00
Guillermo Bonet 1f80117ff7 fix: refs #6861 Column
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:24:50 +02:00
Guillermo Bonet b6abcbe090 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 10:14:20 +02:00
Guillermo Bonet 18dc3873b8 feat: refs #7650 Added no transfer lines to inventory entry and fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 09:54:43 +02:00
Carlos Andrés 9fc3516e52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 19:12:48 +02:00
Jorge Penadés 254cced550 chore: refs #6989 add config model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:40:30 +02:00
Guillermo Bonet baa1498923 feat: refs #7712 sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:29:26 +02:00
Guillermo Bonet 6ad3d5a5eb feat: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 12:36:08 +02:00
Guillermo Bonet e53b12d51b feat: refs #6453 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 12:31:44 +02:00
Guillermo Bonet 4c602800ea feat: refs #6453 Added new ticket search
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 11:46:59 +02:00
Guillermo Bonet e0b9100de1 fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:20:05 +02:00
Guillermo Bonet 6de9ea4b16 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:18:23 +02:00
Guillermo Bonet 403252ac39 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:07:15 +02:00
Guillermo Bonet a4d3eec1e1 fix: refs #7580 Parking deadlock
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:05:22 +02:00
Pablo Natek ba494a77e6 fix: refs #7781 conditional 2024-07-26 12:39:00 +02:00
Pablo Natek 6845f1456e fix: refs #7781 prevent pallet merge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 15:03:33 +02:00
Guillermo Bonet ff8f340978 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 09:40:45 +02:00
Sergio De la torre 2374711a88 hotFix itemShelvingSale_addBySale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 08:36:14 +02:00
Guillermo Bonet 70142c43db Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:25:04 +02:00
Guillermo Bonet 1639f7155e fix: refs #7640 multipleInventory
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:21:01 +02:00
Guillermo Bonet de850e62c9 Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2787
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-25 05:03:29 +00:00
Robert Ferrús cb7d6f25e9 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 12:45:03 +00:00
Guillermo Bonet 983d66a681 feat: refs #7728 Added throw due date
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 14:24:06 +02:00
Robert Ferrús d0dfb95718 feat: refs #7774
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 13:56:21 +02:00
Guillermo Bonet 3d1d5841fd Merge branch 'dev' into 7728-Vctos-DUA
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 08:25:33 +00:00
Guillermo Bonet cf3ee07dd2 feat: refs #7713 Created ACLLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 10:03:51 +02:00
Guillermo Bonet e214da164a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:40:06 +02:00
Guillermo Bonet db31ac3b60 fix: refs #7662 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:39:33 +02:00
Guillermo Bonet 0c51a97a17 refactor: refs #7640 Multipleinventory available
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:13:47 +02:00
Robert Ferrús 65ac02e468 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 05:47:35 +00:00
Guillermo Bonet 23732ab20a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:42:08 +02:00
Guillermo Bonet 2086746eb0 fix: refs #7505 Visible COM
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:34:52 +02:00
Robert Ferrús 49888cc3b9 Merge branch 'dev' into 7774-ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 05:27:34 +00:00
Robert Ferrús a7f725a194 feat: refs #7774 ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 07:25:43 +02:00
Guillermo Bonet fdef84f78d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:11:56 +02:00
Robert Ferrús bb40e6cbf3 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 04:54:00 +00:00
Guillermo Bonet abfbf13440 fix: refs #7505 fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 14:18:52 +02:00
Guillermo Bonet a9aa47fef1 fix: refs #7505 visible_refresh support warehouse null and added isComparative
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 14:17:01 +02:00
Guillermo Bonet 5d2e9c6210 fix: refs #7505 visible_refresh support warehouse null and added isComparative
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 13:59:36 +02:00
Guillermo Bonet 88724d6d8c fix: refs #7505 visible_refresh support warehouse null
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 13:08:49 +02:00
Robert Ferrús bfc2d6f734 feat: refs #7716 travel_setDelivered
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-23 11:38:05 +02:00
Guillermo Bonet c6b49e2134 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:27:05 +02:00
Guillermo Bonet 04ff3e0cc7 fix: refs #7382 throw
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:23:42 +02:00
Guillermo Bonet bfd2b5aebb fix: refs #7382 invoiceIn_booking change
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:22:18 +02:00
Robert Ferrús 2a70df151a Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 07:16:28 +00:00
Sergio De la torre 296fe3442d Merge pull request 'master' (!2773) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2773
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 14:48:36 +00:00
Guillermo Bonet 3fc973dcee Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2770
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 12:02:18 +00:00
Sergio De la torre afbce80303 hotFix solve isPicked refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 13:42:42 +02:00
Carlos Andrés 33a71867bd feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 13:39:48 +02:00
Carlos Andrés b086cc7658 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 13:34:04 +02:00
Guillermo Bonet 7e125cdba5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 12:36:29 +02:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Guillermo Bonet b58cdcc590 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 12:24:39 +02:00
Guillermo Bonet 24c85608eb feat: refs #7740 Ticket before update added restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 12:09:24 +02:00
Carlos Andrés d7b9a3ffd0 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 11:58:51 +02:00
Guillermo Bonet 219740f669 feat: refs #7759 Changed definer root to vn-admin
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 11:52:42 +02:00
Guillermo Bonet ab45b988c8 feat: refs #7704 Added itemMinimumQuantity_check
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:27:24 +02:00
Javi Gallego 8f623bd51e feat: refs #7346 mas intuitivo 2024-07-22 10:26:40 +02:00
Guillermo Bonet 32e88532f9 fix: refs #7752 fix table name (change pablo)
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:07:21 +02:00
Guillermo Bonet a0abc29167 Revert "Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master"
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
This reverts commit d41262798c, reversing
changes made to 3d20908a42.
2024-07-22 10:04:03 +02:00
Pablo Natek 7b44e9f866 fix: refs #7752 fix format
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 09:49:54 +02:00
Pablo Natek 2ba4ca088d fix: refs #7752 fix table name
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 09:46:20 +02:00
Guillermo Bonet a2799e1e61 feat: refs #7589 Added display (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 08:01:23 +02:00
Guillermo Bonet ccc02d57b7 feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 07:59:15 +02:00
Carlos Andrés bf0f95f661 Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:57:16 +02:00
Carlos Andrés 55ea761af4 eat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 15:11:14 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Guillermo Bonet b72923f160 Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2707
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 11:12:21 +00:00
Carlos Andrés b2a8326170 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 12:44:45 +02:00
Guillermo Bonet 578de51f7e feat: #6453 Refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 10:54:40 +02:00
Guillermo Bonet 5f29384389 feat: #6453 Rollback always split by itemPackingType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 10:49:45 +02:00
Pablo Natek d0a635e86a Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2760
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-19 08:35:39 +00:00
Guillermo Bonet 9466c7e529 Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:30:07 +00:00
Guillermo Bonet c94ca96226 feat: #6727 Minor changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-19 09:29:42 +02:00
Guillermo Bonet 1133750629 feat: #6727 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:29:15 +02:00
Guillermo Bonet e61210fd17 feat: #3199 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:09:45 +02:00
Guillermo Bonet 3cf5555612 feat: refs #6727 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:58:51 +02:00
Guillermo Bonet 930e2951b7 feat: refs #6727 Added started and finished
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:39 +02:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Sergio De la torre dbf91293f8 Merge pull request 'master' (!2761) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2761
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 04:31:34 +00:00
Ivan Mas c44bf909b2 Merge branch 'dev' into 7531-Modify-zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 13:23:38 +00:00
Ivan Mas a6e6f435f7 refs #7531 No assigned department
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 15:21:59 +02:00
Pablo Natek 3b529440ba fix: refs #7752 refactor insert
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 15:16:25 +02:00
Pablo Natek 684983ee42 fix: refs #7752 add new state after scan 2024-07-18 15:14:18 +02:00
Guillermo Bonet f687994a7f refactor: refs #7681 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 14:27:10 +02:00
Guillermo Bonet 625b3a5608 refactor: refs #7567 Minor change
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-18 14:12:37 +02:00
Sergio De la torre bd10741311 hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 12:42:00 +02:00
Robert Ferrús 57efba8601 Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 12:04:19 +02:00
Robert Ferrús 15adc59ec5 feat: refs #7683 drop temporary table 2024-07-18 12:04:17 +02:00
Robert Ferrús e878615983 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 09:53:38 +00:00
Robert Ferrús c17214ce05 feat: refs #7683 drop temporary table
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-18 11:50:01 +02:00
Sergio De la torre fa07d03b8c Merge pull request 'master' (!2753) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2753
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-07-18 05:05:01 +00:00
Carlos Andrés f7429f3927 Hotfix itemShelvingSale_doReserve Ticket #204044
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 18:24:27 +02:00
Sergio De la torre 0181764744 Merge pull request 'master' (!2750) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 15:09:35 +00:00
Sergio De la torre 3aea6fdd46 hotFix reservas refs #6861 2024-07-17 16:13:31 +02:00
Pablo Natek 075f2b7ba4 Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2740
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 12:58:40 +00:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Robert Ferrús 762989557f Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 05:18:01 +00:00
Carlos Andrés 4ee0bd687f feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 19:01:02 +02:00
Carlos Andrés 5ca2a432da feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 18:58:26 +02:00
Ivan Mas 350e4b4c53 Merge branch 'dev' into 7531-Modify-zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 16:57:50 +00:00
Ivan Mas 50e2c03d3e refs #7531 Requested modifications in redmine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 18:56:00 +02:00
Carlos Andrés d6a949a9f3 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 18:55:58 +02:00
Carlos Andrés 38d863aac6 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 18:44:24 +02:00
Carlos Andrés 2181664c25 fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 15:14:10 +02:00
Robert Ferrús b1a401444e Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 08:19:34 +00:00
Pablo Natek 99bbb55c37 feat: refs #7297 add new columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 10:02:57 +02:00
Javi Gallego 63763f2b22 Merge branch 'dev' into 7346 2024-07-16 09:32:16 +02:00
Alex Moreno 4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 07:41:21 +02:00
Carlos Andrés 8d61cb762b feat: tabla config dias margen vctos. refs #7728
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-15 17:53:23 +02:00
Robert Ferrús 0fb882e688 feat: refs #7722 changes required
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 14:55:11 +02:00
Robert Ferrús 8f41546829 feat: refs #7222
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 14:25:42 +02:00
Javi Gallego 3698651306 Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2670
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-15 12:16:31 +00:00
Robert Ferrús 200a6714bb fix: refs #7722 delete sms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 12:02:00 +02:00
Carlos Andrés 31f537ae28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 11:52:57 +02:00
Alex Moreno eca89c1c4e Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 08:19:26 +00:00
Carlos Andrés 67b19ee4ca hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-14 09:08:14 +02:00
Carlos Andrés 49183c79f1 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 16:47:24 +02:00
Guillermo Bonet 1e264c2102 fix: refs #7704 Warehouse priority 2024-07-12 14:04:49 +02:00
Carlos Andrés d2e482d7cd hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:13:21 +02:00
Carlos Andrés 66959dd388 hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:10:43 +02:00
Guillermo Bonet 323d26f226 Fix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-12 10:37:39 +02:00
Carlos Andrés b93601d6d8 Actualizar db/routines/vn/procedures/itemShelvingSale_addBySale.sql
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-12 08:27:24 +00:00
Guillermo Bonet f8f6950de1 Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2683
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 08:13:27 +00:00
Guillermo Bonet 9b8e2e1279 Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2717
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 07:43:44 +00:00
Guillermo Bonet f3612c7ee3 fix: refs #7580
gitea/salix/pipeline/head This commit looks good Details
2024-07-12 09:42:10 +02:00
Guillermo Bonet 5ed8b33cef Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2700
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-12 07:34:45 +00:00
Guillermo Bonet 186cd4c7dd refactor: refs #6769 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:29:33 +02:00
Sergio De la torre 21987011b6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 09:06:05 +02:00
Guillermo Bonet bb787b1581 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:03:37 +02:00
Guillermo Bonet 05202e0b76 refactor: refs #7680 Added cursors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 08:15:09 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Guillermo Bonet 28b6dc901f feat: refs #6769 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 07:18:37 +02:00
Robert Ferrús 1c675ca43f Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 05:16:13 +00:00
Sergio De la torre 69bcad9ce0 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-11 18:09:00 +02:00
Guillermo Bonet 96a157d2f7 Merge branch 'dev' into 7580-setParkingfIX
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 12:50:44 +00:00
Guillermo Bonet 6702ff8616 feat: refs #7580 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:50:21 +02:00
Guillermo Bonet dab386326f feat: refs #6769 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 14:44:46 +02:00
Guillermo Bonet 0fd0302545 Merge pull request 'feat: refs #7378 Added productionConfigLog' (!2671) from 7378-productionLogConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2671
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-11 12:36:05 +00:00
Guillermo Bonet d9bd7ad84e feat: refs #7704 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:32:34 +02:00
Guillermo Bonet 0d30331c9a feat: refs #7704 Fixtures hedera
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:25:26 +02:00
Robert Ferrús c770d17c25 feat: refs #7685
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:57:48 +02:00
Robert Ferrús fb1c66633c feat: refs #7685
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:55:10 +02:00
Robert Ferrús 9b2ebe7bd9 feat: refs #7685
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:52:27 +02:00
Robert Ferrús cb0461b241 feat: refs #7685 changes required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:43:19 +02:00
Guillermo Bonet 7bdc242fc7 feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:40:06 +02:00
Guillermo Bonet 90802bd330 feat: refs #7704 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:28:00 +02:00
Guillermo Bonet 823756d71a feat: refs #7704 Optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 10:29:26 +02:00
Robert Ferrús 1669944286 Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 08:26:46 +00:00
Robert Ferrús b3a98226c0 feat: refs #7685 chages required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 10:23:31 +02:00
Guillermo Bonet 61a746c2d8 feat: refs #7704 Fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 09:00:07 +02:00
Guillermo Bonet 02bcfd9be3 feat: refs #7704 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 08:57:45 +02:00
Javi Gallego 618baaf604 usa campo factura multipe 2024-07-11 08:37:08 +02:00
Guillermo Bonet 6dc464d26b refactor: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 07:14:02 +02:00
Guillermo Bonet a2f2ed743d refactor: refs #7681 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 13:31:48 +02:00
Robert Ferrús 3de57b776b Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:02:32 +00:00
Guillermo Bonet a82f7bc025 Merge branch 'dev' into 6769-itemDiary
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 10:04:27 +00:00
Guillermo Bonet 889982dd82 refactor: refs #7126 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 12:00:54 +02:00
Guillermo Bonet 3c975aa9c4 refactor: refs #7580 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:32:41 +02:00
Guillermo Bonet 15f580508b refactor: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 11:29:14 +02:00
Guillermo Bonet 7e415181c2 refactor: refs #6453 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 11:26:45 +02:00
Alex Moreno c7d9fae17b Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 08:39:35 +00:00
Guillermo Bonet a1d3d2f2f8 refactor: refs #6453 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 10:30:24 +02:00
Guillermo Bonet 0e760ba505 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 08:23:43 +02:00
Guillermo Bonet a8d0345073 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 08:18:33 +02:00
Guillermo Bonet b75bdc07c2 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 08:10:34 +02:00
Guillermo Bonet 46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 07:46:18 +02:00
Robert Ferrús 4f4d12c76a Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 05:22:19 +00:00
Guillermo Bonet 9d4db0d408 Merge pull request 'refactor: refs #7505 item_getVisible refactor' (!2573) from 7505-item_calcVisible into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2573
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-10 05:03:18 +00:00
Guillermo Bonet 1ca95678df Fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 14:53:09 +02:00
Guillermo Bonet 0b61a175ef Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-09 14:49:51 +02:00
Guillermo Bonet 64ed96c8ae feat: refs #7486 More debug
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 14:47:12 +02:00
Guillermo Bonet daec922c5c Merge branch 'dev' into 7505-item_calcVisible
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:25:11 +00:00
Guillermo Bonet e2b6473831 feat: refs #7505 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 14:24:35 +02:00
Guillermo Bonet 470c9bc872 feat: refs #7505 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 14:24:17 +02:00
Guillermo Bonet c2e9095ccd feat: refs #7505 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 14:22:32 +02:00
Robert Ferrús f8efecd7c4 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 10:47:02 +00:00
Robert Ferrús f8169b3034 feat: refs #7544 chages required
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-09 12:46:50 +02:00
Guillermo Bonet b28ef09f3d Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:04:02 +02:00
Guillermo Bonet 1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:02:15 +02:00
Guillermo Bonet bb7002b702 fix: refs #7126 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 12:00:55 +02:00
Guillermo Bonet f4e5f0205d fix: refs #7126 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 11:56:32 +02:00
Guillermo Bonet c3051ebcfb fix: refs #7126 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 11:43:15 +02:00
Guillermo Bonet 769ee33ab2 fix: refs #7126 Added addressWaste type
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 11:40:24 +02:00
Guillermo Bonet 5b9e6f0e59 Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2688
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-09 09:33:53 +00:00
Robert Ferrús 775ceabe77 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:20:45 +00:00
Guillermo Bonet 35ca968d88 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 11:03:37 +02:00
Guillermo Bonet 3e4bf55eed fix: refs #7490 Correction
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 11:03:17 +02:00
Robert Ferrús 928dc977b0 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:00:05 +00:00
Guillermo Bonet 96d2bacb3d feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 10:22:42 +02:00
Guillermo Bonet 376adebe9d feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:19:18 +02:00
Guillermo Bonet a725cd2840 feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:19:04 +02:00
Guillermo Bonet 042ea84055 feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:14:55 +02:00
Guillermo Bonet 2078bf58ff feat: refs #7681 Optimization and refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:09:00 +02:00
Robert Ferrús 85a8009034 Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 08:02:59 +00:00
Robert Ferrús 4dcc8b02a5 feat: refs #7685 delivery coordinates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 10:01:32 +02:00
Guillermo Bonet 29f9fa0ce3 feat: refs #7505 Optimization
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:45:55 +02:00
Guillermo Bonet 86acc644fe feat: refs #7505 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:38:07 +02:00
Guillermo Bonet 7279feab12 feat: refs #7505 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:33:31 +02:00
Guillermo Bonet c9e9d95cff Merge branch 'dev' into 7505-item_calcVisible
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 09:06:27 +02:00
Guillermo Bonet 6430fb5b51 refactor: refs #7662 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 08:43:02 +02:00
Robert Ferrús 8469b2ac3f feat: refs #7683 productionControl
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 08:24:50 +02:00
Guillermo Bonet eaca342777 refactor: refs #7662 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 14:11:55 +02:00
Guillermo Bonet 32793990ec refactor: refs #7662 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 14:01:18 +02:00
Guillermo Bonet 86859c98e3 refactor: refs #7662 Added transaction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 13:57:17 +02:00
Guillermo Bonet 73b43aa254 refactor: refs #7580 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 13:22:10 +02:00
Guillermo Bonet f57ab72482 refactor: refs #7580 Fix and improvement
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 13:17:29 +02:00
Guillermo Bonet 4757ce11a3 refactor: refs #7567 Fix and improvement
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 12:35:29 +02:00
Guillermo Bonet f79b2378af Merge branch 'dev' into 7622-addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 10:05:35 +00:00
Guillermo Bonet eb60a1ed77 Merge branch 'dev' into 7378-productionLogConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:00:32 +00:00
Guillermo Bonet 098bda0f9c Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:59:32 +00:00
Guillermo Bonet b068327352 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:49:39 +02:00
Guillermo Bonet 460723bd7a refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:08:04 +02:00
Guillermo Bonet e64f56cff1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:55:00 +02:00
Guillermo Bonet 5213fd4feb Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:54:42 +02:00
Guillermo Bonet 6eef7876d9 Merge pull request 'refactor: refs #7640 multipleInventoryFix' (!2689) from 7640-multipleInventoryFix into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2689
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-08 05:52:51 +00:00
Guillermo Bonet 3a2acfb7f8 feat: refs #7640 Optimization
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 07:21:53 +02:00
Guillermo Bonet fb07cdccc3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:51:09 +02:00
Guillermo Bonet 5712fbd782 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:50:43 +02:00
Guillermo Bonet 592738c7a0 refs #7024 & ticket 198125 Hotfix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:48:03 +02:00
Guillermo Bonet 55f0e90771 feat: refs #7640 Minor change
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-05 13:36:38 +02:00
Guillermo Bonet 3ddf49da0a feat: refs #7640 Fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 13:21:07 +02:00
Guillermo Bonet 8ac26c7281 refactor: refs #7640 Refactor multipleInventory
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 12:50:31 +02:00
Guillermo Bonet 1799b52f8b feat: refs #7622 Added type column addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 12:37:59 +02:00
Guillermo Bonet 481d57042f Merge pull request 'feat: refs #7382 Added unique key' (!2667) from 7382-triggerInvoiceInTax into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2667
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-05 10:26:25 +00:00
Guillermo Bonet 182273d3b3 refs #7450 Modified msg throw
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 09:59:15 +02:00
Guillermo Bonet aa46d7a536 refs #6769 item_getBalance optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 09:46:09 +02:00
Guillermo Bonet 50c9ded103 refs #6769 Fix 2024-07-05 08:38:40 +02:00
Guillermo Bonet 6f0196d656 refs #6769 Changes 2024-07-05 07:06:40 +02:00
Carlos Andrés d6f6df48f2 Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2676
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-04 11:30:11 +00:00
Guillermo Bonet cf7de14de6 refs #6769 Changes, with error no database selected 2024-07-04 11:34:55 +02:00
Robert Ferrús 9819744caf Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 07:34:31 +00:00
Guillermo Bonet c2d899cd6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 09:33:08 +02:00
Guillermo Bonet 108a62f738 refs #7486 Fix tests
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 09:32:56 +02:00
Guillermo Bonet a7895ab0a4 refs #6769 First commit 2024-07-04 09:17:22 +02:00
Robert Ferrús 897da1e48a feat: refs #7654
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-04 08:59:22 +02:00
Robert Ferrús 68871e6345 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn 2024-07-04 08:21:11 +02:00
Guillermo Bonet 5f7c7ae5dd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 07:44:11 +02:00
Guillermo Bonet af6422cf05 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 07:43:58 +02:00
Guillermo Bonet a7b653c42a refs #7486 Fix collection_new
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-07-04 07:34:41 +02:00
Carlos Andrés 989fa5ac5a feat: Avisar cuando no hay posibilidad de fichar refs #7669
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 18:10:02 +02:00
Carlos Andrés d65af6aaaa feat: Avisar cuando no hay posibilidad de fichar refs #7669
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 18:00:28 +02:00
Ivan Mas 4bef3e9107 refs #7531 Modify zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 17:09:10 +02:00
Carlos Andrés 097350adb6 Hotfix sale_getProblems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-03 17:07:25 +02:00
Carlos Andrés 1ec7cd9540 Hotfix sale_getProblems 2024-07-03 16:59:01 +02:00
Guillermo Bonet 246b34571d feat: refs #7382 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 14:24:26 +02:00
Guillermo Bonet 2278b9a05a feat: refs #7382 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 14:20:43 +02:00
Robert Ferrús 4f9552379e feat: refs #7654 entry_splitByShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 13:46:19 +02:00
Guillermo Bonet cf63d6e71c feat: refs #7378 Added productionConfigLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 11:17:33 +02:00
Javi Gallego a8d663bee4 feat: refs #7348 hasDailyInvoice field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:49:51 +02:00
Guillermo Bonet 2f8df96ba7 feat: refs #7564 Added ticket_setVolumeItemCost
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:29:12 +02:00
Guillermo Bonet d1a38ec589 Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2656
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:22:48 +00:00
Guillermo Bonet 1afce8124f Merge pull request 'refactor: refs #7418 Item type refactor' (!2658) from 7418-itemType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2658
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:21:19 +00:00
Guillermo Bonet 18b7fb48c7 Merge pull request 'refs #7443 Deleted ekt barcode' (!2665) from 7443-deleteEktBarcode into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2665
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:18:52 +00:00
Javi Gallego 0d70cb8929 fix: informatica no necesita este correo
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 17:39:46 +02:00
Guillermo Bonet 0bb4439f85 refs #7443 Deleted ekt barcode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 14:37:22 +02:00
Robert Ferrús 872ab1a758 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 11:08:08 +00:00
Ivan Mas 99beb21927 Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 10:36:40 +00:00
Guillermo Bonet edff15662c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 12:34:51 +02:00
Guillermo Bonet 028278ebcf refs #6626 Hotfix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 11:52:25 +02:00
Guillermo Bonet 1e5fd8002c feat: refs #7564 Added proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 09:36:23 +02:00
Guillermo Bonet b6b3da0771 Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued... Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-02 08:06:54 +02:00
Guillermo Bonet a7c7c4c2f6 Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2655
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-02 05:35:52 +00:00
Sergio De la torre 1ca22dab92 Merge branch 'dev' into 7575_setParking_regExp
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:36:18 +00:00
Ivan Mas da9ff6f22c Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:55:06 +00:00
Ivan Mas 29aecd62a5 refs #7651 add afterDelete trigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:51:32 +02:00
Guillermo Bonet cafa7bce44 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 13:40:31 +02:00
Guillermo Bonet a0ea742f9e fix: refs #7486 Hotfix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-01 13:38:25 +02:00
Ivan Mas 2ed31ee1d3 refs #7651 Add editorFk and triggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 13:26:59 +02:00
Guillermo Bonet 9e5f416d55 refactor: refs #7418 Item type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:06:30 +02:00
Guillermo Bonet a23f485296 refactor: refs #7424 Component type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:11:16 +02:00
Guillermo Bonet 8409ffa950 fix: refs #7552 Hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-01 10:26:46 +02:00
Guillermo Bonet 2bf06d8add fix: refs #7552 Hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-01 10:06:34 +02:00
Sergio De la torre 3ad2346504 feat refactor setParking REGEXP refs #7575
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 09:25:00 +02:00
Guillermo Bonet 57a879723e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-01 07:39:19 +02:00
Guillermo Bonet f73176375b Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2645
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-01 05:30:31 +00:00
Guillermo Bonet df4e5deae6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-28 13:33:43 +02:00
Guillermo Bonet 08c9d43b17 refs #7486 Declare exit handler fix collection_assign error
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-28 13:30:08 +02:00
Guillermo Bonet 9164901eac refs #7640 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-27 13:26:59 +02:00
Sergio De la torre 746fa82f2a feat expeditionPalletPrint refs #5210
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 13:20:52 +02:00
Carlos Andrés cbd46330b3 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 13:01:42 +02:00
Guillermo Bonet e8dc6eafdc refs #7640 multiple inventory
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-27 10:18:43 +02:00
Robert Ferrús 0379142fb5 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 11:30:38 +00:00
Guillermo Bonet ad4dd088a3 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-06-26 11:58:43 +02:00
Guillermo Bonet 220f402f4e Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2640
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-26 09:53:25 +00:00
Guillermo Bonet c4af92e9ba horfix: ticket 197676
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 09:54:51 +02:00
Pablo Natek b23ff33e60 Merge branch 'dev' into 6021-floranet240624
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 05:10:42 +00:00
Carlos Andrés 75486ae743 Hotfix ticketStateUpdate to ticket_setState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 19:47:22 +02:00
Carlos Andrés 5bcdc57978 Hotfix ticketStateUpdate to ticket_setState 2024-06-25 19:33:54 +02:00
Carlos Andrés 82118ae933 Hotfix ticketStateUpdate to ticket_setState 2024-06-25 19:30:59 +02:00
Robert Ferrús c4eb7670fe Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 12:59:48 +00:00
Guillermo Bonet b9278f3b3a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 14:02:16 +02:00
Guillermo Bonet 2e1ab3af20 refs #7486 Fix same assign collection
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 14:00:46 +02:00
Carlos Andrés ff1918ef06 Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2176
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-25 11:21:02 +00:00
Alex Moreno 85854e0713 warmFix: use vn
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 13:14:44 +02:00
Pako Natek 4bf00bd428 version 240625
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:51:14 +02:00
Alex Moreno 45e8674087 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 11:34:35 +02:00
Alex Moreno cf0f80142f hotFix: create view vn.expeditionTruck
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 09:24:34 +02:00
Robert Ferrús 205d79f0a6 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 06:13:16 +00:00
Alex Moreno 0284f3b1ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 07:30:20 +02:00
Alex Moreno f2ee1df8ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-25 07:29:56 +02:00
Carlos Andrés cf79711f6a feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 13:30:03 +02:00
Pako Natek c32a87126c Merge branch 'master' into supplierPackaging_ReportSource_masterHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 10:50:31 +00:00
Pako Natek 5f329fde38 or replace
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-24 10:32:51 +02:00
Pako Natek f999010c6c tested proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 10:32:12 +02:00
Pako Natek 8c5f468087 tested proc 2024-06-24 10:30:25 +02:00
Robert Ferrús a170edcdef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable 2024-06-24 08:09:52 +02:00
Pablo Natek ea0b0dc779 fix: business overlapping
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 08:08:39 +02:00
Robert Ferrús 9022f62116 feat: refs #5855 changes required
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-24 08:03:43 +02:00
Sergio De la torre 429149d4e0 Merge branch 'dev' into 7023_itemShelving_filterBuyer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 05:05:27 +00:00
Sergio De la torre 4131653700 feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 13:02:36 +02:00
Sergio De la torre 3fa7eb1d2a feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 13:01:19 +02:00
Pako Natek 7347c50f8e Merge branch 'dev' into 7420-supplierPackaging_reportSource_update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 06:33:15 +00:00
Pako Natek fe154b9ee8 sref
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:32:22 +02:00
Guillermo Bonet 6874474207 Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2394
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-21 05:05:20 +00:00
Guillermo Bonet a899ecaab7 Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2561
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-21 05:04:32 +00:00
Carlos Andrés f7b8bd2df6 Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 18:18:05 +02:00
Carlos Andrés ed49c98c1c fnpmeat: previas con sitema de reservas refs #6861 2024-06-20 18:18:03 +02:00
Carlos Andrés 68f48de6f0 feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 17:14:38 +02:00
Sergio De la torre 9b0913e439 Merge branch 'dev' into 7023_itemShelving_filterBuyer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 14:36:25 +00:00
Carlos Andrés b5cd57e660 Merge pull request 'test' (!2621) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2621
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 13:47:11 +00:00
Carlos Andrés 691413a854 Merge pull request 'master' (!2620) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2620
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 13:44:37 +00:00
Carlos Andrés 11675c2e35 Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2618
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-20 13:34:55 +00:00
Carlos Andrés 414bf9eb03 feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:48:32 +02:00
Carlos Andrés e0d105313d feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:27:11 +02:00
Sergio De la torre c1c01df3c3 feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-20 09:37:22 +02:00
Javi Gallego 018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2609
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-20 05:50:14 +00:00
Javi Gallego 1a8df4d87c feat: refs #7216 triggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 13:41:37 +02:00
Robert Ferrús 0128dfd967 feat: refs #5855 changes required 2024-06-19 11:30:50 +02:00
Pako Natek 49e01218e9 Warehouse name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 10:45:37 +02:00
Robert Ferrús 1e3376f908 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 08:05:01 +00:00
Robert Ferrús a42562b0ca fear: refs #5855 claim_ratio_routine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 10:01:32 +02:00
Pako Natek 1fa0a841da TP previous
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 07:26:30 +02:00
Pako Natek bf62f40c87 actualizada la rama 2024-06-19 07:17:25 +02:00
Pako Natek 66ed958c72 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:07:24 +00:00
Guillermo Bonet b7fadddbb1 Merge branch 'master' into dev 2024-06-18 11:03:56 +02:00
Guillermo Bonet 4d5f3e43ed Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 11:03:49 +02:00
Guillermo Bonet 2b1de271a9 refs #7552 Added force vShowType true
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 11:03:30 +02:00
Guillermo Bonet 4880d1497f feat: refs #6727 Added util logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 08:40:33 +02:00
Pako Natek 3711f26b5f Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 06:24:59 +00:00
Pako Natek 9fc027a3c6 tickets deleted excluded
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 08:24:06 +02:00
Guillermo Bonet a84badff87 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-17 14:52:55 +02:00
Guillermo Bonet ce709798b4 hotfix: refs #7486 collection_new debug error
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 14:51:04 +02:00
Guillermo Bonet 664f4299b3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:42:51 +02:00
Guillermo Bonet 131b44305d hotfix: refs #7552 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:38:40 +02:00
Guillermo Bonet b4377e36e2 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 11:45:19 +02:00
Guillermo Bonet 4c345ffa93 hotfix: refs #7552 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-17 10:57:23 +02:00
Guillermo Bonet 43df0ef55d Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 07:42:33 +00:00
Guillermo Bonet 1d0b89ed52 refs #7519 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 09:42:16 +02:00
Carlos Andrés 51078c804b Ticket #194195 Recupero vn.item_getAtp
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 16:32:13 +02:00
Carlos Andrés 5473f7a308 Hotfix Ticket #194195 Error radar negativos
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 16:01:27 +02:00
Robert Ferrús df6de7e74c fix: refs #194195 item_getAtp
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-14 14:55:03 +02:00
Robert Ferrús 8dea9598e8 fix: refs #194195 item_getAtp
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-14 13:54:43 +02:00
Guillermo Bonet 9b80ef73a8 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:48:00 +02:00
Guillermo Bonet 798bf6d028 hotfix: refs #6281 itemShelving_add buy is required
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:41:46 +02:00
Robert Ferrús 828908a522 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 06:07:39 +00:00
Robert Ferrús 831b2c39f6 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 06:06:54 +00:00
Ivan Mas 615fd3e97b refs #7530 delete trigger deviceProductionConfig_afterUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 15:10:04 +02:00
Sergio De la torre c2e4e187d6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 14:21:59 +02:00
Guillermo Bonet cfc5e32715 feat: refs #6701 Fix error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 13:11:50 +02:00
Guillermo Bonet cb056ff789 Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 11:14:00 +02:00
Sergio De la torre 5340729ead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 11:07:57 +02:00
Guillermo Bonet 53c732bcb9 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-13 07:12:10 +02:00
Guillermo Bonet d7317e4067 hotfix: refs #7024 Modify booked entries
gitea/salix/pipeline/head This commit looks good Details
2024-06-13 07:09:48 +02:00
Carlos Andrés 30caf79490 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 16:12:06 +02:00
Guillermo Bonet d0b926b2c5 feat: refs #7490 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 14:26:26 +02:00
Alex Moreno 671978ec02 Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 10:21:36 +00:00
Guillermo Bonet 17fa1e10f6 feat: refs #6701 Added claimRatio_afterInsert
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 07:33:10 +02:00
Carlos Andrés b9d1c3228b feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 18:43:26 +02:00
Guillermo Bonet aa0e06cfec refactor: refs #7505 Changed name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 14:00:59 +02:00
Guillermo Bonet 3bd596e5fd refactor: refs #7505 Added description
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:53:41 +02:00
Guillermo Bonet 4f10a93584 refactor: refs #7505 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:36:46 +02:00
Guillermo Bonet a9aad7406a refactor: refs #7505 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:51:36 +02:00
Carlos Andrés d75e008a23 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:49:33 +02:00
Carlos Andrés ed7218c133 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:44:25 +02:00
Guillermo Bonet 9f9063567a refactor: refs #7505 item_getVisible refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:40:07 +02:00
Guillermo Bonet 76f76b8304 feat: refs #7568 Added freelancer exception
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:48:24 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 09:59:09 +02:00
Guillermo Bonet bd13ecd464 refactor: refs #7486 engine memory and primary key sales_merge
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 07:59:53 +02:00
Alex Moreno c241189508 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 14:22:12 +02:00
Guillermo Bonet 75a529830c Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2564
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-10 11:33:10 +00:00
Guillermo Bonet 9d82f0ff7c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 12:48:53 +02:00
Guillermo Bonet 37fa92aca8 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 12:48:38 +02:00
Guillermo Bonet 272a34c5f9 refactor: refs #7486 Added userFk debug
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 12:46:26 +02:00
Guillermo Bonet 7579e15fcc refactor: refs #7486 Optimized procs
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-10 11:55:40 +02:00
Guillermo Bonet b4820858c9 hotfix: ticket 192672 ticketPreviousPreparingList
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 11:32:44 +02:00
Javi Gallego b4046de190 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 08:17:17 +00:00
Guillermo Bonet ca7d67451b refactor: refs #7517 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 09:09:11 +02:00
Guillermo Bonet 2e8d28d795 refactor: refs #7517 Added throw
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 09:08:26 +02:00
Guillermo Bonet 317f898c2e refactor: refs #7490 Minor changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-10 08:48:56 +02:00
Guillermo Bonet a4f8c0df80 Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 08:47:03 +02:00
Guillermo Bonet fb4be69cf1 refactor: refs #7490 Added final update 2024-06-10 08:47:02 +02:00
Guillermo Bonet e043badc19 Merge branch 'dev' into 7490-duaInvoiceInBooking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 06:39:15 +00:00
Guillermo Bonet 9b21cd5eb1 refactor: refs #7490 Deleted update duaInvoiceInBooking
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-10 08:38:58 +02:00
Sergio De la torre 4cf5c0775c feat isScannedExpedition refs #7276
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 07:30:33 +02:00
Carlos Andrés 1497146940 Merge branch 'master' into Hotfix-midnight-determinist
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-07 16:17:11 +02:00
Javi Gallego f82f452423 Merge branch 'dev' into 7276_expeditionScanned
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 13:44:24 +00:00
Javi Gallego 0c068ed126 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:03:24 +00:00
Sergio De la torre 7c0fa6dbb9 feat isScannedExpedition refs #7276
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:18:52 +02:00
Guillermo Bonet aff0de23eb Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:29:28 +02:00
Guillermo Bonet b6fb7650cd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:29:04 +02:00
Robert Ferrús 1ca7b75ce3 Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 12:33:35 +00:00
Robert Ferrús d8e6a94797 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 12:31:08 +00:00
Ivan Mas a8f5993c21 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 10:12:45 +00:00
Robert Ferrús ef50d493f1 feat: refs #7544
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 11:54:39 +02:00
Javi Gallego e77bc87a2a Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2546
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-06 09:48:29 +00:00
Robert Ferrús 1c6e881273 feat: refs #7544 crear evento claim_changeState
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-06 11:45:09 +02:00
Robert Ferrús 7f23c81756 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 07:28:40 +02:00
Carlos Andrés b78ef97813 Hotfix modificar entradas contabilizadas Ticket 191417
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 15:50:16 +02:00
Carlos Andrés 638a5e9a1e Hotfix modificar entradas contabilizadas Ticket 191417
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 15:44:11 +02:00
Ivan Mas 8458651ce0 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 12:57:47 +00:00
Ivan Mas 71ea1d1467 refs #7536 modify itemShelvingRadar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 14:53:59 +02:00
Guillermo Bonet feda14a21b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 14:23:09 +02:00
Guillermo Bonet c2fecde1b8 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 14:22:59 +02:00
Robert Ferrús 40d40bd0bb fix: refs #7335 hotFix cmrTicket
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 13:42:21 +02:00
Javi Gallego 1fa22e71a9 feat: refs #7203 nombre variables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 12:42:55 +02:00
Guillermo Bonet e4e7ae1699 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:16:15 +02:00
Guillermo Bonet ceda2718d5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:15:56 +02:00
Guillermo Bonet 82954ed299 hotfix: ticket #176792
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:13:40 +02:00
Carlos Andrés 8b584a08dc Hotfix: midnight deterministic refs #7213
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 10:11:04 +02:00
Carlos Andrés f2b443021f hotfix: midnight deterministis refs #7213 2024-06-05 10:03:37 +02:00
Robert Ferrús e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-05 07:57:34 +00:00
Robert Ferrús a0e79a778d feat: refs #7496 deprecated ticket.isLabeled 2024-06-05 09:57:15 +02:00
Guillermo Bonet 3dab181bff Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2536
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 06:17:10 +00:00
Javi Gallego 130d2b6b47 feat: refs #7203 remove numbres alertLevel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 08:05:46 +02:00
Juan Ferrer feaf5f8f5a Merge pull request 'test' (!2545) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2545
2024-06-04 21:05:47 +00:00
Juan Ferrer f903d7cd2a Merge pull request 'master' (!2538) from master into test
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2538
2024-06-04 21:05:27 +00:00
Carlos Andrés 35b4255505 Hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 16:45:42 +02:00
Carlos Andrés e4969f7061 Hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-04 16:43:09 +02:00
Carlos Andrés a9eb5f7d1e hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:45:54 +02:00
Carlos Andrés 1927fbce45 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:39:02 +02:00
Javi Gallego 8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 14:24:55 +02:00
Javi Gallego 4230d46fe5 Merge branch 'dev' into 4560-GastosReparto 2024-06-04 09:47:58 +02:00
Robert Ferrús 3720f7acfe Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 06:57:29 +00:00
Carlos Andrés 9a7074d600 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-03 20:16:27 +02:00
Guillermo Bonet d3584691fa refactor: refs #6701 Minor change 2024-06-03 12:16:33 +02:00
Guillermo Bonet 85d68890b8 refactor: refs #6701 New table clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 12:11:26 +02:00
Guillermo Bonet b8e95c0284 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 11:46:52 +02:00
Guillermo Bonet 8cef8eace7 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 11:41:09 +02:00
Guillermo Bonet fd237b6d35 Merge branch 'dev' into 6701-claimRatioRoutine 2024-06-03 11:40:50 +02:00
Guillermo Bonet b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 05:22:15 +00:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Guillermo Bonet d27bbd9a8f hotfix: ticket 189567
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:28:47 +02:00
Robert Ferrús fd233a5e51 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 05:09:16 +00:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Guillermo Bonet d461b78c7b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 07:19:03 +02:00
Guillermo Bonet 255a2c5283 fix: refs #7258 Proc bs.claim_ratio_routine
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 07:18:30 +02:00
Pako Natek 03fa06a9fb Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 06:37:44 +00:00
Pako Natek e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 08:36:18 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Guillermo Bonet f770bce54c fix: refs #7486 Deleted get_lock collection_assign
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 07:55:33 +02:00
Carlos Andrés a022ed0854 Hotfix payments ticket 188787
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 14:50:58 +02:00
Carlos Andrés cf84aa7256 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 13:01:27 +02:00
Carlos Andrés 6e5b41a886 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:30:17 +02:00
Guillermo Bonet 55fd94a12a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:51:16 +02:00
Guillermo Bonet 086c2291d1 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:50:59 +02:00
Guillermo Bonet 2498849ed0 hotfix: refs #7486 Added tmp debug insert
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:43:55 +02:00
Ivan Mas 6222d2657b Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 10:33:02 +00:00
Sergio De la torre 32aafc3545 feat: refs #6861 trigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:21:22 +02:00
Sergio De la torre e133dec514 refs #6861 feat: trigger
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-27 11:55:42 +02:00
Robert Ferrús 0b648d09af feat: refs #7296 roadmapStopFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 11:45:22 +02:00
Sergio De la torre 74b71079f2 refs #6861 feat: obsrevation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:04 +02:00
Robert Ferrús 941438efd0 Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 09:41:30 +02:00
Robert Ferrús aaea0c95f7 feat: refs #7296 roadmapStopFk 2024-05-27 09:41:28 +02:00
Robert Ferrús cf5d520692 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:09:34 +00:00
Robert Ferrús eb503238d7 feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-27 09:07:23 +02:00
Sergio De la torre 64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:46:21 +02:00
Sergio De la torre d770cd8d48 refs #6861 feat: getLock
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:33:33 +02:00
Robert Ferrús 846ba9ef66 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 05:30:33 +00:00
Pako Natek 4550d3719c Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 05:17:27 +00:00
Robert Ferrús b02995918e Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 05:04:40 +00:00
Javi Gallego 0e5a15dd4e con addressFk 2024-05-24 15:14:20 +02:00
Pako Natek 49a2e6fc84 tickets y email
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 11:44:58 +02:00
Guillermo Bonet 2c87730dba Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2505
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-24 09:30:54 +00:00
Ivan Mas 4d79dabb69 Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 08:23:05 +00:00
Ivan Mas 7e22e19e62 refs #7217 Reduce error message
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 10:21:35 +02:00
Pako Natek 257de96743 Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta 2024-05-24 07:44:12 +02:00
Pako Natek 0a1e09be41 Merge branch 'dev' into 6021-add-observations-to-json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 05:31:10 +00:00
Guillermo Bonet 2fe279ed47 feat: refs #7438 Requested changes and little changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 07:20:27 +02:00
Pablo Natek ee17ea4842 feat: refs #6021 add new field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 21:38:02 +02:00
Sergio De la torre ea4f70f460 refs #6861 feat: previas a reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 16:35:36 +02:00
Jorge Penadés 2cd3002d06 Merge pull request 'test' (!2506) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2506
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-23 14:07:21 +00:00
Carlos Andrés 14f243f251 Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2495
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-23 14:03:22 +00:00
Guillermo Bonet 35ce259e5a feat: refs #7438 Added volume to item_valuateInventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 14:26:11 +02:00
Carlos Andrés 35a583d6d8 Merge pull request 'test' (!2504) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2504
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-23 11:42:23 +00:00
Guillermo Bonet bbd948c654 refs #7440 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 09:47:14 +02:00
Guillermo Bonet 56aec1c781 refs #7440 Optimized item_comparative 2024-05-23 09:44:18 +02:00
Robert Ferrús 974e327077 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 06:29:16 +00:00
Carlos Andrés 22a6c3695c feat:concurrency issue refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 18:05:16 +02:00
Carlos Andrés 774e92e639 hotfix: Eliminar restricciones ticketRefund Ticket #187137
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-22 16:43:45 +02:00
Carlos Andrés bc6af32962 fix: problems in colums ticket and sale refs #7213
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-22 14:50:45 +02:00
Guillermo Bonet a52b9b6d2e Merge pull request 'refactor: refs #7398 Refactor and change ekt_scan' (!2494) from 7398-ektScan into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2494
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-22 06:31:06 +00:00
Guillermo Bonet 0d620c6f33 feat: refs #7398 Change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 08:11:27 +02:00
Jorge Penadés 365e5a3ba3 fix: refs # 7400 ledger_next
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 17:31:29 +02:00
Guillermo Bonet 2ffdce3c64 refactor: refs #7398 Refactor and change ekt_scan
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 14:40:42 +02:00
Pako Natek ba478d5358 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 11:31:41 +00:00
Pako Natek dfde2f6846 evita facturacion proveedores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 13:28:05 +02:00
Robert Ferrús 0ef93bd98a Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 08:00:50 +00:00
Alex Moreno f803f5a57d Merge branch 'dev' into 7431_itemPlacements
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 07:49:00 +00:00