Commit Graph

548 Commits

Author SHA1 Message Date
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 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 4cbaf247ed removed unused showfield in model log
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:33:45 +02:00
Carlos Jimenez Ruiz 29f1f7e89e itemTaxCountry and item bonanical no longer use the bonanical prop 2021-07-19 14:46:18 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 13:41:29 +02:00
Carlos Jimenez Ruiz 98a691c152 minor changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:00:20 +02:00
Carlos Jimenez Ruiz 21e34de1dd item module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 12:54:59 +02:00
Joan Sanchez 057d138991 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2021-07-02 13:44:44 +02:00
Joan Sanchez 9ad54b9622 HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:17:48 +02:00
Carlos Jimenez Ruiz be850571d9 updated the field name
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:14:36 +02:00
Carlos Jimenez Ruiz 243636ccf6 item category name as category
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 12:34:30 +02:00
Carlos Jimenez Ruiz 2469540f66 item category filter is now working again 2021-06-30 10:48:19 +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
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 7004ad5ade removed several columns from bulk edit and added packingOut
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:47:40 +02:00
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 17:08:21 +02:00
Carlos Jimenez Ruiz e418d6239b fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +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
Joan Sanchez 378175224c HOTFIX: Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:24:24 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Joan Sanchez 93399d6de6 Updated description
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 11:18:44 +02:00
Joan Sanchez 6c36ab3905 Removed back button
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 10:47:31 +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
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00
Joan Sanchez a2144405ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 17:04:37 +02:00
Joan Sanchez 9bbf43c590 Replace http with https
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 14:34:16 +02:00
Joan Sanchez b4cceff4cb 2866 - Limit descriptor photo size to width 100%
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:20:00 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz 767665e3c9 endpoint indentation + type updated yo array of objects
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz 3c8ed85e69 sum is now made on backend and html amends 2021-03-26 10:33:53 +01:00
jorgebl 393b9ba38c Correct name 2021-03-24 14:17:27 +01:00
jorgebl e01b7420d9 Added total cost of item 2021-03-24 13:54:29 +01:00
Joan Sanchez ff6c80aa7e Merge branch 'dev' into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 08:24:10 +00:00
jorgebl 1922280c61 QA rename some descriptions in test and reworked the test
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 17:49:04 +01:00
jorgebl 5cb959f5b8 removed controller.data from submit
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:12:13 +01:00
jorgebl 27816b29e7 Removed ids on controller.data
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:06:35 +01:00
jorgebl d09e47835e Rename the statements for correctly description the action 2021-03-08 12:40:13 +01:00
jorgebl 6e08a66343 Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical 2021-03-08 12:38:54 +01:00
jorgebl 32ea2dbda6 Added permisions from models in table salix ACL 2021-03-08 12:32:35 +01:00
jorgebl 28b9da82ed change conditional 2021-03-08 09:12:10 +01:00
Joan Sanchez 7ec9ddb6d9 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 09:23:31 +01:00
jorgebl b6bf61f410 description put correctly
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 09:09:09 +01:00
jorgebl 63ac492845 Added message for duplicated names
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 08:45:14 +01:00
jorgebl 4cc3fc90c5 conditionals if name already exists 2021-03-04 21:30:56 +01:00
jorgebl 5ebd70a8f0 Fixed error filter on itemBotanical when item hasn't specie and genus data + front test 2021-03-04 20:11:10 +01:00
jorgebl 12ad71d0fe translate some words 2021-03-04 20:08:07 +01:00
jorgebl 300f78f31e added permisions logistic boss 2021-03-04 20:07:45 +01:00