wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
7,294 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

7294 Commits

Author SHA1 Message Date
Javi Gallego 6eb0c93802 feat: manual invoice in two lines 2024-10-03 10:17:36 +02:00
Jorge Penadés a8c48789ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-03 10:03:49 +02:00
Jorge Penadés 30e34ea299 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-03 07:59:46 +00:00
Pablo Natek 629524d63f Merge pull request 'fix: refs #7404 fix style' (!785) from 7404-fixStyle into dev 
Reviewed-on: verdnatura/salix-front#785
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-03 07:54:18 +00:00
Jorge Penadés 9b8e388525 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-03 09:49:04 +02:00
Pablo Natek 06fa5b13a4 Merge branch 'dev' into 7404-fixStyle 2024-10-03 07:47:52 +00:00
Jorge Penadés 739671a6da Merge branch 'dev' into 7524-dynamicFetch 2024-10-03 07:25:40 +00:00
Jorge Penadés 1536cbe205 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-03 07:17:05 +00:00
Javi Gallego 909244a658 Merge branch 'dev' into 7346-manualInvoice 2024-10-03 08:50:46 +02:00
Jon Elias b93375f5a4 Merge branch 'dev' into 7010-AddPackingField 2024-10-03 06:41:50 +00:00
Jon Elias 6a1bb6d41f Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField 2024-10-03 08:38:58 +02:00
Jon Elias 8ee4edc5d5 perf: refs #7010 customer summary packaging type field 2024-10-03 08:38:56 +02:00
Javi Gallego df64814c57 fix: hotfix refund invoice 2024-10-03 08:31:13 +02:00
Javi Gallego 641a25097d fix: refundInvoice 2024-10-03 08:30:19 +02:00
Javi Gallego ed5cf137b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-03 08:29:29 +02:00
Javi Gallego b08a5e63e9 fix: inheritWarehouse 2024-10-03 08:29:26 +02:00
Alex Moreno 58a94599a9 Merge pull request '8062-testToMaster_2' (!792) from 8062-testToMaster_2 into master 
Reviewed-on: verdnatura/salix-front#792
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-10-03 05:48:02 +00:00
Javier Segarra fef875270e Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-02 22:08:13 +00:00
Pablo Natek 5e59ecdb43 fix: refs #7404 with on stockBought mobile version 2024-10-02 17:14:51 +02:00
Javi Gallego 789e70b7a8 feat: all clients just with global series 2024-10-02 16:37:58 +02:00
Javi Gallego 6d08875809 fix: icons 2024-10-02 15:37:05 +02:00
Alex Moreno 8de5602564 chore: refs #8062 add changelog 2024-10-02 15:31:09 +02:00
Carlos Satorres 55ddc8644f refs #7283 fix itemMigration list filters 2024-10-02 12:51:33 +02:00
Jon Elias be53b466b9 Merge branch 'dev' into 7010-AddPackingField 2024-10-02 09:53:22 +00:00
Jon Elias 0b76d0d556 refactor: refs #7010 added function to get item packaging type 2024-10-02 11:52:16 +02:00
Carlos Satorres f9e3c92e68 Merge pull request 'warmFix-userListFixRole' (!788) from warmFix-userListFixRole into dev 
Reviewed-on: verdnatura/salix-front#788
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 09:41:57 +00:00
Carlos Satorres ba3b2198b8 Merge branch 'dev' into warmFix-userListFixRole 2024-10-02 09:31:54 +00:00
Jon Elias 0650380b7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField 2024-10-02 11:29:54 +02:00
Jon Elias e6dc2f16b8 Merge pull request '#7884 added new filter field' (!720) from 7884-AddLabelerField into dev 
Reviewed-on: verdnatura/salix-front#720
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 08:46:55 +00:00
Jon Elias 375adfab76 Merge branch 'dev' into 7884-AddLabelerField 2024-10-02 08:46:08 +00:00
Carlos Satorres e374059f41 Merge pull request 'refs #6899 fix filters, date from to socialName' (!789) from 6899-fixInvoiceOutNegative into dev 
Reviewed-on: verdnatura/salix-front#789
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 08:45:54 +00:00
Jon Elias c54189e06a Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 10:43:55 +02:00
Jon Elias 98df741f1b fix: refs #7884 deleted useless translations 2024-10-02 10:43:54 +02:00
Carlos Satorres 49da7168ab Merge branch 'dev' into 6899-fixInvoiceOutNegative 2024-10-02 08:41:19 +00:00
Jon Elias 12727e93eb Merge branch 'dev' into 7884-AddLabelerField 2024-10-02 08:36:11 +00:00
Jon Elias 8fc3b2e86d Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 10:34:51 +02:00
Jon Elias 7db166974f feat: refs #7884 use VnTable prop for chip label filters and modified translations 2024-10-02 10:34:50 +02:00
Carlos Satorres c2c4acfc30 refs #6899 fix filters, date from to socialName 2024-10-02 09:42:38 +02:00
Javier Segarra c987a1151c Merge pull request 'Improve ZoneLocationTree height' (!786) from fix_height_zoneLocationTree into dev 
Reviewed-on: verdnatura/salix-front#786
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 07:36:09 +00:00
Javier Segarra 692c649b8c perf: refs #7679 #7679 improve watch 2024-10-02 09:29:05 +02:00
Jon Elias 03a3d6bd50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 08:47:21 +02:00
Javier Segarra 2bd004f52b perf: refs #7679 add sortBy & limit whe retrieve Autonomies 2024-10-01 21:56:12 +02:00
Javier Segarra 6b38bdf868 style: improve ZoneLocationTree height 2024-10-01 19:26:03 +00:00
Pablo Natek c0fd5a1c21 fix: refs #7404 fix style 2024-10-01 16:12:18 +02:00
Javi Gallego 38599be9bd Merge pull request '6722-showDegrees' (!782) from 6722-showDegrees into dev 
Reviewed-on: verdnatura/salix-front#782
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-01 14:05:36 +00:00
Javi Gallego 36457f704d Merge branch 'dev' into 6722-showDegrees 2024-10-01 14:04:18 +00:00
Javi Gallego 2f5358d439 Merge pull request '#7356 - transfer ticket method' (!784) from 7356_ticket_migration into dev 
Reviewed-on: verdnatura/salix-front#784
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-01 13:27:38 +00:00
Javier Segarra 2ca99a51ae fix: refs #7356 transfer ticket method 2024-10-01 15:12:22 +02:00
Jon Elias 209c88884f Merge branch 'dev' into 7884-AddLabelerField 2024-10-01 13:10:28 +00:00
Javier Segarra 1a697aa018 feat: refs #7679 #7679 add sortBy and limit 2024-10-01 15:02:42 +02:00