Commit Graph

1507 Commits

Author SHA1 Message Date
Vicent Llopis aab484ad41 refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 10:28:39 +02:00
Vicent Llopis 3eac002fb4 feat: add queue to send rocket messages
gitea/salix/pipeline/head This commit is unstable Details
2022-06-03 12:22:07 +02:00
Vicent Llopis f6028316f4 feat: endpoint sendQueued addded
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 14:55:39 +02:00
Vicent Llopis e9c98a98e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:38:27 +02:00
Vicent Llopis f7be419bbe refator: updated fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 11:52:53 +02:00
Vicent Llopis 7de0fd6634 feat: create table chat
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 13:49:45 +02:00
Alex Moreno 8340041b33 throw userError and maxFileSize
gitea/salix/pipeline/head This commit is unstable Details
2022-06-01 07:57:32 +02:00
Joan Sanchez c369453bfc Added model fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 13:36:27 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 07:56:17 +02:00
Alex Moreno 863977915e fix 2022-05-27 13:27:05 +02:00
Alex Moreno aa7074f303 test(mdb): back test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-27 08:23:52 +02:00
Joan Sanchez a5f3580b17 derp
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 16:14:10 +02:00
Vicent Llopis 6359c9e5bf feat: add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 15:08:23 +02:00
Vicent Llopis 456f167513 feat: fix editExclusion mode
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 11:09:03 +02:00
Vicent Llopis 47ef3d0b46 Merge branch '1781-zoneHoliday' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 08:33:47 +02:00
Vicent Llopis bbdaa7de39 feat: add editExclusion mode 2022-05-26 08:33:45 +02:00
Vicent Llopis dbb44e228d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 07:47:49 +02:00
Vicent Llopis b5db025106 refactor: move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 07:41:00 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable Details
2022-05-25 14:59:28 +02:00
Carlos Jimenez Ruiz 402aa567dd Merge branch 'dev' into 4109-duplicated_folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:39:42 +00:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-25 09:03:52 +02:00
Joan Sanchez 0cf8ee3edf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 15:06:32 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:54:06 +02:00
Alex Moreno 47ab4fc2c1 intro
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:52:26 +02:00
Alex Moreno 7a69d53642 fix(changes): add reference table
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:50:33 +02:00
Vicent Llopis 880f3ce647 refactor: move acl to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 14:44:18 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:33:08 +00:00
Vicent Llopis ab6a0425f5 refactor: translate fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:47:43 +02:00
Vicent Llopis 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:41:01 +02:00
Vicent Llopis 875e9503c3 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:47 +02:00
Vicent Llopis c9bfbe990a refactor: request changues
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:10 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-20 09:17:18 +02:00
Joan Sanchez 6586595976 feat(closure): send incoterms authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-05-19 07:31:00 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Vicent Llopis 9eae1f479c add table vn.printer
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 10:39:46 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 08:32:45 +02:00
Vicent Llopis 7ad56327a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-17 08:21:49 +02:00
Joan Sanchez bf8e7eed57 Added SQL version 10470
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 11:37:43 +02:00
Joan Sanchez 576cad16ad SQL fixes
gitea/salix/pipeline/head This commit is unstable Details
2022-05-16 11:34:29 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Joan Sanchez c88fe629cd Removed duplicated version
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 08:21:12 +02:00
Vicent Llopis 10cd9c5b87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:16 +02:00
Vicent Llopis 40bcc56758 refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:01 +02:00
Vicent Llopis ab13c16948 feat: add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-16 07:17:29 +02:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Joan Sanchez 9cbee7a38a Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 13:05:08 +00:00
Joan Sanchez 913b76880a Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 12:59:30 +00:00
Joan Sanchez f7077aaa3f Show build status
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 15:56:34 +02:00
Joan Sanchez ad4bee7a16 Show build status
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 15:44:11 +02:00
Carlos Jimenez Ruiz 9778783dfa removed unused console logs
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 14:02:50 +02:00
Vicent Llopis b96d9ea4c2 feat(zone.events): add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz 9a47bdafbe debuging conection errors on CI db
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 13:24:19 +02:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 11:13:34 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 08:06:39 +02:00
Carlos Jimenez Ruiz c749438f32 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 13:37:29 +00:00
Carlos Jimenez Ruiz 442644d3f1 Merge branch 'dev' into 3940-export_database
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 12:57:29 +00:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 14:47:54 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz 86ee110b78 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:55:00 +00:00
Joan Sanchez e0c0663e41 Renamed folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 14:21:41 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00:00
Joan Sanchez d9c8ed96e4 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 09:46:56 +02:00
Vicent Llopis a6b8674302 feat(invoiceIn.tax): add button for create an expence
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:34:20 +02:00
Alex Moreno 55574919d2 rename 2022-05-09 13:19:34 +02:00
Vicent Llopis a0af774837 fix: test
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 09:02:52 +02:00
Juan Ferrer bfd8c8d47a DB export
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 15:58:36 +02:00
Alex Moreno ac4d4e6db1 test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:59:37 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 10:35:31 +02:00
Juan Ferrer 6d5d9ca0e4 DB export
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:54:45 +02:00
Vicent Llopis d0f9613b4e delete hedera fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:19:45 +02:00
Javi Gallego 6584a29ce5 create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 11:16:56 +02:00
Alex Moreno b40b8d931d feat(client_credit): remove de old rows
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 11:18:39 +02:00
Juan Ferrer 6bdcdbb13c DB structure & data export
gitea/salix/pipeline/head This commit looks good Details
Hedera tables added to data export
2022-05-02 10:57:13 +02:00
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Joan Sanchez fea7df269c Added invoice schedule method
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 14:59:29 +02:00
Joan Sanchez c923526342 refactor(invoicing): send invoice to print queue
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:14:33 +02:00
Vicent Llopis ad80d0501c add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 07:48:09 +02:00
Vicent Llopis 39f4c4a6e8 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:36:05 +02:00
Vicent Llopis 76ff6330f9 feat(supllier.summary): add two fields
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:23:03 +02:00
Vicent Llopis 5211a0d9d7 feat(supplier.fiscal-data): add two fields 2022-04-25 11:51:34 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 14:59:41 +02:00
Vicent Llopis 579ff3aa4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 07:13:34 +02:00
Alex Moreno 8b68fcf088 change new code
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:40:29 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz 8efcb6233f feat(user): added userConfig.darkMode relation towards account.user
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 10:25:01 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:19:50 +00:00
Vicent Llopis a47349646f change versions db
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:50:29 +02:00
Alex Moreno 88d91d8b47 change db changes folder
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:19:33 +02:00
Alex Moreno 14933d13cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid 2022-04-13 08:17:44 +02:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Joan Sanchez 3d8f851de8 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 11:46:14 +02:00
Joan Sanchez 2bc7b2db0c Removed keep file
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 10:15:30 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:08:55 +02:00
Joan Sanchez 7228394393 Merge branch 'dev' into 3837-edi_import
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 12:43:52 +00:00
Carlos Jimenez Ruiz 018047b6be Merge branch 'dev' into 3347-worker_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz b087d275dc Merge branch 'dev' into 3605-invoiceIn_intrastat3
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:29:01 +00:00
Joan Sanchez 39d18093eb Updated SQL files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 12:04:34 +02:00
Joan Sanchez 47a2f76aa4 3837 - Import data from external service
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 11:58:40 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis 655db502f7 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:04:05 +02:00
Vicent Llopis d8a1bd1b1c fix: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:23:54 +02:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Joan Sanchez 8414f94cf6 Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #926
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:49:39 +00:00
Joan Sanchez 381b37b1ff Merge branch 'dev' into 3043-client_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:31:16 +00:00
Alex Moreno b8a954caec feat(client): section unpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-07 11:41:35 +02:00
Carlos Jimenez Ruiz a72b1cd591 Merge branch 'dev' into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:36:39 +00:00
Joan Sanchez 0a4b7bd000 Added new version folder 2022-04-07 10:31:15 +02:00
Carlos Jimenez Ruiz 6216d6fa9b Merge branch 'dev' into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:29:26 +00:00
Joan Sanchez f5a6521f20 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:34:23 +02:00
Alex Moreno 98755656dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:43:12 +02:00
Alex Moreno dd9a38d1bf feat(client_search-panel): filter by province
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:29:00 +02:00
Joan Sanchez 7a8dbdfb16 Updated SQL files 2022-04-05 09:56:39 +02:00
Alex Moreno d616367714 fix(test): use static dates
gitea/salix/pipeline/head This commit looks good Details
2022-04-05 07:46:49 +02:00
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:26:53 +02:00
Vicent Llopis fdf285dd5f fix(worker_timeControl): corrected db procedure
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 10:31:28 +02:00
Alex Moreno c904bf0bdf feat(back): new Date mocked time
gitea/salix/pipeline/head This commit looks good Details
2022-04-01 13:55:45 +02:00
Alex Moreno d86f4da425 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-01 07:37:29 +02:00
Vicent Llopis 5f29b272e1 feat: add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 11:38:08 +02:00
Vicent Llopis fe32b81d9e sql update
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 10:50:05 +02:00
Vicent Llopis bb267dad16 feat: add fixtures 2022-03-31 09:17:27 +02:00
Vicent Llopis 1f826e1214 sql code for production 2022-03-31 09:16:55 +02:00
Alex Moreno eec1c1ff86 feat(db): static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-30 12:45:01 +02:00
Vicent Llopis 3bf2b46689 feat(ticket_line): update workerMana if check claimMana option
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 10:09:01 +02:00
Vicent Llopis e29f820e60 feat(ticket_line): new table ticketRefund and update proc ticket_doRefund
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 08:56:35 +02:00
Vicent Llopis e0244f388c refator: single quotes in sql files
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 07:39:42 +02:00
Vicent Llopis d06b2e8bb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 07:30:39 +02:00
Vicent Llopis 8e27ab612d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 15:08:48 +02:00
Vicent Llopis a5ca116571 feat(ticket_sale): add mana options 2022-03-29 13:42:37 +02:00
Joan Sanchez bbbb0df1cd Merge branch 'dev' into 3781-export_database
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:18:13 +00:00
Alex Moreno fd02038c8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz 407fe2850b Merge branch 'dev' into 3408-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:06:25 +00:00
Vicent Llopis 889dcf8763 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database 2022-03-29 08:56:59 +02:00
Vicent Llopis 2ab45fe2eb delete jenkins changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 07:34:35 +02:00
Vicent Llopis 9faf9d8688 test Jenkins NOT PUSH
gitea/salix/pipeline/head This commit is unstable Details
2022-03-28 15:01:58 +02:00
Alex Moreno f853696d03 change fixture name
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:59:39 +02:00
Vicent Llopis f4d53c4040 pull request changes required
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:35:36 +02:00
Carlos Jimenez Ruiz 23c473de89 Merge branch 'dev' into 3408-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz 8d70bac5c6 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 10:13:21 +00:00
Alex Moreno 7cd33619e3 change db version
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 11:47:20 +02:00
Alex Moreno 89d7d27061 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-03-28 11:47:09 +02:00
Carlos Jimenez Ruiz 39694b31b8 Merge branch 'dev' into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 08:40:32 +00:00
Juan Ferrer 85de742630 Export data & structure
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 09:44:29 +02:00
Alex Moreno 79c74d92b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-03-25 13:22:04 +01:00
Vicent Llopis e02ab9dd2d feat: add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-24 11:39:19 +01:00
Vicent Llopis 67a90c356f updated FK for production db 2022-03-24 10:58:04 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:02:48 +01:00
Vicent Llopis fd7afc962f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:53:33 +01:00
Vicent Llopis 1056060957 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:37:34 +01:00
Alex Moreno f6ff8ea081 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price 2022-03-23 12:17:14 +01:00
Joan Sanchez 0099b48865 Merge pull request '3704-feat(print_claim-pickup-order): add claimConfig' (#902) from 3704-print_claim-pickup-order into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #902
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 11:09:18 +00:00
Alex Moreno dc03a66c6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-23 12:01:50 +01:00
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Alex Moreno 9a1c0a07fd Merge branch 'dev' into 3680-claim_basic-data_packages
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 08:42:52 +00:00
Vicent Llopis 31a5e19151 move db changes to correct folder
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 13:19:19 +01:00
Vicent Llopis 35312911b0 move db changes to correct folder
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 13:16:42 +01:00
Vicent Llopis 84ebeed8ef add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 13:04:25 +01:00
Vicent Llopis e4eed95724 notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 10:02:56 +01:00
Alex Moreno a2b06e7248 feat(print_claim-pickup-order): add claimConfig
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 13:22:39 +01:00
Vicent Llopis f501d20c65 update sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 12:41:15 +01:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 10:30:30 +01:00
Vicent Llopis c660786e45 refactor chaneg name
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 14:52:06 +01:00
Vicent Llopis a32f7b5ef1 add new row
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-17 14:27:55 +01:00
Vicent Llopis 644c24fa3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-17 11:55:07 +01:00
Vicent Llopis afa7345d22 delete old db changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:00:13 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Carlos Jimenez Ruiz 3098fc36fb Merge branch 'dev' into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 14:14:16 +00:00
Alex Moreno f337f82b35 feat(claim): add packages, and next button
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 12:51:33 +01:00
Vicent Llopis 6742d7aa43 upload db changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 07:22:15 +01:00
Alex Moreno 31eb22c1b4 feat(db): update users to role deliveryBoss
gitea/salix/pipeline/head This commit looks good Details
2022-03-14 11:34:09 +01:00
Vicent Llopis 189fe2ed41 update acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-10 08:14:50 +01:00
Vicent Llopis a32ebc37da add supplier autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-09 23:54:23 +01:00
Juan Ferrer d49d1b437c User.login() error fixed
gitea/salix/pipeline/head This commit looks good Details
2022-03-09 15:34:26 +01:00
Vicent Llopis 91a23088c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-09 08:40:55 +01:00
Vicent Llopis 97f2341ae0 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-08 13:42:44 +01:00
Vicent Llopis 527387aad5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-03-08 08:45:40 +01:00
Alex Moreno efa32a3dc7 export structure
gitea/salix/pipeline/head This commit looks good Details
2022-03-04 13:04:28 +01:00
Alex Moreno 138e2ee9b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-04 12:25:05 +01:00
Vicent Llopis f972afb13e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm 2022-03-04 09:38:33 +01:00
Carlos Jimenez Ruiz 63fc58b6ba Merge branch 'dev' into 3649-claim_log
gitea/salix/pipeline/head This commit looks good Details
2022-03-03 12:00:02 +00:00
Vicent Llopis 5ea8c5b06c delete vendedores_updatePortfolio.sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-03 11:38:32 +01:00
Vicent Llopis 4811254ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-02 15:07:38 +01:00
Vicent Llopis ade34c1e0a add section Autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-02 14:59:30 +01:00
Alex Moreno 5efb678a53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:32:18 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 09:17:19 +00:00
Alex Moreno 44318903e7 feat(claim): add log section
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 15:15:58 +01:00
Joan Sanchez cb21a51065 Added SQL version 10430-ash
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 12:12:40 +01:00
Alex Moreno ab6b5aa803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:14:34 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis 72bfc1ef6e export db
gitea/salix/pipeline/head This commit looks good Details
2022-02-25 08:21:53 +01:00