Commit Graph

1625 Commits

Author SHA1 Message Date
Alex Moreno 3d2f661bf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-02-01 07:20:21 +01:00
Joan Sanchez 9878780006 Merge branch 'dev' into 3552-monitor_ticket_state 2022-01-31 15:41:20 +00:00
Alex Moreno 78b3df0b6a feat(monitor_ticket): classColor in db 2022-01-31 13:15:37 +01:00
Joan Sanchez d30e8d9bcc Removed already uploaded changes 2022-01-28 14:50:19 +01:00
Joan Sanchez 26f980998a renamed folder 2022-01-28 14:49:11 +01:00
Alex Moreno 8936e02cd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 14:23:22 +01:00
Joan Sanchez 2480f37e24 Renamed version number (olrder version already applied on production) 2022-01-28 14:20:54 +01:00
Vicent Llopis 44e6219df5 update table companyGroup 2022-01-28 09:30:54 +01:00
Alex Moreno 072ac5fb6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 09:28:13 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket 2022-01-28 09:15:41 +01:00
Alex Moreno 74916c182a Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:22:39 +01:00
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 f8a0094321 word movible 2022-01-26 08:54:48 +01:00
Alex Moreno 57e4b400c9 Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:12:57 +01:00
Alex Moreno 442d58f59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:11:22 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test 2022-01-25 14:27:30 +01:00
Juan Ferrer 022c2cde3c Merge branch 'dev' into 3536-DbUserSync 2022-01-25 11:18:50 +01:00
Javi Gallego 5fbbae7ac6 Merge branch 'dev' into 2883-invoiceIn-Booking 2022-01-24 15:40:37 +01:00
Joan Sanchez 6de82caf0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 2022-01-21 10:33:40 +01:00
Juan Ferrer 997b7990d4 Docker connectTimeout && MySQL/MariaDB user sync 2022-01-20 15:33:53 +01:00
Javi Gallego 6d66ab7bea getTotals without transaction 2022-01-20 10:05:24 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking 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 2022-01-18 13:57:26 +01:00
Alex Moreno 8e1c3e107c refactor(ticket): advanceable code 2022-01-18 12:48:39 +01:00
Alex Moreno b8355320f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz dc0a498b4d Merge branch 'dev' into 3513-export_database 2022-01-17 13:02:32 +00:00
Alex Moreno 4b2153d638 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-17 13:37:25 +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 2022-01-17 10:14:58 +01:00
Carlos Jimenez Ruiz 941d43b9a2 Merge branch 'dev' into 3448-worker_calendar-payedHolidays 2022-01-17 09:06:27 +00:00
Alex Moreno 61859a23c9 feat(ticket): getAdvanceable 2022-01-17 07:14:29 +01:00
Alex Moreno bf6d196414 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-01-13 08:33:27 +01:00
Alex Moreno 245161375c update database 2022-01-13 08:27:56 +01:00
Alex Moreno c90a2b6e5c update folder changes 2022-01-13 07:24:46 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 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 2022-01-12 14:56:34 +01:00
Alex Moreno 757fe73ecd test(ticket_volume): backTest 2022-01-12 14:55:20 +01:00
Alex Moreno fba09e8c40 feat(ticket_volume): volume for packingType 2022-01-12 14:02:58 +01:00
Vicent Llopis f387551835 add sql 2022-01-12 12:27:12 +01:00
Alex Moreno 9e491082e7 test(send): backTest and fixtures 2022-01-11 08:39:06 +01:00
Alex Moreno ebac06e4fc refactor(send): update got sms 2022-01-10 15:14:05 +01:00
Alex Moreno fc69151f7f update sms 2022-01-10 13:20:57 +01:00
Alex Moreno 1983eb012b refactor(sms): got and apiKey 2022-01-10 12:28:39 +01:00
Alex Moreno e4db123672 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary 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 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 2022-01-03 08:39:06 +01:00
Alex Moreno e8a4a9cd8c update today 2022-01-03 08:38:46 +01:00
Carlos Jimenez Ruiz ea4fc5c262 updated fixtured to amend failing test 2021-12-30 12:08:05 +01:00
Alex Moreno a57999aaad unnecessary space 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 2021-12-24 12:29:47 +01:00
Alex Moreno 8e274f4f17 refactor(travel): deprecated travelThermograph.temperature 2021-12-24 10:10:28 +01:00
Alex Moreno 1e6355cdde fixtures 2021-12-22 08:37:50 +01:00
Alex Moreno 67dc5c2cbc refactor(ticket_basic-data): test e2e 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 2021-12-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures 2021-12-21 20:58:58 +01:00
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono 2021-12-21 14:45:40 +01:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name 2021-12-21 14:43:53 +01:00
Vicent Llopis e30fb0fb37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono 2021-12-21 07:10:19 +01:00
Alex Moreno 412acfbff2 refactor(payment_afterInsert): email 2021-12-20 14:46:09 +01:00
Alex Moreno f67edffcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data 2021-12-20 13:51:44 +01:00
Alex Moreno 50db693e51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2021-12-20 13:50:50 +01:00
Alex Moreno b0019d09ad feat(ticket_basic-data_step-two): adapted for available and transfer sales in back 2021-12-20 13:50:31 +01:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures 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
Alex Moreno 0ea1dea8b5 refactor sqls 2021-12-17 12:52:37 +01:00
Alex Moreno 850ea2ef39 getVisible sql 2021-12-17 12:38:56 +01:00
Alex Moreno 7c17250919 trigger payment_beforeInsert sql 2021-12-16 15:19:56 +01:00
Alex Moreno f4a07cab70 sql update supplier 2021-12-16 12:21:47 +01:00
Alex Moreno 138f2110e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data 2021-12-16 12:15:47 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale 2021-12-15 15:24:45 +01:00
Joan Sanchez 15b78787df Added version 10400-christmas 2021-12-14 10:46:05 +01:00
Joan Sanchez b45263af30 Merge branch 'dev' into export_production 2021-12-14 09:23:15 +00:00
Vicent Llopis 9de1d59d98 fix: deleted repeated tickets 2021-12-14 09:56:38 +01:00
Javi Gallego a99174e42a Merge branch 'dev' into 2883-invoiceIn-Booking 2021-12-14 09:50:39 +01:00
Alex Moreno 6465a5c460 feat(supplier): payMethodChecked for financial 2021-12-14 08:23:11 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test 2021-12-01 12:49:53 +01:00
Vicent Llopis b9893220cd export database 2021-12-01 08:19:28 +01:00
Alex Moreno c7e5c25a28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale 2021-11-30 15:13:38 +01:00
Alex Moreno decd4b5a95 separate sql procedures 2021-11-30 15:13:20 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures 2021-11-30 13:57:17 +01:00
Alex Moreno d5c0be5a9d refactor(ticket_sale): logic and tests 2021-11-30 13:47:16 +01:00
Carlos Jimenez Ruiz 51a608cb5a Merge branch 'dev' into 3325-notify_absence 2021-11-29 09:49:58 +00:00
Vicent Llopis 2f7295020c update column notificationEmail 2021-11-26 13:30:40 +01:00
Alex Moreno 771100ccab remove unnecessary intro and comment 2021-11-26 08:40:20 +01:00
Alex Moreno eea9413628 fix(item_basic-data): controller, test e2e and model 2021-11-26 08:34:32 +01:00
Alex Moreno 9fce06dfe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data 2021-11-25 11:53:26 +01:00
Carlos Jimenez Ruiz 5914e8e1ac fixed e2e by adding acls where needed 2021-11-25 11:30:55 +01:00
Carlos Jimenez Ruiz 09c2b813b5 ACL update 2021-11-24 15:27:09 +01:00
Alex Moreno c03fe359b1 add acl 2021-11-24 14:36:12 +01:00
Alex Moreno fc2e81826d export database 2021-11-24 13:02:58 +01:00
Alex Moreno 00072a7dd1 landing searchable false 2021-11-24 10:02:52 +01:00
Alex Moreno 5931692fac test(item_basic-data): add genericFk e2e 2021-11-24 09:21:41 +01:00
Alex Moreno b460579834 feat(entry_latest-buys): add from and to in search-panel 2021-11-23 09:00:46 +01:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys 2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz cbcfdd33ec Merge branch 'dev' into 3379-payMethod_ibanRequired 2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz 9fdfe64909 Merge branch 'dev' into 3381-item_diary-claim 2021-11-22 13:51:51 +00:00
Carlos Jimenez Ruiz ff0a3acd6e Merge branch 'dev' into 3379-payMethod_ibanRequired 2021-11-22 13:32:18 +00:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar 2021-11-22 13:18:53 +00:00
Alex Moreno fe46dbd343 feat(entry_last-buys): add filter isFloramondo 2021-11-22 11:49:30 +01:00
Carlos Jimenez Ruiz ca0c3be843 Merge branch 'dev' into 3381-item_diary-claim 2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz e5977be502 Merge branch 'dev' into 3374-itemPackingType 2021-11-19 11:47:37 +00:00
Vicent Llopis 8f2e29787b fix(payMethod): alter colums name 2021-11-19 10:07:33 +01:00
Alex Moreno ac9ed90f4a feat(item): modify item_getBalance and do test 2021-11-19 10:02:40 +01:00
Javi Gallego fe97b9472c db changes en el sprint actual 2021-11-19 07:46:08 +01:00
Javi Gallego c8e9416448 Merge branch 'dev' into 2883-invoiceIn-Booking 2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar 2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz 924e6d063d moved getBalance modifications to correct version 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
Vicent Llopis f87f60f00a feat(item-itemPackingType): add model and dumpedFixtures 2021-11-18 09:16:36 +01:00
Javi Gallego b936272898 Merge branch 'dev' into 2883-invoiceIn-Booking 2021-11-18 07:36:03 +01:00
Alex Moreno 26815ad5a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-17 08:36:35 +01:00
Alex Moreno 23b567046b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-16 12:30:28 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest 2021-11-16 10:09:42 +01:00
Alex Moreno ec25df39e4 transaction activeWithBuyer.js 2021-11-15 14:50:02 +01:00
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-15 14:40:50 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel 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 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 2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz 59cdf00134 Merge branch 'dev' into 3312-ibanRequired 2021-11-15 08:24:29 +00:00
Joan Sanchez b83f0fb52f fix(smart-table): load default viewConfig 2021-11-12 17:51:27 +01:00
Carlos Jimenez Ruiz d2dc0bd147 multi check now behaves properly 2021-11-11 16:38:41 +01:00
Joan Sanchez f99e0c5648 Updated default hidden columns 2021-11-11 10:40:21 +01:00
Alex Moreno 5c7efbb838 feat(item): back filter buyer in search panel ans test 2021-11-11 10:33:21 +01:00
Carlos Jimenez Ruiz 0bf553e11e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys 2021-11-10 17:07:16 +01:00
Carlos Jimenez Ruiz 717ea60084 Merge branch 'dev' into 3116-client_balance 2021-11-10 13:40:56 +00:00
Vicent Llopis 18aec14fe9 update backTest 2021-11-10 08:46:09 +01:00
Alex Moreno 119d5e45b9 feat(supplier): add checkbox isPayMethodChecked 2021-11-10 08:43:25 +01:00
Vicent Llopis f5977d9f01 delete maxAmount from structure.sql 2021-11-09 14:35:34 +01:00
Carlos Jimenez Ruiz 469c544536 item.index default columns and filter with like 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 2021-11-09 08:26:41 +00:00
Vicent Llopis 395ad1c76d fix(ibanRequired): set different ibanRequired for Client and Supplier 2021-11-08 15:04:33 +01:00
Vicent Llopis bfbc9b50c4 feat(client_balance): add maxImport if "cash" 2021-11-08 13:02:42 +01:00
Alex Moreno 45b36a5c77 export-database 2021-11-08 09:28:34 +01:00
Vicent Llopis 000ae21ce5 create colum sql 2021-11-08 09:16:27 +01:00
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view 2021-10-27 17:11:33 +02:00
Carlos Jimenez Ruiz 683f01ddd8 refactor(zone): removed deprecated column m3Max 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 2021-10-20 13:32:03 +02:00
Joan Sanchez f87f3e85b4 Merge branch 'dev' into 3211-closure_invoicing 2021-10-19 12:42:13 +00:00
Joan Sanchez 5209414613 feat(closure): should mail the PDF invoice invoiceable clients
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 2021-10-19 09:57:45 +02:00
Carlos Jimenez Ruiz cec04a307d refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures 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 2021-10-18 10:22:53 +02:00
Joan Sanchez e9539c7675 Restored SQL version 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 2021-10-15 14:00:15 +02:00
Joan Sanchez 629a8d25b7 Updated pagination styles 2021-10-15 13:49:41 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance 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
Refs: 3162
2021-10-01 14:31:42 +02:00
Javi Gallego 4f1fd5412d faltan test 2021-09-28 10:57:51 +02:00
Joan Sanchez 0e287447bf SQL version folder 2021-09-24 09:09:16 +02:00
Javi Gallego e5c9ea850b testback done 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 2021-09-17 07:27:14 +00:00
Joan Sanchez f5b1eb3ccd feat(closure): send to driver the route report on route closure 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 2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 398e79c069 Merge branch 'dev' into 3065-client_businessTypeFk_required 2021-09-08 07:55:55 +00:00
Joan Sanchez db538a3f6f Merge branch 'dev' into 3041-monitor_sort_problems 2021-09-08 06:11:39 +00:00
Carlos Jimenez Ruiz 99f4a2ed7d refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked 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
Refs: 3045
2021-09-03 16:30:25 +02:00
Joan Sanchez 8623f914c7 feat(monitor): Sort by amount of problems on a ticket list 2021-09-03 12:09:37 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion 2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz 84b8ed610d fix(fixtures): dua code dups 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 2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests 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 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
Dumped database and fixed structure issues
Refs: #3079
2021-08-31 15:15:51 +02:00
Joan Sanchez d2280a783c Changes 2021-08-31 08:44:31 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate 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 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 2021-08-30 11:41:17 +02:00
Javi Gallego 488ef17559 insert mail 2021-08-27 09:01:21 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime 2021-08-15 08:35:14 +02:00
Javi Gallego f2a81974d0 dbChanges 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 2021-08-13 08:04:42 +02:00
Joan Sanchez 9ec07de1cd Added SQL version 10350-august 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 2021-08-12 07:39:26 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements 2021-08-10 11:48:29 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed 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 2021-08-05 13:42:19 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint 2021-08-02 13:35:38 +02:00
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client 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 2021-07-20 13:11:48 +02:00
Joan Sanchez dbe680a58c 3004 - Deprecated ticket_closeAll() 2021-07-20 13:06:31 +02:00
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample 2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz 9a2fe0260e last steps to preview credit request 2021-07-19 10:16:15 +02:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys 2021-07-14 11:14:53 +02:00
Javi Gallego 2f265760b4 permisos invoceInTax 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 2021-07-01 09:57:17 +02:00
Javi Gallego 9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section 2021-06-30 08:30:40 +02:00
Javi Gallego 59fac7edfa fixtures 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 2021-06-23 13:24:23 +02:00
Joan Sanchez efc25fcb53 Updated ids 2021-06-23 12:28:55 +02:00
Joan Sanchez b0d7f6537b Updated taxClass 2021-06-23 09:32:10 +02:00
Joan Sanchez f445194e46 Restored version 2021-06-22 16:30:15 +02:00
Joan Sanchez e6c50a2033 Updated structure 2021-06-22 16:23:39 +02:00
Joan Sanchez 0a3f3cc57f Incremented up to 1000 on the users id 2021-06-22 16:11:28 +02:00
Joan Sanchez 1d916a6557 Added version 2021-06-22 15:43:08 +02:00
Joan Sanchez 46bbe07c3f 2997 - Export production 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 2021-06-21 11:17:48 +00:00
Joan Sanchez 273ebe9c5f Removed risk min amount 2021-06-21 10:34:41 +00:00
Joan Sanchez 98621b9e42 Removed transaction 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 2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata 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 2021-06-09 14:25:50 +02:00
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table 2021-06-03 16:14:52 +02:00
Joan Sanchez 523f9c6df0 Added new sql version folder 2021-06-03 13:45:57 +02:00
Joan Sanchez d6dd39d447 Updated ticketGetProblems() 2021-06-03 11:40:39 +02:00
Joan Sanchez e2ec78461a HOTFIX: Update production starred modules data 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 2021-05-31 07:50:41 +02:00
Joan Sanchez 8c09adb51a HOTFIX: Inserted module "Monitors" 2021-05-31 07:50:24 +02:00
Joan Sanchez 920e7b1daf E2E fixes 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 2021-05-25 14:08:02 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests 2021-05-25 13:33:17 +02:00
Carlos Jimenez Ruiz 60b0488a47 Merge branch 'dev' into 2925-export_db 2021-05-25 09:23:05 +00:00
Joan Sanchez f7487c76a6 2925 - Exported production database 2021-05-25 11:13:08 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales 2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz d440a631c8 getUserConfig now gets default company and warehouse with dynamic code 2021-05-24 17:41:22 +02:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale 2021-05-21 08:49:32 +02:00
Carlos Jimenez Ruiz c16c93a75a updated fixtures for item 2021-05-19 15:34:17 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices 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 2021-05-19 14:15:28 +02:00
Carlos Jimenez Ruiz f0fbb13af8 fixtures to english changes + e2e amends 2021-05-17 10:38:53 +02:00
Carlos Jimenez Ruiz bdcd05ee14 removed commented code and the keep file 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 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 2021-05-11 09:43:15 +02:00
Joan Sanchez fcc8ab4236 Added model ACL 2021-04-30 10:08:40 +02:00
Joan Sanchez 29b5cac351 Fixtures for supplier 442 2021-04-30 09:48:28 +02:00
Joan Sanchez d77e06a5a0 Changed city name 2021-04-30 08:30:21 +02:00
Joan Sanchez 5445764043 Added supplier address fixtures 2021-04-30 08:26:05 +02:00
Joan Sanchez 330b6bdf8a 2770 - Added supplier addresses section 2021-04-29 14:41:10 +02:00
Joan Sanchez e952e995cb Merge branch 'dev' into 2893-show-expedition.externalId 2021-04-26 11:52:42 +00:00
Joan Sanchez 5ad0f15720 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-04-26 13:41:05 +02:00
Joan Sanchez 1c52bd1618 SQL fixes 2021-04-26 13:40:52 +02:00
Javi Gallego 9ee1385cd1 test ok 2021-04-26 12:33:33 +02:00
Joan Sanchez 42957f9ace Added new SQL version 2021-04-26 11:12:13 +02:00
Javi f7fa363fa5 Merge branch 'dev' into 2873-create-supplier-beneficiary 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 2021-04-07 09:30:05 +00:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete 2021-04-07 07:45:00 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown 2021-04-06 13:46:38 +02:00
Javi Gallego 63ec7677c6 test ok 2021-04-01 18:43:28 +02:00
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary 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 2021-03-31 07:14:13 +00:00
Javi Gallego a034220ffa cambio descripcion del it 2021-03-31 07:54:50 +02:00
Javi Gallego c036c7c7fe model ok 2021-03-31 07:33:00 +02:00
Joan Sanchez d9834ae740 Removed old versions 2021-03-30 14:02:15 +02:00
Joan Sanchez 50f1fd30aa Risk tolerance fixture 2021-03-30 13:15:42 +02:00
Joan Sanchez d66cf68e89 Fixed table error 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 2021-03-29 15:42:22 +02:00
Javi Gallego de3f338629 test 2021-03-29 15:31:00 +02:00
Joan Sanchez 14f0cbaf42 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-24 11:06:15 +01:00
Joan Sanchez 53ae45d4c8 Deleted old .keep file 2021-03-24 11:05:41 +01:00
Joan Sanchez c6ee58a278 Added new changes version 2021-03-24 11:05:05 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests 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 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 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 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 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 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 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 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 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" 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 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 2021-03-03 13:37:41 +01:00
Joan Sanchez e50dcf467f Requested changes 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 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 2021-03-02 14:59:02 +01:00
Carlos Jimenez Ruiz 97667595e5 removed unused ACL and fixed typos 2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz 177ed24892 css amends and sql fixtures for production 2021-03-02 09:58:17 +01:00
Carlos Jimenez Ruiz cd084a53e5 styling update + acls 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 2021-02-17 12:32:26 +01:00
Jorge Padawan a2ad1887a4 ACL bug fixed + package lock updated 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 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 2021-02-11 15:06:41 +01:00
Joan Sanchez 84c82ed32d 2595 - Added invoiceIn module 2021-02-10 15:03:11 +01:00
Jorge Padawan 2cf37a9e96 Added permissions to role administrative 2021-02-10 09:10:15 +01:00
Joan Sanchez dcad6dc8c8 Merge branch 'dev' into 2725-ticket-create-crear-shimpent 2021-02-10 07:21:29 +00:00
Javi Gallego 3a3dae179c done 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 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 2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz a62bebd51e minor refactor 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 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 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 2021-02-01 09:29:47 +01:00
Joan Sanchez 3ec55426ae Removed params due a docker error 2021-02-01 07:21:36 +01:00
Joan Sanchez 57c124b936 Updated config params 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 2021-01-28 12:23:18 +01:00
Bernat Exposito 01c96272bd export production 2021-01-26 10:55:30 +01:00
Javi Gallego d61ab94398 acl conflicto 2021-01-25 07:49:57 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-22 15:05:39 +00:00
Javi Gallego 93417e9676 refactor 2021-01-22 14:45:02 +01:00
Javi Gallego e1711af265 sin keep 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 2021-01-22 14:30:46 +01:00
Carlos Jimenez Ruiz c4f673e089 relocated sql code 2021-01-22 11:28:47 +01:00
Javi Gallego aab9797d3f Merge branch 'dev' into 2479-factura-ticket 2021-01-21 13:40:55 +01:00
Javi Gallego 3dc50e8a16 test ok 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 2021-01-21 11:50:32 +01:00
Carlos Jimenez Ruiz 90c6d2fe3e SQLs moved to current version folder 2021-01-21 11:30:22 +01:00
Jorge Padawan 6acb5c221e Changes folder of ACL 2021-01-21 10:55:21 +01:00
Carlos Jimenez Ruiz a53231c721 amends 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 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 2021-01-21 09:26:02 +01:00
Javi Gallego a6dfdc971a receipt_beforInsert 2021-01-20 13:54:55 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog 2021-01-20 13:51:30 +01:00
Carlos Jimenez Ruiz ef3b48005e sql changes now in correct version 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 2021-01-20 09:17:55 +01:00
Joan Sanchez a67c8e4fbd Renamed version 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 2021-01-20 08:21:45 +01:00
Joan Sanchez ffb76e6cb5 Added new db version 2021-01-20 08:12:40 +01:00
Javi Gallego e47e5b9ec4 merged carpetas de cambios 2021-01-19 11:32:47 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones 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 2021-01-11 17:18:37 +01:00
Javi Gallego d3b5300553 test 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 2021-01-11 08:01:57 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity 2021-01-08 16:45:20 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-08 15:24:05 +01:00
Bernat Exposito a2550ce128 export table payment 2021-01-08 10:24:41 +01:00
Javi Gallego b5cd4e3c9f Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-08 09:44:13 +01:00
Javi Gallego 1884dc8789 fixtures 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 2021-01-07 12:11:14 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-07 09:11:34 +01:00
Bernat Exposito 6179921978 export production 2021-01-07 08:37:56 +01:00
Javi Gallego 1291fc4b6c acl 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 2020-12-29 17:00:45 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations 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 2020-12-28 14:53:26 +01:00
Joan Sanchez c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
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 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 2020-12-22 07:42:28 +01:00
Javi Gallego 340927799c Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-21 09:53:00 +01:00
Javi Gallego 3a6d62ac7d xdiario 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 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
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 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
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 2020-12-18 08:21:36 +01:00
Bernat Exposito 0b5a98c2fe export production 2020-12-17 15:17:03 +01:00
Jorge Padawan 33237dad86 Add acl to supplier billing data 2020-12-17 12:29:37 +01:00
Joan Sanchez 5ecd589106 Updated delivery note 2020-12-16 09:24:11 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad 2020-12-16 08:33:08 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL 2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures 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 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 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 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 2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes 2020-11-20 15:05:57 +01:00
Joan Sanchez 8a3f5345f4 Merge branch 'dev' into 2575-image_download 2020-11-16 13:54:47 +00:00
Joan Sanchez 359dcc904d Version merge 2020-11-16 09:08:39 +01:00
Joan Sanchez 8194801308 Supplier cargo migration to vn 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 2020-11-13 08:32:39 +00:00
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 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 2020-11-11 13:57:37 +01:00
Joan Sanchez db4f226f6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 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 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 2020-11-06 22:55:47 +01:00
Carlos Jimenez Ruiz ead0994032 timeControlCalculate procedure updated 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 2020-11-04 11:29:10 +01:00
Bernat Exposito 2dc51e6125 update acl 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 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 2020-11-02 19:58:45 +01:00
Juan Ferrer b3ab1fe059 Sync fixes & improvements 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 2020-11-02 15:38:23 +01:00
Bernat Exposito b2d69127cb Merge branch 'dev' into 2565-address_fixtures 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 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 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 2020-10-31 01:10:32 +01:00
Juan Ferrer 9b563cb8bf LDAP & Samba synchronization fixes + improvements 2020-10-31 00:02:27 +01:00
Javi Gallego b50ae7b8ca testback arreglados 2020-10-30 15:50:59 +01:00
Joan Sanchez 245b32a47f Added section 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 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 2020-10-30 08:40:47 +01:00
Bernat Exposito ea8d9e70b0 supplier log 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 2020-10-28 09:08:27 +01:00
Joan Sanchez 3675f7ed34 2511 - Changed salesAssitant role to claimManager 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 2020-10-26 08:43:20 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary 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 2020-10-21 11:52:02 +02:00
Javi Gallego ef7a886d86 Merge branch 'dev' into 2510-client-address-create-test 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 2020-10-20 14:42:23 +02:00
Bernat Exposito Domenech 7eed2ddd59 export structure and fix test 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
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 2020-10-15 08:15:04 +02:00
Joan Sanchez 6fa8aae161 2509 - Added forms to create new locations 2020-10-14 11:33:42 +02:00
Joan Sanchez e48effca08 Stop container before remove 2020-10-13 12:28:58 +02:00
Joan Sanchez f00828cf57 Merge branch 'dev' into 2481-campaign_filter 2020-10-06 05:44:11 +00:00
Javi Gallego 77064d85a0 Merge branch 'dev' into 2443 2020-10-05 12:54:02 +00:00
Javi Gallego 531bb6da25 quito copy 2020-10-05 13:22:56 +02:00
Joan Sanchez 86025b88e3 Merge branch 'dev' into 2481-campaign_filter 2020-10-05 09:36:02 +00:00
Joan Sanchez cef2dc982f Updated sql 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 2020-10-05 07:53:03 +02:00
Joan Sanchez 420dfdbdff Send notification by email 2020-10-02 12:23:48 +02:00
Javi Gallego 8d1709ea51 Merge branch 'dev' into 2443 2020-10-01 16:46:33 +02:00
Javi Gallego 78e22df177 test e2e de expense ok 2020-10-01 16:45:28 +02:00
Juan Ferrer 6d8b13423f SQL hotfix 2020-10-01 10:02:19 +02:00
Javi Gallego 2714857227 Merge branch 'dev' into 2443 2020-09-30 14:07:38 +02:00
Juan Ferrer 611aa9cafa SQL hotfix 2020-09-29 10:55:04 +02:00
Joan Sanchez ec2385cd15 Merge branch 'dev' into 2381-mariaDB 2020-09-29 06:53:14 +00:00
Bernat Exposito Domenech 5f9ef3aea3 export structure db 2020-09-29 07:37:29 +02:00
Juan Ferrer 991bece64a SQL fixes 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 2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech 790c9bfe6f update models and fixtures 2020-09-25 14:50:04 +02:00
Javi Gallego c909470f41 merge 2020-09-25 08:10:37 +02:00
Joan Sanchez de3c7acb08 Merge branch 'dev' into 2381-mariaDB 2020-09-24 12:30:44 +00:00
Joan Sanchez 164f636f3f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2020-09-24 09:02:16 +02:00
Joan Sanchez 44e23ca560 Removed sql version 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 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 2020-09-21 13:24:43 +02:00
Javi Gallego 8fb674819a ticket service 2020-09-21 10:35:39 +02:00
Carlos Jimenez Ruiz f50f4514fd fixtures enhanced for tags 2020-09-16 11:11:18 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests 2020-09-15 14:14:13 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors 2020-09-11 14:51:58 +02:00
Juan Ferrer 61f3f82117 Merge branch 'dev' into 2381-mariaDB 2020-09-11 14:39:02 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
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 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 2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech fb3f01151c update fixtures 2020-09-09 13:49:03 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test 2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech ed926c39a1 fix e2e 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 2020-09-08 07:17:23 +02:00
Joan Sanchez 3efe14fc53 Removed unused vars 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 2020-09-07 12:16:20 +02:00
Joan Sanchez c10e24b7cd Updated param description 2020-09-07 11:50:23 +02:00
Joan Sanchez 173aac0ba6 Renamed sql file 2020-09-07 11:45:54 +02:00
Joan Sanchez 13b3353e9a Changed sql folder 2020-09-07 11:45:29 +02:00
Joan Sanchez 7b42497f88 Removed procedures 2020-09-07 11:44:44 +02:00