Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing		2022-09-05 08:12:07 +02:00
..
account	Hotfix: User synchronization	2022-08-04 08:53:31 +02:00
claim	Resolved conflicts	2022-08-10 12:13:31 +02:00
client	Filter by province	2022-08-12 15:31:59 +02:00
entry	Removed translate from grouping and packing	2022-08-11 08:29:24 +02:00
invoiceIn	Resolved conflicts	2022-08-10 12:13:31 +02:00
invoiceOut	Resolved conflicts	2022-08-10 12:13:31 +02:00
item	Removed translate from grouping and packing	2022-08-11 08:29:24 +02:00
mdb/back	Relative path for master versions	2022-08-09 11:49:28 +02:00
monitor	Resolved conflicts	2022-08-10 12:13:31 +02:00
order	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
route	Resolved conflicts	2022-08-10 12:13:31 +02:00
shelving	Resolved conflicts	2022-08-10 12:13:31 +02:00
supplier	feat: update combo "Banck entity"	2022-06-09 08:43:33 +02:00
ticket	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-05 08:12:07 +02:00
travel	Resolved conflicts	2022-08-10 12:13:31 +02:00
worker	Resolved conflicts	2022-08-10 12:13:31 +02:00
zone	Resolved conflicts	2022-08-10 12:13:31 +02:00