 David Domenech
|
3c1237f727
|
refs #6456
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 13:37:18 +01:00 |
 Guillermo Bonet
|
f73a447391
|
refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 11:57:49 +01:00 |
 Jorge Penadés
|
767894b128
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-02 09:41:47 +01:00 |
 Javier Segarra
|
6b37f23349
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 13:06:52 +01:00 |
|
David Domenech
|
d60f2a7f88
|
fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 09:43:09 +01:00 |
|
Jorge Penadés
|
1f2d475f05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 08:41:45 +01:00 |
 Sergio De la torre
|
af83519ee6
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 15:12:39 +00:00 |
|
Jorge Penadés
|
36a9b0eee4
|
refs #6276 collectionAddItem
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 16:00:07 +01:00 |
|
Jorge Penadés
|
3109f7722e
|
refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 13:24:18 +01:00 |
|
Jorge Penadés
|
8acd03f115
|
refs #6276 saleTrackingReplace
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 13:01:34 +01:00 |
|
Sergio De la torre
|
3692021b12
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 07:26:22 +00:00 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
David Domenech
|
eb0766bafd
|
Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 14:08:47 +00:00 |
|
David Domenech
|
8ab981907d
|
refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:25:00 +01:00 |
|
Jorge Penadés
|
133fe1065a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:44:09 +01:00 |
|
Guillermo Bonet
|
3bdb002034
|
Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 09:06:17 +00:00 |
|
Guillermo Bonet
|
2be1639e9f
|
refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 12:42:25 +01:00 |
|
Jorge Penadés
|
900dffbbba
|
refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:26:28 +01:00 |
|
Jorge Penadés
|
251578146e
|
refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 12:32:36 +01:00 |
|
Jorge Penadés
|
3f8d1ff617
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:17:31 +01:00 |
 Javi Gallego
|
3f7663da97
|
feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:09:04 +01:00 |
|
Guillermo Bonet
|
05a7498219
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:14:21 +00: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
|
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 |
|
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
|
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 |
 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 |
|
Jorge Penadés
|
da2bc416f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 08:26:35 +02:00 |
|
Alex Moreno
|
a501d577f8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-25 09:23:00 +02:00 |
|
Jorge Penadés
|
1231d6dd1d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-24 08:34:42 +02:00 |
|
Alex Moreno
|
247aa5af2a
|
refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 09:52:06 +02:00 |
|
Alex Moreno
|
cf856a585b
|
refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 09:50:00 +02:00 |
|
Alex Moreno
|
dc00b85bec
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-23 08:31:37 +02:00 |
|
Alex Moreno
|
1eabad7f4b
|
refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 12:37:44 +02:00 |
|
Alex Moreno
|
ef1ddfd484
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 09:28:37 +02:00 |
|
Alex Moreno
|
84aed7ca21
|
refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 09:26:56 +02:00 |
 Carlos Andrés
|
16f20cea70
|
refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 15:12:06 +02:00 |
|
Guillermo Bonet
|
5c51d7fb04
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:22:33 +02:00 |
|
Alex Moreno
|
d9ab607126
|
refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:03:11 +02:00 |
|
Alex Moreno
|
da20697052
|
refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 15:19:26 +02:00 |
|
Alex Moreno
|
d4770c525e
|
refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 11:00:41 +02:00 |
|
Alex Moreno
|
093431ecdf
|
refs #6119 fix(sale_hook): fix quantity case
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 15:27:10 +02:00 |
|
Alex Moreno
|
b769fa9bcf
|
refs #6199
gitea/salix/pipeline/head This commit looks good
Details
fix(sale_updateQuantity): if clientType is loses skip
test: fix updateQuantity activeCtx and add test for minQuantity
|
2023-10-16 10:10:57 +02:00 |
|
Jorge Penadés
|
ab6c58cd12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 08:18:00 +02:00 |
|
Alex Moreno
|
ab1cc34015
|
refs #6199 feat(sale): best quantity restriction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 15:14:48 +02:00 |
|
Guillermo Bonet
|
3e70cb07e0
|
refs #6184 Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 14:20:35 +02:00 |
|
Guillermo Bonet
|
c0089b1fa0
|
refs #6184 Added cmrFk in ticket model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:20:30 +02:00 |
|
Guillermo Bonet
|
3e522b08b6
|
refs #6184 Added saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 11:43:21 +02:00 |
|
Sergio De la torre
|
3ba349b74a
|
refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 09:14:30 +02:00 |
|
Jorge Penadés
|
4b213c1c9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:31:45 +02:00 |
|
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:18:15 +02:00 |
|
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 07:42:44 +02:00 |
|
Sergio De la torre
|
2ea2943eca
|
refs #5134 feat: models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 13:12:18 +02:00 |
|
Jorge Penadés
|
731bad5981
|
ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 14:52:56 +02:00 |
|
Jorge Penadés
|
f64f7a975d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:51:20 +02:00 |
|
Sergio De la torre
|
ed1d8ca94f
|
refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 12:29:56 +02:00 |
 Carlos Satorres
