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

3724 Commits

Author SHA1 Message Date
William Buezas 7466d03f15 resolve conflicts 2024-05-20 08:46:08 -03:00
Carlos Satorres 9f517eb59d refs #6820 fix BasicData Tickets 2024-05-20 12:40:47 +02:00
Javier Segarra febc88203d style: fix color when is empty 2024-05-20 11:16:05 +02:00
Jorge Penadés c1a6bca508 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 09:31:58 +02:00
Jorge Penadés cda9e71197 refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue 2024-05-20 09:31:31 +02:00
Carlos Satorres 936f921864 Merge pull request '7396-addBasicDataWorker' (!384) from 7396-addBasicDataWorker into dev 
Reviewed-on: verdnatura/salix-front#384
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-20 07:21:10 +00:00
Carlos Satorres ce72b8099b Merge branch 'dev' into 7396-addBasicDataWorker 2024-05-20 07:20:29 +00:00
Carlos Satorres e5c445fc12 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-20 09:00:57 +02:00
Carlos Satorres 4199fc0dc5 refs #7396 fix basicData, summary, change deleteDepartment 2024-05-20 09:00:54 +02:00
Jorge Penadés 2366ef772f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 08:55:35 +02:00
Javier Segarra 8787db8622 Merge pull request 'Zone warehouses' (!385) from hyervoni/salix-front-mindshore:feature/ZoneWarehouses into dev 
Reviewed-on: verdnatura/salix-front#385
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-20 06:44:36 +00:00
Javier Segarra c40f322a8f Merge branch 'dev' into feature/ZoneWarehouses 2024-05-20 08:40:27 +02:00
Jon Elias bfbe71c63e Merge pull request 'refactor: refs #7361 ticket/summary like salix' (!368) from 7361-TicketSummaryRefactor into dev 
Reviewed-on: verdnatura/salix-front#368
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-20 05:09:12 +00:00
Jon Elias 708a852473 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-20 05:08:02 +00:00
William Buezas 202473158c resolve conflicts 2024-05-19 14:21:32 -03:00
Javier Segarra bbd51c5773 feat: AccountDescriptorMenu 2024-05-18 11:40:32 +02:00
Javier Segarra 474e2c3a48 style: align-center 2024-05-18 11:19:04 +02:00
Javier Segarra 0397f9ee68 feat: AccountDescriptor & AccountDescriptorMenu 2024-05-18 11:18:23 +02:00
Javier Segarra c64a403ee2 feat: AccountSummary 2024-05-18 11:17:58 +02:00
Javier Segarra a2316fb222 feat: change skeleteon different components 2024-05-18 10:35:08 +02:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users 2024-05-18 10:16:28 +02:00
Javier Segarra 3be5b66daa Merge pull request 'Zone Delivery' (!377) from hyervoni/salix-front-mindshore:feature/ZoneDelivery into dev 
Reviewed-on: verdnatura/salix-front#377
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-18 07:07:40 +00:00
Javier Segarra 902d260822 Merge branch 'dev' into feature/ZoneDelivery 2024-05-18 07:06:57 +00:00
Javier Segarra 7197881cdd style: reset poc style 2024-05-18 08:53:46 +02:00
Javier Segarra 632acc13ac style: reset poc style 2024-05-18 08:53:08 +02:00
Javier Segarra ce87008c12 fix: remove console.log 2024-05-18 08:50:38 +02:00
William Buezas 78e81c6f75 ZoneWarehouses and ZoneWareousesCreate refactor 2024-05-17 17:16:58 -03:00
William Buezas e38f3fc60d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ZoneWarehouses 2024-05-17 15:32:45 -03:00
William Buezas 6c374061d0 Handle request orders 2024-05-17 15:24:17 -03:00
William Buezas 6e49982531 Revert "Handle onsubmit" 
This reverts commit 7c5b61cca8.
 2024-05-17 15:18:10 -03:00
William Buezas 7c5b61cca8 Handle onsubmit 2024-05-17 14:35:15 -03:00
Javier Segarra 6afafb2f11 minor changes 2024-05-17 18:44:25 +02:00
Javier Segarra cda59116ff Revert "first approach" 
This reverts commit 9604599b33.
 2024-05-17 18:04:48 +02:00
Javier Segarra 3b0f99a196 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-17 17:56:52 +02:00
Javier Segarra 9604599b33 first approach 2024-05-17 17:53:26 +02:00
Jorge Penadés 81998a4137 refactor: refs #6942 summary 2024-05-17 17:26:58 +02:00
Jorge Penadés 7f880b397c fix: refs #6942 fix vncard 2024-05-17 17:26:00 +02:00
William Buezas e196cf8fd5 Zone warehouses 2024-05-17 10:57:20 -03:00
Jorge Penadés 1abcb4796f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-17 14:36:22 +02:00
Alex Moreno 75f3d4f410 fix: refs #6539 VnSelect use url 2024-05-17 14:32:39 +02:00
Carlos Satorres 488c6b3f94 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-17 14:23:02 +02:00
Carlos Satorres d359063e5d refs #7396 fix summary 2024-05-17 14:23:00 +02:00
Javier Segarra ce444c7e5c first approach 2024-05-17 14:19:29 +02:00
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +02:00
Javier Segarra 41e2462b49 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-17 11:58:38 +00:00
Javier Segarra 08e6703853 style updates 2024-05-17 13:57:01 +02:00
Javier Segarra 24eeb5519a style updates 2024-05-17 13:52:45 +02:00
Carlos Satorres d7e3303d68 refs #7396 add fiDueDate, machine 2024-05-17 13:19:59 +02:00
Carlos Satorres 2c41c31b6f Merge pull request '6914-fixWorkerCreateErrors' (!380) from 6914-fixWorkerCreateErrors into dev 
Reviewed-on: verdnatura/salix-front#380
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-17 11:18:31 +00:00
Carlos Satorres 067df2d56b Merge branch 'dev' into 6914-fixWorkerCreateErrors 2024-05-17 11:15:25 +00:00