Commit Graph

1416 Commits

Author SHA1 Message Date
Joan Sanchez 7c7aba86a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-03 09:36:55 +01:00
Carlos Jimenez Ruiz 0d17336220 added salix.module to production dump (starred) 2021-03-02 16:43:33 +01:00
Joan Sanchez fed3657487 Export changes & backtest fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-02 14:59:02 +01:00
Carlos Jimenez Ruiz 97667595e5 removed unused ACL and fixed typos
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz 177ed24892 css amends and sql fixtures for production
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 09:58:17 +01:00
Carlos Jimenez Ruiz cd084a53e5 styling update + acls
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-01 16:13:47 +01:00
Carlos Jimenez Ruiz bebaef7879 sql changes moved to correct folder 2021-03-01 13:07:23 +01:00
Carlos Jimenez Ruiz 23cc4bbfeb starred modules working pre-e2e and css amends 2021-03-01 12:15:13 +01:00
Joan Sanchez 718021cff8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index 2021-03-01 11:49:31 +01:00
Carlos Jimenez Ruiz 3dff5f06ff starred modules front and backend 1st steps 2021-02-26 09:08:31 +01:00
Jorge Padawan 29ca6c52af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 12:32:26 +01:00
Jorge Padawan a2ad1887a4 ACL bug fixed + package lock updated
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 15:20:30 +01:00
Jorge Padawan 86580727e5 Requested changes resolved 2021-02-12 11:47:53 +01:00
Jorge Padawan 1634c81682 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 18:38:27 +01:00
Jorge Padawan a1ca8d90c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-02-11 16:07:04 +01:00
Joan Sanchez c270ec6207 Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-11 15:06:41 +01:00
Joan Sanchez 84c82ed32d 2595 - Added invoiceIn module
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 15:03:11 +01:00
Jorge Padawan 2cf37a9e96 Added permissions to role administrative
gitea/salix/pipeline/head This commit looks good Details
2021-02-10 09:10:15 +01:00
Joan Sanchez dcad6dc8c8 Merge branch 'dev' into 2725-ticket-create-crear-shimpent
gitea/salix/pipeline/head This commit looks good Details
2021-02-10 07:21:29 +00:00
Javi Gallego 3a3dae179c done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 07:58:11 +01:00
Carlos Jimenez Ruiz 83ed70abda Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 10:43:26 +01:00
Carlos Jimenez Ruiz 3d948ef317 warning color added lines with clientType loses 2021-02-09 10:43:19 +01:00
Joan Sanchez c092bf58b4 Import buys
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz a62bebd51e minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-08 10:14:41 +01:00
Carlos Jimenez Ruiz 76d6e2d4b7 worker added to supplier basic data and summary 2021-02-05 15:26:49 +01:00
Joan Sanchez ea1066d664 Added changes version 10281
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 14:08:12 +01:00
Joan Sanchez 4ac207c568 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 12:58:50 +01:00
Carlos Jimenez Ruiz 17c784e06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-02-01 09:52:42 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 09:29:47 +01:00
Joan Sanchez 3ec55426ae Removed params due a docker error
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 07:21:36 +01:00
Joan Sanchez 57c124b936 Updated config params
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 10:03:18 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +01:00
Joan Sanchez ca47fe6827 2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 12:23:18 +01:00
Bernat Exposito 01c96272bd export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 10:55:30 +01:00
Javi Gallego d61ab94398 acl conflicto
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:49:57 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 15:05:39 +00:00
Javi Gallego 93417e9676 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-22 14:45:02 +01:00
Javi Gallego e1711af265 sin keep
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:32:35 +01:00
Javi Gallego 228a642634 Merge branch 'dev' into 2479-factura-ticket 2021-01-22 14:31:28 +01:00
Javi Gallego 7bdfb36f25 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:30:46 +01:00
Carlos Jimenez Ruiz c4f673e089 relocated sql code
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 11:28:47 +01:00
Javi Gallego aab9797d3f Merge branch 'dev' into 2479-factura-ticket
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 13:40:55 +01:00
Javi Gallego 3dc50e8a16 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz 0cf3f198ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 11:50:32 +01:00
Carlos Jimenez Ruiz 90c6d2fe3e SQLs moved to current version folder
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 11:30:22 +01:00
Jorge Padawan 6acb5c221e Changes folder of ACL
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:55:21 +01:00
Carlos Jimenez Ruiz a53231c721 amends
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:44:43 +01:00
Carlos Jimenez Ruiz 42e7fa7047 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:25:39 +01:00
Joan Sanchez 5e4c320310 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 09:26:02 +01:00
Javi Gallego a6dfdc971a receipt_beforInsert
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:54:55 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:51:30 +01:00
Carlos Jimenez Ruiz ef3b48005e sql changes now in correct version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 09:23:58 +01:00
Carlos Jimenez Ruiz 843608c47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-20 09:17:55 +01:00
Joan Sanchez a67c8e4fbd Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:22:23 +01:00
Joan Sanchez 94b8fa7c4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-20 08:22:05 +01:00
Joan Sanchez 24982ba030 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:21:45 +01:00
Joan Sanchez ffb76e6cb5 Added new db version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:12:40 +01:00
Javi Gallego e47e5b9ec4 merged carpetas de cambios
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:32:47 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 10:20:45 +01:00
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Jorge Padawan daa8bafb09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-15 08:56:20 +01:00
Bernat Exposito 975e158ebb itemTag trigger 2021-01-13 08:17:41 +01:00
Jorge Padawan 4e1b9b911b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:05:35 +01:00
Javi Gallego 6acfe7f1cf minorBugs
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 17:18:37 +01:00
Javi Gallego d3b5300553 test
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 16:30:14 +01:00
Bernat Exposito 8b3af8851c fix trigger itemTag 2021-01-11 11:29:47 +01:00
Javi Gallego ea6e234cde minor fixes
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:01:57 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-08 16:45:20 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 15:24:05 +01:00
Bernat Exposito a2550ce128 export table payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:24:41 +01:00
Javi Gallego b5cd4e3c9f Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:44:13 +01:00
Javi Gallego 1884dc8789 fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:43:36 +01:00
Jorge Padawan 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +01:00
Bernat Exposito 779b229dfc refactor tag fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 12:11:14 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 09:11:34 +01:00
Bernat Exposito 6179921978 export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:37:56 +01:00
Javi Gallego 1291fc4b6c acl
gitea/salix/pipeline/head This commit looks good Details
2021-01-04 11:49:32 +01:00
Carlos Jimenez Ruiz e356dd9e5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-30 14:55:14 +01:00
Javi Gallego 0d5540b639 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 17:00:45 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 08:50:12 +01:00
Joan Sanchez f4ff31a294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log 2020-12-29 08:09:49 +01:00
Joan Sanchez 910caf5689 2661 - Added clone options
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 14:53:26 +01:00
Joan Sanchez c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-24 08:59:33 +00:00
Jorge Padawan 3517bdea41 Añadido a las foreignKeys el valor UNIQUE 2020-12-23 13:31:55 +01:00
Bernat Exposito a21476e3df fix searchbar index
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:42:41 +01:00
Jorge Padawan a19064cb1b Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays 2020-12-23 12:23:37 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 07:42:28 +01:00
Javi Gallego 340927799c Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 09:53:00 +01:00
Javi Gallego 3a6d62ac7d xdiario
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 09:52:27 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Bernat Exposito d1793351fb Merge pull request 'fixtures amended for calendar testing' (#484) from 2622-route_tickets_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #484
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-12-18 12:33:18 +00:00
Carlos Jimenez Ruiz 177d3cd35b fixtures amended for calendar testing
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 13:16:44 +01:00
Jorge Benedito 29ec268113 Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
2020-12-18 08:34:00 +00:00
Javi Gallego 87adbbfa3c Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 08:21:36 +01:00
Bernat Exposito 0b5a98c2fe export production
gitea/salix/pipeline/head This commit looks good Details
2020-12-17 15:17:03 +01:00
Jorge Padawan 33237dad86 Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good Details
2020-12-17 12:29:37 +01:00
Joan Sanchez 5ecd589106 Updated delivery note
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 09:24:11 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:33:08 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Bernat Exposito 6605e5ae4c zoneLog 2020-12-02 12:05:47 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Bernat Exposito 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Javi Gallego b23a441f31 fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 12:20:58 +01:00
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00
Joan Sanchez 8a3f5345f4 Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 13:54:47 +00:00
Joan Sanchez 359dcc904d Version merge
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 09:08:39 +01:00
Joan Sanchez 8194801308 Supplier cargo migration to vn
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 08:48:42 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Bernat Exposito 6fc14d569c Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 08:32:39 +00:00
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:22:12 +01:00
Juan Ferrer 4b46b0787b User syncronization fixes, improvements, refactor 2020-11-12 23:20:25 +01:00
Bernat Exposito 5be616ad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 08:04:38 +01:00
Bernat Exposito eb8931bca5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:57:37 +01:00
Joan Sanchez db4f226f6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:39:15 +01:00
Bernat Exposito 1e95f0105a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-11 10:52:46 +01:00
Bernat Exposito 75ffa108fb refactor back download 2020-11-11 10:52:35 +01:00
Joan Sanchez 08af948eb0 Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 12:39:17 +00:00
Bernat Exposito e4e4f37609 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-10 08:46:37 +01:00
Bernat Exposito 4ea5993dcc user image 2020-11-10 08:39:34 +01:00
Juan Ferrer 2628faa9d0 Sync hotfixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-06 22:55:47 +01:00
Carlos Jimenez Ruiz ead0994032 timeControlCalculate procedure updated
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 10:33:02 +01:00
Joan Sanchez 4c88a46b63 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor 2020-11-05 09:12:25 +01:00
Joan Sanchez a325ef2a78 2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 11:29:10 +01:00
Bernat Exposito 2dc51e6125 update acl
gitea/salix/pipeline/head This commit looks good Details
2020-11-03 09:34:50 +01:00
Bernat Exposito 61c3d2233b delete old sqls 2020-11-03 09:34:35 +01:00
Carlos Jimenez Ruiz d533e9da2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-03 09:22:07 +01:00
Bernat Exposito 8976034bb0 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-03 08:15:49 +01:00
Bernat Exposito f2ee122778 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production 2020-11-03 07:51:25 +01:00
Juan Ferrer fc957eda6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 19:58:45 +01:00
Juan Ferrer b3ab1fe059 Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 19:58:07 +01:00
Joan Sanchez 413283288f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 15:38:23 +01:00
Bernat Exposito b2d69127cb Merge branch 'dev' into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:31:36 +00:00
Joan Sanchez 15b7280222 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 14:31:39 +01:00
Joan Sanchez 590de622f5 Added model validations 2020-11-02 14:30:33 +01:00
Bernat Exposito d07e95a7e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:14:42 +01:00
Bernat Exposito e700f11863 acls 2020-11-02 11:14:21 +01:00
Bernat Exposito 7e2555ddf1 export production 2020-11-02 10:58:27 +01:00
Juan Ferrer b6da896fe7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-11-02 10:11:34 +01:00
Bernat Exposito d6c5e0ef0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 09:27:35 +01:00
Joan Sanchez 565bd013bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 08:32:46 +01:00
Juan Ferrer e25a978b19 Merge branch 'test' into dev 2020-11-01 00:03:05 +01:00
Juan Ferrer 9b4f8697b9 User sync fixes 2020-10-31 21:16:58 +01:00
Bernat Exposito 459f4068ab fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 11:05:16 +01:00
Juan Ferrer 15c39f93ca root id changed from 0 to 100 due to loopback join problems with id 0
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 01:10:32 +01:00
Juan Ferrer 9b563cb8bf LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:02:27 +01:00
Javi Gallego b50ae7b8ca testback arreglados
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 15:50:59 +01:00
Joan Sanchez 245b32a47f Added section
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-30 15:11:45 +01:00
Bernat Exposito 39de960b9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-10-30 10:23:47 +01:00
Bernat Exposito 7200aa3dfc fixtures and sql for supplierContact 2020-10-30 10:23:42 +01:00
Javi Gallego 59cbe276f4 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:08:38 +01:00
Javi Gallego 31b5a140d4 test completados 2020-10-30 10:07:53 +01:00
Javi Gallego 3fdc9c315d Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:40:47 +01:00
Bernat Exposito ea8d9e70b0 supplier log
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:27:02 +01:00
Bernat Exposito 792b689b58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log 2020-10-29 13:40:21 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech 77bc1b562e create section supplier log
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 09:08:27 +01:00
Joan Sanchez 3675f7ed34 2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good Details
2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech 1699e0619c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2020-10-26 08:43:20 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech fe2f12cd8f first test step 2020-10-22 09:35:11 +02:00
Javi Gallego 7dfe7ee379 Merge branch 'dev' into 2510-client-address-create-test 2020-10-21 12:35:09 +02:00
Joan Sanchez 5daee49382 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 11:52:02 +02:00
Javi Gallego ef7a886d86 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 10:13:04 +02:00
Joan Sanchez f7e9372bf0 2525 - Change to past date 2020-10-20 15:12:00 +02:00
Javi Gallego 4aea284703 WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 14:42:23 +02:00
Bernat Exposito Domenech 7eed2ddd59 export structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 12:47:37 +02:00
Carlos Jimenez Ruiz cc99c1e980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation 2020-10-16 13:04:58 +02:00
Bernat Exposito 0fbbe9b2ae Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-10-15 07:57:57 +00:00
Bernat Exposito Domenech cc35998f62 new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 08:15:04 +02:00
Joan Sanchez 6fa8aae161 2509 - Added forms to create new locations
gitea/salix/pipeline/head This commit looks good Details
2020-10-14 11:33:42 +02:00
Joan Sanchez e48effca08 Stop container before remove
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 12:28:58 +02:00
Joan Sanchez f00828cf57 Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 05:44:11 +00:00
Javi Gallego 77064d85a0 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 12:54:02 +00:00
Javi Gallego 531bb6da25 quito copy
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 13:22:56 +02:00
Joan Sanchez 86025b88e3 Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 09:36:02 +00:00
Joan Sanchez cef2dc982f Updated sql
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 10:47:12 +02:00
Joan Sanchez ad11a92c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar 2020-10-05 10:02:44 +02:00
Joan Sanchez cdde4d95d7 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 07:53:03 +02:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Javi Gallego 8d1709ea51 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:46:33 +02:00
Javi Gallego 78e22df177 test e2e de expense ok
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:45:28 +02:00
Juan Ferrer 6d8b13423f SQL hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 10:02:19 +02:00
Javi Gallego 2714857227 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 14:07:38 +02:00
Juan Ferrer 611aa9cafa SQL hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 10:55:04 +02:00
Joan Sanchez ec2385cd15 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 06:53:14 +00:00
Bernat Exposito Domenech 5f9ef3aea3 export structure db
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 07:37:29 +02:00
Juan Ferrer 991bece64a SQL fixes
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 21:25:53 +02:00
Juan Ferrer 82de0a30a4 Merge branch 'dev' into 2381-mariaDB 2020-09-28 10:41:16 +02:00
Juan Ferrer 5264b615d4 Optimización docker salix-db 2020-09-28 10:40:50 +02:00
Joan Sanchez 0438171a47 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech 790c9bfe6f update models and fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 14:50:04 +02:00
Javi Gallego c909470f41 merge
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 08:10:37 +02:00
Joan Sanchez de3c7acb08 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 12:30:44 +00:00
Joan Sanchez 164f636f3f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 09:02:16 +02:00
Joan Sanchez 44e23ca560 Removed sql version
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 09:00:42 +02:00
Bernat Exposito Domenech ca41b93995 mail models and fix checkInbox 2020-09-23 08:09:06 +02:00
Bernat Exposito Domenech d4c819ebf7 new models and fixtures 2020-09-23 07:59:10 +02:00
Bernat Exposito Domenech ce1c4e6f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-22 14:00:52 +02:00
Bernat Exposito Domenech 06f03c6b84 mail models and fix checkInbox 2020-09-22 13:59:00 +02:00
Juan Ferrer 81de97c071 Merge branch 'dev' into 2381-mariaDB 2020-09-21 18:33:28 +02:00
Juan Ferrer 9528fe0a19 Merge branch 'dev' into 2381-mariaDB 2020-09-21 17:47:55 +02:00
Juan Ferrer 5e056c315f Tests fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 17:46:40 +02:00
Juan Ferrer 1c621cff85 Fixtures fixes 2020-09-21 16:43:17 +02:00
Juan Ferrer 3880e21ce3 Test fixes 2020-09-21 16:09:34 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Juan Ferrer b9c526c29c LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 13:24:43 +02:00
Javi Gallego 8fb674819a ticket service
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 10:35:39 +02:00
Carlos Jimenez Ruiz f50f4514fd fixtures enhanced for tags
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 11:11:18 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:14:13 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:51:58 +02:00
Juan Ferrer 61f3f82117 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:39:02 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz 270e665291 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color 2020-09-10 14:38:48 +02:00
Bernat Exposito Domenech 0cf99a5a83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech 87fab5f57c delete duplicated fixtures 2020-09-10 11:34:32 +02:00
Bernat Exposito Domenech 4f50106e92 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech fb3f01151c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 13:49:03 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech ed926c39a1 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 11:27:00 +02:00
Bernat Exposito Domenech d90fb3444c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-08 08:30:00 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Joan Sanchez 3efe14fc53 Removed unused vars
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 12:52:27 +02:00
Joan Sanchez ee52581a06 Updated param description 2020-09-07 12:52:21 +02:00
Joan Sanchez 8faddef7e8 Renamed sql file 2020-09-07 12:52:13 +02:00
Joan Sanchez 812847d82e Changed sql folder 2020-09-07 12:52:06 +02:00
Joan Sanchez e6804f6ee3 Removed procedures 2020-09-07 12:51:58 +02:00
Joan Sanchez c3e8c0cc58 Changes 2020-09-07 12:51:49 +02:00
Joan Sanchez fa634d2dad 2285 - Added closure paths 2020-09-07 12:51:38 +02:00
Joan Sanchez bb092b1de9 Removed unused vars
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 12:16:20 +02:00
Joan Sanchez c10e24b7cd Updated param description
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 11:50:23 +02:00
Joan Sanchez 173aac0ba6 Renamed sql file
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 11:45:54 +02:00
Joan Sanchez 13b3353e9a Changed sql folder
gitea/salix/pipeline/head Build queued... Details
2020-09-07 11:45:29 +02:00
Joan Sanchez 7b42497f88 Removed procedures
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 11:44:44 +02:00
Joan Sanchez f3a7fc514a Changes
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 10:54:39 +02:00
Joan Sanchez 66f4674392 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure 2020-09-07 10:05:52 +02:00
Joan Sanchez 52cbcf1fa3 Updated description
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:34:04 +02:00
Carlos Jimenez Ruiz c3c7ef901a version pre-hex in vn.ink table
gitea/salix/pipeline/head This commit looks good Details
2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz c796132e77 e2e + fixtures amended + refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 15:20:28 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Joan Sanchez cb4fe1f610 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:37:48 +00:00
Joan Sanchez 5a16a10b8f Merge branch 'dev' into 2409-last_entries_contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:55:13 +00:00
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
Joan Sanchez 8ae7871318 Removed procedure
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:56:56 +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
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 c70ad808a0 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz d156ca95ba front and back unit tests 2020-08-27 15:14:30 +02: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 4d8a84e774 Fixed back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 08:45:03 +02:00
Joan Sanchez 7fdfd92a1c Removed sql
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:13:16 +02:00
Joan Sanchez f0818acf32 2387 - Fixed error when deleting a zone
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:04:12 +02:00
Carlos Jimenez Ruiz 3a723a2e3d zone descriptor e2e
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 15:35:50 +02:00
Bernat Exposito Domenech 0d689a8c01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 10:43:25 +02:00
Bernat Exposito Domenech 689245c27d fix test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech f180b73656 delete deprecated sql
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech 1e56619c33 export structure and fix test 2020-08-12 13:07:58 +02:00
Bernat Exposito Domenech 96af9bdcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 11:12:52 +02:00
Bernat Exposito Domenech 9a4e20bb31 new models and fixtures 2020-08-11 11:03:43 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +02:00
Juan Ferrer bbc5193970 #2381 First working version
gitea/salix/pipeline/head This commit looks good Details
2020-08-07 14:35:20 +02:00
Carlos Jimenez Ruiz 9402f368f6 ticket index and zone descriptor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 12:51:19 +02:00
Joan Sanchez 0348b79f0d Merge branch 'dev' into 1880-refactor_loggable
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:03:22 +00:00
Bernat Exposito Domenech 8c926a1a7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable 2020-07-16 13:20:41 +02:00
Joan Sanchez cfceaa531e Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:18:22 +00:00
Joan Sanchez 171deeb82c Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:12:34 +00:00
Joan Sanchez fa43c2ea2f Merge branch 'dev' into 2369-export_db
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 10:45:15 +00:00
Bernat Exposito Domenech 064b950773 export production
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Bernat Exposito Domenech 02c82f894a fix e2e errors 2020-07-09 14:14:11 +02:00
Bernat Exposito Domenech 7d6ac265b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index 2020-07-09 08:17:03 +02:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00
Joan Sánchez dd8e03dd0f Added absence selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 14:29:57 +02:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good Details
2020-07-07 06:19:12 +00:00
Bernat Exposito Domenech 122dacffb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech c42c6c19d6 changes in order index
gitea/salix/pipeline/head This commit looks good Details
2020-07-02 07:46:55 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 11:57:16 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech ea1eb16060 export structure
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 07:32:08 +02:00
Joan Sanchez beb1dd4973 absenceType fixture
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-27 12:16:56 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-25 17:12:53 +02:00
Joan Sanchez b46cc20511 Min TLS v1.0
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 14:03:14 +02:00
Joan Sanchez dd7e6e5716 2300 - WaitForHealthy
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:27:17 +02:00
Joan Sanchez 5d9ed49451 2285 - Added closure paths
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:17:01 +02:00
Joan Sanchez ed83fd5f73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption 2020-06-15 09:00:24 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Carlos Jimenez Ruiz d4f1a90f87 ip botained for ci and localhost
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:55 +02:00
Carlos Jimenez Ruiz 477b1c8e1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker 2020-06-11 10:13:54 +02:00
Javi Gallego b40be5cca9 2035
gitea/salix/pipeline/head Build queued... Details
2020-06-05 10:01:21 +02:00
Carlos Jimenez Ruiz 3ea3f707bc gulpfile refactor and removed unused code
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-04 21:09:06 +02:00
Joan Sanchez 0637302a0b Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 09:49:13 +02:00
Bernat Exposito Domenech b3eba1c75a fix dbtest and export production
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 13:53:54 +02:00
Joan Sanchez 751f79373a Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:28:14 +00:00
Bernat Exposito Domenech 546272cc3f zone delete
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 08:59:04 +02:00
Carlos Jimenez Ruiz 9deb518064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:55:05 +02:00
Carlos Jimenez Ruiz 9bf509cd5d customs agent e2e path + small fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:54:31 +02:00
Joan Sanchez 5c3e8e9465 Added insert ignore
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 08:09:12 +02:00
Joan Sanchez a3e7771295 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix 2020-05-28 08:08:00 +02:00
Carlos Jimenez Ruiz 2345a922c8 now we can create thermographs for travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 13:11:41 +02:00
Bernat Exposito Domenech 89ce963a4c update db
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 08:35:24 +02:00
Joan Sanchez d24f04912e 2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures Details
2020-05-26 14:37:34 +02:00
Bernat Exposito Domenech 41bf237289 dbtest zone_getEvent 2020-05-26 12:07:52 +02:00
Bernat Exposito 26930c5091 Merge pull request 'test ticket_makecomponentupdate' (#277) from 2229-dbtest_ticket_componentMakeUpdate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-26 08:46:54 +00:00
Bernat Exposito Domenech 9e85e8187c skipped
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:58:08 +02:00
Bernat Exposito Domenech a77467fb0e skip test
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:53:30 +02:00
Bernat Exposito Domenech 1de6b2bd77 test ticket_makecomponentupdate
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:28:41 +02:00
Bernat Exposito Domenech 8c2f57e380 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech 52241e6f2c update itemLastENtries 2020-05-21 15:26:00 +02:00
Joan Sanchez ce43c1f2d9 Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-21 12:27:14 +00:00
Joan Sanchez 80a5200281 Unified sql
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 17:03:29 +02:00
Bernat Exposito Domenech d4dd5eae0c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 14:06:51 +02:00
Bernat Exposito Domenech 8ca12d9fdd fix bugs in travel summary 2020-05-20 13:19:02 +02:00
Bernat Exposito Domenech bf9ebe21b6 comment test skipped
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 10:38:11 +02:00
Bernat Exposito Domenech 84f804eaf4 skip dbTest until the procedure works fine
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 14:42:32 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego a7e6e3d4b7 cr juan
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:46:42 +02:00
Bernat Exposito 5f8a2a24f5 Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-05-19 06:42:07 +00:00
Joan Sanchez af0d0f1fbe Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:18:23 +00:00
Joan Sanchez 4aea769797 2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 13:46:45 +02:00
Joan Sanchez 53b55468fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 11:45:43 +02:00
Bernat Exposito Domenech 37d5cf5975 delete old db changes
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 10:29:57 +02:00
Joan Sanchez 42bec3a944 1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 14:47:19 +02:00
Bernat Exposito Domenech 5ceb26c6da update structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 13:11:23 +02:00
Javi Gallego 3815edfbea falta CR
gitea/salix/pipeline/head This commit has test failures Details
2020-05-15 12:17:34 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Juan Ferrer 58be5ef78e Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 10:16:31 +00:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Javi Gallego ceb3d1f4cf all filters tested 2020-04-30 07:20:43 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good Details
2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Joan Sanchez 2ad14230b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz
gitea/salix/pipeline/head This commit looks good Details
2020-04-17 14:22:46 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 12:33:36 +02:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Ainki 42f3bfb86d test, fitxures and changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-30 14:28:29 +02:00
Javi Gallego 729daf8b34 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:16:47 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:22:00 +01:00
Joan Sanchez d4ca58edad Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:10:30 +01:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:41:40 +01:00
Joan Sanchez f231fabef1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 16:14:13 +01:00
Bernat Exposito 77e8bbc2ce Merge branch '2182_worker_log' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 07:53:23 +00:00
Javi Gallego 0561f19313 version 1
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:32:30 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 12:20:53 +01:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 23:57:11 +01:00
Joan Sanchez 27b1376799 changes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 11:21:25 +01:00
Javi Gallego 7fe9c7babc getWarehouse
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 11:36:14 +01:00
Bernat Exposito Domenech a19a0578e9 structure DB
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 10:25:49 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-06 11:19:26 +00:00
Bernat Exposito Domenech ead7a20ecd traductions
gitea/salix/pipeline/head This commit has test failures Details
2020-03-06 11:47:14 +01:00
Bernat Exposito Domenech 0f8d199d2f workerTimeControlCheck dbTest fix
gitea/salix/pipeline/head This commit has test failures Details
2020-03-06 07:14:40 +01:00
Bernat Exposito Domenech 85ac133d00 update db test 2020-03-05 15:01:03 +01:00
Bernat Exposito Domenech 63faeab909 fix db test 2020-03-05 14:06:55 +01:00
Bernat Exposito Domenech f3e4bc7aeb workerTImeControlCheck test
gitea/salix/pipeline/head This commit has test failures Details
2020-03-05 10:50:07 +01:00
Carlos Jimenez Ruiz 0f3ceea653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 15:13:03 +01:00
Carlos Jimenez Ruiz 0179461cb3 timeBusiness and timeControl db tests 2020-03-04 15:12:36 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-04 12:15:41 +00:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:26:12 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Bernat Exposito Domenech 686382a0e6 entryLog section 2020-03-02 11:57:09 +01:00
Joan Sanchez 04917f980f Updated E2E
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech 5e86f67b37 dbtest workerTimeControCheck 2020-03-02 08:18:41 +01:00
Joan Sanchez 28553a1c0d Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 07:50:07 +01:00
Joan Sanchez 8a4e2620c2 Changed sprint
gitea/salix/dev This commit looks good Details
2020-02-27 07:55:21 +01:00
Joan Sanchez 886bc45525 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-02-27 07:54:22 +01:00
Joan Sanchez a063722fbe Changed SQL sprint
gitea/salix/test There was a failure building this commit Details
2020-02-27 07:53:38 +01:00
Joan Sanchez 21be73b734 2127 - Disable preview on sepa core sample 2020-02-27 07:40:43 +01:00
Joan Sanchez d66c53dbf2 2127 - Disable preview on sepa core sample
gitea/salix/2127-sample_disable_preview There was a failure building this commit Details
2020-02-26 14:30:30 +01:00
Carlos Jimenez Ruiz 0bf0ed78ee Merge branch '2056-entry_descriptor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-25 10:49:40 +00:00
Joan Sanchez 70b0143f0a Renamed sql version
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-25 08:53:09 +01:00
Joan Sanchez 447cdc686e 2138 - Added field m3Max to zoneEvent 2020-02-25 08:08:13 +01:00
Bernat Exposito Domenech 79fca8b70b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-24 09:25:39 +01:00
Joan Sanchez 224241a954 Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 08:02:51 +00:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Javi Gallego 4d389176fe Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-21 08:50:50 +01:00
Javi Gallego a8137c8a6b zoneClosure 3
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-20 15:15:50 +01:00
Joan Sanchez 54bc1bc281 Merge branch '1835-e2e-item-request' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-20 10:10:18 +00:00
Joan Sanchez 64e4593156 Renamed version number
gitea/salix/dev This commit looks good Details
2020-02-20 10:46:43 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech aecfe2b8a9 report entry-order 2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez 61b3ce184c Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 06:32:17 +00:00
Joan Sanchez fe8a0b4583 Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-18 07:21:35 +01:00
Joan Sanchez a9b8fab51d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit Details
2020-02-17 14:55:26 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 12:47:03 +01:00
Javi Gallego 03f0a415f9 zoneClosure fase 2
gitea/salix/test This commit looks good Details
2020-02-17 12:01:11 +01:00
Bernat Exposito Domenech b78858eb7c export structure db
gitea/salix/2105-export_structure_db This commit looks good Details
2020-02-13 09:30:18 +01:00
Bernat Exposito Domenech 1887cc8c60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db 2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech 4b48a89eaa ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good Details
2020-02-13 08:31:29 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz 2a7f826cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary
gitea/salix/2006-e2e-route-summary This commit looks good Details
2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good Details
2020-02-12 10:39:46 +01:00
Joan Sanchez f2fdce11cd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 14:54:59 +01:00
Bernat Exposito Domenech dd368a8c3f refactor ticket.basicData steps
gitea/salix/2041-ticket_datos_basico This commit looks good Details
2020-02-07 13:38:32 +01:00
Javi Gallego 5d0f72af4e zoneDoCalc
gitea/salix/test This commit looks good Details
2020-02-06 16:04:23 +01:00
Joan Sanchez 1be640a59d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-29 14:51:37 +01:00
Joan Sanchez c174d0a29e acl fix
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:50:53 +01:00
Joan Sanchez a6d94737af changed version
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 13:15:24 +01:00
Joan Sanchez a078898627 Merge branch '2049-hotfix_percentage' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2020-01-29 10:29:35 +00:00
Bernat Exposito Domenech 58717a7c46 fix order e2e
gitea/salix/2050-order_lines_e2e This commit looks good Details
2020-01-28 11:59:36 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData
gitea/salix/2022-update_model_zone This commit looks good Details
2020-01-27 09:45:13 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-23 14:59:37 +01:00
Bernat Exposito Domenech 937ddd7880 fix table componentType
gitea/salix/2014-remove_bi_from_db This commit has test failures Details
2020-01-23 13:53:39 +01:00
Bernat Exposito Domenech cf130b800a fix db test
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 13:01:29 +01:00
Bernat Exposito Domenech 6700daf0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito 6c0cc3d204 Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-23 10:00:58 +00:00
Bernat Exposito Domenech 2790cc8057 update structure
gitea/salix/2012-2013_update_structure_bi This commit looks good Details
2020-01-22 14:34:45 +01:00
Javi Gallego 5bd31eb082 zoneClosure
gitea/salix/master This commit looks good Details
2020-01-22 10:41:09 +01:00
Bernat Exposito Domenech 0b848adf03 fix back test
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-22 09:43:10 +01:00
Joan Sanchez 77f6333aba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-21 12:23:10 +01:00
Joan Sanchez f0b4c26aea added travel thermograph create & remove methods
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 12:21:53 +01:00
Joan Sanchez 20b4f6ec74 updated tests
gitea/salix/dev This commit looks good Details
2020-01-21 09:33:26 +01:00
Joan Sanchez 5e4ab8b128 Loggable errors
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 09:00:42 +01:00
Joan Sanchez 41e69a2e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-20 13:05:06 +01:00
Joan Sanchez 3ff1fb7d2d Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good Details
2020-01-20 11:59:15 +01:00
Joan Sanchez 3226081081 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2015-chat_sendCheckingPresence 2020-01-20 11:46:57 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 59d0ecca67 send message to worker or channel
gitea/salix/2015-chat_sendCheckingPresence This commit has test failures Details
2020-01-20 07:33:24 +01:00
Joan Sanchez 826dfe8092 changes to percentage filter
gitea/salix/master This commit looks good Details
2020-01-17 11:46:45 +01:00
Joan Sanchez 3a4c379033 Added waste section 2020-01-17 11:44:05 +01:00
Joan Sanchez 4002b51565 added section
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-17 08:43:10 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor
gitea/salix/2011-client_phone This commit looks good Details
2020-01-17 07:24:57 +01:00
Joan Sanchez 3cba6f0293 Translated family names
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 14:35:40 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech 1307f6c5fb update structure
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:43:38 +01:00
Joan Sanchez 708789502d Added waste section
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:07:33 +01:00
Bernat Exposito Domenech 1f60aac446 export structure db
gitea/salix/1999-travel_basicData This commit looks good Details
2020-01-15 08:19:22 +01:00
Bernat Exposito Domenech 6c4e25bfe3 create entry.index
gitea/salix/1990-create_entry_section This commit looks good Details
2020-01-10 11:52:35 +01:00
Carlos Jimenez Ruiz 83d2ec40d4 Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech d432c32577 export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good Details
2020-01-09 10:49:09 +01:00
Joan Sanchez 5a7bd4e18f filters refactor
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-08 12:27:18 +01:00
Bernat Exposito Domenech 730b8e160f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data 2020-01-07 08:30:55 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good Details
2020-01-03 08:43:03 +01:00
Joan Sanchez a5eb8e5315 extended worker contract ranges & fixed invoice
gitea/salix/dev There was a failure building this commit Details
2020-01-02 11:10:26 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good Details
2019-12-31 14:01:05 +01:00
Joan Sanchez 417642ac9e updated UserPhone acl
gitea/salix/dev This commit looks good Details
2019-12-31 11:07:46 +01:00
Joan Sanchez 0ece53a35e Send chat message with user avatar
gitea/salix/1958-send_chat_with_avatar This commit looks good Details
2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good Details
2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good Details
2019-12-20 13:51:04 +01:00
Joan Sanchez 472352e24c Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 10:05:38 +00:00
Joan Sanchez 72d591e143 sql changes
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:59:17 +01:00
Joan Sanchez b9415c0335 updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:40:12 +01:00
Joan Sanchez 61b9646f5b Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit Details
2019-12-19 14:55:09 +01:00
Joan Sanchez a1c6c0ab39 claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-19 11:37:53 +01:00
Bernat Exposito Domenech aab970e667 client.phone section
gitea/salix/1928-client_phone This commit looks good Details
2019-12-17 09:11:28 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech c1db827889 update structure db
gitea/salix/1930-turn_view_in_tables This commit looks good Details
2019-12-16 11:33:10 +01:00
Bernat Exposito Domenech e4c17492f0 update structure
gitea/salix/1926-delete_bs This commit looks good Details
2019-12-16 09:22:59 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one
gitea/salix/1926-delete_bs This commit has test failures Details
2019-12-16 08:48:12 +01:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good Details
2019-12-13 09:06:39 +01:00
Bernat Exposito c65364cda4 Merge branch '1907manaSpellers' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 07:57:36 +00:00
Bernat Exposito Domenech dd86961542 update structure
gitea/salix/1907manaSpellers This commit looks good Details
2019-12-13 08:46:40 +01:00
Javi Gallego 44304e993a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good Details
2019-12-13 08:19:22 +01:00
Bernat Exposito 6d1bd7575d Merge branch '1925excludeTables' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 06:17:03 +00:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech e8c216799c update estructure
gitea/salix/1925excludeTables This commit looks good Details
2019-12-12 14:28:58 +01:00
Javi Gallego ec081e6a3a campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good Details
2019-12-12 13:53:54 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good Details
2019-12-12 09:46:29 +01:00
Bernat Exposito Domenech 126a02c1b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1707route.ticket 2019-12-12 09:11:45 +01:00
Juan Ferrer 3428dfa6e0 Migration complete & test 2019-12-11 15:01:01 +01:00
Bernat Exposito Domenech d0a2f4627b 1707 route.ticket sistema tablas que soporte dirección salida para warehouses
gitea/salix/1707route.ticket This commit looks good Details
2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech 2cc9c5e951 create section travel create
gitea/salix/1900travelCreate This commit looks good Details
2019-12-09 12:15:19 +01:00
Bernat Exposito Domenech f6eabc81da add models and update structure db
gitea/salix/1834createTravelModels This commit looks good Details
2019-12-05 14:20:11 +01:00
Bernat 261b9686a0 update procedures db 2019-12-04 11:10:24 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Bernat 8f4e44aa37 update procedures db
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-27 13:37:36 +01:00
Bernat dcdd4473b1 fix structure db
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-27 11:57:09 +01:00
Bernat 89e127f0ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-26 14:26:50 +01:00
Bernat 18b5342609 update fixtures and structure db 2019-11-26 14:15:43 +01:00
Bernat Exposito a4a48e76a4 Merge branch '1762-worker_dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-25 08:33:04 +00:00
Joan Sanchez f9dba9489f updated tests
gitea/salix/1762-worker_dms This commit looks good Details
2019-11-25 09:17:24 +01:00
Bernat 5040d1d4a8 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-22 14:34:28 +01:00
Joan Sanchez a077dd5165 test unitario
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 14:34:20 +01:00
Bernat Exposito 6a153bd69d Merge branch 'timeControl_calculate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-22 09:55:31 +00:00
Bernat 1ce0c63bf2 1711Eliminar_referencias_vn2008
gitea/salix/1711Eliminar_referencias_vn2008 This commit looks good Details
2019-11-22 08:23:31 +01:00
Carlos Jimenez Ruiz dca7dd5fc7 rejected last modifications
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:51:11 +01:00
Carlos Jimenez Ruiz 33e9cf9816 Javi validation
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:39:09 +01:00
Carlos Jimenez Ruiz a45ca84e7f workerTimeControlCalculate procedure refactor
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:23:22 +01:00
Bernat 038ba3edb2 1711 update structure db 2019-11-21 13:18:30 +01:00
Carlos Jimenez Ruiz f4a62dfa86 Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 11:30:00 +00:00
Juan Ferrer 30ac174b1e SQL grouping quoted
gitea/salix/dev This commit looks good Details
2019-11-21 12:01:21 +01:00
Joan Sanchez fd72f206bc Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 12:00:56 +01:00
Carlos Jimenez Ruiz 8202a6f419 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
gitea/salix/1891-worker_time_control_tests This commit looks good Details
2019-11-21 11:17:17 +01:00
Joan Sanchez 56a73f152e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 09:33:10 +01:00
Joan Sanchez 5f28d39bbf dynamic header & footer texts by company #1336 2019-11-21 09:33:08 +01:00
Carlos Jimenez Ruiz c04640bd62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests 2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz 52a8d5e0c2 #1891 tests for worker time control function 2019-11-21 09:19:03 +01:00
Bernat 0473f1de82 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-21 09:09:17 +01:00
Bernat 525e115781 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-21 07:24:31 +01:00
Bernat a1784470cc update scheme db 2019-11-20 12:42:10 +01:00
Joan Sanchez 37618efb58 changed userPhone fkeys
gitea/salix/dev This commit has test failures Details
2019-11-20 11:37:13 +01:00
Joan Sanchez 5bb7f7f14a deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures Details
2019-11-20 11:14:11 +01:00
Bernat 2bfa0873a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-19 13:49:24 +01:00
Juan Ferrer c47f3137c1 Delivery days fixes
gitea/salix/dev This commit looks good Details
2019-11-19 13:49:10 +01:00
Bernat 20088c6712 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-19 13:40:50 +01:00
Bernat ee3a83ac0a update structure and fixtures 2019-11-19 13:40:29 +01:00
Joan Sanchez e499d44018 dont use payMethodId on view #1854
gitea/salix/dev This commit looks good Details
2019-11-19 12:53:25 +01:00
Bernat b608273510 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-19 12:51:11 +01:00
Bernat 99585b9cc9 fix fixtures 2019-11-19 12:50:50 +01:00
Joan Sanchez 3d90e80c82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-19 11:53:04 +01:00
Joan Sanchez f9deb9f52d send closure error by email 2019-11-19 11:53:01 +01:00
Bernat 12825f0503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-11-19 11:43:00 +01:00
Bernat 0b58b5d09a update fixtures tblContadores 2019-11-19 11:40:46 +01:00
Carlos Jimenez Ruiz e74cb52867 Merge branch '1391-ticket_closure' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
LGTM
2019-11-19 07:02:12 +00:00
Joan Sanchez 06e4cbb783 renamed view atenderFk to
gitea/salix/dev This commit looks good Details
2019-11-19 07:41:02 +01:00
Carlos Jimenez Ruiz f5aacc804d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-18 16:46:51 +01:00
Juan Ferrer bdb03729b7 zone_getOptionsForShipment fixes
gitea/salix/dev This commit looks good Details
2019-11-18 16:36:08 +01:00
Carlos Jimenez Ruiz 04b4f60c48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 16:35:21 +01:00
Juan Ferrer 4d4e4f31f4 vnZoneEvents refactor
gitea/salix/dev This commit looks good Details
2019-11-18 16:31:37 +01:00
Joan Sanchez 8643030bf0 restructure router methods, added closure method
gitea/salix/1391-ticket_closure This commit looks good Details
2019-11-18 15:04:51 +01:00
Javi Gallego 60cdc1114c #1602 back confirm.js
gitea/salix/dev There was a failure building this commit Details
2019-11-18 14:48:37 +01:00
Carlos Jimenez Ruiz 3c2ad2df48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 12:35:30 +01:00
Javi Gallego 4b51d607f7 error getLanded con drop temporary table
gitea/salix/dev This commit looks good Details
2019-11-15 15:42:00 +01:00
Carlos Jimenez Ruiz d1b114de59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-15 10:37:42 +01:00
Joan Sanchez ddb19cb198 added event
gitea/salix/dev This commit looks good Details
2019-11-15 10:03:46 +01:00
Juan Ferrer 64124376f0 Final fixes 2019-11-14 14:37:18 +01:00
Carlos Jimenez Ruiz 8629b72d55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-14 14:22:22 +01:00
Carlos Jimenez Ruiz 34bd35ce4e #1852 worker.time-control 2019-11-14 14:20:05 +01:00
Javi Gallego 1301ea5962 test buyUltimateFromInterval arreglado 2019-11-14 13:40:53 +01:00
Javi Gallego 5da4722bdd No borra warehouse de zone 2019-11-14 10:36:21 +01:00
Joan Sanchez e0ed9072c9 unified LCR and CORE #1868
gitea/salix/dev This commit looks good Details
2019-11-14 08:16:52 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good Details
2019-11-13 13:22:39 +01:00
Bernat a3159f7dbd dumped data updated
gitea/salix/dev This commit looks good Details
2019-11-13 10:41:14 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-13 08:09:54 +01:00
Joan Sanchez c3962c3d78 updated test
gitea/salix/dev This commit looks good Details
2019-11-12 15:07:37 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-11-12 11:13:20 +01:00
Bernat e8862b5b56 fix sql userPhone
gitea/salix/dev This commit looks good Details
2019-11-12 08:52:09 +01:00
Joan Sanchez 6cedfceddd Show ticket state #1836
gitea/salix/dev This commit looks good Details
2019-11-11 13:51:30 +01:00
Joan Sanchez 963ac3ad77 dumpedfixtures rollback
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 11:56:13 +01:00
Joan Sanchez 6f7962935d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-11 11:24:26 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +01:00
Javi Gallego bd630aa562 ticketCalculateClon
gitea/salix/dev This commit looks good Details
2019-11-07 11:12:05 +01:00
Javi Gallego eaa2ef4570 zone warehouse error
gitea/salix/dev This commit looks good Details
2019-11-07 07:49:37 +01:00
Javi Gallego 729f6cb767 changes to zone
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-06 13:44:58 +01:00
Joan Sanchez 114e8c87d6 export sample table
gitea/salix/1466-print_refactor This commit has test failures Details
2019-11-06 10:56:18 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 10:55:04 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good Details
2019-10-31 12:54:16 +01:00
Javi Gallego 763f8f53f8 fixtures y algunos test de zone
gitea/salix/dev This commit has test failures Details
2019-10-30 18:33:08 +01:00
Javi Gallego 700c092b90 merge 2019-10-29 12:58:26 +01:00
Javi Gallego 1a56f0af96 zoneRefactor 2019-10-29 12:29:38 +01:00
Bernat cb90e86f64 #1846 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-10-29 11:28:35 +01:00
Bernat 9fd0ab0bd3 #1775 travel.log crear sección historial 2019-10-25 13:28:12 +02:00
Bernat eb384425f2 #1777 travel.descriptor
gitea/salix/dev This commit looks good Details
2019-10-24 14:43:11 +02:00
Bernat afd7c5684a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good Details
2019-10-24 12:49:23 +02:00
Bernat 7bdb497976 #1773 travel.summary & #1774 2019-10-24 12:49:18 +02:00
Carlos Jimenez Ruiz c84625b0d5 #1713 route.tickets boton mas bajo derecha
gitea/salix/dev This commit looks good Details
2019-10-23 09:25:28 +02:00
Bernat 939c507fba #1810 El método listPackaging filtrar por isPackagingReturnable 2019-10-21 09:16:52 +02:00
Bernat 6adeb689eb Tarea #1814 refactor fixtures userPhone
gitea/salix/dev This commit looks good Details
2019-10-21 08:52:42 +02:00
Bernat 1cedd6cbfd merge 2019-10-18 08:38:25 +02:00
Bernat 7a89ab5335 #1778 Refactor worker.phone 2019-10-18 08:36:33 +02:00
Carlos Jimenez Ruiz bdbadaf61a #1819 fixtures
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-17 14:30:52 +02:00
Joan Sanchez 6ed5695063 Added zoneFk to routes. solved #1713
gitea/salix/dev This commit looks good Details
2019-10-16 07:18:05 +02:00
Bernat 25bd28990a Refactor #1812 refactor phone
gitea/salix/dev This commit looks good Details
2019-10-15 14:44:00 +02:00
Bernat ed1ed7f50b #1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good Details
2019-10-15 07:23:34 +02:00
Joan Sanchez 05d0f50606 changed warehouse from ticket id 17
gitea/salix/dev This commit looks good Details
2019-10-10 09:58:34 +02:00
Joan Sanchez eb655215f4 merge pull changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 09:23:29 +02:00
Joan Sanchez 9473636b5b treeview refactor
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-02 09:54:52 +02:00
Joan Sanchez 183d770483 first changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-01 15:09:55 +02:00
Juan Ferrer 60f611b76b Merge branch 'test' into dev 2019-09-26 12:47:45 +02:00
Juan Ferrer 445668d57f Refactor agency SQL scripts 2019-09-26 12:47:16 +02:00
Juan Ferrer 5262cd7e43 Merge branch 'test' into dev 2019-09-26 10:09:17 +02:00
Juan Ferrer c0f39ba87f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 10:09:07 +02:00
Juan Ferrer 3d4b7601be SQL scripts 2019-09-26 10:08:37 +02:00
Bernat f28305de9b Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
gitea/salix/dev This commit looks good Details
2019-09-26 09:13:18 +02:00
Juan Ferrer 91e4e62a1c Merge branch 'test' into dev 2019-09-26 08:44:00 +02:00
Bernat bf5a9967cf Refactor #1682 modificar modelos componentRate y componentTypeRate 2019-09-24 13:45:54 +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
Joan Sanchez 7daf2e4328 merge with master
gitea/salix/test This commit looks good Details
2019-09-19 11:48:41 +02:00
Joan Sanchez 4d894365eb Fixed production errors #1699 2019-09-19 09:42:41 +02:00
Joan Sanchez 73b1f18759 Fixed production errors #1699 2019-09-19 08:58:42 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Bernat 40cfa19d01 bug claimDms 2019-09-16 12:51:51 +02:00
Bernat a1e0da8905 Tarea #1689 exportat procedimientos a local desde produccion 2019-09-12 07:22:12 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit Details
2019-09-09 09:05:13 +02:00
Carlos Jimenez Ruiz 56c291a160 merge
gitea/salix/dev There was a failure building this commit Details
2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz ce9fb14b62 #1655 e2e ticket.sale Añadir lineas 2019-09-06 11:43:15 +02:00
Bernat e8cb57e27a #1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen
gitea/salix/dev This commit looks good Details
2019-09-06 09:47:58 +02:00
Bernat a2228fa15f Tarea #1673 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good Details
2019-09-04 09:06:08 +02:00
Joan Sanchez d3441fa1b3 Ticket step one refactor #1669
gitea/salix/dev This commit looks good Details
2019-09-04 08:04:31 +02:00
Bernat fc872a2b21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-03 14:38:40 +02:00
Carlos Jimenez Ruiz e1b5b449ce #1656 ticket.regularizar eliminar ticket 2019-09-03 09:57:53 +02:00
Bernat b9c13ac3a3 #1664 , table city deprecated 2019-09-02 14:58:58 +02:00
Joan Sanchez 67733e6e08 merge
gitea/salix/test This commit looks good Details
2019-09-02 09:57:46 +02:00
Carlos Jimenez Ruiz 11b99d9a5f #1618 e2e ticket.basicData.stepOne
gitea/salix/dev This commit looks good Details
2019-08-20 14:18:32 +02:00
Bernat 3cea9cf405 #1637 update fixtures for dms
gitea/salix/dev This commit looks good Details
2019-08-12 14:07:30 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251
gitea/salix/dev This commit looks good Details
2019-08-09 08:04:44 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Bernat 4e329a4201 Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/master This commit looks good Details
2019-08-02 12:24:08 +02:00
Bernat 58ed37aa76 Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/test This commit looks good Details
2019-08-02 12:23:50 +02:00
Joan Sanchez 07519a4369 mege from test branch
gitea/salix/master This commit looks good Details
2019-07-31 11:34:54 +02:00
Joan Sanchez 77d8ac82a5 contabilize worker.calenday holidays, updated styles
gitea/salix/test This commit looks good Details
2019-07-31 09:51:08 +02:00
Joan Sanchez eccf381e56 contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures Details
2019-07-31 09:50:47 +02:00
Bernat 7571cd6e1b Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures Details
2019-07-31 07:46:24 +02:00
Bernat 4bc7d88162 refactor fixtures #1620 2019-07-30 11:57:28 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593
gitea/salix/dev This commit looks good Details
2019-07-30 08:51:38 +02:00
Bernat 46dac984ab Refactor #1620 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-07-29 15:02:43 +02:00
Bernat 772095fc1e Tarea #1617 eliminar vn2008.Gastos de export.data.sh
gitea/salix/dev This commit looks good Details
2019-07-29 11:37:44 +02:00
Bernat e6ac764762 Tarea #1617 eliminar tablas de export.data.sh
gitea/salix/dev This commit looks good Details
2019-07-29 09:51:49 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good Details
2019-07-26 11:48:01 +02:00
Juan Ferrer ab2a47d363 Docker size reduced
gitea/salix/dev This commit has test failures Details
2019-07-25 17:35:51 +02:00
Bernat d608c80028 Bug #1616 fix db test
gitea/salix/dev This commit has test failures Details
2019-07-25 13:32:25 +02:00
Joan Sanchez 6d5412227a Changed invoiceOut pdf to hasPdf
gitea/salix/dev This commit has test failures Details
2019-07-24 12:42:33 +02:00
Bernat 8089c32ec2 Tarea #1611 export db roduction to local
gitea/salix/dev This commit looks good Details
2019-07-23 14:56:57 +02:00
Bernat 97f2229090 Tarea #1603 ticket.index ticket.sales problems icon
gitea/salix/dev This commit looks good Details
2019-07-23 11:15:06 +02:00
Joan Sanchez 2c39103e93 fixed dms back unit tests 2019-07-17 07:45:43 +02:00
Joan Sanchez a7b15c2dfc fixed dms back unit tests
gitea/salix/dev There was a failure building this commit Details
2019-07-16 14:48:48 +02:00
Joan Sanchez 7b610d62b6 removed console.log
gitea/salix/dev This commit looks good Details
2019-07-11 07:19:22 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Bernat b98b534eec Tarea #1583 exportar produccio a la local
gitea/salix/dev This commit looks good Details
2019-07-05 14:16:33 +02:00
Bernat 65ec629221 Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse 2019-07-03 08:29:40 +02:00
Carlos Jimenez Ruiz 4b0a71644f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-07-02 14:44:39 +02:00
Carlos Jimenez Ruiz 4ac419b419 #1528 e2e claim/detail 2019-07-02 14:44:36 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Bernat b3ade3c7f5 Tarea #1511
gitea/salix/dev This commit looks good Details
refactr fixtures expedition
2019-06-27 13:20:30 +02:00
Bernat fb2545994c Refactor #1563 fixtures item
gitea/salix/dev This commit looks good Details
2019-06-27 12:38:30 +02:00
Joan Sanchez 507bc8c2ce updated fonts & calendar acls
gitea/salix/dev This commit looks good Details
2019-06-27 11:48:33 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good Details
2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz c352a12d49 merge 2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz fe7278af66 #1387 e2e Ticket Edit sale path 2019-06-26 14:19:08 +02:00
Joan Sanchez 8ff61a5d3a added zone prices, radio-group and calendar refactor #1320
gitea/salix/dev This commit looks good Details
2019-06-26 13:35:38 +02:00
Bernat 13abed3d00 #1517 update ticketGetProblems
gitea/salix/dev This commit looks good Details
2019-06-25 15:02:25 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-06-25 14:00:55 +02:00