Commit Graph

5739 Commits

Author SHA1 Message Date
Joan Sanchez f752404ebe removed QR barcode margins
gitea/salix/master This commit looks good Details
2019-10-22 14:11:39 +02:00
Joan Sanchez ff292baecf added item-label report and configurable report options 2019-10-22 14:11:28 +02:00
Joan Sanchez 47d689ae50 Uploadfile parameters are now required + fixed date filters 2019-10-22 14:11:18 +02:00
Joan Sanchez 43a2c2e939 insert timeControl from procedure
gitea/salix/master This commit looks good Details
2019-10-17 14:03:22 +02:00
Joan Sanchez c33906ca10 descuadre de horas #1766 rollback
gitea/salix/master This commit looks good Details
2019-10-16 07:56:46 +02:00
Joan Sanchez 2a3d6dcd76 fixed transaction params
gitea/salix/master This commit looks good Details
2019-10-14 11:54:28 +02:00
Joan Sanchez 9f608b725b Merge branch '1763-worker_time_control_add' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
LGTM
2019-10-10 12:19:50 +00:00
Joan Sanchez 8af7f13ac6 #1763 insert from procedure
gitea/salix/1763-worker_time_control_add This commit looks good Details
2019-10-10 14:11:23 +02:00
Joan Sanchez 144f13c400 changed state to stowaway ticket
gitea/salix/master This commit looks good Details
2019-10-10 10:00:38 +02:00
Joan Sanchez f34742c18c changed warehouse from ticket id 17 2019-10-10 10:00:34 +02:00
Joan Sanchez d2329d989f added transaction options to findOne()
gitea/salix/master This commit looks good Details
2019-10-10 09:21:42 +02:00
Joan Sanchez 6422d25ad6 stowaway changed to correct field name
gitea/salix/master This commit looks good Details
2019-10-08 14:37:38 +02:00
Joan Sanchez cc71f51f45 added invoiceOut alias
gitea/salix/master This commit looks good Details
2019-10-08 13:52:50 +02:00
Joan Sanchez 05aa9151eb fixed stowaway list
gitea/salix/master This commit looks good Details
2019-10-08 11:45:00 +02:00
Joan Sanchez 9c3e7f50ec disabled autoload on stowaway model #1747
gitea/salix/master This commit looks good Details
2019-10-04 11:21:24 +02:00
Joan Sanchez 6b44686ff4 update zone and shipped on #1746
gitea/salix/master This commit looks good Details
2019-10-04 09:45:30 +02:00
Joan Sanchez 2e22c79e18 fixed #1734 canHaveStowaway validation
gitea/salix/master This commit looks good Details
2019-10-02 14:36:24 +02:00
Joan Sanchez 199529b3b9 fiscal name ignore case
gitea/salix/master This commit looks good Details
2019-10-01 15:12:58 +02:00
Carlos Jimenez Ruiz e3dd482457 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 12:09:35 +02:00
Carlos Jimenez Ruiz 92463b0ccd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-24 12:08:39 +02:00
Carlos Jimenez Ruiz ebc4dd5616 #1696 formulario que se envia a los clientes 2019-09-24 12:08:21 +02:00
Joan Sanchez 9606f039e0 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 11:56:14 +02:00
Joan Sanchez 3af26900e3 watcher preventing claim creation
gitea/salix/dev This commit looks good Details
2019-09-24 11:55:36 +02:00
Joan Sanchez 5851784e41 Create new order now opens on new window
gitea/salix/dev This commit looks good Details
2019-09-24 11:41:00 +02:00
Joan Sanchez 310f2bae70 Create new order now opens on new window
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-09-24 11:35:46 +02:00
Joan Sanchez e6f6c262fa Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 10:43:16 +02:00
Juan Ferrer a319eed5f6 Zone.getLeaves() refactor
gitea/salix/dev This commit looks good Details
2019-09-24 10:41:25 +02:00
Juan Ferrer 4b58078798 Zone.getLeaves refactor & fixes 2019-09-24 10:38:07 +02:00
Juan Ferrer 52a6221b59 recover getLeaves 2019-09-24 10:38:05 +02:00
Carlos Jimenez Ruiz 1cc8b5512e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-24 09:31:20 +02:00
Carlos Jimenez Ruiz 25165792c8 #1680 left-menu descriptor scrollbar overlap 2019-09-24 09:29:57 +02:00
Joan Sanchez 4ff8b760b6 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 08:51:41 +02:00
Joan Sanchez 15183df65f transfer sales error fixed
gitea/salix/dev This commit looks good Details
2019-09-24 08:51:21 +02:00
Joan Sanchez 314b609060 fixed family translation
gitea/salix/dev This commit looks good Details
2019-09-24 08:34:14 +02:00
Joan Sanchez 059a72a719 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 08:20:17 +02:00
Joan Sanchez e52be911cf Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 07:48:13 +02:00
Joan Sanchez a091674f08 allowed numbers on fiscal name
gitea/salix/dev This commit looks good Details
2019-09-24 07:47:06 +02:00
Joan Sanchez 7f33f4c56e fixed salixfront deletedTicket icon
gitea/salix/dev This commit looks good Details
2019-09-24 07:25:22 +02:00
Joan Sanchez 8e52a6043f fixed salixfront deletedTicket icon
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 07:24:17 +02:00
Joan Sanchez f563833630 Merge branch 'dev' into test 2019-09-24 07:21:57 +02:00
Carlos Jimenez Ruiz 6c1fdb444a removed fdescribe
gitea/salix/dev This commit looks good Details
2019-09-24 07:03:22 +02:00
Joan Sanchez bd8a1ee00e merge with dev
gitea/salix/test This commit looks good Details
2019-09-23 15:02:27 +02:00
Joan Sanchez 6910e6048b fixed sql
gitea/salix/dev This commit looks good Details
2019-09-23 14:50:30 +02:00
Joan Sanchez f2d9323c4f Deprecated ticketCalculate
gitea/salix/dev This commit looks good Details
2019-09-23 14:47:27 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690
gitea/salix/dev This commit looks good Details
2019-09-23 14:41:54 +02:00
Carlos Jimenez Ruiz 695ff14b60 removed the tests index used by karma (deprecated)
gitea/salix/dev This commit looks good Details
2019-09-23 14:17:44 +02:00
Carlos Jimenez Ruiz 12ece820ee karma removed from integration tests
gitea/salix/dev This commit looks good Details
2019-09-23 14:02:30 +02:00
Carlos Jimenez Ruiz a48b3b31b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-23 13:55:28 +02:00
Carlos Jimenez Ruiz bcceb94e40 deprecated Karma 2019-09-23 13:55:19 +02:00
Joan Sanchez aad0d09394 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-23 09:34:25 +02:00