21105 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	0fce8c755b	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-09 05:14:38 +00:00
Sergio De la torre	7bcabbf51c	Merge pull request 'refs #6276 hotFix:itemShelving_add' (!2425) from 6276_itemShelving_Add into master ... Reviewed-on: #2425 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-09 05:12:57 +00:00
Sergio De la torre	10513d1991	Merge branch 'master' into 6276_itemShelving_Add	2024-05-09 05:00:07 +00:00
Robert Ferrús	b0848edff8	feat: refs #5699 quittar de client_afterUpdate desactivar cliente	2024-05-08 12:52:11 +02:00
Robert Ferrús	ce42cbf287	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-08 10:44:15 +00:00
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +02:00
Sergio De la torre	5207f07c80	refs #6276 hotFix:itemShelving_add	2024-05-08 10:03:11 +02:00
Robert Ferrús	f66942ba08	Merge pull request 'hotfix: refs #6777 manaCustomerUpdate' (!2423) from 6777-hotfixManaCustomerUpdate into master ... Reviewed-on: #2423 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-05-08 06:35:00 +00:00
Guillermo Bonet	e070906ea6	hotfix: refs #6777 manaCustomerUpdate	2024-05-08 07:49:32 +02:00
Robert Ferrús	9bd8369469	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5699-hoFixClientsDisable	2024-05-07 13:23:49 +02:00
Robert Ferrús	2dcc959488	fix: refs #5699 clientsDisable	2024-05-07 13:17:56 +02:00
Guillermo Bonet	20414c70ad	Merge pull request 'hotfix: #7173 Rollback' (!2418) from 7173-rollbackInvoiceInRestriction into master ... Reviewed-on: #2418 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 11:12:55 +00:00
Guillermo Bonet	cc8873f48a	hotfix: #7173 Rollback	2024-05-07 13:08:44 +02:00
Jorge Penadés	4fb8a19936	Merge pull request '#6938 rollback phone' (!2417) from 6938-hotfix-rollbackHidePhone into master ... Reviewed-on: #2417 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:44:34 +00:00
Jorge Penadés	dce754a64b	Merge branch 'master' into 6938-hotfix-rollbackHidePhone	2024-05-07 10:41:50 +00:00
Guillermo Bonet	da8378d422	hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate	2024-05-07 12:15:28 +02:00
Jorge Penadés	1d9b6e489c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hotfix-rollbackHidePhone	2024-05-07 11:49:31 +02:00
Jorge Penadés	0f5e2dcc54	fix: refs #6938 rollback	2024-05-07 11:47:22 +02:00
Guillermo Bonet	3ed1c8f6fd	hotfix: ticket #181890 duaInvoiceInBooking	2024-05-07 11:35:07 +02:00
Guillermo Bonet	ef567bb167	fix: ticket #181920 catalog_componentCalculate	2024-05-07 10:03:33 +02:00
Alex Moreno	5d421cb4f0	Merge pull request 'dump: db dump' (!2413) from 7299_dump into master ... Reviewed-on: #2413 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-05-07 06:01:59 +00:00
Alex Moreno	56008ba51f	dump: db dump	2024-05-07 07:53:11 +02:00
Alex Moreno	878ee9e303	Merge pull request '7299_testToMaster' (!2411) from 7299_testToMaster into master ... Reviewed-on: #2411 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-07 05:30:41 +00:00
Carlos Andrés	14a1c5cbbb	Merge pull request 'master' (!2408) from master into test ... Reviewed-on: #2408 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 12:22:04 +00:00
Carlos Andrés	53a6de27cf	Merge pull request 'fix: Error workerTimeControl_direction Salix' (!2407) from 7330-Error-workerTimeControl_direction-en-Salix into master ... Reviewed-on: #2407 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 11:41:09 +00:00
Carlos Andrés	0b4ac51749	fix: Error workerTimeControl_direction Salix	2024-05-06 13:34:46 +02:00
Pablo Natek	52c9015fca	Merge pull request 'fix: refs #6005 runtime' (!2401) from 6005-fix-runtime-error into test ... Reviewed-on: #2401 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:53:51 +00:00
Pablo Natek	bc366c950d	Merge branch '6005-fix-runtime-error' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:52:19 +02:00
Pablo Natek	3ae192c761	fix: refs #6005 fix test	2024-05-03 12:52:12 +02:00
Pablo Natek	6152820078	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:47:14 +02:00
Pablo Natek	0dfb7f2825	Merge branch 'test' into 6005-fix-runtime-error	2024-05-03 10:34:52 +00:00
Pablo Natek	48bfba71de	fix: refs #6005 runtime	2024-05-03 12:33:59 +02:00
Pablo Natek	f5352c03a9	Merge pull request 'fix: refs #6005 time issue' (!2399) from 6005-fix-time-error into test ... Reviewed-on: #2399 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:12:28 +00:00
Pablo Natek	8b11a4a290	fix: refs #6005 time issue	2024-05-03 12:08:22 +02:00
Robert Ferrús	9f2c3bbd0d	Merge pull request 'feat: refs #179918 entry delete isBooked' (!2393) from 179918-cleanDeleteEntry into master ... Reviewed-on: #2393 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-02 11:46:13 +00:00
Robert Ferrús	00eae3920b	feat: refs 179918 clean	2024-05-02 13:33:25 +02:00
Robert Ferrús	145a477a80	feat: refs #179918 entry delete isBooked	2024-05-02 12:39:12 +02:00
Alex Moreno	0b2606096f	Merge pull request '#6889 set originalQuantity to 0' (!2391) from 6889-hotfix-resetOriginalQuantity into master ... Reviewed-on: #2391 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 10:07:28 +00:00
Jorge Penadés	7cb728432a	fix refs #6889 set originalQuantity to 0	2024-05-02 10:15:01 +02:00
Alex Moreno	71f8e18b46	Merge pull request 'hotFix(getBalance): date setHours to 0' (!2390) from hotFix_getBalance into master ... Reviewed-on: #2390 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 06:27:55 +00:00
Robert Ferrús	a00dd82f14	hotFix(getBalance): if null	2024-05-02 08:21:39 +02:00
Robert Ferrús	54499ae4dc	Merge branch 'master' into hotFix_getBalance	2024-05-02 06:10:58 +00:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	2024-05-02 08:09:59 +02:00
Guillermo Bonet	b926725021	hotfix: ticket#179915 Fix no worker exists	2024-05-02 08:04:44 +02:00
Robert Ferrús	77a1b4bb57	hotFix(getBalance): simplify	2024-05-02 08:02:17 +02:00
Robert Ferrús	b8b055b86c	hotFix(getBalance): date setHours to 0	2024-05-02 08:00:44 +02:00
Alex Moreno	d18f08e676	hotFix(addSaleByCode) add userId	2024-04-30 12:15:27 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Guillermo Bonet	d44b8f7c9a	hotfix: ticket #179514 ticket_close packaging fix	2024-04-30 11:44:16 +02:00
Carlos Andrés	2b6d4198ad	Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master ... Reviewed-on: #2385 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-30 07:06:43 +00:00