22858 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	d149dcf3bd	fix: refs #6802 fix merge conflicts	2024-07-11 14:00:25 +02:00
Carlos Andrés	dc897854a4	merge: refs #6802 merge dev fix conflicts	2024-07-11 13:59:55 +02:00
Carlos Andrés	d8086c7776	feat: salesPersonFk to saleDepartmentFk refs #6802	2024-07-11 13:09:10 +02:00
Carlos Andrés	3b5f88fd33	refactor: refs #6802 refactor salesPerson to salesDepartment	2024-07-11 12:30:43 +02:00
Carlos Satorres	3305d2897c	Merge pull request 'refs #6952 add producer sql trad' (!2698) from 6952-fixProducerNameInvoice into dev ... Reviewed-on: #2698 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-11 08:32:51 +00:00
Carlos Satorres	ec356423bb	Merge branch 'dev' into 6952-fixProducerNameInvoice	2024-07-11 08:31:13 +00:00
Guillermo Bonet	a003cd24f6	Merge pull request 'refactor: refs #7684 vehicle warehouseFk fix' (!2697) from 7684-vehicleFixFk into dev ... Reviewed-on: #2697 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-10 08:22:45 +00:00
Robert Ferrús	bfb2866833	Merge pull request 'feat: refs #7116 insert into agencyIncoming' (!2710) from 7116-agencyIncoming into dev ... Reviewed-on: #2710 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-10 05:54:07 +00:00
Robert Ferrús	5264888f06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7116-agencyIncoming	2024-07-10 07:26:09 +02:00
Robert Ferrús	57500f100e	Merge pull request 'feat: refs #7544 crear evento claim_changeState' (!2552) from 7544-claimChangeState into dev ... Reviewed-on: #2552 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-10 05:24:01 +00:00
Robert Ferrús	4f4d12c76a	Merge branch 'dev' into 7544-claimChangeState	2024-07-10 05:22:19 +00:00
Robert Ferrús	5bfabee6e3	Merge branch 'dev' into 7116-agencyIncoming	2024-07-10 05:19:02 +00:00
Robert Ferrús	004dcb67ff	feat: refs #7116 insert into agencyIncoming	2024-07-10 07:13:57 +02:00
Guillermo Bonet	9d4db0d408	Merge pull request 'refactor: refs #7505 item_getVisible refactor' (!2573) from 7505-item_calcVisible into dev ... Reviewed-on: #2573 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-10 05:03:18 +00:00
Guillermo Bonet	1ca95678df	Fix	2024-07-09 14:53:09 +02:00
Guillermo Bonet	0b61a175ef	Merge branch 'test' into dev	2024-07-09 14:49:51 +02:00
Guillermo Bonet	64ed96c8ae	feat: refs #7486 More debug	2024-07-09 14:47:12 +02:00
Guillermo Bonet	daec922c5c	Merge branch 'dev' into 7505-item_calcVisible	2024-07-09 12:25:11 +00:00
Guillermo Bonet	e2b6473831	feat: refs #7505 Minor changes	2024-07-09 14:24:35 +02:00
Guillermo Bonet	470c9bc872	feat: refs #7505 Minor changes	2024-07-09 14:24:17 +02:00
Guillermo Bonet	c2e9095ccd	feat: refs #7505 Requested changes	2024-07-09 14:22:32 +02:00
Robert Ferrús	6ef216f4ed	Merge pull request 'fix: refs #6738 restore column grupotarifa' (!2709) from 6738-restoreColumnPayrollWorker into master ... Reviewed-on: #2709 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-09 11:54:37 +00:00
Carlos Satorres	4cc6fd3d8b	Merge branch 'dev' into 6952-fixProducerNameInvoice	2024-07-09 11:20:20 +00:00
Robert Ferrús	f8efecd7c4	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 10:47:02 +00:00
Robert Ferrús	f8169b3034	feat: refs #7544 chages required	2024-07-09 12:46:50 +02:00
Robert Ferrús	18de9b4e13	Merge branch 'master' into 6738-restoreColumnPayrollWorker	2024-07-09 10:13:47 +00:00
Carlos Satorres	dcdbc20fe4	Merge pull request 'hotfix-ticketState' (!2708) from hotfix-ticketState into master ... Reviewed-on: #2708 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 10:13:30 +00:00
Carlos Satorres	42f1277248	Merge branch 'master' into hotfix-ticketState	2024-07-09 10:11:15 +00:00
Robert Ferrús	8f86ffbc38	fix: refs #6738	2024-07-09 11:47:02 +02:00
Robert Ferrús	d8f3a04553	fix: refs #6738 restore column grupotarifa	2024-07-09 11:45:58 +02:00
Carlos Satorres	944cf3baa3	refs #7694 hotfix filter	2024-07-09 11:44:43 +02:00
Guillermo Bonet	5b9e6f0e59	Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev ... 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	2024-07-09 09:20:45 +00:00
Guillermo Bonet	be83fa6729	fix: refs #7622 Fix	2024-07-09 11:13:55 +02:00
Guillermo Bonet	35ca968d88	Merge branch 'test' into dev	2024-07-09 11:03:37 +02:00
Guillermo Bonet	3e4bf55eed	fix: refs #7490 Correction	2024-07-09 11:03:17 +02:00
Alex Moreno	248000bdcd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-09 11:00:36 +02:00
Robert Ferrús	928dc977b0	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 09:00:05 +00:00
Carlos Satorres	02c2ccd62e	stash filterState	2024-07-09 11:00:02 +02:00
Alex Moreno	f8953afdc6	Merge pull request 'deploy: dump db' (!2704) from 7691-dump into master ... Reviewed-on: #2704 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-09 08:59:54 +00:00
Guillermo Bonet	40461fb89e	Merge pull request 'refactor: refs #7662 Added transaction' (!2702) from 7662-ticketSplitPackingType into dev ... Reviewed-on: #2702 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 07:49:09 +00:00
Javier Segarra	725cbb5aa4	Merge pull request '#7380 - Substitution field' (!2677) from 7380_substitutionCondition into dev ... Reviewed-on: #2677 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 07:46:50 +00:00
Guillermo Bonet	29f9fa0ce3	feat: refs #7505 Optimization	2024-07-09 09:45:55 +02:00
Guillermo Bonet	86acc644fe	feat: refs #7505 Changes	2024-07-09 09:38:07 +02:00
Guillermo Bonet	7279feab12	feat: refs #7505 Changes	2024-07-09 09:33:31 +02:00
Guillermo Bonet	c9e9d95cff	Merge branch 'dev' into 7505-item_calcVisible	2024-07-09 09:06:27 +02:00
Guillermo Bonet	6430fb5b51	refactor: refs #7662 Requested changes	2024-07-09 08:43:02 +02:00
Guillermo Bonet	3f0335cf37	feat: refs #7644 Added with recursive buy-label	2024-07-09 08:37:36 +02:00
Robert Ferrús	cb5c660e13	Merge pull request '#7116 agencyIncoming' (!2178) from 7116-agencyIncoming into dev ... Reviewed-on: #2178 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-09 06:29:33 +00:00
Javier Segarra	4d52e32718	Merge branch 'dev' into 7380_substitutionCondition	2024-07-09 06:24:27 +00:00