Commit Graph

1433 Commits

Author SHA1 Message Date
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
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
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 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 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 3c975aa9c4 refactor: refs #7580 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:32:41 +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 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 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 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 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 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
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
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
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
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
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
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
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
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 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
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
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 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
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 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 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 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 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
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
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
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
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
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
Guillermo Bonet 6f9826421d refactor: refs #7422 Fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 09:39:09 +02:00
Sergio De la torre 6dad3d8af4 refs #7431 feat: itemPlacementSupplyStockGetTargetList
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 09:37:29 +02:00
Sergio De la torre cb866b4ab7 refs #7431 feat: itemPlacementSupplyStockGetTargetList
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 09:16:47 +02:00
Guillermo Bonet b33d4ce319 Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2471
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-21 06:11:24 +00:00
Robert Ferrús 623aa8d537 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:38:11 +00:00
Pako Natek abdacb3627 casting values
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:33:01 +02:00
Sergio De la torre 598a7eefbc 6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:39:23 +02:00
Sergio De la torre 2b2406ae52 6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:32:12 +02:00
Sergio De la torre 20bf2b73b6 6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:27:20 +02:00
Sergio De la torre dd76168bc3 6281 feat:buyFk in itemShekving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:15:24 +02:00
Sergio De la torre b71984c53f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6281_buyFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:13:44 +02:00
Pako Natek 9a5acedd38 improved proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 08:21:54 +02:00
Sergio De la torre df08f7a8de Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 15:10:26 +00:00
Sergio De la torre c822a64dc7 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 16:38:11 +02:00
Ivan Mas 8b6844b9f0 Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:13:38 +00:00
Pablo Natek 4790ae94d1 Merge branch 'dev' into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:33:57 +00:00
Carlos Andrés c8db0a3aa8 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-17 12:48:16 +02:00
Guillermo Bonet 0b5f05cbed refactor: refs #7375 Refactor clientsDisable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:36:54 +02:00
Sergio De la torre 135526e513 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:20:26 +02:00
Guillermo Bonet 1154e484e5 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-05-17 09:57:35 +02:00
Ivan Mas 68425bd41f Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 07:55:27 +00:00
Ivan Mas db28bf335e refs #7217 Modify error message
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 09:53:17 +02:00
Guillermo Bonet a99554c773 fix: Occasionally saleVolume bad index
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 09:50:53 +02:00
Ivan Mas 4bf36f2655 refs #7217 Modify proc name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 08:16:50 +02:00
Guillermo Bonet bddc9a8386 Deleted insert into util.debug (deletedState)
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 07:51:51 +02:00
Sergio De la torre 27110c2abe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 06:27:09 +02:00
Carlos Andrés 08ea0d2693 Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2467
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 18:13:39 +00:00
Carlos Andrés dab90633db Merge pull request 'test' (!2466) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2466
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 17:21:54 +00:00
Carlos Andrés 8d8cfa24de refs #7400 feat: book ledger with counters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 19:16:25 +02:00
Carlos Andrés 01d1a2391d refs #7400 feat: book ledger with counters 2024-05-16 18:48:59 +02:00
Ivan Mas b2db076c2f refs #7217 create travel_throwAWBError
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 15:34:45 +02:00
Carlos Andrés 2f4f199fad fix: invoiceInTax_getFromEntries (referenceRate)
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-16 14:40:02 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Sergio De la torre 75bb08a0c6 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-16 07:08:47 +02:00
Sergio De la torre 9b73cdfa6f refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 17:03:33 +02:00
Guillermo Bonet 7e3861a02f Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued... Details
2024-05-15 14:32:48 +02:00
Guillermo Bonet 049e8931ab hotfix: Tmp fix item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 14:30:04 +02:00
Guillermo Bonet 9134e0ff65 feat: refs #7264 Minor change 2024-05-15 14:05:35 +02:00
Guillermo Bonet 53fa78894c feat: refs #7264 Refactor proc itemShelvingRadar and added columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 13:54:22 +02:00
Sergio De la torre 9288f08b91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:30:05 +02:00
Robert Ferrús 1ee29036f4 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 08:22:00 +00:00
Guillermo Bonet 778f368300 Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2429
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-15 08:19:34 +00:00
Pako Natek 0adf6bfc45 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 10:50:59 +00:00