Commit Graph

17984 Commits

Author SHA1 Message Date
Pablo Natek 3ce0957de0 Merge pull request 'fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit' (!1818) from 6150-clientCredit-update-Fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1818
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-07 12:29:30 +00:00
Pablo Natek 0818efaa99 fix(fixtures): refs #6150 clientCredit
gitea/salix/pipeline/head This commit looks good Details
2023-11-06 14:58:39 +01:00
Pablo Natek 1c6618d494 fix(new): refs #6150 revert chabges in worker new method
gitea/salix/pipeline/head Build queued... Details
2023-11-06 14:56:48 +01:00
Pablo Natek 72c8e76a2f Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 14:54:57 +01:00
Pablo Natek b442c9f5ed fix: refs #6150 ticket to client trigger 2023-11-06 14:54:56 +01:00
Pablo Natek 526a5fdc8f Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 13:26:45 +00:00
Pablo Natek aa800b1fd3 Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 14:23:38 +01:00
Pablo Natek a75565f2ce feat(client.create): refs #6150 clientCredit update fix 2023-11-06 14:23:36 +01:00
Pablo Natek 779ca2cc05 Merge pull request 'feat(claimViewer): refs #5881 nuevo rol claimViewer' (!1825) from 5881-claim-viewer into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1825
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-06 09:46:42 +00:00
Pablo Natek 7ca3ea156c feat(claimViewer): refs #5881 nuevo rol claimViewer
gitea/salix/pipeline/head This commit looks good Details
2023-11-06 09:16:10 +01:00
Juan Ferrer 99c88e6f5d fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good Details
2023-11-05 09:33:18 +01:00
Alex Moreno 8c5e40c27f refs #4797 fix: correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 15:16:03 +01:00
Alex Moreno d06810b1b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno a523e32373 refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 07:57:53 +01:00
Jorge Penadés d0975f0acd ref #6276 operator_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-02 16:25:25 +01:00
Sergio De la torre 439b3091d0 Merge pull request 'hotFix_6312 fix originalQuantity' (!1819) from hotFix_6312 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1819
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-02 14:05:17 +00:00
Sergio De la torre 728838334c hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:42:22 +01:00
Pablo Natek 2d3ee4a16e Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 13:05:31 +00:00
Pablo Natek 175e73e565 fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:05:14 +01:00
Alex Moreno 03e2f57306 refs #6067 fix: emailVerify url
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 10:57:50 +01:00
Alex Moreno 740d2fb976 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-02 08:48:03 +01:00
Alex Moreno 83b9ef72fc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:47:44 +01:00
Alex Moreno bf84863237 refs #6376 fix: changelog
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:42:53 +01:00
Alex Moreno 742d6de986 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 07:28:41 +01:00
Robert Ferrús 8d737e579d Merge pull request 'refs #5637 saleGroup traducciones' (!1816) from 5637-saleGroupLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1816
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-11-02 06:07:17 +00:00
Alex Moreno d7542bcbb4 refs #6335 fix(ticketAdvance): procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-31 15:11:03 +01:00
Carlos Andrés 8c1ff26de7 Merge branch 'dev' into 5637-saleGroupLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 11:12:40 +00:00
Pablo Natek efddb5ed1d Merge pull request 'refs #4131 changeStateRefactor' (!1753) from 4131-unifyTicketStatusChanges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1753
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-31 09:34:20 +00:00
Robert Ferrús 6112c7ba5f refs #5637 saleGroup traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 09:59:34 +01:00
Pablo Natek a47d31cec9 Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 06:48:53 +00:00
Pablo Natek e7da093fc1 fix(acl.sql): refs #4131 òner comillas en el sql
gitea/salix/pipeline/head Build queued... Details
2023-10-31 07:49:27 +01:00
Alex Moreno 37dce99447 refs #6335 test(ticketAdvance): add test to keep price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 15:00:05 +01:00
Pablo Natek e504ad313c remove(console.log): refs #4131 quitar console log
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 14:56:33 +01:00
Alex Moreno a80715583c refs #6335 feat(ticketAdvance): change the date if you can
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 14:16:25 +01:00
Jorge Penadés d2468033ea Merge pull request '5216-addExpeditionState' (!1815) from 5216-addExpeditionState into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1815
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-30 12:52:21 +00:00
Jorge Penadés f250c084f7 ref #5216 refactor expeditionState BeforeInsert
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 09:11:52 +01:00
Jorge Penadés ab0640291b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 08:25:41 +01:00
Sergio De la torre ada308bcb6 Merge pull request 'refs #5134 fix: model ExpeditionScan' (!1814) from 5134-ModelsSalixs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1814
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-30 06:28:21 +00:00
Alex Moreno bd8cc897c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-30 07:21:31 +01:00
Pablo Natek 14753212bb fix(saveSign): refs #4131 remove call state on saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:07:17 +02:00
Pablo Natek 65a1d052dc feat(ticket.state): refs #4131 to state
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:03:40 +02:00
Sergio De la torre 7ae12327f5 refs #5134 fix: model ExpeditionScan
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 16:16:22 +02:00
Alex Moreno ae160890a8 refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-27 15:06:20 +02:00
Pablo Natek 42bbdf9814 feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 13:41:32 +02:00
Pablo Natek 9708f66cef merge(dev): refs #4131 merge dev move sql files
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 12:36:28 +02:00
Pablo Natek 524ac4d99d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges 2023-10-26 22:16:06 +02:00
Pablo Natek 3584b15c19 Merge branch 'dev' into 4131-unifyTicketStatusChanges 2023-10-26 22:10:35 +02:00
Jorge Penadés 7fe0641817 Merge pull request '5914-transferInvoiceOut' (!1761) from 5914-transferInvoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1761
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-26 12:39:07 +00:00
Alex Moreno 55d80458cc refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 14:37:42 +02:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00