2241 Commits

Author	SHA1	Message	Date
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
Javier Segarra	8a66391cd5	Merge branch 'dev' into 6434-signIn_issue	2023-12-13 12:31:53 +00:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
Javier Segarra	6af99b7669	refs #6434 feat: delete records whe !owner	2023-12-13 12:07:41 +01:00
David Domenech	d4fa1e9aca	refs #6398	2023-12-13 12:04:07 +01:00
Javier Segarra	5b3645a641	refs #6434 fix: bad merge	2023-12-13 11:59:00 +01:00
Javier Segarra	d69b59b63e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue	2023-12-13 11:54:28 +01:00
Jorge Penadés	8d61473d4f	refs #6276 fixtures & itemBarcode_delete	2023-12-13 11:43:19 +01:00
Carlos Satorres	556b403a5b	refs #5525 letter debtor st	2023-12-13 11:29:50 +01:00
David Domenech	2f61b648f7	refs #6398	2023-12-13 09:49:03 +01:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Javier Segarra	074bb2b980	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-13 06:30:14 +00:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Carlos Satorres	412cac7e94	refs #5925 models table docuware	2023-12-12 14:42:36 +01:00
Jorge Penadés	3109f7722e	refs #6276 saleTracking_mark	2023-12-12 13:24:18 +01:00
Jorge Penadés	8acd03f115	refs #6276 saleTrackingReplace	2023-12-11 13:01:34 +01:00
Carlos Satorres	584f3264ed	refs #6085 refactor sql trad	2023-12-11 08:54:58 +01:00
Jorge Penadés	e27bf2ef8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-11 08:29:35 +01:00
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Alex Moreno	ec66386b44	refs #5914 fix: correct sql folder	2023-12-11 07:49:44 +01:00
Alex Moreno	f874faa921	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-11 07:47:55 +01:00
Jorge Penadés	b88d61e864	Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl	2023-12-07 14:53:33 +01:00
Jorge Penadés	6fb4e86777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD	2023-12-07 14:47:31 +01:00
Sergio De la torre	61ed53bd1d	REFS #6275 feat:Silex_to_Salix	2023-12-07 10:37:06 +01:00
Carlos Satorres	920b38c929	refs #5525 move sql	2023-12-07 09:49:15 +01:00
Javi Gallego	58ba1c10d0	ci: dev-test	2023-12-07 08:01:16 +01:00
Carlos Satorres	102ea1ee65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-12-07 07:35:18 +01:00
Jorge Penadés	b50a6add0d	refs #6274 merge renewToken	2023-12-05 15:57:42 +01:00
Jorge Penadés	bb186bafe0	Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-05 14:12:00 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Jorge Penadés	419ab41816	refs #6276 Acl addTimeEntry	2023-12-05 09:55:22 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	7a63e527a5	refs #5666 perf: remove comments	2023-12-05 07:50:52 +01:00
Javier Segarra	2fe631f078	refs #5666 feat: change models permissions	2023-12-05 07:15:22 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Pablo Natek	303b6f5240	fix(expencefk): refs #6398 expenceFk to expenseFk	2023-12-01 13:48:56 +01:00
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Jorge Penadés	d5f09c2f75	refs #6276 saleTrackingDel	2023-12-01 09:44:49 +01:00
Alex Moreno	e634a5e213	refs #5914 feat: create getTaxBases and use in negatives and positives procedures	2023-11-30 15:15:40 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Javier Segarra	16001099b6	refs #5666 feat: update ACLs for role and vnRole	2023-11-30 12:15:48 +01:00
Javier Segarra	7611acb8f2	refs #6434 perf rename version folder for sql file	2023-11-30 08:34:10 +01:00
Javier Segarra	80f8037f58	refs #6434 perf remove version folder for sql file	2023-11-30 08:23:14 +01:00
Javier Segarra	6b354a20ad	refs #6434 perf: add sql table description	2023-11-30 08:13:28 +01:00
Javier Segarra	138d11b7b0	refs #6434 perf new version folder for sql file	2023-11-30 08:10:32 +01:00
Javier Segarra	46774b2e73	refs #6434 perf: new field in SignInLog table	2023-11-29 19:35:37 +00:00
Jorge Penadés	27d223cbab	refs #6276 machineWorker_add	2023-11-29 16:25:15 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Jorge Penadés	48dd068190	refs #6274 upperCase Model	2023-11-29 08:37:56 +01:00
Carlos Satorres	0186c2c806	refs #6085 aclMail back	2023-11-29 07:33:49 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Jorge Penadés	f862ed7d8a	refs #6274 refactor updateInTime	2023-11-23 13:19:59 +01:00
Jorge Penadés	cf3b5efee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-23 12:36:19 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Alex Moreno	217aa1ac77	refs #6491 deploy(2350) init version	2023-11-23 08:35:08 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Jorge Penadés	fac6aab26c	refs #6276 machineWorker_update	2023-11-22 14:25:19 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Jorge Penadés	67fa60ae81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-21 12:27:13 +01:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00:00
Juan Ferrer	1937560118	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-16 23:07:30 +01:00
Juan Ferrer	4f5242e3ae	fix: refs #6432 account sync fixes	2023-11-16 23:07:26 +01:00
Javier Segarra	a73453e9ed	refs #6434 feat: remove old sql file	2023-11-16 11:56:59 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Javier Segarra	67f5be474d	refs #6434 perf: rename db/changes current folder	2023-11-16 09:21:22 +01:00
Javier Segarra	e4f7790843	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 09:15:01 +01:00
Javier Segarra	144b26cf4c	refs #6434 perf: signInLog table id column AI	2023-11-16 08:47:08 +01:00
Javier Segarra	d032b3a527	refs #6434 perf: add description to signInLog table	2023-11-16 08:42:17 +01:00
Javier Segarra	e73836cbdb	refs #6434 feat: remove primary key constraint	2023-11-16 08:31:01 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Javier Segarra	e0f6d08a1e	refs #6434 feat: create signInLog table	2023-11-15 13:49:41 +01:00
Javier Segarra	4d677ccc89	refs #6434 perf: rename folder db/changes version	2023-11-15 10:02:48 +01:00
Javier Segarra	4061241650	refs #6434 feat: create signInLog table	2023-11-15 09:37:03 +01:00
Alex Moreno	2a67048594	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-14 15:54:47 +01:00
Alex Moreno	88ec0f24c3	ref #5914 rename table	2023-11-14 15:45:52 +01:00
Javier Segarra	7f82243ce6	refs #6434 feat: create signInLog table	2023-11-14 15:00:03 +01:00
Alex Moreno	2cd9c9c688	Merge branch 'dev' into 5914-warmfix-renameTable	2023-11-14 09:36:47 +00:00
Alex Moreno	bc6389fd66	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-14 09:00:12 +00:00
Alex Moreno	0fed5c1ab4	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-10 09:59:24 +00:00
Alex Moreno	69255fe2fc	refs #6014 feat(execute): use user_hasRoutinePriv. feat(execute): split in executeProc & executeFunc	2023-11-10 10:58:58 +01:00
Alex Moreno	f1b5e45491	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6014-executeRoutineMethod	2023-11-10 10:53:11 +01:00
Alex Moreno	2eacf7391e	refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls	2023-11-10 08:46:49 +01:00
Alex Moreno	e9666a5930	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-10 08:11:52 +01:00
Alex Moreno	fd142b9f23	refs #5881 warmFix: roleSync	2023-11-09 15:05:36 +01:00
Sergio De la torre	4aac9f93cc	Merge branch 'dev' into 6014-executeRoutineMethod	2023-11-09 13:03:25 +00:00
Jorge Penadés	3e45334149	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-warmfix-renameTable	2023-11-09 12:04:47 +01:00
Jorge Penadés	01d3c23cf0	ref #5914 renameTable	2023-11-09 11:57:52 +01:00
Alex Moreno	a0c4573f4d	refs #4797 fix: correct sql folder	2023-11-09 09:34:37 +01:00
Alex Moreno	52f419d4cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-09 09:33:22 +01:00
Alex Moreno	dbe6844419	refs #6415 feat: init version 23.48	2023-11-09 09:31:32 +01:00
Alex Moreno	973eff4520	refs #6415 fix. sql files	2023-11-09 09:05:56 +01:00
Sergio De la torre	5751065e6a	refs #5652 feat:addressShortage	2023-11-08 11:50:04 +01:00
Sergio De la torre	d30c4e4463	refs #5652 feat:addressShortage	2023-11-07 16:13:21 +01:00
Pablo Natek	72c8e76a2f	Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix	2023-11-06 14:54:57 +01:00
Pablo Natek	b442c9f5ed	fix: refs #6150 ticket to client trigger	2023-11-06 14:54:56 +01:00
Pablo Natek	526a5fdc8f	Merge branch 'dev' into 6150-clientCredit-update-Fix	2023-11-06 13:26:45 +00:00
Pablo Natek	aa800b1fd3	Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix	2023-11-06 14:23:38 +01:00
Pablo Natek	a75565f2ce	feat(client.create): refs #6150 clientCredit update fix	2023-11-06 14:23:36 +01:00
Pablo Natek	7ca3ea156c	feat(claimViewer): refs #5881 nuevo rol claimViewer	2023-11-06 09:16:10 +01:00
Javier Segarra	21028e3b79	refs #6264 feat: db changes	2023-11-04 17:23:44 +01:00
Alex Moreno	8c5e40c27f	refs #4797 fix: correct sql folder	2023-11-03 15:16:03 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Jorge Penadés	d0975f0acd	ref #6276 operator_add	2023-11-02 16:25:25 +01:00
Pablo Natek	2d3ee4a16e	Merge branch 'dev' into 6150-clientCredit-update-Fix	2023-11-02 13:05:31 +00:00
Pablo Natek	175e73e565	fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit	2023-11-02 14:05:14 +01:00
Alex Moreno	740d2fb976	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-02 08:48:03 +01:00
Alex Moreno	83b9ef72fc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-02 08:47:44 +01:00
Alex Moreno	bf84863237	refs #6376 fix: changelog	2023-11-02 08:42:53 +01:00
Alex Moreno	742d6de986	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-02 07:28:41 +01:00
Alex Moreno	d7542bcbb4	refs #6335 fix(ticketAdvance): procedure	2023-10-31 15:11:03 +01:00
Pablo Natek	a47d31cec9	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-31 06:48:53 +00:00
Pablo Natek	e7da093fc1	fix(acl.sql): refs #4131 òner comillas en el sql	2023-10-31 07:49:27 +01:00
Jorge Penadés	f250c084f7	ref #5216 refactor expeditionState BeforeInsert	2023-10-30 09:11:52 +01:00
Alex Moreno	bd8cc897c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-30 07:21:31 +01:00
Pablo Natek	65a1d052dc	feat(ticket.state): refs #4131 to state	2023-10-27 18:03:40 +02:00
Alex Moreno	ae160890a8	refs #6335 feat(ticketAdvance): use componentUpdate	2023-10-27 15:06:20 +02:00
Pablo Natek	9708f66cef	merge(dev): refs #4131 merge dev move sql files	2023-10-27 12:36:28 +02:00
Pablo Natek	524ac4d99d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges	2023-10-26 22:16:06 +02:00
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	6b94ea7d11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-26 09:48:35 +02:00
Jorge Penadés	e0b4ac733e	ref #5914 move changes	2023-10-26 09:30:48 +02:00
Jorge Penadés	56c431888f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 09:29:13 +02:00
Alex Moreno	cecdf8633c	refs #6350 deploy: init version 23.46	2023-10-26 09:27:32 +02:00
Jorge Penadés	da2bc416f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 08:26:35 +02:00
Alex Moreno	83cff37422	refs #6350 fix: 00-dropWorkerCreate.sql	2023-10-26 08:23:18 +02:00
Alex Moreno	26bdbabff5	refs #6335 feat(ticketAdvanced): show all tickets	2023-10-25 15:48:19 +02:00
Carlos Andrés	b461f63e2c	refs #4707 fix: correct sqlVersion	2023-10-25 11:02:53 +02:00
Alex Moreno	a501d577f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-25 09:23:00 +02:00
Carlos Andrés	800bbd74c8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl	2023-10-24 14:35:36 +02:00
Alex Moreno	589d7cbbb8	fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version	2023-10-24 12:02:21 +02:00
Jorge Penadés	35bb949fcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 10:13:38 +02:00
Alex Moreno	22b7c59812	refs #6335 feat(ticketAdvance): add zone field	2023-10-24 09:23:03 +02:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Carlos Andrés	4ff0bb94c0	refs #4707	2023-10-23 16:58:56 +02:00