308 Commits

Author	SHA1	Message	Date
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Joan Sanchez	c177c0366d	Item PDF	2022-10-03 13:35:49 +02:00
Joan Sanchez	e4b61f81a9	Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev ... Reviewed-on: #1066 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-03 07:41:58 +00:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Pau	901007d34b	change test case to expect the image to be defined	2022-09-27 13:58:27 +02:00
Pau	2dd6de1d47	Modified Fixtures, clone.js and the item model	2022-09-27 13:46:23 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +02:00
Joan Sanchez	410e651edd	Buyer waste	2022-09-27 07:24:45 +02:00
Joan Sanchez	f9f09440ec	Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev ... Reviewed-on: #1053 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:10:48 +00:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Vicent Llopis	1fd97f167c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-09-13 11:35:15 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	8f54365350	refator: parametrizardo con ?	2022-08-10 09:19:23 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	537c383cd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-07-29 13:38:23 +02:00
Vicent Llopis	224ea61a62	fix: delete warehouseFk from itemType model	2022-07-29 13:07:25 +02:00
Vicent Llopis	840e792d13	fix: backTest	2022-07-29 12:52:53 +02:00
Vicent Llopis	605da52286	fix: replace it.warehouseFk by userConfig.warehouseFk	2022-07-29 12:22:03 +02:00
Joan Sanchez	468da0c5a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-07-27 08:12:06 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Vicent Llopis	7bf9a8c100	delete itemType.warehouseFk	2022-07-12 11:52:47 +02:00
Vicent Llopis	6f3d4792d5	update backTest	2022-07-12 10:03:58 +02:00
Vicent Llopis	eaa7658b23	delete it.warehouseFk	2022-07-12 10:03:50 +02:00
Joan Sanchez	ae79163048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-30 13:17:04 +02:00
Joan Sanchez	140af7e808	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-30 13:14:08 +02:00
Joan Sanchez	ad021265c7	Deprecated field taxTypeFk	2022-06-30 11:42:37 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Carlos Jimenez Ruiz	a76dd11825	Merge branch 'dev' into 3870-models	2022-05-23 12:33:08 +00:00
Vicent Llopis	1b3f0ee026	refactor: added itemPackingType and temperature relations	2022-05-23 12:40:11 +02:00
Vicent Llopis	3c9800a7a3	refactor: pull request changes	2022-05-20 12:33:12 +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	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
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
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	13a6f1f8c1	feat(item): add section itemType	2022-05-11 14:47:54 +02:00
Vicent Llopis	734f9cb60d	feat(item.itemType): added section itemType	2022-05-11 07:28:17 +02:00
Vicent Llopis	a6b8674302	feat(invoiceIn.tax): add button for create an expence	2022-05-09 14:34:20 +02:00
Carlos Jimenez Ruiz	b2f930911f	fixed problems in two spec files	2022-04-29 09:18:06 +02:00
Vicent Llopis	bad90c12f4	feat: add required fields and models	2022-04-27 14:17:41 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Alex Moreno	c7b8b61a08	feat(item): add model itemPackingType	2022-04-08 10:34:36 +02:00
Vicent Llopis	eba3ac40a5	refactor: delete item.compression	2022-04-06 11:48:12 +02:00