Commit Graph

1148 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 0bf553e11e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:16 +01:00
Carlos Jimenez Ruiz 717ea60084 Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 13:40:56 +00:00
Vicent Llopis 18aec14fe9 update backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 08:46:09 +01:00
Alex Moreno 119d5e45b9 feat(supplier): add checkbox isPayMethodChecked
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 08:43:25 +01:00
Vicent Llopis f5977d9f01 delete maxAmount from structure.sql
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 14:35:34 +01:00
Carlos Jimenez Ruiz 469c544536 item.index default columns and filter with like
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-09 11:47:54 +01:00
Carlos Jimenez Ruiz a53f98dea9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-09 09:56:13 +01:00
Carlos Jimenez Ruiz 345be297f0 Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 08:26:41 +00:00
Vicent Llopis 395ad1c76d fix(ibanRequired): set different ibanRequired for Client and Supplier
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 15:04:33 +01:00
Vicent Llopis bfbc9b50c4 feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 13:02:42 +01:00
Alex Moreno 45b36a5c77 export-database
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 09:28:34 +01:00
Vicent Llopis 000ae21ce5 create colum sql
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 09:16:27 +01:00
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 17:11:33 +02:00
Carlos Jimenez Ruiz 683f01ddd8 refactor(zone): removed deprecated column m3Max
gitea/salix/pipeline/head This commit looks good Details
2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz 14a72b32bd refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max 2021-10-21 11:37:09 +02:00
Alex Moreno 9c4e46f363 export_database
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 13:32:03 +02:00
Joan Sanchez f87f3e85b4 Merge branch 'dev' into 3211-closure_invoicing
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 12:42:13 +00:00
Joan Sanchez 5209414613 feat(closure): should mail the PDF invoice invoiceable clients
gitea/salix/pipeline/head This commit looks good Details
Refs: 3211
2021-10-19 13:46:17 +02:00
Carlos Jimenez Ruiz e3942c0bb9 refactor(thermograph): empty fields handler added and correct usage of thermograph.code 2021-10-19 10:58:58 +02:00
Carlos Jimenez Ruiz b41a0bd849 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 09:57:45 +02:00
Carlos Jimenez Ruiz cec04a307d refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 12:05:38 +02:00
Alex Moreno bf100f339e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 10:22:53 +02:00
Joan Sanchez e9539c7675 Restored SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:09:07 +02:00
Joan Sanchez d5cf57fbb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-15 14:07:48 +02:00
Joan Sanchez 8fabd378e7 Removed version folder
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:00:15 +02:00
Joan Sanchez 629a8d25b7 Updated pagination styles
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 13:49:41 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:03:06 +02:00
Joan Sanchez 313db4960e refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:59:08 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3162
2021-10-01 14:31:42 +02:00
Javi Gallego 4f1fd5412d faltan test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-28 10:57:51 +02:00
Joan Sanchez 0e287447bf SQL version folder
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 09:09:16 +02:00
Javi Gallego e5c9ea850b testback done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-24 08:24:34 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Carlos Jimenez Ruiz 8d8740a33b Merge branch 'dev' into 2910-route_closure
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:27:14 +00:00
Joan Sanchez f5b1eb3ccd feat(closure): send to driver the route report on route closure
gitea/salix/pipeline/head This commit looks good Details
2021-09-10 10:38:19 +02:00
Carlos Jimenez Ruiz 46b59473a3 refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures 2021-09-09 16:06:44 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 398e79c069 Merge branch 'dev' into 3065-client_businessTypeFk_required
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 07:55:55 +00:00
Joan Sanchez db538a3f6f Merge branch 'dev' into 3041-monitor_sort_problems
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 06:11:39 +00:00
Carlos Jimenez Ruiz 99f4a2ed7d refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz 1f0bcb63f1 refactor(thermograph): added temperature model + updated thermographs models and endpoints 2021-09-06 16:38:27 +02:00
Carlos Jimenez Ruiz ca82d7e759 fix(coillection): collection created dates were wrong for testing purposes 2021-09-06 16:35:31 +02:00
Joan Sanchez 4db25bf722 refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance
gitea/salix/pipeline/head This commit looks good Details
Refs: 3045
2021-09-03 16:30:25 +02:00
Joan Sanchez 8623f914c7 feat(monitor): Sort by amount of problems on a ticket list
gitea/salix/pipeline/head This commit looks good Details
2021-09-03 12:09:37 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz 84b8ed610d fix(fixtures): dua code dups
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 15:30:07 +02:00
Carlos Jimenez Ruiz 158c15afa1 fix(filter): removed fixtures that no longer work due to structure changes 2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz ec9c061051 fix(getUpcomingDeliveries) fixtures were broken due to db structure changes
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 11:48:21 +02:00
Carlos Jimenez Ruiz 07929af0cb fixed(dua): removed fixtures from duainvoicein as dua has less data on production now
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 16:47:27 +02:00
Carlos Jimenez Ruiz 8de6712eab fix(client): column cplusTerIdNifFk deprecated on production 2021-08-31 16:29:21 +02:00
Joan Sanchez c592212290 fix(structure): Dumped production database
gitea/salix/pipeline/head This commit looks good Details
Dumped database and fixed structure issues
Refs: #3079
2021-08-31 15:15:51 +02:00
Joan Sanchez d2280a783c Changes
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 08:44:31 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 06:27:23 +00:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz d5625d19f1 removed ACL for item niche 2021-08-30 13:24:13 +02:00
Joan Sanchez 73d76848b2 Removed version
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:41:17 +02:00
Javi Gallego 488ef17559 insert mail
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-27 09:01:21 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Javi Gallego f2a81974d0 dbChanges
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 09:19:58 +02:00
Joan Sanchez 48e6079527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:04:42 +02:00
Joan Sanchez 9ec07de1cd Added SQL version 10350-august
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:02:09 +02:00
Carlos Jimenez Ruiz e547642c16 corrected a syntax error preventing the changes to apply 2021-08-12 17:26:46 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 54634ed22d test okl
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 07:39:26 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-10 11:48:29 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:18:52 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Joan Sanchez 886d38ad8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys 2021-08-05 14:33:28 +02:00
Joan Sanchez 1b9ca13391 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:42:19 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-02 13:35:38 +02:00
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 09:07:04 +02:00
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02:00
Joan Sanchez 64b3f10fc5 Removed drop temporary table
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:11:48 +02:00
Joan Sanchez dbe680a58c 3004 - Deprecated ticket_closeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:06:31 +02:00
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz 9a2fe0260e last steps to preview credit request
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:16:15 +02:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:14:53 +02:00
Javi Gallego 2f265760b4 permisos invoceInTax
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:27:36 +02:00
Javi Gallego 3ca2dd820d Merge branch 'dev' into 2940-invoiceInTax-section 2021-07-08 08:20:30 +02:00
Joan Sanchez c2112f907e Removed bi from export
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 09:57:17 +02:00
Javi Gallego 9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-30 08:30:40 +02:00
Javi Gallego 59fac7edfa fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:33:01 +02:00
Carlos Jimenez Ruiz 7e4e6fae21 e2e path for ticket dms import 2021-06-28 16:04:21 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez efc25fcb53 Updated ids
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 12:28:55 +02:00
Joan Sanchez b0d7f6537b Updated taxClass
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 09:32:10 +02:00
Joan Sanchez f445194e46 Restored version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 16:30:15 +02:00
Joan Sanchez e6c50a2033 Updated structure
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 16:23:39 +02:00
Joan Sanchez 0a3f3cc57f Incremented up to 1000 on the users id
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 16:11:28 +02:00
Joan Sanchez 1d916a6557 Added version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 15:43:08 +02:00
Joan Sanchez 46bbe07c3f 2997 - Export production
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 15:01:10 +02:00
Joan Sanchez 4f2c21707f 2997 - Export production db 2021-06-22 14:59:26 +02:00
Joan Sanchez be9e230fe8 Merge branch 'dev' into 2742--invoiceIn-create
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 11:17:48 +00:00
Joan Sanchez 273ebe9c5f Removed risk min amount
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 10:34:41 +00:00
Joan Sanchez 98621b9e42 Removed transaction
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 10:00:38 +00: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 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 fc3af7b6a6 ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 14:25:50 +02:00
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:14:52 +02:00
Joan Sanchez 523f9c6df0 Added new sql version folder
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-03 13:45:57 +02:00
Joan Sanchez d6dd39d447 Updated ticketGetProblems()
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 11:40:39 +02:00
Joan Sanchez e2ec78461a HOTFIX: Update production starred modules data
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 13:45:18 +02:00
Carlos Jimenez Ruiz 9f00fd11d2 favorite modules positions 2021-06-01 22:18:13 +02:00
Joan Sanchez 7feb3df05d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-31 07:50:41 +02:00
Joan Sanchez 8c09adb51a HOTFIX: Inserted module "Monitors"
gitea/salix/pipeline/head This commit looks good Details
2021-05-31 07:50:24 +02:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 13:33:17 +02:00
Carlos Jimenez Ruiz 60b0488a47 Merge branch 'dev' into 2925-export_db
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 09:23:05 +00:00
Joan Sanchez f7487c76a6 2925 - Exported production database
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 11:13:08 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz d440a631c8 getUserConfig now gets default company and warehouse with dynamic code
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 17:41:22 +02:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 08:49:32 +02:00
Carlos Jimenez Ruiz c16c93a75a updated fixtures for item
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:34:17 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Carlos Jimenez Ruiz f0fbb13af8 fixtures to english changes + e2e amends
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 10:38:53 +02:00
Carlos Jimenez Ruiz bdcd05ee14 removed commented code and the keep file
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 10:30:39 +02:00
Carlos Jimenez Ruiz 61fb997717 removed transaction from procedure to use backend's 2021-05-14 19:17:37 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Joan Sanchez e6e91ced99 2905 - Restore ticket shipped and landed 2021-05-13 08:56:26 +02:00
Joan Sanchez 6a3cb7f724 Added new version
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 14:17:28 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Joan Sanchez dc44af148d 2863 - Added sales monitor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 09:43:15 +02:00
Joan Sanchez fcc8ab4236 Added model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 10:08:40 +02:00
Joan Sanchez 29b5cac351 Fixtures for supplier 442
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 09:48:28 +02:00
Joan Sanchez d77e06a5a0 Changed city name
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 08:30:21 +02:00
Joan Sanchez 5445764043 Added supplier address fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 08:26:05 +02:00
Joan Sanchez 330b6bdf8a 2770 - Added supplier addresses section
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 14:41:10 +02:00
Joan Sanchez e952e995cb Merge branch 'dev' into 2893-show-expedition.externalId
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 11:52:42 +00:00
Joan Sanchez 5ad0f15720 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 13:41:05 +02:00
Joan Sanchez 1c52bd1618 SQL fixes
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 13:40:52 +02:00
Javi Gallego 9ee1385cd1 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 12:33:33 +02:00
Joan Sanchez 42957f9ace Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 11:12:13 +02:00
Javi f7fa363fa5 Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz 5931dd238c Anomalous trigger disabled 2021-04-15 10:43:28 +02:00
Carlos Jimenez Ruiz 2d041142c3 Merge branch 'dev' into 2631-notify_incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 09:30:05 +00:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Javi Gallego 63ec7677c6 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:43:28 +02:00
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:14:26 +02:00
Joan Sanchez 5712f1c43b Changes 2021-04-01 13:12:02 +02:00
Joan Sanchez 41ee6e70a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-01 08:42:02 +02:00
Carlos Jimenez Ruiz b1b2a1ee19 Merge branch 'dev' into 2785-getBalance-tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:14:13 +00:00
Javi Gallego a034220ffa cambio descripcion del it
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:54:50 +02:00
Javi Gallego c036c7c7fe model ok
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:33:00 +02:00
Joan Sanchez d9834ae740 Removed old versions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:02:15 +02:00
Joan Sanchez 50f1fd30aa Risk tolerance fixture
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 13:15:42 +02:00
Joan Sanchez d66cf68e89 Fixed table error
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 12:28:43 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Javi Gallego 3cb0859f85 Merge branch 'dev' into 2785-getBalance-tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:22 +02:00
Javi Gallego de3f338629 test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:31:00 +02:00
Joan Sanchez 14f0cbaf42 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:06:15 +01:00
Joan Sanchez 53ae45d4c8 Deleted old .keep file
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:05:41 +01:00
Joan Sanchez c6ee58a278 Added new changes version
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:05:05 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:11 +01:00
Carlos Jimenez Ruiz af7f885d2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 14:36:14 +01:00
Joan Sanchez a2165b6bfc Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2021-03-16 13:59:39 +01:00
Carlos Jimenez Ruiz 1d521fa9a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 10:57:24 +01:00
Carlos Jimenez Ruiz fb418edc7b backend modifications for route tickets 2021-03-15 11:32:17 +01:00
Joan Sanchez d275dcfafd Fix for procedure changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 09:45:48 +01:00
Joan Sanchez f92db8c5a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 08:52:07 +01:00
Carlos Jimenez Ruiz 4c0d583556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT 2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Joan Sanchez b39ec70a2c Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:54:14 +00:00
Joan Sanchez 5cbd8d632d Changes 2021-03-09 10:01:40 +01:00
jorgebl 32ea2dbda6 Added permisions from models in table salix ACL 2021-03-08 12:32:35 +01:00
Joan Sanchez 85920e5c07 Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 17:11:04 +01:00
Carlos Jimenez Ruiz 2c6609cf12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 12:14:25 +01:00
jorgebl 5972526327 Merge branch '2791-item_botanical_remove_field' of https://gitea.verdnatura.es/verdnatura/salix into 2791-item_botanical_remove_field
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 08:05:23 +01:00
jorgebl 4a22cd5f85 db changes and acl for logistic boss on section item-botanical 2021-03-04 20:09:35 +01:00
Joan Sanchez 49fbecfc59 Exported db
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 08:41:42 +01:00
jorgebl 08cb69330a ACL logisticBoss 2021-03-04 08:09:54 +01:00
jorgebl 92db67292c Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:56:31 +01:00
Joan Sanchez 0b532880c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:54:15 +01:00
Carlos Jimenez Ruiz 1a203d9c3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 13:37:41 +01:00
Joan Sanchez e50dcf467f Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 12:21:04 +01:00
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