verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity
12,972 Commits 287 Branches 0 Tags 125 MiB
Commit Graph

5227 Commits

Author SHA1 Message Date
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana 2022-10-26 08:11:15 +02:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files 2022-10-25 14:09:21 +02:00
Alex Moreno ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 10:39:50 +00:00
Pau 296a743d8a Fix test, remove console log 2022-10-25 12:25:56 +02:00
Pau 7b04464848 Merge branch 'dev' into 2612-create-supplier 2022-10-25 10:00:13 +00:00
Joan Sanchez 1196125350 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-10-25 11:58:47 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 09:58:17 +00:00
Pau 76d248131c Merge branch 'dev' into 2612-create-supplier 2022-10-25 09:45:25 +00:00
Pau 9089ba7346 requested changes 2022-10-25 10:42:16 +02:00
Alex Moreno e8500f926c feat(invoiceIn): add email 2022-10-25 08:19:56 +02:00
Vicent Llopis 931a891f71 fix: check client.email exists 2022-10-25 08:09:23 +02:00
Vicent Llopis 8a3573474a refactor: move 'lastEntries' to thrid position in descriptor 2022-10-25 07:40:32 +02:00
Alex Moreno 7cb8175b73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-25 07:36:21 +02:00
Vicent Llopis d18b22bb05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving 2022-10-25 07:05:26 +02:00
Joan Sanchez e80754f280 Added new SQL version 2022-10-24 18:37:38 +02:00
Alex Moreno 9e0eab5a77 feat(invoiceIn): email 2022-10-24 15:15:23 +02:00
Alex Moreno 6a17a634d4 hotFix(receipt): add receiptPdf 2022-10-24 09:49:51 +02:00
Alex Moreno d29d1ff538 Merge branch '4548-invoiceIn-pdf' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-24 08:27:12 +02:00
Alex Moreno 6c38835e8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-24 08:20:25 +02:00
Joan Sanchez cf0b750304 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-10-21 12:35:01 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving 2022-10-21 11:41:53 +02:00
Vicent Llopis f968b19d1e fix: testFront 2022-10-21 09:08:17 +02:00
Vicent Llopis c33cab7b10 fix: test back 2022-10-21 09:01:08 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana 2022-10-21 08:55:05 +02:00
Vicent Llopis e7261573d7 delete focus 2022-10-21 08:01:22 +02:00
Vicent Llopis 6f31bea21f feat: update testBack 2022-10-21 08:00:48 +02:00
Vicent Llopis 5da29fe381 refactor: unify duplicated code 2022-10-21 08:00:24 +02:00
Alex Moreno 066cf6f69b add show dialog 2022-10-20 15:11:56 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code 2022-10-20 15:05:46 +02:00
Vicent Llopis 29093d7d30 feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas 2022-10-20 14:25:55 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-20 08:49:08 +02:00
Vicent Llopis bcc9acac0a fix: tBack 2022-10-20 08:41:00 +02:00
Vicent Llopis 51cad75298 fix: testFront 2022-10-20 08:17:15 +02:00
Alex Moreno 9ef835a077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-19 15:10:22 +02:00
Joan Sanchez 7d502c6f57 Merge pull request 'Send delivery note to refund tickets' () from 3505-closure_refund into dev 
Reviewed-on:
2022-10-19 13:00:18 +00:00
Alex Moreno 192e61a70d hotFix(route_index): fix driverRoutePdf 2022-10-19 14:54:13 +02:00
Alex Moreno ca138cc2be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-19 08:23:19 +02:00
Pau dc1b1bc1c3 Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox 2022-10-19 05:35:06 +00:00
Alex Moreno c9073641aa feat(invoiceInPdf): content 2022-10-18 14:58:38 +02:00
Pau 9fa81fe9eb Merge branch '2612-create-supplier' of https://gitea.verdnatura.es/verdnatura/salix into 2612-create-supplier 2022-10-18 14:22:56 +02:00
Pau c2fd1fa44d fixed tests 2022-10-18 14:22:54 +02:00
Pau 73a69051a8 Merge branch 'dev' into 2612-create-supplier 2022-10-18 12:01:04 +00:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality 2022-10-18 13:45:46 +02:00
Pau db12ceb369 removed async from the redirect function 2022-10-18 13:07:10 +02:00
Pau 470b4485d5 Fixed test and DB structure 2022-10-18 12:58:44 +02:00
Vicent Llopis ae3e3c3c49 fix: id model duplicated 2022-10-18 12:37:06 +02:00
Pau a204c6e2b0 Fixed the suppliers not appearing 2022-10-18 12:29:04 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name 2022-10-18 11:47:37 +02:00
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Pau f481cc3c97 Capitalizar 2022-10-18 10:38:40 +02:00
Pau 89bbf35a87 Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox 2022-10-18 08:30:32 +00:00
Pau 1d8fb25325 Refactored according to the suggested changes 2022-10-18 10:25:54 +02:00
Pau 047076f189 changed tests 2022-10-18 07:14:40 +02:00
Alex Moreno eb58839839 feat(invoiceIn): invoiceInPdf 2022-10-17 15:13:27 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-10-17 14:06:31 +02:00
Pau 9290cd6fb6 Finished back tests 2022-10-17 14:02:18 +02:00
Vicent Llopis f85c2e9700 refactor: delete code repeated 2022-10-17 14:01:21 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments 2022-10-17 12:07:34 +02:00
Alex Moreno 57b2ae770d fix(e2e) 2022-10-17 11:44:29 +02:00
Alex Moreno 79b970286c refactor(claim_claimPickupEmail): use text template and external form 2022-10-17 11:22:27 +02:00
Pau cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data 2022-10-17 08:41:39 +00:00
Pau a4243e14c5 Created Back test for newSupplier 2022-10-17 10:17:56 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund 2022-10-17 08:15:16 +00:00
Pau dc53aac163 Merge branch 'dev' into 2612-create-supplier 2022-10-17 07:32:50 +00:00
Pau f0b1591b14 Remove debugging elements 2022-10-17 09:22:50 +02:00
Pau 0cdee89ac3 Button removed when user does not have permissions 2022-10-17 09:20:45 +02:00
Vicent Llopis 787d10aac6 fix: select one result only 2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break 2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long 2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Pau 1603619d81 removed debugging elements 2022-10-17 07:38:54 +02:00
Pau 594cee12f3 add checks to the existence of object variables 2022-10-17 07:35:02 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-17 07:32:32 +02:00
Pau dc6c8f924d feat: Create new Supplier 2022-10-17 07:25:25 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana 2022-10-14 14:43:08 +02:00
Vicent Llopis 40075e7e21 fix: testFront 2022-10-14 14:38:47 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both 2022-10-14 14:30:37 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Joan Sanchez 390ee60e59 Get first element in array 2022-10-14 07:26:34 +02:00
Joan Sanchez 67097970ed Incoterms required param 2022-10-13 10:44:20 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets 2022-10-13 09:30:31 +02:00
Alex Moreno 74383b61e7 hotFix(monitor): use left join in ticketState 2022-10-13 09:22:53 +02:00
Pau 012cd68c89 Added menu to create a new supplier, not working 2022-10-11 11:43:01 +02:00
Vicent Llopis bfefec397e feat: add testFront 2022-10-11 09:13:29 +02:00
Vicent Llopis 1a38fc307f delete: duplicated keybinding 2022-10-11 08:42:59 +02:00
Vicent Llopis 9c52508a88 feat: add total labels 2022-10-11 08:40:22 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving 2022-10-11 07:09:20 +02:00
Vicent Llopis dbfc3d335d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-11 07:06:45 +02:00
Joan Sanchez e3606c7273 Updated unit test 2022-10-10 14:46:06 +02:00
Vicent Llopis 1f21fdeb65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-10 13:30:27 +02:00
Vicent Llopis 843f67919c feat: add backTest 2022-10-10 12:56:03 +02:00
Joan Sanchez 7f023d7456 Set user default warehouse 2022-10-10 12:23:40 +02:00
Joan Sanchez 990a1b3c67 250 nodes 2022-10-10 10:33:08 +02:00
Joan Sanchez 31d1b84bb9 Unfold when there's less than 100 nodes to show 2022-10-10 10:25:59 +02:00
Alex Moreno e497ddd664 fix: add td-editable 2022-10-10 09:21:14 +02:00
Alex Moreno 18cd34bccb fix(travel_extraCommunity): css 2022-10-10 08:57:41 +02:00
Joan Sanchez 4ecbb59ac0 Closure hours 2022-10-10 07:49:08 +02:00
Alex Moreno 9befa2531b Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css 2022-10-10 07:29:26 +02:00
Joan Sanchez 934c0d0169 Updated unit test 2022-10-10 07:28:10 +02:00