|
f60b6b84fe
|
refs #5843 fix back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 11:58:36 +02:00 |
|
Jorge Penadés
|
87cee57e56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 10:47:53 +02:00 |
|
Alex Moreno
|
2dbd711104
|
Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 05:24:05 +00:00 |
|
Pablo Natek
|
66e851b5ea
|
refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 19:48:58 +02:00 |
 Vicent Llopis
|
f3e43686a3
|
refs #5811 feat: al borrar expedicion borrar tmb de viaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 14:59:28 +02:00 |
|
Jorge Penadés
|
0f3b633de4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 08:03:01 +02:00 |
|
Alex Moreno
|
3eacb4dbd9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:05:04 +02:00 |
|
Alex Moreno
|
508a4b2d34
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:04:27 +02:00 |
|
Jorge Penadés
|
82d08261e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
|
2023-08-23 10:25:48 +02:00 |
|
Vicent Llopis
|
2f2611a705
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:31:17 +00:00 |
|
Alex Moreno
|
a26652045c
|
refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:17:46 +02:00 |
|
Sergio De la torre
|
a6047d257b
|
refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:45:18 +02:00 |
|
Alex Moreno
|
9ef4ba9bef
|
refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:32:49 +02:00 |
|
Sergio De la torre
|
6eb88f8ab7
|
refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-11 11:58:30 +02:00 |
|
Jorge Penadés
|
7ca6c6b96d
|
refs #5914 fix merge
|
2023-08-08 15:10:15 +02:00 |
|
Alex Moreno
|
ce78fc8e5d
|
refs #5986 feat: state model add classColor properties
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 15:06:28 +02:00 |
|
Jorge Penadés
|
3ef74cab5c
|
refs #5914 WIP created transferInvoiceOut
|
2023-08-01 12:45:57 +02:00 |
|
Jorge Penadés
|
22f76ec6a9
|
refs #5914 WIP clone method created
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-31 10:33:51 +02:00 |
|
Jorge Penadés
|
10361ba78e
|
refs #5216 addExpeditionState refactored
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 13:33:56 +02:00 |
|
Jorge Penadés
|
bbc26d8ba4
|
WIP refs #5216 addExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 12:36:30 +02:00 |
|
Jorge Penadés
|
0b88194f09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 10:27:01 +02:00 |
|
Jorge Penadés
|
fa9dfdf411
|
refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-25 16:32:38 +02:00 |
|
Jorge Penadés
|
543fbf3c0a
|
refs #5929 isEditableOrThrow created, tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-25 15:35:08 +02:00 |
|
Jorge Penadés
|
ea4190f15c
|
refs #5216 update expedition state added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-24 13:32:28 +02:00 |
|
Vicent Llopis
|
f926c60017
|
remove file
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-21 12:02:02 +02:00 |
|
Jorge Penadés
|
9db8ae237f
|
refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 10:19:03 +02:00 |
|
Vicent Llopis
|
28eedbfd23
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-14 11:04:06 +00:00 |
|
Alex Moreno
|
219a4fbca9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-12 13:09:58 +02:00 |
|
Vicent Llopis
|
93e70e699a
|
refs #5874 feat: refactorizado proceso facturación
|
2023-07-11 09:19:15 +02:00 |
|
Alex Moreno
|
040e9e4197
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:50:45 +02:00 |
 Juan Ferrer
|
e32a29fc09
|
refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-25 19:08:13 +02:00 |
|
Sergio De la torre
|
c62e6fa0eb
|
refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 10:51:22 +02:00 |
|
Juan Ferrer
|
9a63ce86aa
|
refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 23:54:27 +02:00 |
|
Vicent Llopis
|
024cb1e3f4
|
refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 11:56:14 +02:00 |
|
Vicent Llopis
|
67413360c6
|
refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 13:31:41 +02:00 |
|
Vicent Llopis
|
ba64dbbe46
|
refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:20:29 +02:00 |
|
Vicent Llopis
|
d727ea83ab
|
refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-01 15:31:16 +02:00 |
|
Vicent Llopis
|
0d85069e0f
|
refs #5561 feat: permite colorear
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 15:01:38 +02:00 |
|
Alex Moreno
|
456e1d5912
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-05 14:11:47 +02:00 |
|
Alex Moreno
|
97da5e6e24
|
refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 13:58:11 +02:00 |
|
Alex Moreno
|
c1ea1acc8c
|
refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 13:49:08 +02:00 |
|
Juan Ferrer
|
49368a837b
|
refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 19:10:04 +02:00 |