Commit Graph

531 Commits

Author SHA1 Message Date
Alex Moreno d0c4099255 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:20:39 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 14:27:30 +01:00
Javi Gallego 5fbbae7ac6 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-24 15:40:37 +01:00
Joan Sanchez 6de82caf0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 16:17:53 +01:00
Joan Sanchez ddf62d2496 Updated back unit test 2022-01-21 16:16:39 +01:00
Joan Sanchez 5ff950d078 refactor(invoice): hide report logo for non group companies #3519
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 10:33:40 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 14:19:29 +01:00
Joan Sanchez 352c3205bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 13:57:26 +01:00
Alex Moreno b8355320f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 14:50:10 +01:00
Joan Sanchez 7d16d7aaf2 Closure refactor 2022-01-17 12:33:11 +01:00
Alex Moreno b05f464517 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 10:14:58 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 07:20:23 +01:00
Alex Moreno 6f7c1b6a46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:56:34 +01:00
Alex Moreno fba09e8c40 feat(ticket_volume): volume for packingType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-12 14:02:58 +01:00
Alex Moreno 9e491082e7 test(send): backTest and fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 08:39:06 +01:00
Alex Moreno e4db123672 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 13:55:36 +01:00
Alex Moreno 2a9cc2f465 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 09:54:11 +01:00
Alex Moreno db609c1713 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3468-export-database
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 08:39:06 +01:00
Carlos Jimenez Ruiz ea4fc5c262 updated fixtured to amend failing test
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 12:08:05 +01:00
Alex Moreno a57999aaad unnecessary space
gitea/salix/pipeline/head This commit looks good Details
2021-12-29 11:55:48 +01:00
Alex Moreno e9f77bb9b4 feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk 2021-12-29 11:51:56 +01:00
Alex Moreno 5401c1ebf6 export database and fixture train
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 12:29:47 +01:00
Alex Moreno 1e6355cdde fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 08:37:50 +01:00
Alex Moreno 67dc5c2cbc refactor(ticket_basic-data): test e2e
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 08:11:33 +01:00
Alex Moreno e609994efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 20:58:58 +01:00
Alex Moreno f67edffcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 13:51:44 +01:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 09:40:34 +00:00
Alex Moreno 9247bc98f1 feat(db): sql for supplier isPayMethodChecked 2021-12-20 08:01:13 +01:00
Javi Gallego a99174e42a Merge branch 'dev' into 2883-invoiceIn-Booking 2021-12-14 09:50:39 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 12:49:53 +01:00
Vicent Llopis b9893220cd export database
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 08:19:28 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:57:17 +01:00
Alex Moreno 771100ccab remove unnecessary intro and comment
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 08:40:20 +01:00
Alex Moreno eea9413628 fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 08:34:32 +01:00
Alex Moreno 5931692fac test(item_basic-data): add genericFk e2e
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 09:21:41 +01:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz ff0a3acd6e Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:32:18 +00:00
Alex Moreno fe46dbd343 feat(entry_last-buys): add filter isFloramondo
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 11:49:30 +01:00
Vicent Llopis 8f2e29787b fix(payMethod): alter colums name
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 10:07:33 +01:00
Javi Gallego c8e9416448 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz 924e6d063d moved getBalance modifications to correct version
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 12:42:31 +01:00
Carlos Jimenez Ruiz 2bfcaa810c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-18 12:40:50 +01:00
Javi Gallego b936272898 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 07:36:03 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 10:09:42 +01:00
Alex Moreno ec25df39e4 transaction activeWithBuyer.js
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:50:02 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 13:53:18 +01:00
Alex Moreno 73211c5b3b Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 12:14:37 +01:00
Alex Moreno adf295ebf3 fix(item): add ng-model, add fixture and transaction back test 2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz d69ee4a597 Merge branch 'dev' into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz 59cdf00134 Merge branch 'dev' into 3312-ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 08:24:29 +00:00
Alex Moreno 5c7efbb838 feat(item): back filter buyer in search panel ans test
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 10:33:21 +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
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
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
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 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
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 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 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 ca82d7e759 fix(coillection): collection created dates were wrong for testing purposes 2021-09-06 16:35:31 +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
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 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
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
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
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +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
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 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 4f2c21707f 2997 - Export production db 2021-06-22 14:59:26 +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 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
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
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