Commit Graph

3465 Commits

Author SHA1 Message Date
Joan Sanchez ef9f3b13e4 html fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:28:31 +02:00
Joan Sanchez 362c404aba Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 09:16:59 +02:00
Joan Sanchez deaade92b0 Shortened packing type
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 14:27:45 +02:00
Joan Sanchez 256203944e HOTFIX: Prevent error on tickets without state
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 14:11:33 +02:00
Carlos Jimenez Ruiz 0421fd8828 back end unit tests for zone endpoints
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 15:04:23 +02:00
Carlos Jimenez Ruiz b651fdebe6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-21 14:35:01 +02:00
Joan Sanchez 8c0171096f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 09:19:00 +00:00
Carlos Jimenez Ruiz 48a2bb7b10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-21 09:08:03 +02:00
Carlos Jimenez Ruiz 05c630533a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 16:38:33 +02:00
Joan Sanchez 8f24c3f39b Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 14:34:48 +00:00
Joan Sanchez 9506a8fd90 Disabled sortable column
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 16:34:34 +02:00
Joan Sanchez 6acf922d3b Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 14:15:42 +00:00
Joan Sanchez dd7f37e36c Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #663
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-18 14:15:15 +00:00
Joan Sanchez a4f20daf17 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 16:14:30 +02:00
Joan Sanchez a50eebfed4 Replaced salesPerson by packages column 2021-06-18 16:07:13 +02:00
Carlos Jimenez Ruiz 4656b2e25a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz 1afae3d56d address nickname now gets updated when client or address updates 2021-06-18 15:54:33 +02:00
Carlos Jimenez Ruiz ba0fdcd743 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 15:05:10 +02:00
Carlos Jimenez Ruiz 82cb9ed749 zone module endpoints now have transactions 2021-06-18 15:05:03 +02:00
Joan Sanchez 20e933ed07 2980 - Invoice in fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 13:29:59 +02:00
Joan Sanchez 0ff114ff36 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 12:32:37 +02:00
Joan Sanchez c622f24b0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 11:12:58 +02:00
Carlos Jimenez Ruiz e74f1f109e Merge branch 'dev' into 2906-deliveryNote_packages
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:27:46 +00:00
Joan Sanchez 325afe2245 2906 - Number of packages
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:42:55 +02:00
Joan Sanchez b36b48f4b3 Merge branch 'dev' into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 06:04:33 +00:00
Joan Sanchez bc7c288742 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:03:55 +02:00
Joan Sanchez 8695fadc18 Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 05:21:01 +00:00
Joan Sanchez bbbf008076 Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 16:09:17 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 11:52:12 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 47ad63c154 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz 588a499c44 editLatestsBuys now is called only with id and itemFk 2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz f5ad0c9c1c Merge branch 'dev' into 2961-summary_tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 10:18:47 +00:00
Joan Sanchez 447d8341e7 Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:49:12 +00:00
Joan Sanchez 76623d8c95 Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:47:45 +00:00
Joan Sanchez 0ce782a4de Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:40:00 +02:00
Joan Sanchez 3e938fa9fb Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz b9cdc5ed6a Merge branch 'dev' into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 08:19:01 +00:00
Joan Sanchez efc9edb384 Fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 10:13:06 +02:00
Joan Sanchez df94190a8c Removed console log 2021-06-16 09:59:54 +02:00
Carlos Jimenez Ruiz 34e0d0b7cf translations update
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:50:32 +02:00
Joan Sanchez 225bfd09b9 Missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:47:54 +02:00
Joan Sanchez c10f792619 Merge branch 'dev' into 2929-entry_latestsbuys_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 07:44:30 +00:00
Joan Sanchez 353d0e352d 2961 - Show tickets on summary
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:43:07 +02:00
Joan Sanchez 55908c0fca Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 07:41:16 +00:00
Carlos Jimenez Ruiz 1a053942a1 Merge branch 'dev' into 2963-creditInsurance_acl
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:41:52 +00:00
Carlos Jimenez Ruiz 8c1df0743d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 16:41:12 +02:00
Carlos Jimenez Ruiz 8aa3d269ea Travel descriptor now shows delete option if there are no entries 2021-06-15 16:41:01 +02:00