Commit Graph

10102 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 29f1f7e89e itemTaxCountry and item bonanical no longer use the bonanical prop 2021-07-19 14:46:18 +02:00
Joan Sanchez 63b502b368 Updated model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 13:01:06 +02:00
Joan Sanchez 97e9ac4044 Merge pull request 'last steps to preview credit request' (#692) from 1939-add_client_credit_report into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #692
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-19 10:33:18 +00:00
Joan Sanchez e9b6c6b63e 3026 - Send invoice PDF
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz 724da74204 removed footer unused bindings and added date
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:57:08 +02:00
Carlos Jimenez Ruiz 4ed31f5172 added footerr to report
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:42:12 +02:00
Carlos Jimenez Ruiz 9a2fe0260e last steps to preview credit request
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:16:15 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 13:41:29 +02:00
Joan Sanchez d46c9bbfa7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:37:46 +02:00
Carlos Jimenez Ruiz 559eaf5853 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:22:04 +02:00
Carlos Jimenez Ruiz 9f5df91be4 workers without active contract no longer set calendar and timeControl at fault 2021-07-14 11:21:29 +02:00
Joan Sanchez a5ea19b527 Merge pull request 'the absences are now fetched alongside the hours' (#689) from 3018-time_control_info into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #689
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-14 09:17:42 +00:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:14:53 +02:00
Joan Sanchez 675a48d8ad Merge branch 'dev' into 3018-time_control_info
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 08:36:09 +00:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 10:09:24 +02:00
Joan Sanchez 4eabba115f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-13 11:21:26 +02:00
Joan Sanchez c72cefe61e Merge pull request '3002-more_module_transactions' (#688) from 3002-more_module_transactions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #688
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-13 08:15:55 +00:00
Joan Sanchez ea78db1441 3012 - Hotfix: Get ticket list
gitea/salix/pipeline/head This commit looks good Details
2021-07-13 08:59:36 +02:00
Carlos Jimenez Ruiz 98a691c152 minor changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:00:20 +02:00
Carlos Jimenez Ruiz 1835171fe8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-more_module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 13:56:58 +02:00
Carlos Jimenez Ruiz 21e34de1dd item module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 12:54:59 +02:00
Carlos Jimenez Ruiz dd3473b93d small refactors correcting constants and adding transactions 2021-07-12 12:50:15 +02:00
Joan Sanchez c0d75e20d8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 08:32:11 +02:00
Joan Sanchez 878e989c02 HOTFIX: Disable address without a province
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 08:29:21 +02:00
Carlos Jimenez Ruiz 3b2b4e3819 client module changes for transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-08 15:53:30 +02:00
Carlos Jimenez Ruiz 10c7aa70d6 claim module transactions for filter, summary and isEditable 2021-07-05 12:00:49 +02:00
Joan Sanchez ae091a3b11 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:41:45 +02:00
Joan Sanchez 35e3c8ce65 HOTFIX: 3009 - Unlock report button
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:35:24 +02:00
Joan Sanchez 48730be203 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:12:37 +02:00
Joan Sanchez 057d138991 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2021-07-02 13:44:44 +02:00
Joan Sanchez 4849355c9b Changed limit value
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:22:37 +02:00
Joan Sanchez 9ad54b9622 HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:17:48 +02:00
Joan Sanchez eeb9a1861e HOTFIX: Added pagination 2021-07-02 13:10:46 +02:00
Joan Sanchez 249f5074df Show client id
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 10:57:17 +02:00
Joan Sanchez a29b1fbd8d Merge pull request '2967-zone_deliverydays_keep_search_on_url' (#687) from 2967-zone_deliverydays_keep_search_on_url into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #687
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-02 07:16:24 +00:00
Carlos Jimenez Ruiz d20b717c1b tested controller modifications accordingly
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 16:19:59 +02:00
Carlos Jimenez Ruiz 0c71b915ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2967-zone_deliverydays_keep_search_on_url 2021-07-01 15:04:45 +02:00
Carlos Jimenez Ruiz 74582f1498 Merge pull request '2983 - Invoice tickets from ticket index' (#685) from 2983-ticket_invoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #685
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-01 12:57:57 +00:00
Carlos Jimenez Ruiz 03b1ab0166 Merge branch 'dev' into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 12:30:54 +00:00
Joan Sanchez 3246101574 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 14:03:28 +02:00
Joan Sanchez cb354193c8 Merge pull request 'workers without active contract no longer set calendar and timeControl at fault' (#684) from 3003-worker_sections_without_contract_faults into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #684
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-01 11:50:44 +00:00
Joan Sanchez 319a168b89 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:43:13 +02:00
Joan Sanchez 92b6318c79 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:31:04 +02:00
Joan Sanchez 79f20a404d Merge branch 'dev' into 3003-worker_sections_without_contract_faults
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 11:18:15 +00:00
Joan Sanchez e61244d11b Merge pull request '3006-item_filter_category' (#683) from 3006-item_filter_category into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #683
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-01 11:16:47 +00:00
Carlos Jimenez Ruiz be850571d9 updated the field name
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:14:36 +02:00
Carlos Jimenez Ruiz 243636ccf6 item category name as category
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 12:34:30 +02:00
Carlos Jimenez Ruiz 8cf2b241cd route delivery days now gets params from url 2021-07-01 12:08:48 +02:00
Carlos Jimenez Ruiz 3ea2772e1e Merge branch 'dev' into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 09:54:57 +00:00
Carlos Jimenez Ruiz 8ef5c56a98 Merge pull request '2974 - Get amount unpaid from customer_risk' (#686) from 2974-receipt_amountUnpaid into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #686
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-01 08:59:31 +00:00