1202 Commits

Author	SHA1	Message	Date
Guillermo Bonet	aab0771e6e	refs #5995 Removed my code in closure.js	2023-08-02 14:37:38 +02:00
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +02:00
Guillermo Bonet	16353dfddc	refs #5995 First commit	2023-08-02 07:35:40 +02:00
Jorge Penadés	bd122e6327	refs #5014 WIP trasactions added	2023-08-01 16:13:24 +02:00
Carlos Satorres	2bde94a667	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-08-01 11:40:29 +00:00
Jorge Penadés	3ef74cab5c	refs #5914 WIP created transferInvoiceOut	2023-08-01 12:45:57 +02:00
Alex Moreno	30c5e8d8cc	hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0	2023-08-01 11:11:29 +02:00
Carlos Satorres	12acda0b1c	refs #4764 ticketSerivce refund add	2023-07-31 11:06:19 +02:00
Jorge Penadés	22f76ec6a9	refs #5914 WIP clone method created	2023-07-31 10:33:51 +02:00
Jorge Penadés	e63efa4f0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-07-31 10:32:41 +02:00
Jorge Penadés	50155cea8d	refs #5914 WIP transfer invoiceOut	2023-07-28 15:21:43 +02:00
Vicent Llopis	1d4ce2c703	refs #5804 fix: delete transaction	2023-07-28 12:24:24 +02:00
Vicent Llopis	65b9cadd9e	refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker	2023-07-27 12:51:14 +02:00
Vicent Llopis	777426aa05	refs #5561 add backTest	2023-07-27 07:58:55 +02:00
Jorge Penadés	10361ba78e	refs #5216 addExpeditionState refactored	2023-07-26 13:33:56 +02:00
Carlos Satorres	118f41c898	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-07-26 13:12:01 +02:00
Jorge Penadés	bbc26d8ba4	WIP refs #5216 addExpeditionState	2023-07-26 12:36:30 +02:00
Jorge Penadés	0b88194f09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-07-26 10:27:01 +02:00
Jorge Penadés	05eff94217	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-07-26 10:22:32 +02:00
Jorge Penadés	a0fee6ad50	refs #5929 removed useless vars	2023-07-26 09:20:54 +02:00
Jorge Penadés	fa9dfdf411	refs #5216 try ACL updateExpeditionState	2023-07-25 16:32:38 +02:00
Jorge Penadés	96483a827f	Merge branch 'dev' into 5929-editTicketPrice	2023-07-25 13:40:08 +00:00
Jorge Penadés	543fbf3c0a	refs #5929 isEditableOrThrow created, tests passed	2023-07-25 15:35:08 +02:00
Jorge Penadés	9978db9d52	refs #5929 WIP test created	2023-07-25 11:33:01 +02:00
Jorge Penadés	ea4190f15c	refs #5216 update expedition state added	2023-07-24 13:32:28 +02:00
Jorge Penadés	4f80221101	refs #5929 added ACL and accurate errors	2023-07-24 10:34:44 +02:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Vicent Llopis	f926c60017	remove file	2023-07-21 12:02:02 +02:00
Vicent Llopis	51f9055d23	remove file	2023-07-21 12:01:57 +02:00
Vicent Llopis	cf0b6f8c6e	refs #5561 fix: saleGroupDetail.saleFk UNIQUE	2023-07-21 12:01:01 +02:00
Vicent Llopis	f52b398596	refs #5561 refactor: sustituidos sql por loopback	2023-07-21 09:50:27 +02:00
Alex Moreno	eb963ff993	refs #5866 fix(transferClient): correct variable name	2023-07-21 08:28:19 +02:00
Jorge Penadés	618989052a	refs #5866 fix transferClient and test added	2023-07-20 15:15:33 +02:00
Vicent Llopis	7d2e98267f	refs #5561 eliminados valores a piñon	2023-07-20 15:09:31 +02:00
Jorge Penadés	8281dbacd1	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 12:34:16 +00:00
Vicent Llopis	8f7caa1183	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-20 11:42:10 +02:00
Jorge Penadés	2fa1c4b6ca	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 08:23:07 +00:00
Jorge Penadés	9db8ae237f	refs #5866 addBackTransferClient	2023-07-20 10:19:03 +02:00
Vicent Llopis	7312ed9cc4	refs #5244 fix back test	2023-07-20 09:56:07 +02:00
Vicent Llopis	04ca5743a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-20 09:40:41 +02:00
Vicent Llopis	4755c50cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved	2023-07-20 07:22:30 +02:00
Alex Moreno	8c84f006b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-20 07:15:30 +02:00
Alex Moreno	2c79056f34	refs #5976 error extended	2023-07-19 13:44:04 +02:00
Carlos Satorres	aaba4e74b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems	2023-07-19 12:00:59 +02:00
Alex Moreno	f07ac89cb6	refs #5976 add custom error	2023-07-18 15:01:04 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Alex Moreno	15dee8bef4	refs #5976 refactor: transaferSale call setDeleted	2023-07-17 15:19:36 +02:00
Vicent Llopis	28eedbfd23	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-14 11:04:06 +00:00
Vicent Llopis	1d7f0e2135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-13 11:42:49 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	337ce56a60	refs #5887 test exlcuido	2023-07-13 08:37:11 +02:00
Alex Moreno	219a4fbca9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-12 13:09:58 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Vicent Llopis	bd85cf4e90	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-12 12:29:17 +02:00
Vicent Llopis	da13f0811c	refs 5887 cambiado drop y create por create or replace	2023-07-11 09:59:11 +02:00
Vicent Llopis	93e70e699a	refs #5874 feat: refactorizado proceso facturación	2023-07-11 09:19:15 +02:00
Alex Moreno	be0120728d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-06 15:15:36 +02:00
Carlos Satorres	9c9b53917a	refs #5334 fix error	2023-07-06 08:20:33 +02:00
Alex Moreno	040e9e4197	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-05 12:50:45 +02:00
Alex Moreno	444b08c566	refs #5712 test(docuware)	2023-07-05 12:09:52 +02:00
Carlos Satorres	6b813cb859	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-07-04 11:54:19 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Carlos Satorres	d03df4c5cc	refs #5690 ticketproblems	2023-07-03 11:38:38 +02:00
Vicent Llopis	7b4e8570aa	refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker	2023-06-30 12:03:26 +02:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Javi Gallego	bc4058512a	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-29 12:43:16 +00:00
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Carlos Satorres	319c6af354	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-29 06:37:23 +02:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Alex Moreno	befa385830	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-06-28 14:30:20 +02:00
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Juan Ferrer	e32a29fc09	refs #5900 Remove duplicated logs	2023-06-25 19:08:13 +02:00
Vicent Llopis	e99627c0b2	codigo innecesario	2023-06-20 11:28:25 +02:00
Vicent Llopis	cea6fae649	fix: eliminada variable que no estaba definida	2023-06-20 10:40:57 +02:00
Carlos Satorres	8dd360bf1e	refs #4764 e2e solve	2023-06-19 08:46:15 +02:00
Carlos Satorres	fbe4441eda	refs #4764 e2e solve	2023-06-16 09:06:25 +02:00
Carlos Satorres	9b950cd8d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-16 07:23:41 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Carlos Satorres	b3022d0ce2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-14 17:47:56 +02:00
Sergio De la torre	c62e6fa0eb	refs #5651 packingSiteAdvanced	2023-06-14 10:51:22 +02:00
Juan Ferrer	961941ecb3	refs #5667 TicketRequest translations added/fixed	2023-06-13 20:52:26 +02:00
Carlos Satorres	58bcad7b2d	refs #4764 validator create	2023-06-12 12:42:30 +02:00
Carlos Satorres	c9bf74dcc4	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-12 09:56:34 +00:00
Alexandre Riera	48ee29568d	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-06-12 05:26:28 +00:00
Carlos Satorres	06d1334e1f	refs #4764 withWarehouse	2023-06-09 14:30:46 +02:00
Carlos Satorres	9ca82a2f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-09 14:23:55 +02:00
Carlos Satorres	61d9e2dcd3	refs #4764 remake refund, back front	2023-06-09 14:19:17 +02:00
Alexandre Riera	81a96e7d82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-09 09:03:23 +02:00
Carlos Satorres	ec9dfa90fd	refs #5760 fixtures	2023-06-09 08:06:45 +02:00
Carlos Satorres	bdffc0401f	refs #5760 update getChanges, traduccion	2023-06-08 15:29:03 +02:00
Vicent Llopis	cf559b2ba5	refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono	2023-06-08 09:19:57 +02:00
Vicent Llopis	a88166cdb5	Merge branch 'dev' into 5252-canRefund_withOutWarehouse2	2023-06-08 05:15:24 +00:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Vicent Llopis	e2c7a38e82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-06-07 14:18:36 +02:00
Carlos Satorres	a34519f6d0	refs #4764 refundTicket	2023-06-07 14:12:04 +02:00
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Carlos Satorres	d09075d490	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 05:57:05 +00:00
Vicent Llopis	024cb1e3f4	refs #5561 feat: permite modificar registros	2023-06-06 11:56:14 +02:00
Carlos Satorres	4d333c3a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-05 10:38:59 +02:00