Commit Graph

10378 Commits

Author SHA1 Message Date
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:49:09 +00:00
Javi Gallego a5fbe57159 gulpfile
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:42:31 +02:00
Javi Gallego a567738f2c set addressFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:33:11 +02:00
Joan Sanchez 8ae7871318 Removed procedure
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:56:56 +02:00
Joan Sanchez 0a542a2057 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:38:03 +02:00
Joan Sanchez 156c5de17d Merge pull request '2416 - Item request - Added state filter' (#361) from 2408-item_request into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #361
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-31 13:23:13 +00:00
Joan Sanchez b34545b316 Merge branch 'dev' into 2408-item_request
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 13:11:07 +00:00
Carlos Jimenez Ruiz f797fdce94 Merge pull request '2391 - Editable description(done) + e2e' (#359) from 2391-client_balance_description into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #359
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-31 13:05:12 +00:00
Joan Sanchez 8aa9918d84 2409 - Added filter by selection
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 15:03:00 +02:00
Carlos Jimenez Ruiz a156a26e19 e2e updated
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 15:00:11 +02:00
Javi Gallego daee9081d1 test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:29:51 +02:00
Joan Sanchez 6297d09de2 Updated syntax
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:14:39 +02:00
Joan Sanchez 4a870213ce Merge branch 'dev' into 2408-item_request
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 09:03:41 +00:00
Joan Sanchez 7a1d697375 Merge branch 'dev' into 2391-client_balance_description
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 08:26:02 +00:00
Carlos Jimenez Ruiz 7a2779b597 Merge pull request '2394 - Removed call to order_total()' (#358) from 2394-order_index_total into dev
Reviewed-on: #358
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-31 08:23:34 +00:00
Joan Sanchez 95601f5d55 Updated translations
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 10:15:02 +02:00
Joan Sanchez 8b67c6f1a5 Merge branch 'dev' into 2394-order_index_total
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 08:01:48 +00:00
Joan Sanchez baf9ec6e70 2416 - Item request - Added state filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 08:32:30 +02:00
Carlos Jimenez Ruiz 5c53c9301e path e2e + fixes + exclusion
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 19:52:54 +02:00
Javi Gallego 8b26c41b7f campo packageFk
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz 0b4f65724e semantics, traductions and small aditions
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 10:40:47 +02:00
Carlos Jimenez Ruiz c70ad808a0 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz 2f81e41881 grping and pcking shown as per item last entries
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 16:42:01 +02:00
Carlos Jimenez Ruiz 58fc25d91f grouping & packaging according to grouping mode
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 16:40:08 +02:00
Carlos Jimenez Ruiz 5614a39f91 traductuctions
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 15:29:48 +02:00
Carlos Jimenez Ruiz a66656dcce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-27 15:14:41 +02:00
Carlos Jimenez Ruiz d156ca95ba front and back unit tests 2020-08-27 15:14:30 +02:00
Joan Sanchez f4a63e0876 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:32:10 +02:00
Joan Sanchez 7c4d9b9460 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:31:54 +02:00
Joan Sanchez a75938b6d0 Updated error handler
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:23:40 +02:00
Joan Sanchez 55d047c0dd Renamed error var
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:11:22 +02:00
Joan Sanchez fd67a85fe8 Changed to 1 second
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:09:21 +02:00
Joan Sanchez 0c4939830b Fixed error
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:00:40 +02:00
Joan Sanchez 6f3fb83cd7 Changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 13:53:11 +02:00
Joan Sanchez 32de0e1e6f Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 12:43:57 +02:00
Joan Sanchez 914407012a Fixed bank search expression
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 11:58:28 +02:00
Joan Sanchez f14b484faf Added ACL to td-editable
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 11:23:39 +02:00
Joan Sanchez ac181bb845 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 11:16:36 +02:00
Joan Sanchez 1b764e0b3a Merge branch 'dev' into 2394-order_index_total
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 07:54:53 +00:00
Joan Sanchez 17542472da 2391 - Editable description
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 08:24:21 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 16:33:47 +02:00
Joan Sanchez 30a4bbfe1a Css changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 12:41:38 +02:00
Joan Sanchez a343d5eb9a 2394 - Removed call to order_total()
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 11:27:36 +02:00
Carlos Jimenez Ruiz d23e3eff76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-26 09:49:52 +02:00
Joan Sanchez 55c88514bd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 08:29:03 +02:00
Joan Sanchez e12612b0ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 08:28:41 +02:00
Joan Sanchez ea4f561bcf Added try-catch
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-26 07:33:00 +02:00
Joan Sanchez 17cd808015 Merge pull request 'Download route PDF on route index' (#357) from 2358-route_download_pdf into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #357
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-25 13:17:58 +00:00
Joan Sanchez 7e494962cd Merge branch 'dev' into 2358-route_download_pdf
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 12:27:17 +00:00
Joan Sanchez 9ef58cabd4 Removed console log
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 14:10:38 +02:00