Commit Graph

1329 Commits

Author SHA1 Message Date
Alex Moreno 90ed2fdfac change changes folder name 2022-02-01 12:38:05 +01:00
Carlos Jimenez Ruiz 01e269db6d Merge branch 'dev' into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:03:47 +00:00
Alex Moreno 56331da20b feat(item_index): add column producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:37:11 +01:00
Alex Moreno 7cf252a8f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-02-01 07:29:38 +01:00
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
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 15:41:20 +00:00
Alex Moreno 78b3df0b6a feat(monitor_ticket): classColor in db
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 13:15:37 +01:00
Joan Sanchez d30e8d9bcc Removed already uploaded changes
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 14:50:19 +01:00
Joan Sanchez 26f980998a renamed folder
gitea/salix/pipeline/head This commit looks good Details
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)
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-28 14:20:54 +01:00
Vicent Llopis 44e6219df5 update table companyGroup
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 14:27:30 +01:00
Juan Ferrer 022c2cde3c Merge branch 'dev' into 3536-DbUserSync
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 11:18:50 +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
Juan Ferrer 997b7990d4 Docker connectTimeout && MySQL/MariaDB user sync
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 15:33:53 +01:00
Javi Gallego 6d66ab7bea getTotals without transaction
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 10:05:24 +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 8e1c3e107c refactor(ticket): advanceable code
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz dc0a498b4d Merge branch 'dev' into 3513-export_database
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 10:14:58 +01:00
Carlos Jimenez Ruiz 941d43b9a2 Merge branch 'dev' into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 09:06:27 +00:00
Alex Moreno 61859a23c9 feat(ticket): getAdvanceable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-17 07:14:29 +01:00
Alex Moreno bf6d196414 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 08:33:27 +01:00
Alex Moreno 245161375c update database
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 08:27:56 +01:00
Alex Moreno c90a2b6e5c update folder changes
gitea/salix/pipeline/head This commit looks good Details
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
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 757fe73ecd test(ticket_volume): backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:55:20 +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
Vicent Llopis f387551835 add sql
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 12:27:12 +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 ebac06e4fc refactor(send): update got sms
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 15:14:05 +01:00
Alex Moreno fc69151f7f update sms
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 13:20:57 +01:00
Alex Moreno 1983eb012b refactor(sms): got and apiKey
gitea/salix/pipeline/head This commit looks good Details
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
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
Alex Moreno e8a4a9cd8c update today
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 08:38:46 +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 8e274f4f17 refactor(travel): deprecated travelThermograph.temperature
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 10:10:28 +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
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:45:40 +01:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-21 07:10:19 +01:00
Alex Moreno 412acfbff2 refactor(payment_afterInsert): email
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-20 13:50:31 +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
Alex Moreno 0ea1dea8b5 refactor sqls
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 12:52:37 +01:00
Alex Moreno 850ea2ef39 getVisible sql
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 12:38:56 +01:00
Alex Moreno 7c17250919 trigger payment_beforeInsert sql
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 15:19:56 +01:00
Alex Moreno f4a07cab70 sql update supplier
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 12:15:47 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-15 15:24:45 +01:00
Joan Sanchez 15b78787df Added version 10400-christmas
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 10:46:05 +01:00
Joan Sanchez b45263af30 Merge branch 'dev' into export_production
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 09:23:15 +00:00
Vicent Llopis 9de1d59d98 fix: deleted repeated tickets
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 08:23:11 +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
Alex Moreno c7e5c25a28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 15:13:38 +01:00
Alex Moreno decd4b5a95 separate sql procedures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 15:13:20 +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 d5c0be5a9d refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:47:16 +01:00
Carlos Jimenez Ruiz 51a608cb5a Merge branch 'dev' into 3325-notify_absence
gitea/salix/pipeline/head This commit looks good Details
2021-11-29 09:49:58 +00:00
Vicent Llopis 2f7295020c update column notificationEmail
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 13:30:40 +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 9fce06dfe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:53:26 +01:00
Carlos Jimenez Ruiz 5914e8e1ac fixed e2e by adding acls where needed
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:30:55 +01:00
Carlos Jimenez Ruiz 09c2b813b5 ACL update
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 15:27:09 +01:00
Alex Moreno c03fe359b1 add acl
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 14:36:12 +01:00
Alex Moreno fc2e81826d export database
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 13:02:58 +01:00
Alex Moreno 00072a7dd1 landing searchable false
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 10:02:52 +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
Alex Moreno b460579834 feat(entry_latest-buys): add from and to in search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:00:46 +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 cbcfdd33ec Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz 9fdfe64909 Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:51:51 +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
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:18:53 +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
Carlos Jimenez Ruiz ca0c3be843 Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz e5977be502 Merge branch 'dev' into 3374-itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 11:47:37 +00: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
Alex Moreno ac9ed90f4a feat(item): modify item_getBalance and do test
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 10:02:40 +01:00
Javi Gallego fe97b9472c db changes en el sprint actual
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 07:46:08 +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
Vicent Llopis f87f60f00a feat(item-itemPackingType): add model and dumpedFixtures
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 09:16:36 +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
Alex Moreno 26815ad5a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 12:30:28 +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
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:40:50 +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
Joan Sanchez b83f0fb52f fix(smart-table): load default viewConfig
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 17:51:27 +01:00
Carlos Jimenez Ruiz d2dc0bd147 multi check now behaves properly
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-11 16:38:41 +01:00
Joan Sanchez f99e0c5648 Updated default hidden columns
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-11 10:40:21 +01: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 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