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

5045 Commits

Author SHA1 Message Date
Jon Elias cc3216f1f3 Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-09 07:46:33 +02:00
Jon Elias 3f76b5496a fix: refs #7717 fix order sections 2024-08-09 07:46:32 +02:00
Jon Elias 3dc2ac8bac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-07 07:25:57 +02:00
Alex Moreno ffcab60a06 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 14:31:28 +02:00
Alex Moreno 1db7fd8412 hotFix(routeTicket): limit 0 2024-08-06 13:01:07 +02:00
Alex Moreno 297ac8592f Merge pull request 'fix: routeForm' (!595) from 7129-hotfix into master 
Reviewed-on: verdnatura/salix-front#595
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-06 10:19:10 +00:00
Alex Moreno c3fb30e72b Merge branch 'master' into 7129-hotfix 2024-08-06 10:15:38 +00:00
Alex Moreno 7e7fddb86b fix(router_basicData): transalation kmMax 2024-08-06 11:50:33 +02:00
Carlos Satorres 9a165b38c9 Merge pull request 'refs #6898 fix new list' (!594) from 6898-suppliersMigrationFix3 into master 
Reviewed-on: verdnatura/salix-front#594
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-06 09:45:46 +00:00
Pablo Natek 7d6520fdaa fix: routeForm 2024-08-06 11:44:38 +02:00
Carlos Satorres 75866f2d27 refs #6898 fix new list 2024-08-06 11:00:59 +02:00
Alex Moreno 4c46e419e3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 09:43:50 +02:00
Alex Moreno 28efe4aacf hotFix(route_list): columnFilter change "from" to "to" 2024-08-06 09:43:16 +02:00
Alex Moreno f38a70c040 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 08:01:41 +02:00
Alex Moreno 02172fbc26 Merge pull request '7837-testToMaster_2432' (!592) from 7837-testToMaster_2432 into master 
Reviewed-on: verdnatura/salix-front#592
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-08-06 05:54:10 +00:00
Alex Moreno 8c754dd196 hotFix(claim_development): reload when change route id 2024-08-05 15:22:34 +02:00
Alex Moreno 6abce3c7d0 hotFix(VnPaginate): watch when is mounted 2024-08-05 15:20:07 +02:00
Alex Moreno 2faab84962 add changelog 2024-08-05 14:52:20 +02:00
Alex Moreno dcc2ef3d18 typo 2024-08-05 14:25:42 +02:00
Guillermo Bonet 59b709b57d Merge branch 'test' into dev 2024-08-05 11:59:15 +02:00
Guillermo Bonet da911f80f6 Merge branch 'master' into test 2024-08-05 11:58:58 +02:00
Guillermo Bonet d90ed6c703 Merge pull request 'feat: refs #7644 Optimized entry labels report' (!590) from 7644-buyLabelChunk into master 
Reviewed-on: verdnatura/salix-front#590
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-05 09:53:42 +00:00
Guillermo Bonet d12c0de144 feat: refs #7644 Optimized entry labels report 2024-08-05 11:29:44 +02:00
Alex Moreno cb95f0637f Merge pull request 'feat(customer_balance): refs #6943 add functionality from salix' (!589) from 6943-cusotmer-balance into dev 
Reviewed-on: verdnatura/salix-front#589
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-05 08:08:43 +00:00
Alex Moreno c83b3d54ae typo 2024-08-05 10:07:47 +02:00
Alex Moreno 30961c796d feat(customer_balance): refs #6943 translations 2024-08-05 10:05:41 +02:00
Alex Moreno 460b166a17 feat(customer_balance): refs #6943 add functionality from salix 2024-08-05 09:04:08 +02:00
Alex Moreno 6cece5c071 Merge pull request 'hotfix: refs CAU #207614 fix sale.concept field' (!586) from hotfix_TicketList_itemName into test 
Reviewed-on: verdnatura/salix-front#586
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-05 05:45:47 +00:00
Alex Moreno 91e066e18a Merge branch 'test' into hotfix_TicketList_itemName 2024-08-05 05:44:41 +00:00
Jon Elias d4a5b074be Merge pull request 'hotfix: CAU 207504 fix itemDiary and logs' (!587) from hotfix_ItemDiary into test 
Reviewed-on: verdnatura/salix-front#587
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-02 11:06:37 +00:00
Jon Elias bdf4c793dc Merge branch 'test' into hotfix_ItemDiary 2024-08-02 11:04:47 +00:00
Alex Moreno 3e5c811961 Merge pull request 'fix: refs #6101 fix TicketList' (!585) from hotfix_6101_FixTicketList into test 
Reviewed-on: verdnatura/salix-front#585
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-02 10:29:48 +00:00
Alex Moreno eb55743bc0 Merge branch 'test' into hotfix_6101_FixTicketList 2024-08-02 10:28:44 +00:00
Guillermo Bonet 0d016e0898 Merge branch 'test' into dev 2024-08-02 10:01:16 +02:00
Guillermo Bonet 33da5dd8a8 Merge branch 'master' into test 2024-08-02 10:01:01 +02:00
Guillermo Bonet 6bc265b83f Merge pull request 'fix: refs #7413 No id tag' (!580) from 7413-filterValueFix into master 
Reviewed-on: verdnatura/salix-front#580
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-02 07:57:32 +00:00
Guillermo Bonet 8450830b59 Merge branch 'master' into 7413-filterValueFix 2024-08-02 07:55:30 +00:00
Jon Elias 2367550bc1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ItemDiary 2024-08-02 09:25:46 +02:00
Jon Elias 276202f0c7 fix: refs CAU 207504 fix itemDiary and logs 2024-08-02 09:23:30 +02:00
Jon Elias b6bb8e0952 hotfix: refs CAU #207614 fix sale.concept field 2024-08-02 08:41:46 +02:00
Jon Elias 3d79cbcf59 Merge branch 'test' into hotfix_6101_FixTicketList 2024-08-02 06:27:30 +00:00
Jon Elias c5f2075148 fix: refs #6101 fix TicketList 2024-08-02 08:25:57 +02:00
Jon Elias 8a4f723732 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-02 04:50:39 +00:00
Alex Moreno c0fdf21c31 test: kubernetes pods 2024-08-01 14:46:36 +02:00
Alex Moreno 8a3a26dc9a test: kubernetes pods 2024-08-01 14:42:31 +02:00
Alex Moreno 508320a544 test: kubernetes pods 2024-08-01 14:34:21 +02:00
Alex Moreno c8662e4bb8 test: kubernetes pods 2024-08-01 14:27:27 +02:00
Alex Moreno 968de67393 test: kubernetes pods 2024-08-01 14:22:05 +02:00
Alex Moreno 545f7c8039 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 14:11:15 +02:00
Alex Moreno da85d7d2a0 Merge pull request 'fix(claim): small details' (!582) from 6336-claim-v6 into test 
Reviewed-on: verdnatura/salix-front#582
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-08-01 08:55:07 +00:00