12113 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	1b3f0ee026	refactor: added itemPackingType and temperature relations	2022-05-23 12:40:11 +02:00
Carlos Jimenez Ruiz	150507ea1e	Merge pull request '3905-invoice-out_refund' (#949) from 3905-invoice-out_refund into dev ... Reviewed-on: #949 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-20 11:36:12 +00:00
Vicent Llopis	9736a68dd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create	2022-05-20 13:16:58 +02:00
Vicent Llopis	875e9503c3	refactor: request changes	2022-05-20 13:16:47 +02:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz	d86ac41b70	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:54:08 +00:00
Carlos Jimenez Ruiz	ae87373c6f	Merge pull request '4082-zone.basic-data' (#982) from 4082-zone.basic-data into dev ... Reviewed-on: #982 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-20 10:53:40 +00:00
Vicent Llopis	f4b080243c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-20 12:53:23 +02:00
Vicent Llopis	c9bfbe990a	refactor: request changues	2022-05-20 12:53:10 +02:00
Vicent Llopis	fd80fc58fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-20 12:33:23 +02:00
Vicent Llopis	3c9800a7a3	refactor: pull request changes	2022-05-20 12:33:12 +02:00
Joan Sanchez	4d093d37bd	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz	b3c0aa7933	Merge branch 'dev' into 4082-zone.basic-data	2022-05-20 10:19:00 +00:00
Carlos Jimenez Ruiz	6c20f37211	Merge pull request '4065-delete_sms.destinationFk' (#977) from 4065-delete_sms.destinationFk into dev ... Reviewed-on: #977 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-20 10:17:59 +00:00
Vicent Llopis	c125fd54eb	refactor: pull request changes	2022-05-20 12:08:12 +02:00
Vicent Llopis	0425b17b4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-05-20 11:57:20 +02:00
Vicent Llopis	69e12e0dd8	refactor: 'bonus' can be a negative value	2022-05-20 09:21:33 +02:00
Alex Moreno	3650567caf	test(account): e2e for ldap and samba	2022-05-19 15:02:39 +02:00
Alex Moreno	68c94ec3c1	typo	2022-05-18 15:02:06 +02:00
Alex Moreno	34bcdf1bd3	test(account): acl, connections and accounts secctions	2022-05-18 14:01:30 +02:00
Joan Sanchez	e294582039	Merge pull request '4058-fix(entry_latest-buys): fix multi_check_TEST' (#978) from 4058-multi-check_fix into test ... Reviewed-on: #978	2022-05-18 08:24:54 +00:00
Alex Moreno	89baf63646	feat(account): add e2e acl	2022-05-17 15:19:54 +02:00
Alex Moreno	4a9c5742c0	fix(entry_latest-buys): fix multi_check	2022-05-17 13:50:06 +02:00
Vicent Llopis	605ab2ec62	refactor: delete sms.detinationFk	2022-05-17 12:37:54 +02:00
Vicent Llopis	eeede417eb	feat: update date depending of accountingType	2022-05-17 12:24:35 +02:00
Vicent Llopis	9eae1f479c	add table vn.printer	2022-05-17 10:39:46 +02:00
Vicent Llopis	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Vicent Llopis	76515bdd3f	add: search-panel	2022-05-17 09:54:49 +02:00
Vicent Llopis	3335cb8a01	feat(item.itemType): add fields	2022-05-17 08:32:45 +02:00
Vicent Llopis	7ad56327a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-17 08:21:49 +02:00
Joan Sanchez	bf8e7eed57	Added SQL version 10470	2022-05-16 11:37:43 +02:00
Joan Sanchez	576cad16ad	SQL fixes	2022-05-16 11:34:29 +02:00
Carlos Jimenez Ruiz	d7c790de4f	Merge pull request '4037-fix(multi-check)' (#973) from 4037-multi-check_align into dev ... Reviewed-on: #973 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-16 08:35:54 +00:00
Carlos Jimenez Ruiz	5747fbbd2f	Merge branch 'dev' into 4037-multi-check_align	2022-05-16 08:29:42 +00:00
Carlos Jimenez Ruiz	9f246f08d5	Merge pull request '3409-clientCredit_maxRows' (#963) from 3409-clientCredit_maxRows into dev ... Reviewed-on: #963 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-16 08:24:40 +00:00
Alex Moreno	1707ff7f0f	duplicate test	2022-05-16 10:24:02 +02:00
Alex Moreno	ef9158ee36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4037-multi-check_align	2022-05-16 10:23:12 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Joan Sanchez	c88fe629cd	Removed duplicated version	2022-05-16 08:21:12 +02:00
Joan Sanchez	a71e53fdf4	Merge pull request '3893-supplier.fiscal-data' (#947) from 3893-supplier.fiscal-data into dev ... Reviewed-on: #947 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-16 06:05:30 +00:00
Vicent Llopis	10cd9c5b87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data	2022-05-16 07:22:16 +02:00
Vicent Llopis	40bcc56758	refactor: change acl	2022-05-16 07:22:01 +02:00
Joan Sanchez	3c738efb2a	Merge pull request 'gulp-jasmine replaced by jasmine' (#971) from gulp-jasmine_deprecation into dev ... Reviewed-on: #971 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-13 17:03:57 +00:00
Carlos Jimenez Ruiz	6e9fedf2b5	tests batteries command updated on readme	2022-05-13 18:41:53 +02:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz	7bafc48d68	removed CI references for e2e	2022-05-13 18:29:20 +02:00
Carlos Jimenez Ruiz	39413c145d	e2e test battery moved out of gulp to npm script	2022-05-13 17:09:41 +02:00
Joan Sanchez	567d5b1ad9	Merge pull request '3771-ticket.expedition' (#970) from 3771-ticket.expedition into dev ... Reviewed-on: #970 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-13 13:38:35 +00:00
Joan Sanchez	9cbee7a38a	Merge branch 'dev' into 3771-ticket.expedition	2022-05-13 13:05:08 +00:00