Commit Graph

4728 Commits

Author SHA1 Message Date
Vicent Llopis 568579f461 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:27:04 +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
Alex Moreno af1fa8051f refactor(clientCredit): refactor test 2022-05-12 08:06:30 +02:00
Vicent Llopis 16fdf982c8 feat(item.itemtype): add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 07:40:24 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Vicent Llopis 05b0a5342f feat(zone.events): new dialog when choose 'exclude'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 14:53:52 +02: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
Vicent Llopis 734f9cb60d feat(item.itemType): added section itemType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 07:28:17 +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
Carlos Jimenez Ruiz a47c0dbaea Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz 0e65f382f9 Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:36:35 +00:00
Alex Moreno 5919c42df2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 11:42:35 +02:00
Joan Sanchez 7f19f0bebe Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #938
2022-05-10 08:26:38 +00:00
Joan Sanchez 866834d1d7 Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #956
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-05-10 08:25:47 +00:00
Joan Sanchez aa431bbe0f Merge branch 'dev' into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:24:32 +00:00
Joan Sanchez 93829eeff5 Merge branch 'dev' into 3948-invoceIn.index
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:22:06 +00:00
Joan Sanchez c0f2b9dca9 Merge branch 'dev' into 3996-entry_summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:09:31 +00:00
Alex Moreno fde73b35e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 08:57:28 +02:00
Alex Moreno 5bad0592a5 change errors
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:48:51 +02:00
Alex Moreno 263d0e3f79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive 2022-05-10 07:55:41 +02:00
Vicent Llopis bb4dbb60b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 07:11:26 +02:00
Carlos Jimenez Ruiz 5c55caaec6 Merge branch 'dev' into 3978-invoiceIn.summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:59:32 +00:00
Carlos Jimenez Ruiz e71003778a Merge branch 'dev' into 3950-invoiceIn.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:41:33 +00:00
Carlos Jimenez Ruiz 6fb83f5c65 Merge branch 'dev' into 3941-order.index
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:21:24 +00:00
Carlos Jimenez Ruiz 9c085fa653 Merge branch 'dev' into 3927-monitor_ticket
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:14:01 +00:00
Joan Sanchez 7365143eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 16:09:17 +02:00
Carlos Jimenez Ruiz 93d29bb202 Merge branch 'dev' into 3900-client_credit
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:16:04 +00:00
Vicent Llopis f08a384a7c fix: e2e test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:49:37 +02:00
Alex Moreno d9055abca9 fix(entry_summary): get entry.id
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:44:30 +02:00
Carlos Jimenez Ruiz efc43c9611 Merge branch 'dev' into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 12:36:27 +00: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 a00728384f Merge branch '3409-clientCredit_maxRows' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:19:38 +02:00
Alex Moreno 54fdc4b6e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows 2022-05-09 13:19:20 +02:00
Joan Sanchez f806a598ea Updated method path
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:15:48 +02:00
Vicent Llopis bd7eb67aeb fix: add CAST DECIMAL(10,2)
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 12:31:38 +02:00
Joan Sanchez f380d5fd28 Merge pull request '3942-ticket.volume' (#953) from 3942-ticket.volume into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #953
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-05-09 08:29:23 +00:00
Alex Moreno d34a8629f7 fix(setSaleQuantity): save originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 13:09:37 +02:00
Alex Moreno 798147ea99 jenkins error
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 13:25:57 +02:00
Vicent Llopis 93e3ea103a added frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:05:46 +02:00
Vicent Llopis 9862960c99 comment frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:00:39 +02:00
Vicent Llopis 38f5541ef4 execute jenkins test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 11:27:03 +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
Javi Gallego dcd5d07a28 menu order
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:43:40 +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
Alex Moreno b5a73ec3a2 fix(monitor_client): clientsFilter refactor
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:32:14 +02:00
Alex Moreno 0cae852dea refactor
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:28:17 +02:00
Alex Moreno 1cc199e26b refactor(client-credit)
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:26:13 +02:00
Alex Moreno 800b4984ff fix(test): use ctx.options
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:46:47 +02:00
Alex Moreno e140c9d1f4 console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 15:17:34 +02:00
Alex Moreno f364c19c70 fix(monitor_client): fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 14:08:46 +02:00
Javi Gallego 6584a29ce5 create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 11:16:56 +02:00
Joan Sanchez c6e554c608 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 14:52:02 +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
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Alex Moreno d27a45522b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 12:49:42 +02:00
Vicent Llopis fec9554d5b feat(invoceIn.index): added 'file' and deleted 'account'
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 12:13:02 +02:00
Vicent Llopis 48f10c4e53 feat(invoceIn.create): added nif and deleted currency
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 09:50:43 +02:00
Carlos Jimenez Ruiz b2f930911f fixed problems in two spec files
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 09:18:06 +02:00
Vicent Llopis 11a7f48bd1 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-29 08:32:02 +02:00
Vicent Llopis c10e4c04b6 refactor: delete file
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 08:23:35 +02:00
Javi Gallego 9973eeddb9 Merge remote-tracking branch 'origin/3750-claim_photo' into 3851-dms_delete 2022-04-29 07:51:17 +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
Vicent Llopis 32ec755a35 fix: check if value.length
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:26:38 +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 ab0aba6cfb refactor: translate
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:13:43 +02:00
Vicent Llopis a7b519994d refactor: updated shrink-datetime
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 07:56:14 +02:00
Vicent Llopis 6d4f803cbe refactor: changed 'expand'
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 07:53:06 +02:00
Joan Sanchez b06b9718dc Merge branch 'dev' into 3862-ticket_problemItemShortage
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 12:58:40 +00:00
Vicent Llopis bad90c12f4 feat: add required fields and models
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 14:17:41 +02:00
Vicent Llopis 24fa818cb3 fix(monitor_ticket): filter shipped without time
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 09:48:31 +02:00
Vicent Llopis 1766222c12 refactor: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:25:12 +02:00
Vicent Llopis b246a119cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-04-26 13:15:45 +02:00
Vicent Llopis 7abceb8564 refactor: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:08:06 +02:00
Vicent Llopis 5e35783a38 fix: javi's requested 2022-04-26 13:07:50 +02:00
Alex Moreno 165af44d85 fix(zone_delivery-days): await zone.Events.show()
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 09:49:18 +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
Alex Moreno e7cb9cf2da fix
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 10:30:44 +02:00
Vicent Llopis 6d35200607 updated front test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 10:10:59 +02:00
Vicent Llopis 789365799e refactor: changed name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 08:45:50 +02:00
Alex Moreno 42f02c3b9e fix(client): socialName unique check client.fi 2022-04-25 08:09:58 +02:00
Vicent Llopis 2b9c656d21 feat(invoiceOut): add refund option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-22 11:46:28 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Carlos Jimenez Ruiz 9d46b4c79c refactor(SuggestedTickets): added translations and descriptors
gitea/salix/pipeline/head This commit looks good Details
2022-04-22 11:26:16 +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 4a6873a0fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:37 +02:00
Vicent Llopis 0ec51202e0 pull request changed
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:13 +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
Vicent Llopis 5db20ee3e2 refactor: deleteOldFiles in claim
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:46:37 +02:00
Alex Moreno 62f7b80ed4 quit $
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 08:55:43 +02:00
Alex Moreno ea2e38af4e support front filter and front test for component
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 08:24:12 +02:00
Alex Moreno 433afb8fe8 change tooltip client descriptor btnFive
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-19 15:21:28 +02:00
Alex Moreno 69530d3019 fix filter
gitea/salix/pipeline/head This commit looks good Details
2022-04-19 14:12:31 +02:00
Alex Moreno 7cecf1584b feat(ticket): change isAvailable to itemShortage
gitea/salix/pipeline/head This commit looks good Details
2022-04-19 12:04:06 +02:00
Alex Moreno 8432815cb7 refactor
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 14:58:46 +02:00