4674 Commits

Author	SHA1	Message	Date
Guillermo Bonet	b324b0c0f3	Merge branch 'dev' into 7126-improvedWaste	2024-05-10 11:20:33 +00:00
Guillermo Bonet	4d1031e031	feat: refs #7126 Added manaClaim calc	2024-05-10 13:20:15 +02:00
Guillermo Bonet	ba72408e84	refactor: refs #7345 Deprecated isFarmer__	2024-05-10 12:45:53 +02:00
Guillermo Bonet	6b7a529b55	refactor: refs #7345 Renamed column of invoiceInConfig	2024-05-10 11:39:14 +02:00
Guillermo Bonet	eea04520ad	Fix: refs #7126 Fix proc	2024-05-10 10:05:02 +02:00
Guillermo Bonet	1ea357a5dd	feat: refs #7126 Refactor and added columns in bs.waste table & proc	2024-05-10 10:01:46 +02:00
Ivan Mas	9d1dc6b483	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-09 11:41:04 +00:00
Guillermo Bonet	9c5b46b3e2	Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev ... Reviewed-on: #2346 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 11:30:28 +00:00
Jorge Penadés	bf0db89286	refactor: refs #6202 remove blanks	2024-05-09 12:02:44 +02:00
Jorge Penadés	74399d5ab6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6202-mytWatcher	2024-05-09 11:56:48 +02:00
Guillermo Bonet	faf2d51a43	Merge branch 'test' into dev	2024-05-09 11:36:15 +02:00
Guillermo Bonet	494b46e7ec	fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry	2024-05-09 11:33:57 +02:00
Javi Gallego	abd692cbd3	Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev ... Reviewed-on: #2426 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 05:49:28 +00:00
Robert Ferrús	833994bd27	Merge branch 'dev' into 7291-sale_getProblems	2024-05-09 05:23:33 +00:00
Robert Ferrús	e02dfc0456	Merge branch 'dev' into 182001-packaging	2024-05-09 05:18:08 +00:00
Guillermo Bonet	c4a66b42bb	feat: refs #7247 Minor changes	2024-05-08 14:56:51 +02:00
Guillermo Bonet	3a7d93759c	Merge branch 'dev' into 7247-monacoVies	2024-05-08 12:52:32 +00:00
Guillermo Bonet	162c78e392	Merge branch '6230-revoke' of https://gitea.verdnatura.es/verdnatura/salix into 6230-revoke	2024-05-08 13:59:38 +02:00
Guillermo Bonet	7d92b514c5	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:59:37 +02:00
Guillermo Bonet	a90e83e9e0	Merge branch 'dev' into 6230-revoke	2024-05-08 11:56:31 +00:00
Guillermo Bonet	53b58104c7	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:52:52 +02:00
Sergio De la torre	f7e6901ef6	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 11:32:00 +00:00
Guillermo Bonet	4df13d900a	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 10:55:47 +00:00
Guillermo Bonet	82ac54f0b3	Merge branch 'test' into dev	2024-05-08 12:52:02 +02:00
Guillermo Bonet	90107936b7	Merge branch 'master' into test	2024-05-08 12:51:36 +02:00
Sergio De la torre	0d42b32611	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 10:47:22 +00:00
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +02:00
Javi Gallego	393d57f078	fix: #7344 getSupplierDebt agrupa por pago	2024-05-08 10:51:35 +02:00
Robert Ferrús	2866f231b8	Merge branch 'dev' into 182001-packaging	2024-05-08 08:41:38 +00:00
Guillermo Bonet	16e7fb9662	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 08:29:00 +00:00
Carlos Satorres	c0b4a931a6	Merge branch 'dev' into 6682-notHolidays	2024-05-08 07:55:26 +00:00
Guillermo Bonet	71f66085f6	Merge branch 'test' into dev	2024-05-08 09:50:52 +02:00
Guillermo Bonet	854604368a	Merge branch 'master' into test	2024-05-08 09:50:37 +02:00
Sergio De la torre	9a235838d8	refs #7161 feat:setVisibleDiscard by itemTrash	2024-05-08 09:04:08 +02:00
Carlos Satorres	8637488fc1	refs #6882 fix pr	2024-05-08 08:48:19 +02:00
Guillermo Bonet	6cde2e8170	fix: refs #6585 Requested changes	2024-05-08 08:48:08 +02:00
Guillermo Bonet	e070906ea6	hotfix: refs #6777 manaCustomerUpdate	2024-05-08 07:49:32 +02:00
Carlos Satorres	371df19194	Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-07 14:59:25 +02:00
Carlos Satorres	3eba4a1f69	refs #6882 fix sql	2024-05-07 14:59:23 +02:00
Robert Ferrús	43c742938c	feat: refs #179881	2024-05-07 14:37:24 +02:00
Robert Ferrús	f70f2949ec	feat: refs #182001	2024-05-07 14:30:38 +02:00
Robert Ferrús	f529a7f5b4	feat : refs #182001	2024-05-07 14:25:26 +02:00
Robert Ferrús	6c6ae412bd	feat: refs #182001 packaging	2024-05-07 14:19:11 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +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
Guillermo Bonet	832db8901e	Merge branch '7335-modifyCmr' of https://gitea.verdnatura.es/verdnatura/salix into 7335-modifyCmr	2024-05-07 13:03:51 +02:00
Guillermo Bonet	2adf96cb37	refactor: #6585 Deleted transaction ticket_doCmr	2024-05-07 13:03:50 +02:00
Jorge Penadés	dce754a64b	Merge branch 'master' into 6938-hotfix-rollbackHidePhone	2024-05-07 10:41:50 +00:00
Guillermo Bonet	45f7412b35	Merge branch 'dev' into 7335-modifyCmr	2024-05-07 10:36:28 +00:00