Commit Graph

12689 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz 347c1ae197 Merge branch 'dev' into 2974-receipt_amountUnpaid
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:20:36 +00:00
Carlos Jimenez Ruiz b4d46f6876 Merge pull request '2847 - Driver route now shows item packaging type' (#671) from 2847-driver_route into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #671
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-01 08:19:56 +00:00
Joan Sanchez c2112f907e Removed bi from export
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 09:57:17 +02:00
Joan Sanchez d09ab13ba1 Replaced customer_risk with clientRisk 2021-07-01 09:56:22 +02:00
Joan Sanchez 2643d79781 Reformat rollback
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:41:04 +02:00
Joan Sanchez 9cd6728956 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2847-driver_route
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:35:17 +02:00
Joan Sanchez c8bfc911c2 2974 - Get amount unpaid from customer_risk
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:33:56 +02:00
Joan Sanchez 7e836e570f 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 16:10:26 +02:00
Joan Sanchez d30a3490fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 15:21:47 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz d946750113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 10:48:27 +02:00
Carlos Jimenez Ruiz 2469540f66 item category filter is now working again 2021-06-30 10:48:19 +02:00
Joan Sanchez 5d38488ac1 Merge pull request 'deprecated alertLevel.alertLevel now using alertLevel.id' (#682) from 2950-alertlevel_to_alertlevel_id into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #682
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-30 08:29:05 +00:00
Javi Gallego 9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-30 08:30:40 +02:00
Javi Gallego 9371c49922 cambios solicitados
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-30 08:26:03 +02:00
Joan Sanchez 33d03c8f21 Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 06:15:05 +00:00
Joan Sanchez 4b8d27a8be Merge pull request '2949-client_basicdata_businesstype' (#681) from 2949-client_basicdata_businesstype into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #681
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-30 06:11:53 +00:00
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz 15c7c0cb4b read acl set on the model
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 15:31:58 +02:00
Carlos Jimenez Ruiz a51494e784 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2949-client_basicdata_businesstype 2021-06-29 15:03:56 +02:00
Joan Sanchez c9f1f2ed2a Merge pull request '3002-backend_transactions' (#679) from 3002-backend_transactions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #679
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-29 11:01:19 +00:00
Carlos Jimenez Ruiz 01a9154015 Merge branch 'dev' into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:23:47 +00:00
Joan Sanchez 1d04cfad43 Merge pull request '2999-ticket_dms_import_from_existing + buyer to ticket.isEditable' (#678) from 2999-ticket_dms_import_from_existing into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #678
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-29 10:13:21 +00:00
Carlos Jimenez Ruiz d67e36212f added validation for the dms id field
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz f30cd1aeda added business type to client basic data
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:51:27 +02:00
Carlos Jimenez Ruiz f3193f0dc1 added businesType model and relation to client 2021-06-29 10:51:01 +02:00
Javi Gallego 59fac7edfa fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:33:01 +02:00