Commit Graph

10884 Commits

Author SHA1 Message Date
Joan Sanchez 29ec883390 Merge pull request '3044 - FIX: Load correct tickets on different situations' (#710) from 3044-summary_getTickets into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #710
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-13 06:02:57 +00:00
Joan Sanchez 9ec07de1cd Added SQL version 10350-august
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:02:09 +02:00
Carlos Jimenez Ruiz 8acf6c23ab Merge branch '2940-invoiceInTax-section' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 17:28:31 +02:00
Carlos Jimenez Ruiz 70b4dd3ed8 e2e for invoiceIn tax 2021-08-12 17:27:39 +02:00
Carlos Jimenez Ruiz e547642c16 corrected a syntax error preventing the changes to apply 2021-08-12 17:26:46 +02:00
Joan Sanchez 911ea20b0f Updated package-lock
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 14:16:31 +02:00
Joan Sanchez cb129a4b64 Removed package-lock
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 14:10:15 +02:00
Javi Gallego 5efcd6a57e translation
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 14:00:15 +02:00
Joan Sanchez 4aad4ee2e0 3044 - FIX: Load correct tickets on different situations
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 13:55:10 +02:00
Carlos Jimenez Ruiz 2b4afdd04d ticket module transactions + tests 2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz 708c0035c0 deprecated changeWorker as it is no longer in use 2021-08-12 11:06:49 +02:00
Carlos Jimenez Ruiz 2c3f46f394 added throw to catch in many tests 2021-08-12 10:55:04 +02:00
Javi Gallego da9eddbf9e package
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 10:02:35 +02:00
Javi Gallego 5f390f996f package
gitea/salix/pipeline/head Build queued... Details
2021-08-12 09:41:31 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 92c3a24b1b dash
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 09:24:42 +02:00
Javi Gallego 3b9bdc18bf funciona
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 09:23:19 +02:00
Javi Gallego 54634ed22d test okl
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 07:39:26 +02:00
Carlos Jimenez Ruiz da7bda2d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-11 16:06:52 +02:00
Carlos Jimenez Ruiz 80c414d786 Merge pull request '2984 - Global invoicing form' (#706) from 2984-invoiceOut_global into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #706
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-11 11:48:53 +00:00
Carlos Jimenez Ruiz 73492190f7 removed unwanted waitForTimeout calls
gitea/salix/pipeline/head This commit looks good Details
2021-08-11 13:37:24 +02:00
Carlos Jimenez Ruiz 1274fef983 e2e path for global invoicing
gitea/salix/pipeline/head This commit looks good Details
2021-08-11 13:34:32 +02:00
Joan Sanchez e4cae57c0b Merge branch 'dev' into 2984-invoiceOut_global
gitea/salix/pipeline/head This commit looks good Details
2021-08-11 06:47:50 +00:00
Joan Sanchez de2bda5284 Removed PDF generation from transaction
gitea/salix/pipeline/head This commit looks good Details
2021-08-11 08:47:05 +02:00
Carlos Jimenez Ruiz 8be54f6115 Merge pull request '2848 - Added photo cropper' (#709) from 2848-photo_cropper into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #709
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-10 13:16:16 +00:00
Carlos Jimenez Ruiz 5339eb36a7 Merge branch 'dev' into 2848-photo_cropper
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 12:52:04 +00:00
Joan Sanchez 6ed0dcc4c5 Removed exclusion
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 14:28:37 +02:00
Joan Sanchez b3db1cda13 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 13:57:03 +02:00
Joan Sanchez 3b127b6806 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-10 13:23:45 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-10 11:48:29 +02:00
Carlos Jimenez Ruiz d4c5d54fa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-10 08:29:11 +02:00
Carlos Jimenez Ruiz c3aee5488e Merge pull request '2985 - Create a manual invoice from a ticket or client' (#702) from 2985-invoiceOut_manual into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #702
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-10 06:25:45 +00:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:18:52 +02:00
Carlos Jimenez Ruiz e7a8bc0b6d e2e for manual invoice
gitea/salix/pipeline/head This commit looks good Details
2021-08-09 18:24:53 +02:00
Joan Sanchez cbaba8a075 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 14:06:23 +02:00
Joan Sanchez 3a45c99594 Merge branch '2985-invoiceOut_manual' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 13:00:41 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Joan Sanchez e3a192bcea Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-08-09 12:37:52 +02:00
Joan Sanchez a87ebba4ab 2848 - Added photo cropper
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 07:47:50 +02:00
Carlos Jimenez Ruiz a9b2e45683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual 2021-08-06 13:30:14 +02:00
Joan Sanchez d5ba0ced0b Merge pull request 'added catalog calculate join to show only available item types' (#708) from 2954-order_catalog_types into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #708
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-08-06 11:26:54 +00:00
Carlos Jimenez Ruiz ec6d4b29c1 Merge branch 'dev' into 2954-order_catalog_types
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 10:48:51 +00:00
Joan Sanchez 9048ce238e Added translation
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:47:46 +02:00
Carlos Jimenez Ruiz 7d442c40ec Merge branch 'dev' into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 10:39:15 +00:00
Joan Sanchez 9911a6d6a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:37:25 +02:00
Carlos Jimenez Ruiz 2b866cd38f Merge pull request '2879 - Autocomplete item field from imported buys' (#690) from 2879-import_buys into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #690
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-06 10:35:35 +00:00
Joan Sanchez 9dc1168ad2 Transaction refactor
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:24:36 +02:00
Joan Sanchez ce37f982c4 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:03:39 +02:00
Carlos Jimenez Ruiz 3432fab6af now shows only the itemType of available items
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 11:53:38 +02:00