22611 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	64ed96c8ae	feat: refs #7486 More debug	2024-07-09 14:47:12 +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
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	3e4bf55eed	fix: refs #7490 Correction	2024-07-09 11:03:17 +02: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
Alex Moreno	213524edb5	deploy: dump db	2024-07-09 07:52:18 +02:00
Alex Moreno	5558e69e64	Merge pull request '7691-testToMaster' (!2703) from 7691-testToMaster into master ... Reviewed-on: #2703 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-09 05:38:26 +00:00
Alex Moreno	f1276d6f56	changelog	2024-07-08 14:51:50 +02:00
Alex Moreno	30d118f9df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-08 14:32:43 +02:00
Carlos Satorres	ec3b055eb8	Merge pull request 'refs #5525 fix accountDetailValue' (!2701) from hotifix-sepaCore2 into master ... Reviewed-on: #2701 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-08 11:49:25 +00:00
Carlos Satorres	06ae86d78f	refs #5525 fix adt	2024-07-08 13:45:16 +02:00
Carlos Satorres	03b95eb9f6	refs #5525 fix accountDetailValue	2024-07-08 13:43:08 +02:00
Pablo Natek	dd2101790d	Merge pull request 'fix: refs #6403 extend length to 6 digits for mrw clientType' (!2696) from 6403-fixClientTypeWidth into master ... Reviewed-on: #2696 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-08 08:56:49 +00:00
Pablo Natek	62045756e6	fix: refs #6403 extend length to 6 digits for mrw clientType	2024-07-08 10:50:15 +02:00
Pablo Natek	53b23526f5	Merge pull request 'feat: refs #6403 add dynamic clientType' (!2693) from 6403-add-dynamyc-clientType into master ... Reviewed-on: #2693 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-08 07:30:37 +00:00
Pablo Natek	816b111f79	feat: refs #6403 add dynamic clientType	2024-07-08 09:20:39 +02:00
Guillermo Bonet	5213fd4feb	Merge branch 'master' into test	2024-07-08 07:54:42 +02:00
Guillermo Bonet	6eef7876d9	Merge pull request 'refactor: refs #7640 multipleInventoryFix' (!2689) from 7640-multipleInventoryFix into master ... 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	2024-07-08 07:21:53 +02:00
Sergio De la torre	41fab962d9	Merge pull request '6964_itemNewer' (!2682) from 6964_itemNewer into master ... Reviewed-on: #2682 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 15:04:04 +00:00
Sergio De la torre	f7ea560723	Merge branch 'master' into 6964_itemNewer	2024-07-05 15:02:34 +00:00
Guillermo Bonet	5712fbd782	Merge branch 'master' into test	2024-07-05 13:50:43 +02:00
Guillermo Bonet	592738c7a0	refs #7024 & ticket 198125 Hotfix	2024-07-05 13:48:03 +02:00
Guillermo Bonet	55f0e90771	feat: refs #7640 Minor change	2024-07-05 13:36:38 +02:00
Guillermo Bonet	3ddf49da0a	feat: refs #7640 Fix	2024-07-05 13:21:07 +02:00
Guillermo Bonet	8ac26c7281	refactor: refs #7640 Refactor multipleInventory	2024-07-05 12:50:31 +02:00
Sergio De la torre	573efbf4bd	Merge branch 'master' into 6964_itemNewer	2024-07-05 10:01:28 +00:00
Robert Ferrús	0d1573973e	Merge pull request '6371-restoreSeries' (!2685) from 6371-restoreSeries into master ... Reviewed-on: #2685 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 09:00:57 +00:00
Sergio De la torre	40eb5f1a31	Merge pull request 'warmFix getSales refs #6861' (!2686) from 6861_reservas into test ... Reviewed-on: #2686 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-05 08:57:37 +00:00
Sergio De la torre	f3f450463b	warmFix getSales refs #6861	2024-07-05 10:47:26 +02:00
Robert Ferrús	3051e4ed25	Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries	2024-07-05 10:35:32 +02:00
Robert Ferrús	53a48735e8	Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries	2024-07-05 09:05:41 +02:00
Robert Ferrús	27a4b747b5	fix: refs #6371 restore table Series	2024-07-05 09:05:39 +02:00
Robert Ferrús	923efadf6a	fix: refs #6371 restore table Series	2024-07-05 09:00:40 +02:00
Sergio De la torre	159f2f5f1c	hotFix itemNewer refs #6964	2024-07-05 08:44:09 +02:00
Sergio De la torre	859f610f43	hotFix itemNewer refs #6964	2024-07-05 08:43:45 +02:00
Carlos Satorres	69b30b1d42	Merge pull request 'hotfix-sepaCore' (!2678) from hotfix-sepaCore into master ... Reviewed-on: #2678 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-05 05:52:15 +00:00
Carlos Satorres	64f5ad0e19	refs #5525 remove AS	2024-07-04 16:54:57 +02:00
Carlos Satorres	f3dcc7dd99	Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore	2024-07-04 16:50:57 +02:00
Carlos Satorres	cf621071d0	refs #5525 fixear sql, fixtures, js	2024-07-04 16:50:54 +02:00
Carlos Satorres	9ae8938b72	Merge branch 'master' into hotfix-sepaCore	2024-07-04 07:56:25 +00:00
Carlos Satorres	fcec3bc0ae	refs #5525 fix sql accountDetail	2024-07-04 09:54:09 +02:00
Guillermo Bonet	108a62f738	refs #7486 Fix tests	2024-07-04 09:32:56 +02:00
Guillermo Bonet	5a9850939e	Merge branch 'master' into test	2024-07-04 09:26:00 +02:00