Commit Graph

349 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 4b37b0fc1e #1155 item.index añadir grouping y packing 2019-02-25 14:55:06 +01:00
Gerard 8a137e7713 grouping and packing added 2019-02-25 13:40:53 +01:00
Joan Sanchez ac1e619b06 fixed zone bugs 2019-02-25 10:03:50 +01:00
Juan Ferrer c3f20dba3c Small fix 2019-02-22 17:23:03 +01:00
Juan Ferrer 26419e75c9 Style fixes 2019-02-22 16:15:54 +01:00
Juan Ferrer 961eb6edaf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test 2019-02-22 14:38:45 +01:00
Juan Ferrer 9fc6a2c4c2 Style fixes 2019-02-22 14:34:11 +01:00
Gerard ea9d194368 traduction added 2019-02-22 13:18:53 +01:00
Gerard 9370142731 styles fixed 2019-02-22 12:43:08 +01:00
Gerard 86b3407e35 item barcode to item created 2019-02-22 08:32:18 +01:00
Gerard c590dc6270 traduction added 2019-02-21 14:08:32 +01:00
Gerard 1324d53e1b claim action now shows ticket 2019-02-21 13:48:34 +01:00
Gerard 1e199e9d5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-21 12:58:05 +01:00
Gerard 6fb936a08a ticket log disabled temporally 2019-02-21 12:57:19 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge 2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
Gerard 506c857b70 Merge branch 'test' into dev 2019-02-21 10:17:54 +01:00
Gerard 03e168739b updated icons 2019-02-21 10:17:13 +01:00
Juan Ferrer 02569aeea4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-21 10:10:48 +01:00
Juan Ferrer e42da544cd Styles fixed 2019-02-21 10:10:38 +01:00
Gerard ab6606a624 Merge branch 'test' into dev 2019-02-21 10:07:27 +01:00
Gerard 8d6fdc4b2f added envialia and solved problems with worker popover 2019-02-21 10:06:38 +01:00
Joan Sanchez c9746521dc removed unused getSubTotal() method 2019-02-21 08:44:03 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151 2019-02-21 08:43:04 +01:00
Gerard 42cc2bde0d Merge branch 'test' into dev 2019-02-21 07:48:31 +01:00
Gerard 444d531162 summary action now shows ticket id 2019-02-21 07:46:27 +01:00
Gerard a651142fff Merge branch 'test' into dev 2019-02-20 18:50:08 +01:00
Gerard 4b54b82a9d #1150 descriptor popover intentar abrir con id movimiento 2019-02-20 18:46:30 +01:00
Gerard a3dab9013c Merge branch 'test' into dev 2019-02-20 17:53:10 +01:00
Gerard 0cca3bb9ce #1137 ticket.summary, ticket.sale 2019-02-20 17:52:36 +01:00
Gerard 902b654f80 Merge branch 'test' into dev 2019-02-20 16:43:52 +01:00
Gerard c95b2d71d4 tag not closed correctly fixed 2019-02-20 16:43:01 +01:00
Gerard 79cf4afb3e #1116 loggable now works with transaction and log enabled on ticket module 2019-02-20 16:30:46 +01:00
Juan Ferrer 8c401b6921 Style fixes 2019-02-20 14:38:41 +01:00
Juan Ferrer 752a703cdb Merge 2019-02-20 14:34:56 +01:00
Juan Ferrer 8f1e41e744 Style fixes 2019-02-20 14:34:16 +01:00
Joan Sanchez 646e6c7b46 Disabled delivery-note preview 2019-02-20 13:26:31 +01:00
Joan Sanchez 90092a4f48 fixed treeview order 2019-02-20 12:31:08 +01:00
Gerard 23e08331fc fetched tags not sowing title and displaying wrong fixed 2019-02-20 12:12:16 +01:00
Gerard b97cb52abe changed traduction of email 2019-02-20 11:52:36 +01:00
Gerard 5d6951a610 deleted deprecated component 2019-02-20 11:41:06 +01:00
Gerard efff9d2184 deleted duplicated data 2019-02-20 11:36:55 +01:00
Gerard 0f5d1e55c0 item descriptor not sending the correct warehouse fixed 2019-02-20 11:30:55 +01:00
Joan Sanchez 20843a9068 updated module worker acl, removed fi from summary 2019-02-20 09:59:39 +01:00
Joan Sanchez 40d765adc1 removed fi from worker module 2019-02-20 09:16:19 +01:00
Carlos Jimenez Ruiz 250bb359e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 18:00:07 +01:00
Carlos Jimenez Ruiz 7d2bc25c95 #1142 order.line total 2019-02-19 17:55:19 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Gerard a8a17b72bd Merge remote-tracking branch 'origin/dev' into jgallego 2019-02-19 16:10:16 +01:00