335 Commits

Author	SHA1	Message	Date
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Robert Ferrús	dd977fab83	fix: refs #7141 catalog_calculate	2024-03-25 14:56:12 +01:00
Pako Natek	10a16fccd8	primer prototipo	2024-03-25 13:03:11 +01:00
Guillermo Bonet	092eaab851	Merge pull request 'feat: refs #7024 Added entry_checkBooked' (!2201) from 7024-entry_checkBooked into dev ... Reviewed-on: #2201 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-25 11:11:51 +00:00
Guillermo Bonet	4005fe9064	feat: refs #7024 Added entry_checkBooked	2024-03-25 08:47:06 +01:00
Jorge Penadés	256ae359ce	Merge branch 'dev' into 6951-ticketCloneAll	2024-03-25 07:46:38 +00:00
Javi Gallego	8d258254d0	feat: #7013 change name procedure	2024-03-25 07:52:40 +01:00
Javi Gallego	3f3ba3c612	Merge branch 'dev' into 7013-solunionRiskRequest	2024-03-25 07:52:01 +01:00
Jorge Penadés	0867f4d501	fix: refs #6951 var names & procedure name	2024-03-22 16:01:22 +01:00
Jorge Penadés	e8d1967e11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-22 15:14:12 +01:00
Ivan Mas	b9bcc5b2cf	refs #6966 changes required	2024-03-22 15:06:57 +01:00
Guillermo Bonet	5070d4d46f	hotfix item_getSimilar	2024-03-22 14:59:39 +01:00
Ivan Mas	3851d967f4	refs #6966 Modify name sale_replaceItem	2024-03-22 13:56:46 +01:00
Ivan Mas	8a51df2fe5	refs #6498 Delete multipleInventoryHistory	2024-03-22 12:28:23 +01:00
Guillermo Bonet	bda80e03ee	Hotfix item_getSimilar	2024-03-22 11:36:26 +01:00
Guillermo Bonet	ee67820c20	refactor: refs #7018 Fix invoiceInTax_recalc	2024-03-21 12:14:48 +01:00
Guillermo Bonet	535dd40625	fix: refs #7018 Fix invoiceInTax_recalc	2024-03-21 12:06:59 +01:00
Ivan Mas	c33c90aefe	Merge branch 'dev' into 6499-procRefactor6	2024-03-21 10:39:05 +00:00
Javi Gallego	a24d38128b	feat: #7013 muestra solo clientes asegurados	2024-03-21 10:48:43 +01:00
Javi Gallego	c46e7227e7	feat: #7013 solo muestra clientes asegurados	2024-03-21 10:40:30 +01:00
Javi Gallego	20a338f746	feat: #7120 specialPrice with new fiels	2024-03-21 10:25:08 +01:00
Guillermo Bonet	1cd495df06	fix: refs #7018 Fix invoiceInTax_recalc	2024-03-21 09:25:33 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Jorge Penadés	f044809f30	feat: refs #6951 to create back	2024-03-15 15:45:47 +01:00
Jorge Penadés	0fd6a6360c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 14:18:02 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Jorge Penadés	a38f93b0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 10:44:37 +01:00
Jorge Penadés	690d935429	refactor: refs #6951 cloneAll	2024-03-15 10:00:24 +01:00
Carlos Andrés	160d72e755	hotfix upload invoiceIn_add.sql error	2024-03-14 17:02:07 +01:00
Jorge Penadés	ff130b773d	fix: refs #6492 drop useless insert	2024-03-14 11:49:21 +01:00
Jorge Penadés	3e458281e6	fix: refs #6492 boxes alias	2024-03-14 09:42:54 +01:00
Guillermo Bonet	fbeb9b058d	hotfix: itemProposal added optimizer_search_depth	2024-03-14 09:34:37 +01:00
Jorge Penadés	7a94ae3551	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 09:10:44 +01:00
Guillermo Bonet	08359cdfe0	Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev ... Reviewed-on: #2047 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 08:05:11 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00
Guillermo Bonet	b5f3753253	Merge branch 'test' into dev	2024-03-13 07:42:51 +01:00
Guillermo Bonet	319bf314b3	hotfix: itemProposal	2024-03-13 07:38:14 +01:00
Jorge Penadés	9e596e6525	fix: refs #6492 file names	2024-03-12 15:27:09 +01:00
Jorge Penadés	10c2d25cbd	feat: refs #6492 create procedures & grant privileges	2024-03-12 12:57:34 +01:00
Javier Segarra	63a22a50f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-12 09:37:41 +01:00
Jorge Penadés	5531639027	feat: refs #6951 create procedure	2024-03-12 09:34:12 +01:00
Guillermo Bonet	1d398a0acf	refactor: refs #7018 Added comment and minor changes	2024-03-12 08:40:11 +01:00
Guillermo Bonet	e2eddbaef7	refactor: refs #7018 Added comment	2024-03-12 08:35:13 +01:00
Guillermo Bonet	1bcb61a224	refactor: refs #7018 Mirated procs to vn	2024-03-12 08:25:58 +01:00
Guillermo Bonet	516b4b364f	Merge branch 'dev' into 6499-procRefactor6	2024-03-11 13:36:34 +00:00
Guillermo Bonet	adafab5847	refactor: refs #6874 item_getSimilar	2024-03-11 13:27:18 +01:00
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +01:00
Guillermo Bonet	a34be6ca02	Merge branch 'test' into dev	2024-03-11 12:21:54 +01:00
Robert Ferrús	9910ae5c64	fix: refs #6610 quitar variable	2024-03-11 12:12:02 +01:00
Alex Moreno	dcdad9c469	Merge branch 'dev' into 6925-invoice-transaction	2024-03-11 06:05:50 +00:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Robert Ferrús	b1e90fabb2	refs #6610	2024-03-08 12:32:22 +01:00
Robert Ferrús	cdb9f372cf	feat: refs #6610 fixDeleteTickets	2024-03-08 12:19:57 +01:00
Guillermo Bonet	37e8518242	feat: refs #6372 Added saleLabel to vn.clean	2024-03-08 10:38:35 +01:00
Alex Moreno	2f2aba1cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-07 11:42:35 +01:00
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Carlos Andrés	f1654609df	Merge pull request 'test' (!2142) from test into dev ... Reviewed-on: #2142 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-03-06 16:16:16 +00:00
Sergio De la torre	dc6cfafd05	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 16:03:24 +00:00
Ivan Mas	6b2533cfb1	refs #6498 correccion errores 2	2024-03-06 15:16:55 +01:00
Alex Moreno	9ab0228714	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-06 13:58:10 +01:00
Ivan Mas	492c6f4dd6	refs #6969 test	2024-03-06 12:50:44 +01:00
Ivan Mas	7947d6644e	refs #6498 Correcion errores	2024-03-06 12:44:59 +01:00
Sergio De la torre	49800a5cab	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 11:36:05 +00:00
Sergio De la torre	010f585ed4	Merge branch 'dev' into 6193_inventory	2024-03-06 11:33:34 +00:00
Javier Segarra	7999a9bf93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-06 11:42:09 +01:00
Ivan Mas	3cb45dd57b	Merge branch 'test' into 6969-Error_packaging-buyUltimateFromInterval	2024-03-06 10:08:50 +00:00
Ivan Mas	354ecfaa16	refs #6498 Arreglar grant y tabs	2024-03-06 09:00:21 +01:00
Guillermo Bonet	4e28c315f7	Merge branch 'dev' into 6874-item_getSimilar	2024-03-06 06:14:13 +00:00
Sergio De la torre	34572112ec	Merge branch 'dev' into 6193_inventory	2024-03-05 15:21:16 +00:00
Sergio De la torre	2d5aae3b40	Merge branch 'dev' into 6607_checking_boxes	2024-03-05 15:11:14 +00:00
Sergio De la torre	d397980efb	refs #6607 feat:[checking boxes]	2024-03-05 16:10:56 +01:00
Ivan Mas	68846d3018	refs #6499 Refactor historico_multiple	2024-03-05 13:43:03 +01:00
Pako Natek	9c14836bc7	BlueMonkey	2024-03-05 13:18:13 +01:00
Guillermo Bonet	950d7a2461	refactor: refs #6874 Changed params item_getSimilar	2024-03-05 12:48:39 +01:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Guillermo Bonet	d2f451c613	ticket #162561 hotfix	2024-03-05 12:33:28 +01:00
Sergio De la torre	726558d5a7	refs #6607 feat:[checking boxes]	2024-03-05 10:37:15 +01:00
Guillermo Bonet	e0732835d0	refactor: refs #6948 Bank to Accouting	2024-03-05 10:25:23 +01:00
Guillermo Bonet	05380df4f8	Merge pull request 'refactor: refs #6874 Proc itemProposal' (!2123) from 6874-itemProposalRefactor into dev ... Reviewed-on: #2123 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-05 06:35:04 +00:00
Guillermo Bonet	489d126f79	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 13:44:47 +00:00
Guillermo Bonet	2c7913a3be	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 12:41:50 +00:00
Guillermo Bonet	fa70eeb75c	refactor: refs #6499 Requested changes	2024-03-04 13:42:11 +01:00
Guillermo Bonet	e65fc06a30	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 12:33:49 +00:00
Guillermo Bonet	a96743c3b9	refactor: refs #6494 Requested changes	2024-03-04 13:34:42 +01:00
Guillermo Bonet	cf810fe497	refactor: refs #6874 Proc itemProposal	2024-03-04 13:14:41 +01:00
Guillermo Bonet	24efc1dd28	Merge branch 'dev' into 6874-itemProposalRefactor	2024-03-04 11:43:36 +00:00
Javier Segarra	753525d0ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-04 11:57:16 +01:00
Ivan Mas	bd5d88f5ef	refs #6969 Error packaging	2024-03-04 08:41:09 +01:00
Guillermo Bonet	28dbb200fc	refactor: refs #6874 Proc itemProposal	2024-03-04 08:38:24 +01:00
Ivan Mas	1ccec1e0fb	refs #6499 procRefactor part 6	2024-03-04 08:11:06 +01:00
Guillermo Bonet	df7427d83c	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 06:07:56 +00:00
Guillermo Bonet	b29a001c7f	Merge branch 'dev' into 6496-cleanVn2008	2024-03-04 06:07:53 +00:00
Guillermo Bonet	0b63991303	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 06:07:24 +00:00
Alex Moreno	a3052c1cf9	refs #6925 hotFix(invoice) parenthesis & handle incoterms error	2024-03-01 15:05:12 +01:00
Guillermo Bonet	1f9f10323b	refactor: refs #6494 Migrated and deleted residual procs	2024-03-01 11:21:04 +01:00
Robert Ferrús	594780d6cb	feat: refs #6958 delete sale_checkNoComponents	2024-02-29 13:44:49 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Guillermo Bonet	96bab9b27d	refactor: refs #6496 Requested changes	2024-02-29 07:37:23 +01:00
Guillermo Bonet	7a43ccaa36	refactor: refs #6496 Requested changes	2024-02-29 07:32:19 +01:00
Robert Ferrús	82445683a7	fix: refs #6501 entry_getTransferFix	2024-02-28 09:19:57 +01:00
Guillermo Bonet	9f2d1a8c0f	refactor: refs #6499 Minor change	2024-02-28 09:13:01 +01:00
Guillermo Bonet	b8e6cc9f9c	refactor: refs #6499 Added comments	2024-02-28 09:08:47 +01:00
Guillermo Bonet	cba0e55846	refactor: refs #6499 Added comments	2024-02-28 08:39:49 +01:00
Guillermo Bonet	b9c5930f68	refactor: refs #6499 Minor changes	2024-02-28 08:29:12 +01:00
Guillermo Bonet	6c67462943	refactor: refs #6499 Minor changes	2024-02-28 08:26:17 +01:00
Guillermo Bonet	80ecd698f8	refactor: refs #6499 Migrated procs to vn	2024-02-28 08:23:58 +01:00
Guillermo Bonet	fefc193ec0	refactor: refs #6496 Deleted clean vn2008	2024-02-27 13:59:21 +01:00
Guillermo Bonet	554f6c4695	Merge branch 'test' into dev	2024-02-26 14:28:46 +01:00
Guillermo Bonet	57dd1a4e56	Merge branch 'master' into test	2024-02-26 14:28:08 +01:00
Ivan Mas	e3b735d80b	Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores	2024-02-26 13:14:15 +00:00
Alex Moreno	b1a8fcf968	refs #6925 fix(invoice): incoterms error	2024-02-26 11:50:46 +01:00
Guillermo Bonet	89a9cc26d3	fix: ticket #158883	2024-02-26 09:50:03 +01:00
Jorge Penadés	6e161dfee8	fix: refs #6878 column name	2024-02-23 12:45:58 +01:00
Ivan Mas	03fc7cfb4e	Merge branch 'dev' into 6784-delete-clientTypeFk	2024-02-23 08:24:12 +00:00
Alex Moreno	1d4c48e149	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 08:39:26 +01:00
Alex Moreno	f51df43d17	Merge branch 'master' into 6878-hotfix-addManualTimeEntries	2024-02-23 07:32:18 +00:00
Guillermo Bonet	6345d1ae42	fix refs #6780 XDiario	2024-02-23 08:14:58 +01:00
Sergio De la torre	131ae6b522	refs #6193 feat:modify inventory	2024-02-23 07:44:25 +01:00
Robert Ferrús	6580fd44cd	fix: refs #6371 bankPolicy_notifyExpired accountingFk	2024-02-23 07:18:32 +01:00
Ivan Mas	a0cb32ea10	refs #6784 Delete unnecessary JOINs	2024-02-22 14:01:19 +01:00
Jorge Penadés	76b1433099	fix: refs #6878 use clockIn procedure on update time	2024-02-22 12:48:07 +01:00
Javier Segarra	d0c82f694e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-22 07:08:41 +01:00
Pako Natek	10bdc21829	Merge branch 'dev' into 6906-workerActivity	2024-02-21 16:16:41 +00:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
Javier Segarra	7bf89cd448	Merge branch 'dev' into 5858-zone_Collisions	2024-02-21 13:27:38 +00:00
Javier Segarra	e00133458b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-21 13:48:53 +01:00
Ivan Mas	84270d29b8	refs #6626 modify invoiceInTax	2024-02-21 13:15:46 +01:00
Ivan Mas	f30a5a7597	refs #6626 invoiceInTax different transactions	2024-02-21 13:13:28 +01:00
Pako Natek	40a3df18e8	Merge branch 'dev' into 6906-workerActivity	2024-02-21 11:14:35 +00:00
Pako Natek	3463b8fcb1	done	2024-02-21 12:09:52 +01:00
Sergio De la torre	448763ee72	refs #6834 feat:handle Error	2024-02-21 07:15:43 +01:00
Sergio De la torre	614652c357	refs #6834 feat:handle Error	2024-02-21 07:08:45 +01:00
Sergio De la torre	be81835474	refs #6834 feat:handle Error	2024-02-20 16:11:59 +01:00
Sergio De la torre	b9fe990003	refs #6834 feat:handle Error	2024-02-20 16:10:16 +01:00
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Ivan Mas	3813dbb9fd	refs #6784 Delete clientTypeFk	2024-02-20 13:10:03 +01:00
Guillermo Bonet	6daa7a03ff	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-20 06:26:16 +00:00
Jorge Penadés	d127354905	Merge branch 'dev' into 6776-makeMulti	2024-02-19 12:21:48 +00:00
Jorge Penadés	882c179e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-19 11:14:02 +01:00
Pablo Natek	2e01b6ee0a	refactor(packing): refs #6875 add restriction on vn.buy.packing field not null and > 0	2024-02-19 09:55:54 +01:00
Pako Natek	ad1010f3fc	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 07:37:54 +00:00
Pako Natek	3ef26bfd7d	packing	2024-02-19 08:34:17 +01:00