7307 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	fe78de0c47	refs #7283 fixedPrices	2024-08-05 11:49:06 +02:00
Guillermo Bonet	d12c0de144	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:44 +02:00
Alex Moreno	cb95f0637f	Merge pull request 'feat(customer_balance): refs #6943 add functionality from salix' (!589) from 6943-cusotmer-balance into dev ... Reviewed-on: #589 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-05 08:08:43 +00:00
Alex Moreno	c83b3d54ae	typo	2024-08-05 10:07:47 +02:00
Alex Moreno	30961c796d	feat(customer_balance): refs #6943 translations	2024-08-05 10:05:41 +02:00
Alex Moreno	460b166a17	feat(customer_balance): refs #6943 add functionality from salix	2024-08-05 09:04:08 +02:00
Alex Moreno	6cece5c071	Merge pull request 'hotfix: refs CAU #207614 fix sale.concept field' (!586) from hotfix_TicketList_itemName into test ... Reviewed-on: #586 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-05 05:45:47 +00:00
Alex Moreno	91e066e18a	Merge branch 'test' into hotfix_TicketList_itemName	2024-08-05 05:44:41 +00:00
Jorge Penadés	6f771c7ae6	fix: refs #7283 basicData locale	2024-08-02 14:31:41 +02:00
Jon Elias	954a6ff6c0	refacotr: refs #7553 refactor sales, purchaseRequest and saleTracking	2024-08-02 13:55:51 +02:00
Jon Elias	2a4180a1c3	refactor: refs #6346 deleted front error checking	2024-08-02 13:20:46 +02:00
Jon Elias	d4a5b074be	Merge pull request 'hotfix: CAU 207504 fix itemDiary and logs' (!587) from hotfix_ItemDiary into test ... Reviewed-on: #587 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-02 11:06:37 +00:00
Jon Elias	bdf4c793dc	Merge branch 'test' into hotfix_ItemDiary	2024-08-02 11:04:47 +00:00
Jorge Penadés	27e7d30158	fix: refs #7283 basicData locale	2024-08-02 12:50:58 +02:00
Jorge Penadés	bc4ee5c8a5	fix: refs #7283 basicData locale	2024-08-02 12:50:09 +02:00
Alex Moreno	3e5c811961	Merge pull request 'fix: refs #6101 fix TicketList' (!585) from hotfix_6101_FixTicketList into test ... Reviewed-on: #585 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-02 10:29:48 +00:00
Alex Moreno	eb55743bc0	Merge branch 'test' into hotfix_6101_FixTicketList	2024-08-02 10:28:44 +00:00
Jorge Penadés	51fec90607	feat: refs #4074 useAcl in vnSelectDialog	2024-08-02 12:04:19 +02:00
Guillermo Bonet	0d016e0898	Merge branch 'test' into dev	2024-08-02 10:01:16 +02:00
Guillermo Bonet	33da5dd8a8	Merge branch 'master' into test	2024-08-02 10:01:01 +02:00
Guillermo Bonet	6bc265b83f	Merge pull request 'fix: refs #7413 No id tag' (!580) from 7413-filterValueFix into master ... Reviewed-on: #580 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-02 07:57:32 +00:00
Guillermo Bonet	8450830b59	Merge branch 'master' into 7413-filterValueFix	2024-08-02 07:55:30 +00:00
Jorge Penadés	6c3c03722f	feat: refs #4074 useAcl in vnSelectDialog	2024-08-02 09:37:48 +02:00
Jon Elias	2367550bc1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ItemDiary	2024-08-02 09:25:46 +02:00
Jon Elias	276202f0c7	fix: refs CAU 207504 fix itemDiary and logs	2024-08-02 09:23:30 +02:00
Jorge Penadés	53aec24790	chore: refs #4074 drop workerCreate	2024-08-02 09:04:16 +02:00
Jon Elias	b6bb8e0952	hotfix: refs CAU #207614 fix sale.concept field	2024-08-02 08:41:46 +02:00
Jon Elias	3d79cbcf59	Merge branch 'test' into hotfix_6101_FixTicketList	2024-08-02 06:27:30 +00:00
Jon Elias	c5f2075148	fix: refs #6101 fix TicketList	2024-08-02 08:25:57 +02:00
Jon Elias	8a4f723732	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-02 04:50:39 +00:00
Jorge Penadés	199ed80212	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-08-01 16:39:20 +02:00
Jorge Penadés	9e9a530803	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-08-01 16:37:12 +02:00
Jorge Penadés	db18e8c937	fix: refs #4074 workerCard data-key	2024-08-01 16:10:26 +02:00
Jorge Penadés	fb496d7fc6	chore: refs #4074 admit several acls	2024-08-01 16:08:40 +02:00
Alex Moreno	c0fdf21c31	test: kubernetes pods	2024-08-01 14:46:36 +02:00
Jorge Penadés	27034d1dc2	chore: refs #4074 admit several acls	2024-08-01 14:46:04 +02:00
Alex Moreno	8a3a26dc9a	test: kubernetes pods	2024-08-01 14:42:31 +02:00
Alex Moreno	508320a544	test: kubernetes pods	2024-08-01 14:34:21 +02:00
Alex Moreno	c8662e4bb8	test: kubernetes pods	2024-08-01 14:27:27 +02:00
Alex Moreno	968de67393	test: kubernetes pods	2024-08-01 14:22:05 +02:00
Jorge Penadés	dcc2f4dfde	chore: refs #4074 admit several acls	2024-08-01 14:14:28 +02:00
Jorge Penadés	c766110bd9	chore: refs #4074 wip replace useRole for useAcl	2024-08-01 14:13:37 +02:00
Alex Moreno	545f7c8039	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-01 14:11:15 +02:00
Carlos Satorres	b668d07e2d	refs #7283 fetchedTags	2024-08-01 13:20:33 +02:00
Alex Moreno	da85d7d2a0	Merge pull request 'fix(claim): small details' (!582) from 6336-claim-v6 into test ... Reviewed-on: #582 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-01 08:55:07 +00:00
Alex Moreno	fa60467e76	fix(claim): small details	2024-08-01 10:51:13 +02:00
Carlos Satorres	f618ed1132	Merge pull request 'refs #7355 fix vnTable' (!506) from 7355-accountMigration into dev ... Reviewed-on: #506 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-01 08:48:15 +00:00
Alex Moreno	3a64929c05	feat(VnLocation): onCityCreated refresh provinces	2024-08-01 10:35:33 +02:00
Carlos Satorres	2604441c13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-01 10:19:26 +02:00
Carlos Satorres	8d8bd095f6	Merge branch 'dev' into 7355-accountMigration	2024-08-01 08:15:21 +00:00