Jorge Penadés
|
4fc780967f
|
fix: refs #6703 tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-26 15:32:50 +01:00 |
Guillermo Bonet
|
49a08a96da
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 11:56:43 +00:00 |
Guillermo Bonet
|
567e480e3b
|
feat: #6184 Minor changes
gitea/salix/pipeline/head Build queued...
Details
|
2024-01-26 12:40:42 +01:00 |
Jorge Penadés
|
ab3fdf4fe4
|
fix: refs #6703 remove console log
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-01-26 12:33:04 +01:00 |
Guillermo Bonet
|
25fa154f60
|
feat: #6184 Minor changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-26 12:25:02 +01:00 |
Jorge Penadés
|
e33861a80d
|
fix: refs #6703 filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-26 12:15:53 +01:00 |
Guillermo Bonet
|
d5a145ba1b
|
feat: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 10:44:04 +01:00 |
Guillermo Bonet
|
dec795d902
|
feat: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 10:14:47 +01:00 |
Guillermo Bonet
|
5828fa9657
|
feat: #6184 Refactor saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 10:05:24 +01:00 |
Javier Segarra
|
0afc9ab109
|
refs #6174 test: fix test bug
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 09:55:21 +01:00 |
Jorge Penadés
|
53f37bb0eb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-26 09:32:08 +01:00 |
Javier Segarra
|
f1cbb6aab3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
|
2024-01-26 08:48:05 +01:00 |
Jorge Penadés
|
e5d466b697
|
fix: refs #6703 drop & replace sale refund by clone
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 08:30:43 +01:00 |
Jorge Penadés
|
ed77347fe1
|
fix: #6557 replace procedure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-25 15:41:55 +01:00 |
Pablo Natek
|
a7faac3ef6
|
fix. refs #6743 remove consoleLog
|
2024-01-25 15:07:19 +01:00 |
Pablo Natek
|
2e1b55448a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb
gitea/salix/pipeline/head Build queued...
Details
|
2024-01-25 15:04:32 +01:00 |
Pablo Natek
|
3848503853
|
fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 14:58:48 +01:00 |
Guillermo Bonet
|
9005975f1c
|
feat: #6184 Modified email cmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-25 13:56:47 +01:00 |
Jorge Penadés
|
e6335548ad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 12:23:08 +01:00 |
Jorge Penadés
|
63fb3db8a1
|
fix: refs #6276 test item_card & general fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 12:14:14 +01:00 |
Alex Moreno
|
66936d8983
|
hotFix: saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 11:37:25 +01:00 |
Alex Moreno
|
578bcd3cce
|
hotFix: saveSign
|
2024-01-25 11:09:56 +01:00 |
Alex Moreno
|
d305de2438
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 09:00:48 +01:00 |
Pablo Natek
|
36fc55180a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-25 08:30:28 +01:00 |
Pablo Natek
|
01c21baa65
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb
|
2024-01-25 08:25:08 +01:00 |
Jorge Penadés
|
01340408c6
|
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
|
2024-01-25 08:14:02 +01:00 |
Jorge Penadés
|
02e38eb711
|
fix: refs #6276 fix tests
gitea/salix/pipeline/head Build queued...
Details
|
2024-01-25 08:13:47 +01:00 |
Alex Moreno
|
dec625d2df
|
Merge branch 'master' into 6745-2404_testToMaster
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 06:23:29 +00:00 |
Carlos Satorres
|
a594fda704
|
Merge branch 'dev' into 6313-removecanForceQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-24 12:50:03 +00:00 |
Alex Moreno
|
1c0f8acb87
|
refs #5871 fix: awb
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-24 13:37:29 +01:00 |
Sergio De la torre
|
48e4e21aa8
|
refs #6028 hotFix : getByWorker days to show
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-24 12:55:51 +01:00 |
Sergio De la torre
|
fc53e98bb5
|
refs #6028 hotFix : getByWorker days to show
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-24 10:48:01 +01:00 |
Robert Ferrús
|
2ee48a53e2
|
refs #6222 fix(ticket): step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-24 09:59:27 +01:00 |
Javier Segarra
|
bc6f9bc074
|
refs #6174 test: new test for new method
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-23 23:52:45 +01:00 |
Guillermo Bonet
|
c7be1b57b1
|
Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-23 14:13:41 +01:00 |
Guillermo Bonet
|
a676607e29
|
feat: #6184 Added email cmr
|
2024-01-23 14:13:40 +01:00 |
Guillermo Bonet
|
12bfb8ca77
|
feat: #6184 Added tests and process.env.IS_SPEC_RUNNING
|
2024-01-23 11:05:39 +01:00 |
Guillermo Bonet
|
43bfb3cfde
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-23 10:05:21 +00:00 |
Jorge Penadés
|
799237e14c
|
feat: refs #6276 test shelving_addLog
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-23 09:09:55 +01:00 |
Javier Segarra
|
dcb2907d49
|
Merge branch 'dev' into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-23 07:43:40 +00:00 |
Jorge Penadés
|
dcf6232c14
|
feat: refs #6276 test sale_getFromSectorCollection
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-23 08:39:30 +01:00 |
Jorge Penadés
|
efb8bc46c6
|
refactor: refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 15:13:49 +01:00 |
Jorge Penadés
|
e3899b2cf7
|
refactor: refs #6276 saleTracking_mark
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 13:32:50 +01:00 |
Jorge Penadés
|
65e5c6dac5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-22 12:45:25 +01:00 |
Jorge Penadés
|
ed713e762b
|
feat: refs #6276 test saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 12:36:52 +01:00 |
Javier Segarra
|
7f43a45955
|
Merge branch 'dev' into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 11:08:06 +00:00 |
Carlos Satorres
|
cf03982d0c
|
refs #6397 trad tback
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 10:20:10 +01:00 |
Guillermo Bonet
|
6701f70a33
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 09:07:31 +00:00 |
Javier Segarra
|
95398485dc
|
Merge branch 'dev' into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 09:01:28 +00:00 |
Javier Segarra
|
ba2815becb
|
Merge branch 'dev' into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 09:00:55 +00:00 |
Alex Moreno
|
ee6fe5a6e1
|
Merge branch 'dev' into 6667-searchFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 07:02:51 +00:00 |
Jorge Penadés
|
f04724a61f
|
feat: refs #6276 new test added
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 07:58:18 +01:00 |
Jorge Penadés
|
89d18e29f0
|
feat: refs #6276 test saleTrackingReplace (updateTracking)
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 07:49:21 +01:00 |
Jorge Penadés
|
6ee7ca79b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-19 14:54:25 +01:00 |
Carlos Satorres
|
73e1b52348
|
refs #6397 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-19 14:53:56 +01:00 |
Jorge Penadés
|
f8faa958e6
|
feat: refs #6276 drop worker_getPrinter
|
2024-01-19 14:53:41 +01:00 |
Jorge Penadés
|
d78e90687e
|
fix: refs #6276 drop worker_getPrinter
|
2024-01-19 14:51:03 +01:00 |
Jorge Penadés
|
428da6fe00
|
feat: refs #6276 drop worker_getPrinter
gitea/salix/pipeline/head Build queued...
Details
|
2024-01-19 14:50:33 +01:00 |
Jorge Penadés
|
6e59a87f9c
|
feat: refs #6276 test operator_add
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-19 14:44:07 +01:00 |
Jorge Penadés
|
817a6b1289
|
feat: refs #6276 test operator_add
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-19 14:35:10 +01:00 |
Carlos Satorres
|
391f418883
|
refs #6397 fix test back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-19 14:18:17 +01:00 |
Carlos Satorres
|
0f104e5410
|
refs #6667 view workerDepartment
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-19 10:11:33 +01:00 |
Jorge Penadés
|
5c0425b942
|
feat: refs #6276 test machineWorker_update
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-19 09:52:49 +01:00 |
Carlos Satorres
|
3be194356f
|
fix expense
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-19 09:31:25 +01:00 |
Carlos Satorres
|
882dd04adb
|
Merge branch 'dev' into 6296-countryAddress
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-19 07:55:00 +00:00 |
Alex Moreno
|
7ea1fbfb26
|
refs #5509 feat: entryDms funcionality
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 15:09:52 +01:00 |
Jorge Penadés
|
34420375cd
|
feat: refs #6276 test item_updateFromSale
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 15:03:17 +01:00 |
Jorge Penadés
|
b33594e0da
|
fix: refs #6276 item_card & wip test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-18 14:35:51 +01:00 |
Jorge Penadés
|
d41d57143f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 13:53:26 +01:00 |
Jorge Penadés
|
c8bfb35cf6
|
feat: refs #6276 test itemShelvingMake_multi
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 13:28:22 +01:00 |
Jorge Penadés
|
6f35c62cd5
|
feat: refs #6276 test collection_addItem
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-18 11:51:21 +01:00 |
Carlos Satorres
|
e9c1f125a5
|
refs #6397 test back
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 11:43:05 +01:00 |
Carlos Satorres
|
7cb7c7dace
|
refs #6397 back validation
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 10:57:17 +01:00 |
Guillermo Bonet
|
9faf889833
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 09:55:04 +00:00 |
Alex Moreno
|
ef2b156b55
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 08:07:47 +01:00 |
Guillermo Bonet
|
ce5a2ada62
|
feat: #6184 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-18 07:46:58 +01:00 |
Jorge Penadés
|
8e5be5f5da
|
feat: refs #6276 test itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 15:26:04 +01:00 |
Carlos Satorres
|
23b8703afc
|
refs #6397 emailValidation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 15:00:31 +01:00 |
Guillermo Bonet
|
a486b7f2d4
|
feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 14:42:38 +01:00 |
Carlos Satorres
|
ccdef0458a
|
refs #6667 fix groupBy
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 14:39:11 +01:00 |
Guillermo Bonet
|
85a0f8b323
|
feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 14:30:58 +01:00 |
Jorge Penadés
|
c0398d17bf
|
feat: refs #6276 test itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 14:21:50 +01:00 |
Alex Moreno
|
3c778216a4
|
Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 13:19:18 +00:00 |
Guillermo Bonet
|
1a52e58eaa
|
feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 14:18:31 +01:00 |
Carlos Satorres
|
7525998477
|
refs #6296 postal code
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 14:13:09 +01:00 |
Carlos Satorres
|
d1a3c67d2e
|
refs #6667 fix limit
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 14:07:04 +01:00 |
Carlos Satorres
|
1458a803bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 13:49:05 +01:00 |
Carlos Satorres
|
bf796c445d
|
refs #5919 fix section
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-01-17 13:20:28 +01:00 |
Guillermo Bonet
|
45fd96cee6
|
feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 13:07:26 +01:00 |
Jorge Penadés
|
1fbb84ae9f
|
fix: refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 12:58:57 +01:00 |
Jorge Penadés
|
bf13e85ecc
|
fix: refs #6276 getFromSectorCollection
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 12:14:38 +01:00 |
Jorge Penadés
|
e69ec2c856
|
feat: refs #6276 test expeditionPallet_get
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 12:07:22 +01:00 |
Javier Segarra
|
3564a77043
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 11:12:04 +01:00 |
Guillermo Bonet
|
f1b84ee7a0
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:44:00 +01:00 |
Javier Segarra
|
21ce57d217
|
refs #6174 feat: update back to separate invoice and pdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:31:07 +01:00 |
Jorge Penadés
|
90b1e8d664
|
fix: refs #6276 backend tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:18:13 +01:00 |
Carlos Satorres
|
d47429b4a7
|
refs #6667 sql
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:01:38 +01:00 |
Guillermo Bonet
|
2f67056dbf
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 09:44:32 +01:00 |
Jorge Penadés
|
6a78123fca
|
fix: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 09:01:48 +01:00 |
Jorge Penadés
|
07e9b737c5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-17 07:50:21 +01:00 |
Jorge Penadés
|
4f7240b496
|
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
|
2024-01-16 14:50:55 +01:00 |
Jorge Penadés
|
fafc25ed19
|
refactor: refs #6276 sectorCollection_getSale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-16 14:50:09 +01:00 |
Alex Moreno
|
aac3e17d3c
|
Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-16 13:40:37 +00:00 |
Alex Moreno
|
9452aacb49
|
Merge branch 'dev' into 6230-basicItem
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-16 13:25:28 +00:00 |
Guillermo Bonet
|
5bbeda4014
|
feat: refs #4734 Added viaexpress interdia
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-16 13:05:16 +01:00 |
Carlos Satorres
|
7b9480f006
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE
|
2024-01-16 12:48:13 +01:00 |
Carlos Satorres
|
3ebeebc159
|
refs #6230 remove basic-data columns
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-16 11:47:45 +01:00 |
Carlos Satorres
|
b3e1c58918
|
refs #6313 remove restriction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 14:50:08 +01:00 |
Jorge Penadés
|
54192c54ad
|
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
|
2024-01-15 13:56:32 +01:00 |
Carlos Satorres
|
55b5e4cfcd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 13:29:39 +01:00 |
Javier Segarra
|
831d358e41
|
refs #6174 feat first approach
|
2024-01-15 10:52:02 +01:00 |
Guillermo Bonet
|
107e35001a
|
fix: refs #6582 Solved log error
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-15 10:09:43 +01:00 |
Carlos Satorres
|
107dded411
|
refs #6296 countryAddress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 09:03:56 +01:00 |
Jorge Penadés
|
fcca927adb
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-15 07:54:35 +01:00 |
Alex Moreno
|
c20b9fe212
|
refs #6656 fix(updateTimeEntry): correct accessType (WRITE)
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-15 07:45:40 +01:00 |
Jorge Penadés
|
6236cf0621
|
hotfix ticketRefund
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 16:18:26 +01:00 |
Alex Moreno
|
199656afb8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-12 12:41:52 +01:00 |
Jorge Penadés
|
2a6b509a78
|
fix: refs #6656 change acls
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 09:54:18 +01:00 |
Alex Moreno
|
14fff571b5
|
Merge branch 'dev' into 6353-ratingCatalog
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 08:52:51 +00:00 |
Carlos Satorres
|
c0c3d913b7
|
refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-12 09:03:54 +01:00 |
Carlos Satorres
|
d0df880c32
|
Merge branch 'dev' into 6322-futureTicketImporte
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 07:47:23 +00:00 |
Jorge Penadés
|
ddcecb8f22
|
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
|
2024-01-11 16:52:54 +01:00 |
Alex Moreno
|
b1530d049e
|
refs #6398 hotFix: use userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 13:29:03 +01:00 |
Javi Gallego
|
c98baf21bf
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 12:17:59 +00:00 |
Juan Ferrer
|
ce5e8c278f
|
Merge branch 'dev' into 6660-mariadbV10.11.6
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 11:22:55 +00:00 |
Jorge Penadés
|
c61f5a67b6
|
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
|
2024-01-11 09:28:24 +01:00 |
Alex Moreno
|
a92297da73
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 08:14:56 +01:00 |
Javier Segarra
|
b76e269e73
|
refs #5499 perf: rename variable
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 06:18:02 +00:00 |
Alex Moreno
|
edde5819e3
|
refs #6660 feat: update mariadb version 10.7.7→10.11.6
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 15:39:35 +01:00 |
Javier Segarra
|
de4ddf9392
|
remove bad comment
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 13:47:42 +00:00 |
Pablo Natek
|
a623e5b90e
|
Merge branch '6398-ticketTrackingAsignFix' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTrackingAsignFix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 13:55:03 +01:00 |
Pablo Natek
|
dff277ed12
|
fix(spec): refs #6398 fix spec
|
2024-01-10 13:55:01 +01:00 |
Pablo Natek
|
5d63b4fba8
|
Merge branch 'master' into 6398-ticketTrackingAsignFix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-10 12:51:33 +00:00 |
Pablo Natek
|
63b20c1e91
|
fix(ticketTracking): refs #6398 assign ticket workerFk to userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-10 13:12:12 +01:00 |
Carlos Satorres
|
980ca81bfc
|
refs #6353 fixtures catalog rating
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 09:38:20 +01:00 |
Carlos Satorres
|
877dc718a7
|
refs #6353 remove rating
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 08:57:19 +01:00 |
Javier Segarra
|
7cc454751e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-10 07:48:11 +01:00 |
Javier Segarra
|
1bd6751d56
|
refs #5499 revert
|
2024-01-10 07:46:11 +01:00 |
Guillermo Bonet
|
783436e8d2
|
fix: refs #6582 Traductions routesMonitor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-09 15:02:58 +01:00 |
Carlos Satorres
|
16d7a20798
|
Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 13:49:31 +00:00 |
Guillermo Bonet
|
81ffc122fc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 14:09:47 +01:00 |
Guillermo Bonet
|
9a82fbea05
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 14:07:32 +01:00 |
Guillermo Bonet
|
5d4c106825
|
fix: refs #5848 Added flag DONT_EXPIRE_PASSWD
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 13:59:11 +01:00 |
Carlos Satorres
|
bf44f82f4f
|
refs #6322 fix code
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 13:16:14 +01:00 |
Carlos Satorres
|
676d95563b
|
refs #6322 importe
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 12:53:58 +01:00 |
Robert Ferrús
|
ea5483e847
|
refs #6222 refactor: sale_calculateComponent
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 10:50:37 +01:00 |
Carlos Satorres
|
a22de3ab25
|
Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 08:46:01 +00:00 |
Jorge Penadés
|
ab1dc7af55
|
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
|
2024-01-08 16:21:46 +01:00 |
Pablo Natek
|
0e29db3b1e
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 13:17:24 +00:00 |
Carlos Satorres
|
782772bffc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 09:54:50 +01:00 |
Jorge Penadés
|
547ac44e9b
|
fix: refs #6643 fix user link
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 09:11:44 +01:00 |
Pablo Natek
|
9af27783ed
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-08 08:11:03 +00:00 |
Carlos Satorres
|
c72311860b
|
refs #647 remove e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 09:06:22 +01:00 |
Javi Gallego
|
406cf7335b
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-05 07:12:12 +00:00 |
Pablo Natek
|
f48500f4b3
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 18:44:11 +00:00 |
Pablo Natek
|
e9773b3885
|
refactor(state): refs #6366 simplify if condition
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 18:56:31 +01:00 |
Jorge Penadés
|
8a5da43503
|
refactor: sectorCollection_getSale refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 16:00:25 +01:00 |
Javier Segarra
|
8ee6cfb015
|
refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 15:36:35 +01:00 |
Pablo Natek
|
2e5ae062cf
|
Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 14:24:24 +00:00 |
Javier Segarra
|
71937a4df3
|
refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 15:17:16 +01:00 |
Jorge Penadés
|
7a64b57a2a
|
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
|
2024-01-04 15:07:33 +01:00 |
Javi Gallego
|
767c6a6ac8
|
test: refs #3979 fixtures arregladas para que los abonos sean negativos
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 15:01:56 +01:00 |
Jorge Penadés
|
ad89363db5
|
fix: mark refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 13:11:39 +01:00 |
Jorge Penadés
|
2eca02d74f
|
refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:57:46 +01:00 |
Jorge Penadés
|
932b993723
|
Merge branch 'dev' into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 11:45:38 +00:00 |
Jorge Penadés
|
3ebf0a30a9
|
refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:44:44 +01:00 |
Jorge Penadés
|
da8057e4c7
|
fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:35:00 +01:00 |
Jorge Penadés
|
384d9ec803
|
fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:27:02 +01:00 |
Javier Segarra
|
f7d83b15bd
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 08:08:46 +00:00 |
Jorge Penadés
|
7d0c11e937
|
Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 08:51:46 +01:00 |
Jorge Penadés
|
6d0e1cc47c
|
refactor: fix conficts refs #6276
|
2024-01-04 08:51:18 +01:00 |
Carlos Satorres
|
15d6c9a65b
|
Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 08:39:07 +01:00 |
Javi Gallego
|
4cb82524cb
|
test: refs #3979 quito clone parametro group porque no se usa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 08:37:34 +01:00 |
Alex Moreno
|
23b544c1ec
|
refs #6635 fix: add translation
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 08:19:48 +01:00 |
Pablo Natek
|
847623f9c6
|
Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 18:28:46 +00:00 |
Pablo Natek
|
b42aed13c4
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 18:15:29 +00:00 |
Javi Gallego
|
2fb60aeed3
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 15:37:05 +01:00 |
Javi Gallego
|
ab341b9b5e
|
test: refs #3979 test de clone
|
2024-01-03 15:36:39 +01:00 |
Alex Moreno
|
227afbe39d
|
refs #5914 fix(invoiceOut_descriptorMenu): transalation
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 14:54:01 +01:00 |
Alex Moreno
|
af784522c1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
|
2024-01-03 14:52:16 +01:00 |
Javier Segarra
|
4d7f0329ee
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 12:46:26 +00:00 |
Carlos Satorres
|
3fbead7473
|
refs #6291 fix tinIsValid
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 13:44:20 +01:00 |
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
|
a6ebd01ebd
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 13:28:23 +01:00 |
Jorge Penadés
|
1f77559519
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 12:53:12 +01:00 |
Sergio De la torre
|
0b5ffcc81c
|
refs #6276:modify back silex→salix
|
2024-01-03 12:50:53 +01:00 |
Alex Moreno
|
ba26237998
|
refs #5914 refactor: getTaxBases
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 12:19:28 +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
|
4e951263c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 11:55:37 +01:00 |
Jorge Penadés
|
5dc49d226a
|
refs #6274 fix locale
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 10:13:56 +01:00 |
Alex Moreno
|
121caee93a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
|
2024-01-03 09:53:52 +01:00 |
Jorge Penadés
|
23854cb103
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 09:02:52 +01:00 |
Jorge Penadés
|
b086da1936
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 08:57:46 +01:00 |
Alex Moreno
|
399ca694ab
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 08:38:01 +01:00 |
Alex Moreno
|
f607719efe
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2024-01-03 08:34:00 +01:00 |
Carlos Satorres
|
12165ab382
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 08:31:07 +01:00 |
Carlos Satorres
|
69739fca9c
|
refs #5919 locker relation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 08:17:37 +01:00 |
Pablo Natek
|
c116bc56c3
|
refactor(clientSms): refs #6259 redirect to lilium
|
2024-01-02 19:37:51 +01:00 |
Jorge Penadés
|
31c282ac0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 14:50:26 +01:00 |
Guillermo Bonet
|
176cbe1537
|
Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 13:02:16 +00:00 |
Alex Moreno
|
1e3a7e5f91
|
refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 13:17:10 +01:00 |
Javier Segarra
|
295124e0af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries
|
2024-01-02 12:59:50 +01:00 |
Jorge Penadés
|
924fe12a93
|
add root: refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 12:44:12 +01:00 |
Sergio De la torre
|
365e05d560
|
refs #6276:mdify back silex→salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 12:21:25 +01:00 |
Javier Segarra
|
b11b0642f8
|
Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-01-02 11:03:52 +00:00 |
Guillermo Bonet
|
7cfcb17aff
|
Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 10:50:00 +00:00 |
Jorge Penadés
|
6b8a4a512b
|
adding filter: refs #6606
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 10:42:50 +01:00 |
Javier Segarra
|
4510f0a037
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 09:26:18 +00:00 |
Jorge Penadés
|
68ef193a19
|
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
|
2024-01-02 09:58:30 +01:00 |
Jorge Penadés
|
3bd14095fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 09:45:44 +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 |
Jorge Penadés
|
763af7da2d
|
fix test: refs #6274
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 08:58:41 +01:00 |
Alex Moreno
|
dd02a932ef
|
Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 06:40:18 +00:00 |
Jorge Penadés
|
15ec91ec79
|
fix query: refs #6369
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-29 14:05:01 +01:00 |
Pablo Natek
|
ccf5387e04
|
refactor(state): refs #6366 unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-29 12:44:24 +01:00 |
Jorge Penadés
|
1b8461034e
|
using hasAnyNegative: refs #6515
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-29 12:40:48 +01:00 |
Carlos Satorres
|
3a429a31da
|
refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-29 08:44:42 +01:00 |
Carlos Satorres
|
6ceee45b13
|
refs #5919 fix locker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-28 16:40:13 +01:00 |
Pablo Natek
|
f7ec64f3c1
|
merge(dev): refs #6366 merge dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-28 16:00:23 +01:00 |
Jorge Penadés
|
567879d64e
|
corrective back created: refs #4466
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-28 15:55:11 +01:00 |
Carlos Satorres
|
bfb31ad7c3
|
refs #5525 supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-28 11:46:34 +01:00 |
Carlos Satorres
|
c77715d865
|
refs #6291 validation original
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-26 15:03:10 +01:00 |
Jorge Penadés
|
a89d1e883a
|
create rectification: refs #4466
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-26 14:36:58 +01:00 |
Carlos Satorres
|
f35b2a4905
|
refs #5919 back chooseLocker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-26 13:44:52 +01:00 |
Carlos Satorres
|
aa33c28468
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-26 12:15:43 +01:00 |
Pablo Natek
|
5a1c4ddea0
|
refactor(ticketSms): refs #6259 ticketSmsToClientSms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-26 08:20:13 +01:00 |
Jorge Penadés
|
86db5a931d
|
arrange test suites: refs #6274
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-22 10:44:21 +01:00 |
Pablo Natek
|
35750bc93f
|
merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 18:46:12 +01:00 |
Pablo Natek
|
27a369bef4
|
refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 18:34:22 +01:00 |
Carlos Satorres
|
c4ff4c1984
|
refs #6291 tin valid
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 15:07:03 +01:00 |
Jorge Penadés
|
0998b5bf2c
|
add locale and refactor: refs #6274
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 13:58:33 +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 |
Javier Segarra
|
100936d40b
|
Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 12:05:27 +00:00 |
Carlos Satorres
|
73d1c1698b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
|
2023-12-21 12:38:58 +01:00 |
Guillermo Bonet
|
0f20f95dc5
|
refactor: refs #6433 Deleted isPreviousPrepared* columns in model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 10:08:17 +01:00 |
Jorge Penadés
|
f5cc2cd75b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 08:38:33 +01:00 |
Alex Moreno
|
7b65ebb58b
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 06:50:45 +00:00 |
Javier Segarra
|
adc7608b25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-20 14:40:42 +01:00 |
Javier Segarra
|
5c5be788c1
|
refs #5499 feat: trigger for all changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-20 14:08:11 +01:00 |
Guillermo Bonet
|
5f83fc158c
|
Merge branch 'dev' into 6582-routesMonitorTraduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 13:03:57 +00:00 |
Jorge Penadés
|
5d75592627
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 12:19:10 +01:00 |
Javier Segarra
|
acb0ec508f
|
refs #5499 feat: claimObservation
|
2023-12-20 12:09:01 +01:00 |
Javier Segarra
|
01e6e7dc39
|
Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 11:02:00 +00:00 |
Juan Ferrer
|
10bfafdd3c
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 09:05:53 +00:00 |
Alex Moreno
|
351a12204a
|
Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 08:07:30 +00:00 |
Guillermo Bonet
|
753c6e9ec5
|
feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 07:28:54 +01:00 |
Guillermo Bonet
|
516a3760a1
|
feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 07:27:13 +01:00 |
Alex Moreno
|
7777696cf7
|
refs #6589 fix(worker_absences): fix started hours
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 13:58:08 +01:00 |
Javier Segarra
|
3e30e77728
|
Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 12:57:59 +01:00 |
Javier Segarra
|
38a5337f68
|
refs #5858 test: execute test
|
2023-12-19 12:57:10 +01:00 |
Javier Segarra
|
243319b113
|
refs #5858 feat zoneIncludedCheck model
|
2023-12-19 12:55:27 +01:00 |
Alex Moreno
|
3f44eeb130
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 11:45:48 +00:00 |
Pablo Natek
|
4fbb7f05ec
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 09:51:36 +00:00 |
Pablo Natek
|
f68529960e
|
fix(notification): refs #6005 notification changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 10:51:18 +01:00 |
Guillermo Bonet
|
17e177b788
|
fix: refs #6398 Fix tests back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 10:12:03 +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 |
Javier Segarra
|
72e9b69d7e
|
Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 07:04:41 +00:00 |
Javier Segarra
|
dbc3fc8007
|
refs #5858 perf: remove bad comments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 08:02:38 +01:00 |
Carlos Satorres
|
e4de704b4c
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 11:16:58 +00:00 |
Jorge Penadés
|
5c22f51043
|
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-18 10:29:14 +01:00 |
Javier Segarra
|
7723b244d0
|
Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 07:17:51 +00:00 |
Javier Segarra
|
8d650cf6c0
|
refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 08:09:44 +01:00 |
Javier Segarra
|
29a7d9b941
|
Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-15 13:01:47 +01:00 |
Javier Segarra
|
dc98436b85
|
refs #2051 perf: rename variable
|
2023-12-15 13:01:44 +01:00 |
Javier Segarra
|
c9af8cba81
|
refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-15 12:50:05 +01:00 |
Jorge Penadés
|
d70a3570d3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2023-12-15 12:18:28 +01:00 |
Javier Segarra
|
98a98e0d9e
|
refs #2687 perf: remove force test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-15 07:40:31 +01:00 |
Javi Gallego
|
3a37e6dfc8
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
|
2023-12-15 07:37:29 +01:00 |
Javier Segarra
|
f10cada19f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-15 07:35:04 +01:00 |
Javier Segarra
|
b5b58faee4
|
refs #2687 perf: remove comments
|
2023-12-15 07:34:37 +01:00 |
Javier Segarra
|
d9ffdaf855
|
refs #2687 test: use tx.rollback()
|
2023-12-14 16:00:29 +01:00 |
Alex Moreno
|
21a1dbeae7
|
refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 15:56:49 +01:00 |
Carlos Satorres
|
fe184156a1
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 13:51:09 +00:00 |
Carlos Satorres
|
f73f3813b3
|
Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 14:37:22 +01:00 |
Carlos Satorres
|
bbb9f58a9e
|
refs #6220 fix(client_filter): fix where
|
2023-12-14 14:37:14 +01:00 |
Javier Segarra
|
043c411f68
|
Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 11:41:11 +00:00 |
Javier Segarra
|
9316c31180
|
refs #6264 perf: rename variable when destroy ids
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 12:36:36 +01:00 |
Javier Segarra
|
1939c65fab
|
refs #6264 test: remove force describe for dms test
|
2023-12-14 12:35:54 +01:00 |
Javier Segarra
|
d0af29c0c5
|
refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 12:28:41 +01:00 |
Javier Segarra
|
dddc749744
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 11:05:00 +00:00 |
Javi Gallego
|
26a05a4840
|
fix: refs #3979 si se abona un abono sin almacen no falla
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 09:14:21 +01:00 |
Alex Moreno
|
e7911738c6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 08:50:20 +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 |
Javier Segarra
|
397eb4d32b
|
Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 06:22:22 +00:00 |
Javier Segarra
|
485968037b
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 06:22:17 +00: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 |
Javier Segarra
|
1e89ed6cdc
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 14:39:10 +00:00 |
Javier Segarra
|
06bae44824
|
refs #2051 perf: uploadFile after review
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 15:38:46 +01:00 |
Carlos Satorres
|
9a5536a3a3
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 14:05:51 +00:00 |
Carlos Satorres
|
cfa08963fb
|
Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 15:05:43 +01:00 |
Carlos Satorres
|
40499e44cf
|
refs #6220 remove concat
|
2023-12-13 15:05:41 +01:00 |
Robert Ferrús
|
4df2fa8ee4
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 13:30:53 +00:00 |
Robert Ferrús
|
b9efbc7d44
|
refs #5854
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 14:30:29 +01:00 |
Javier Segarra
|
7b9e3b0985
|
refs #2051 perf: removeFile after review
|
2023-12-13 14:24:05 +01:00 |
Carlos Satorres
|
6416891918
|
refs #6291 tinIsValid worker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 13:55:31 +01:00 |
Javier Segarra
|
7bdb1b2078
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
|
2023-12-13 13:49:38 +01:00 |
Javier Segarra
|
a5ecec9603
|
refs #2051 feat: remove front methods refactor
|
2023-12-13 13:47:30 +01:00 |
David Domenech
|
9bcd0a3c98
|
Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 11:29:46 +00:00 |
Jorge Penadés
|
8d61473d4f
|
refs #6276 fixtures & itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 11:43:19 +01:00 |
Jorge Penadés
|
a4c3d78e31
|
refs #6276 drop fixtures & fix getSale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 09:45:01 +01:00 |
David Domenech
|
ee6ad55e66
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 09:43:20 +01:00 |
Jorge Penadés
|
64c10f3b8e
|
refs #6276 sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 08:52:43 +01:00 |
Pablo Natek
|
f63b26b71f
|
Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 07:52:36 +00:00 |
Carlos Satorres
|
371a202230
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 07:51:23 +00:00 |
Pablo Natek
|
69dd34665f
|
refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 08:50:17 +01:00 |
Jorge Penadés
|
01fa0b1d36
|
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-13 08:35:11 +01:00 |
Javier Segarra
|
074bb2b980
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 06:30:14 +00:00 |
Sergio De la torre
|
435819cf3c
|
refs #6275 feat:Silex_to_Salix test getExpeditionSummary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 07:24:13 +01:00 |
Javier Segarra
|
d44cdcbd13
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 06:14:55 +00:00 |
Robert Ferrús
|
5f4adab017
|
refs #5854
gitea/salix/pipeline/head Build queued...
Details
|
2023-12-12 18:03:09 +01:00 |
Jorge Penadés
|
9e6fac9add
|
refs #6276 change to boolean
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 16:00:43 +01:00 |
Sergio De la torre
|
e22201c840
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 14:50:25 +00:00 |
Javier Segarra
|
d206c93305
|
refs #2051 feat: getAllowedContentTypes approach
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 15:03:00 +01:00 |
Jorge Penadés
|
7b81630b85
|
refs #6276 shelvingLog_add
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 14:56:58 +01:00 |
Javier Segarra
|
6b70f8b3eb
|
refs #2051 feat: uploadFile approach
|
2023-12-12 13:49:14 +01:00 |
Jorge Penadés
|
f5ee3aff7a
|
refs #6276 remove checking visible
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 13:43:15 +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 |
Carlos Satorres
|
78aa25d74f
|
refs #6220 fix testback
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 13:21:08 +01:00 |
Carlos Satorres
|
6cefc982e4
|
refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 13:14:41 +01:00 |
Javier Segarra
|
ae76776245
|
refs #2051 feat: removeFile approach
|
2023-12-12 12:09:06 +01:00 |
Javier Segarra
|
8bd9becb74
|
refs #2687 feat: remove procedure argument
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 07:34:20 +01:00 |
Javier Segarra
|
30dbc8a587
|
refs #2687 feat: fix test suite
|
2023-12-12 07:33:08 +01:00 |
Robert Ferrús
|
9894591aa9
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 17:56:40 +00:00 |
Javier Segarra
|
c0d2e0511d
|
refs #2687 feat: modify back method
|
2023-12-11 14:54:12 +01:00 |
Carlos Satorres
|
7e6f311a43
|
refs #6220 address filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 14:51:11 +01:00 |
Carlos Satorres
|
c81ca94d2e
|
refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 14:44:33 +01:00 |
Jorge Penadés
|
84270587cb
|
refs #6274 refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 13:42:19 +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 |
Javier Segarra
|
f817551a57
|
refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:59:02 +01:00 |
Carlos Satorres
|
2beb1f65f0
|
refs #6085 findOne
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:45:55 +01:00 |
Javier Segarra
|
d1f0557923
|
refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:40:16 +01:00 |
Carlos Satorres
|
53ff8784ff
|
refs #6085 remove myOptions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 10:16:46 +01:00 |
Carlos Satorres
|
57ed36cdfc
|
ref #6085 remove console options
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 09:43:38 +01:00 |
Carlos Satorres
|
584f3264ed
|
refs #6085 refactor sql trad
|
2023-12-11 08:54:58 +01:00 |
Jorge Penadés
|
e27bf2ef8b
|
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-11 08:29:35 +01:00 |
Carlos Satorres
|
866ad7a9f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
|
2023-12-11 08:20:19 +01:00 |
Alex Moreno
|
f874faa921
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 07:47:55 +01:00 |
Pablo Natek
|
5a99408ba7
|
feat: refs #6548 add buyer department to salesPerson list in client BasicData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 07:31:57 +01:00 |
Jorge Penadés
|
b88d61e864
|
Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl
|
2023-12-07 14:53:33 +01:00 |
Jorge Penadés
|
6fb4e86777
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD
|
2023-12-07 14:47:31 +01:00 |
Jorge Penadés
|
968dc65231
|
refs #6274 tests created
|
2023-12-07 14:47:22 +01:00 |
Sergio De la torre
|
9937fbed5e
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 11:59:01 +01:00 |
Sergio De la torre
|
67994188ee
|
Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 10:42:30 +00:00 |
Sergio De la torre
|
fa65cc84a9
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 11:39:22 +01:00 |
Sergio De la torre
|
0263d880ca
|
refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 08:00:17 +01:00 |
Carlos Satorres
|
3c9c221220
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 06:59:38 +00:00 |
Sergio De la torre
|
c9bcd672c9
|
refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 07:59:21 +01:00 |
Carlos Satorres
|
c7d960229d
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 06:34:32 +00:00 |
Carlos Satorres
|
acfa0fd857
|
Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 06:31:21 +00:00 |
Javi Gallego
|
7ff8ec93ff
|
Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1879
|
2023-12-06 07:54:13 +00:00 |
Jorge Penadés
|
bb186bafe0
|
Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
|
2023-12-05 14:12:00 +01:00 |
Javier Segarra
|
a7c48b6ddc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 13:02:34 +01:00 |
Javier Segarra
|
035b31d878
|
refs #5666 test: fix e2e tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 12:00:31 +01:00 |
Jorge Penadés
|
25006a938b
|
refs #6274 refactor clockIn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 11:53:27 +01:00 |
Carlos Satorres
|
f55e85a189
|
refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 10:35:48 +01:00 |
Carlos Satorres
|
af07a531ed
|
refs #6318 quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:49:55 +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 |
Sergio De la torre
|
318f7e3c0d
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:20:55 +01:00 |
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
Jorge Penadés
|
8cb97e2477
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 15:09:44 +01:00 |
Javier Segarra
|
a8b0a7a5b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 14:46:21 +01:00 |
Javier Segarra
|
e3379b42a1
|
refs #5858 test: bad test calls
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 14:06:28 +01:00 |
Carlos Satorres
|
6d486fbec9
|
refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:58:45 +01:00 |
Jorge Penadés
|
1dfdd94584
|
refs #6276 fix getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:56:43 +01:00 |
Jorge Penadés
|
4690dca4f9
|
refs #6276 getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:54:09 +01:00 |
Pablo Natek
|
bec1ff71ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
|
2023-12-01 13:43:27 +01:00 |
Jorge Penadés
|
660e77be55
|
refs #6276 updateFromSale refactored
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 12:48:21 +01:00 |
Jorge Penadés
|
7e57640758
|
refs #6276 itemShelving_updateFromSale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 11:43:07 +01:00 |
Jorge Penadés
|
d2769f4c21
|
refs #6276 return fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 11:38:30 +01:00 |
Robert Ferrús
|
2a93dcf5b8
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-01 10:20:08 +00:00 |
Jorge Penadés
|
f2ab44bb8f
|
refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 10:14:32 +01:00 |
Jorge Penadés
|
30b63f577f
|
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-01 09:49:49 +01:00 |
Jorge Penadés
|
d5f09c2f75
|
refs #6276 saleTrackingDel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 09:44:49 +01:00 |
Javier Segarra
|
db06620d7c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 09:39:47 +01:00 |
Jorge Penadés
|
3333c83702
|
refs #6276 WIP itemShelving_return
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 16:25:13 +01:00 |
Jorge Penadés
|
611b45bae0
|
Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 15:16:18 +00:00 |
Alex Moreno
|
b2e7ea3089
|
refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 15:16:41 +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 |
Pablo Natek
|
72283005b8
|
remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:43:14 +01: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 |
Pablo Natek
|
c457b5c4d2
|
Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:39:26 +00:00 |
Jorge Penadés
|
40236fdb7b
|
refs #6276 itemShelvingMake_multi
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 13:23:10 +01:00 |
Alex Moreno
|
ee7dd66ce9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:49:42 +01:00 |
Alex Moreno
|
35e74a7635
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:48:27 +01:00 |
Alex Moreno
|
016e4ae37c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-11-30 12:20:50 +01:00 |
Javier Segarra
|
01e7135224
|
refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 12:20:05 +01:00 |
Pablo Natek
|
3f22f48df7
|
fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:13:12 +01:00 |
Javier Segarra
|
2a2998a8bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
|
2023-11-30 12:01:44 +01:00 |
Jorge Penadés
|
25a0ffcfde
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 09:49:50 +01:00 |
Jorge Penadés
|
6121eeaa3a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 09:44:05 +01:00 |
Carlos Satorres
|
9cdb7c3cca
|
refs #6065 remove workcenter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 09:18:00 +01:00 |
Jorge Penadés
|
5442e3b4e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 08:44:41 +01:00 |
Javier Segarra
|
97d7f8356f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
|
2023-11-30 07:08:23 +01:00 |
Javier Segarra
|
1576ab992d
|
refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 19:36:30 +00:00 |
Jorge Penadés
|
0d558fb4f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-29 16:26:10 +01:00 |
Javi Gallego
|
d246b5f9a8
|
Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 15:26:51 +01:00 |
Carlos Satorres
|
9a3efdd6fe
|
refs #6085 model y back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 13:55:44 +01:00 |
Jorge Penadés
|
877c679273
|
refs #6276 getVersion
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 13:22:44 +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 |
Jorge Penadés
|
c609f6f47f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:27:50 +01:00 |
Carlos Satorres
|
e548ef4dae
|
refs #6085 searchpanel and change path
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-29 07:51:58 +01:00 |
Carlos Satorres
|
0186c2c806
|
refs #6085 aclMail back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 07:33:49 +01:00 |
Jorge Penadés
|
29fb36010c
|
refs #6274 back methods created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 14:48:03 +01:00 |
Javier Segarra
|
63533459b0
|
refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 13:22:17 +01:00 |
Jorge Penadés
|
f2673c3818
|
refs #5835 rate added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-28 12:12:42 +01:00 |
Guillermo Bonet
|
1a5cc67312
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 12:07:50 +01:00 |
Javi Gallego
|
2fa56cce4b
|
fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 09:22:00 +01:00 |
Javier Segarra
|
bb9723b65d
|
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-11-28 08:18:11 +01:00 |
Javier Segarra
|
f5f2896cbf
|
refs 5666 feat: replace Role model by VnRole model
|
2023-11-28 08:12:16 +01:00 |
Pablo Natek
|
b713a32fe1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 08:12:06 +01:00 |
Alex Moreno
|
37555cbb63
|
refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 15:10:00 +01:00 |
Juan Ferrer
|
c7291e3367
|
Merge pull request 'test' (!1863) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1863
|
2023-11-27 12:17:11 +00:00 |
Juan Ferrer
|
74772472d5
|
Merge pull request 'master' (!1820) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-27 12:16:42 +00:00 |
Robert Ferrús
|
5f26553092
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 11:05:50 +00:00 |
Robert Ferrús
|
62fab4e744
|
refs #5854 itemShelving traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 11:52:37 +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
|
aefff68c29
|
refactor: refs #3222 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 09:51:56 +01:00 |
Javier Segarra
|
901a44cc62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 09:48:31 +01:00 |
Javier Segarra
|
72a0932e35
|
refs #6264 other: rename camel-case variable
|
2023-11-27 09:46:27 +01:00 |
Alex Moreno
|
3fb1ed9dfe
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 08:38:17 +01:00 |
Carlos Satorres
|
f9d5cad412
|
refs #6506 contract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 07:57:18 +01:00 |
Alex Moreno
|
824ca1d70a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 07:42:50 +01: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 |
Javier Segarra
|
4383ebd7f1
|
refs #5858 feat: email notification
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 12:30:44 +01:00 |
Jorge Penadés
|
53c8e87b5b
|
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-24 10:57:32 +01:00 |
Jorge Penadés
|
8ac3887d80
|
refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 10:53:38 +01:00 |
Jorge Penadés
|
c56588a472
|
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-24 10:18:47 +01:00 |
Jorge Penadés
|
b3584d9db5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:12:45 +01:00 |
Carlos Satorres
|
5d18c211a0
|
refs #6507 state
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 08:40:06 +01:00 |
Javi Gallego
|
4071c06b5f
|
feat: refs #6275 getTickets con los campos de silex
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 08:15:39 +01:00 |
Carlos Satorres
|
8a568f180a
|
refs #6506 fix e2e, refactor business
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 07:47:57 +01:00 |
Carlos Satorres
|
ebe467f721
|
refs #6506 hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 07:04:55 +01:00 |
Javi Gallego
|
aa0794e136
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 06:31:25 +01:00 |
Jorge Penadés
|
e314a67fe7
|
refs #6274 time control methods migrated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 13:25:31 +01:00 |
Jorge Penadés
|
cf3b5efee9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 12:36:19 +01:00 |
Jorge Penadés
|
6b2c1e09de
|
refs #5835 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:31:00 +01:00 |
Javi Gallego
|
5b145a57e6
|
error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:29:53 +01:00 |
Jorge Penadés
|
048e3089cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:26:41 +01:00 |
Jorge Penadés
|
db15285858
|
refs #5811 test updated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:21:56 +01:00 |
Jorge Penadés
|
2e67ef4f5d
|
refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:32:07 +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 |
Pablo Natek
|
b261e9987a
|
Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 10:10:11 +01:00 |
Pablo Natek
|
754150d17d
|
feat(operator.spec): refs #6005 add spec for delay and fix spec for spam
|
2023-11-23 10:10:09 +01:00 |
Javi Gallego
|
f44424dbcf
|
test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 09:44:47 +01:00 |
Javi Gallego
|
5b289ec083
|
Merge branch 'dev' into 6028_route_getRouteByWorker
|
2023-11-23 09:21:44 +01:00 |
Pablo Natek
|
68dca67442
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 07:33:46 +00:00 |
Pablo Natek
|
a35a790155
|
remove(getVideo.spec.js): refs #6005 created task to review the spec
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 08:33:30 +01:00 |
Jorge Penadés
|
da7b670d74
|
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-23 08:28:56 +01:00 |
Alex Moreno
|
f4fabb9fff
|
refs #6491 refactor(order_filter): optimized
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 08:26:14 +01:00 |
Pablo Natek
|
1b4ce1a0b5
|
feat(noSpam): refs #6005 check if exists a previous notification
|
2023-11-23 08:22:24 +01:00 |
Carlos Satorres
|
2b455488a3
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 18:35:16 +01:00 |
Carlos Satorres
|
6b07ee4eb1
|
hotfix workerhours
|
2023-11-22 18:35:14 +01:00 |
Javi Gallego
|
e856de0cfd
|
feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:54:38 +01:00 |
Jorge Penadés
|
26a8cc6a2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:41:24 +01:00 |
Jorge Penadés
|
a60a30128c
|
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-11-22 15:40:11 +01:00 |
Javi Gallego
|
e146c0ea46
|
Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 12:42:20 +01:00 |
Javi Gallego
|
a0a9e299d9
|
feat: refs #6275 getTickets with phone
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 12:39:21 +01:00 |
Guillermo Bonet
|
d52c82fb19
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 11:36:07 +00:00 |
Pablo Natek
|
8dae2919e8
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 09:38:20 +00:00 |
Jorge Penadés
|
40bbad04c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 10:16:12 +01:00 |
Jorge Penadés
|
a27bb53089
|
refs #5835 getTotals fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 08:57:45 +01:00 |
Carlos Satorres
|
7c6798c564
|
refs #6291 dni vn-user
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 16:25:48 +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
|
67fa60ae81
|
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-11-21 12:27:13 +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 |
Guillermo Bonet
|
b3d1c72adc
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:13:41 +00:00 |
Alex Moreno
|
e909c2bc26
|
Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:13:17 +00:00 |
Alex Moreno
|
02e8b90926
|
refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:12:07 +01:00 |
Juan Ferrer
|
bf7c67dbde
|
fix: refs #6197 add definer to events
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:26:02 +01:00 |
Jorge Penadés
|
dd11cf5327
|
ref #5835 fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:03:25 +01:00 |
Jorge Penadés
|
34e5409533
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 08:19:11 +01:00 |
Juan Ferrer
|
0a2fd9cf5d
|
fix: refs #6432, #5848 account sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-20 18:39:37 +01:00 |
Alex Moreno
|
ee1a0c15ee
|
refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 15:09:55 +01:00 |
Guillermo Bonet
|
5fdf18825c
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 13:14:51 +00:00 |
Alex Moreno
|
e25ca914a0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-20 10:13:02 +01:00 |
Alex Moreno
|
0ddfb28327
|
refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 07:56:15 +01:00 |
Guillermo Bonet
|
badb4d69a2
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 06:15:40 +00:00 |
Pablo Natek
|
e2a2454d4e
|
Merge branch 'dev' into 6461-fixFilterNegativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 10:31:35 +00:00 |
Pablo Natek
|
dc100f7959
|
fix(filter): refs #6461 now is mockDate in local
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 11:29:57 +01:00 |
Juan Ferrer
|
bb6f3b4cfd
|
fix: refs #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 08:56:25 +01:00 |
Guillermo Bonet
|
500eb22dc6
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-17 06:43:58 +00:00 |
Guillermo Bonet
|
8da36569f7
|
refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-17 07:44:43 +01:00 |
Guillermo Bonet
|
3d1c69be56
|
refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-17 07:43:32 +01:00 |
Guillermo Bonet
|
2f611391b9
|
Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good
Details
This reverts commit bfd6e1f398 .
|
2023-11-17 07:17:29 +01:00 |
Juan Ferrer
|
c2e295f777
|
fix: refs #6432 account sync fixes
|
2023-11-17 00:08:29 +01:00 |
Juan Ferrer
|
ea5a881d1f
|
fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 23:10:30 +01:00 |
Juan Ferrer
|
1937560118
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 23:07:30 +01:00 |
Juan Ferrer
|
4f5242e3ae
|
fix: refs #6432 account sync fixes
|
2023-11-16 23:07:26 +01:00 |
Javier Segarra
|
9e64939810
|
refs #6434 feat: add Id property in model
|
2023-11-16 11:56:48 +01:00 |
Alex Moreno
|
b8d256e4e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:58:51 +01:00 |
Alex Moreno
|
f677382f96
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:29:53 +01:00 |
Javier Segarra
|
e4f7790843
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 09:15:01 +01:00 |
Javier Segarra
|
c6b5d7f5a4
|
refs #6434 feat: rename id key by token
|
2023-11-16 08:30:01 +01:00 |
Guillermo Bonet
|
bfd6e1f398
|
refactor: refs #4502 Deleted zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 08:29:00 +01:00 |
Alex Moreno
|
5bdf6a7338
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 07:56:23 +01:00 |
Javier Segarra
|
13720291b2
|
refs #6434 perf: remove unique in token column
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 15:18:02 +01:00 |
Alex Moreno
|
ac3d23579a
|
Merge branch 'master' into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 13:50:21 +00:00 |
Carlos Satorres
|
5b587b3449
|
Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 12:56:45 +00:00 |
Javier Segarra
|
e0f6d08a1e
|
refs #6434 feat: create signInLog table
|
2023-11-15 13:49:41 +01:00 |
Sergio De la torre
|
a5d94b3a26
|
Merge branch 'test' into 5652_warmFix_setVisibleDiscard
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 12:43:58 +00:00 |
Alex Moreno
|
89967b8538
|
fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 13:16:31 +01:00 |
Sergio De la torre
|
692c5eb164
|
refs #5652 fix: setVisibleDiscard add parameter null
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 12:38:08 +01:00 |
Guillermo Bonet
|
2847b993d3
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 11:30:23 +00:00 |
Javier Segarra
|
f7b0882978
|
refs #6434 feat: remove forceId property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 11:50:56 +01:00 |
Javi Gallego
|
a4328e607e
|
Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:11:05 +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 |
Javier Segarra
|
4061241650
|
refs #6434 feat: create signInLog table
|
2023-11-15 09:37:03 +01:00 |
Alex Moreno
|
2a67048594
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 15:54:47 +01:00 |
Alex Moreno
|
88ec0f24c3
|
ref #5914 rename table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 15:45:52 +01:00 |
Pablo Natek
|
2a57f7e98a
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 14:02:27 +00:00 |
Pablo Natek
|
0a5e8e1902
|
refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 14:49:54 +01:00 |
Carlos Satorres
|
f3faf37e1a
|
hotfix addressFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 12:34:00 +01:00 |
Carlos Satorres
|
b57106af48
|
refs #6291 validateTin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 11:13:33 +01:00 |
Alex Moreno
|
2cd9c9c688
|
Merge branch 'dev' into 5914-warmfix-renameTable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 09:36:47 +00:00 |
Alex Moreno
|
bc6389fd66
|
Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 09:00:12 +00:00 |
Alex Moreno
|
aec1c9d447
|
fix: correct align
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 09:54:07 +01:00 |
Guillermo Bonet
|
4003e161ce
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:44:06 +00:00 |
Guillermo Bonet
|
64ca72b1f4
|
refactor refs #6184 Changed downloadCmrsZip
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:57:25 +01:00 |
Javier Segarra
|
384b5eb7c7
|
refs #5666 remove old file
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:56:16 +01:00 |
Javier Segarra
|
aab88dc7de
|
refs #5666 perf: use use loggable as mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-13 09:54:12 +01:00 |
Guillermo Bonet
|
2792efa9cd
|
perf: refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 08:36:05 +01:00 |
Javier Segarra
|
3c5af184bb
|
refs #5666 feat: use mixin for this models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 15:12:49 +01:00 |
Carlos Satorres
|
c5c314eb43
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-10 11:59:01 +01:00 |
Guillermo Bonet
|
a4cbc33ee1
|
Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-10 11:55:38 +01:00 |
Guillermo Bonet
|
b7da144967
|
feat: refs #6023 Added SELECT FOR UPDATE
|
2023-11-10 11:55:37 +01:00 |
Guillermo Bonet
|
eb98de71b1
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 10:49:38 +00:00 |
Carlos Satorres
|
a1c8bba4a5
|
hotfix addressId
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 11:29:18 +01:00 |
Alex Moreno
|
0fed5c1ab4
|
Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 09:59:24 +00:00 |
Alex Moreno
|
2eacf7391e
|
refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 08:46:49 +01:00 |
Alex Moreno
|
e9666a5930
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-11-10 08:11:52 +01:00 |
Jorge Penadés
|
40b9a83606
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:59:12 +01:00 |
Jorge Penadés
|
8d94a94e14
|
ref #5914 fix test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:56:50 +01:00 |
Jorge Penadés
|
513562955b
|
ref #5835 test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:53:41 +01:00 |
Jorge Penadés
|
52f1843580
|
ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:00:49 +01:00 |
Jorge Penadés
|
0baa9c5a98
|
ref #5914 fix summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 14:34:53 +01:00 |
Jorge Penadés
|
b07858fddb
|
ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 14:33:46 +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 |
Guillermo Bonet
|
0771548ef1
|
refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 14:14:09 +01:00 |
Guillermo Bonet
|
9668468f94
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:06:55 +00:00 |
Pablo Natek
|
1e4f778ef9
|
refactor(main-labeler): refs #6005 refactor de mainLabeler a backupPrinterFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:22:12 +01:00 |
Jorge Penadés
|
01d3c23cf0
|
ref #5914 renameTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 11:57:52 +01:00 |
Alex Moreno
|
52f419d4cf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
|
2023-11-09 09:33:22 +01:00 |
Pablo Natek
|
c00bbe070c
|
Merge branch 'dev' into 6005-backupLabeler
|
2023-11-09 09:26:13 +01:00 |
Sergio De la torre
|
4258015c07
|
refs #5870 feat:fixModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 08:04:38 +01:00 |
Pablo Natek
|
9c896c835f
|
refactor(printer-notification): refs #6005 refactor de la notificación
|
2023-11-09 07:56:35 +01:00 |
Javi Gallego
|
9d54618620
|
fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-08 10:01:02 +01:00 |
Sergio De la torre
|
d30c4e4463
|
refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-07 16:13:21 +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
|
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 |
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
|
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
|
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
|
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
|
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 |
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 |
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 |
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
|
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 |
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
|
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
|
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 |
Alex Moreno
|
6b94ea7d11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-10-26 09:48:35 +02:00 |
Jorge Penadés
|
3a1227bdc2
|
ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 09:20:25 +02: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
|
013b010c22
|
refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 07:56:57 +02:00 |
Alex Moreno
|
26bdbabff5
|
refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-25 15:48:19 +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 |
Alex Moreno
|
efa9f16452
|
fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-25 09:22:44 +02:00 |
Carlos Andrés
|
001d7cd574
|
Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 15:03:38 +00:00 |
Jorge Penadés
|
9f141238bc
|
ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 11:47:54 +02:00 |
Alex Moreno
|
5442476f05
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-10-24 10:35:11 +02:00 |
Jorge Penadés
|
35bb949fcb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 10:13:38 +02:00 |
Jorge Penadés
|
f1deeb69ca
|
ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 09:34:04 +02:00 |
Alex Moreno
|
22b7c59812
|
refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 09:23:03 +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 |
Carlos Andrés
|
08431e94c6
|
Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 13:52:52 +00:00 |
Carlos Andrés
|
6e3517b40f
|
refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 14:51:09 +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 |
Jorge Penadés
|
1f0a57d320
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-23 09:03:15 +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 |
Jorge Penadés
|
33656e9d9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 08:21:32 +02:00 |
Pablo Natek
|
0237517f0c
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 10:55:30 +00:00 |
Pablo Natek
|
8597c23fb3
|
Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 12:53:57 +02:00 |
Pablo Natek
|
5c69d9c7f0
|
fix: add await in async functions refs #5979
|
2023-10-20 12:53:54 +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 |
Pablo Natek
|
75cfea4a2e
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 10:18:43 +00:00 |
Pablo Natek
|
25c13e42ab
|
Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 11:36:24 +02:00 |
Pablo Natek
|
243a32dff5
|
remove(expand): quito expand de la columna requester refs #6278
|
2023-10-20 11:36:11 +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 |
Alex Moreno
|
d5f98700e7
|
refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 08:32:35 +02:00 |
Pablo Natek
|
9cb4e57951
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 05:31:12 +00:00 |
Pablo Natek
|
dc93328bcf
|
Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 18:24:04 +02:00 |
Pablo Natek
|
07fa011035
|
fix(updateClaim): el spec daba error refs #5979
|
2023-10-19 18:24:03 +02:00 |
Pablo Natek
|
dad67539c5
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 16:23:34 +00: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 |
Pablo Natek
|
f26595bb62
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 12:15:43 +00:00 |
Alex Moreno
|
a0e32cf455
|
Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 12:05:25 +00:00 |
Alex Moreno
|
cadec7d01f
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 11:36:14 +00: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 |
Pablo Natek
|
71182d8630
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 10:49:31 +00:00 |
Alex Moreno
|
1ea6b87266
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 10:48:51 +00:00 |
Juan Ferrer
|
39a0f13500
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 10:14:29 +00:00 |
Guillermo Bonet
|
1b8f227c47
|
ticket #125321 filter advance tickets fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 11:58:15 +02:00 |
Pablo Natek
|
e2f7ce8b35
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:58:50 +00:00 |
Alex Moreno
|
3294937b54
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:50:29 +00:00 |
Jorge Penadés
|
e680a6a080
|
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-19 10:00:43 +02:00 |
Jorge Penadés
|
15890e80d8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 09:59:19 +02:00 |
Jorge Penadés
|
52b14cf8b4
|
ref #6138 fix emailVerified
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 09:51:10 +02:00 |
Jorge Penadés
|
5b1e5743b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 09:35:37 +02:00 |
Pablo Natek
|
f1b11fdca2
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 06:51:50 +00:00 |
Javi Gallego
|
84fc0de4ea
|
Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1803
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-10-19 06:41:43 +00:00 |
Pablo Natek
|
d3a7b4ecb9
|
remove: console.log from updateClaim refs #5979
|
2023-10-19 08:41:26 +02:00 |
Pablo Natek
|
f8889df903
|
remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued...
Details
|
2023-10-19 08:40:25 +02:00 |
Pablo Natek
|
488181e1b6
|
feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:37:28 +02:00 |
Jorge Penadés
|
770aa60b69
|
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-19 08:26:22 +02:00 |
Jorge Penadés
|
7e25fac3e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:25:00 +02:00 |
Jorge Penadés
|
8917821ec0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:23:44 +02:00 |
Alex Moreno
|
daaf076133
|
Merge branch 'dev' into 6312
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 05:29:43 +00: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 |
Javi Gallego
|
44ce0a8730
|
refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:46:41 +02:00 |
Jorge Penadés
|
8fe911ee0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:43:22 +02:00 |
Jorge Penadés
|
62d2c7e701
|
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-18 13:42:15 +02:00 |
Jorge Penadés
|
ea5597d3f3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:40:02 +02:00 |
Jorge Penadés
|
af0d5072ff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:37:14 +02:00 |
Pablo Natek
|
3e96b3d0d2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 11:24:03 +00:00 |
Jorge Penadés
|
330fb08aac
|
ref #5417 fix back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:23:00 +02:00 |
Pablo Natek
|
bf09f13aa2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 11:07:24 +00:00 |
Pablo Natek
|
44bc30adf7
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:35:53 +00:00 |
Pablo Natek
|
2bb4300e1b
|
remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:35:45 +02:00 |
Pablo Natek
|
34c9d030e9
|
Merge branch 'dev' into 6266-minimumImprtSmsFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:31:12 +00:00 |
Pablo Natek
|
5f49a4fe1d
|
fix: created -> shipped refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:25:47 +02:00 |
Pablo Natek
|
1920a1b893
|
merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:23:23 +02:00 |
Jorge Penadés
|
251d71a437
|
ref #5417 refactor transactions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 12:05:33 +02:00 |
Alex Moreno
|
a84f6fe1da
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:05:04 +02:00 |
Jorge Penadés
|
700caac641
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:03:07 +02:00 |
Alex Moreno
|
4300b24c14
|
refs #5918 refactor(worker_timeControl): simplify ng-show
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:45:15 +02:00 |
Alex Moreno
|
d1cb2a1d9a
|
refs #5918 test: add updateWorkerTimeControlMail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:30:36 +02:00 |
Alex Moreno
|
a7b0ef1e4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
|
2023-10-18 09:23:55 +02:00 |
Alex Moreno
|
b3c7511e59
|
refs #6067 feat(url): getByUser
|
2023-10-18 08:52:06 +02:00 |
Alex Moreno
|
a916007314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-18 07:20:34 +02:00 |
Pablo Natek
|
8d44bb8867
|
refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 15:05:48 +02:00 |
Jorge Penadés
|
69a54be1a9
|
ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 14:02:08 +02:00 |
Pablo Natek
|
541926d3f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded
|
2023-10-17 13:57:32 +02:00 |
Pablo Natek
|
9870a0e60a
|
feat(origin): create method url_/geturl redf #5979
|
2023-10-17 13:56:49 +02:00 |
Carlos Satorres
|
fd64cb7e80
|
refs #5919 front back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 13:08:00 +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 |
Jorge Penadés
|
48003b5d03
|
ref #6138
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 08:28:15 +02:00 |
Pablo Natek
|
4f911e644c
|
fix: remove console.log refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:43:03 +02:00 |
Pablo Natek
|
afe4c676fc
|
fix(url): la ulr termina con / no es necesario añadir el texto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:38:33 +02:00 |
Pablo Natek
|
033c02750b
|
refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:24:58 +02:00 |
Jorge Penadés
|
bd535374d8
|
ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 15:58:25 +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
|
9e39e96cf4
|
hotFix: workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 15:22:33 +02:00 |
Carlos Satorres
|
5a375ebfda
|
refs #5919 front back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 13:22:36 +02:00 |
Alex Moreno
|
f79e711617
|
refs #6199 test: updateQuantity refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 10:19:33 +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
|
3af72e1439
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
|
2023-10-16 08:20:20 +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 |
Pablo Natek
|
f832c1d9ec
|
refs #5979 getUrl
|
2023-10-15 11:08:33 +02:00 |
Sergio De la torre
|
f6bf36d46a
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 14:02:25 +00: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 |
Alex Moreno
|
03687cb482
|
hotFix: delete getCurrentWorkerMana
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 14:56:56 +02:00 |
Jorge Penadés
|
9ba3c9c8bc
|
Merge branch 'dev' into 5914-transferInvoiceOut
|
2023-10-13 11:17:12 +00:00 |
Jorge Penadés
|
6b8a6c7a69
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 11:15:04 +00:00 |
Alex Moreno
|
f00a4e63a6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 13:08:54 +02:00 |
Javi Gallego
|
0081c55b9e
|
Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 10:56:33 +00:00 |
Carlos Andrés
|
9c0334619d
|
refs #6199
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 11:56:50 +02:00 |
Alex Moreno
|
fa90132934
|
refs #6199 fix(orderCatalogView): html and css
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 10:23:48 +02:00 |
Guillermo Bonet
|
7367656a35
|
refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 09:02:40 +02:00 |
Sergio De la torre
|
35c0ec0d04
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 15:14:13 +00:00 |
Guillermo Bonet
|
c79f706cdc
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:23:39 +00:00 |
Guillermo Bonet
|
3e70cb07e0
|
refs #6184 Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 14:20:35 +02:00 |
Javi Gallego
|
393d1889f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 14:06:32 +02:00 |
Javi Gallego
|
df9d6fd6f8
|
efectue con acento
|
2023-10-11 14:06:28 +02:00 |
Carlos Satorres
|
38bf90da66
|
refs #5919 sql
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 13:26:27 +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 |
Carlos Satorres
|
cba8a48d18
|
Merge branch 'dev' into 5768-incoterms
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 10:05:45 +00:00 |
Carlos Satorres
|
0023561acb
|
refs #6293 traducción
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:04:12 +02:00 |
Guillermo Bonet
|
d9339af87e
|
refs #6184 Insert in ticketCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 11:46:56 +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 |
Guillermo Bonet
|
6b1dded222
|
refs #6199 Requested change, position of input
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 08:28:52 +02:00 |
Guillermo Bonet
|
d41233efaf
|
refs #6199 Requested change, name of color
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 07:59:05 +02:00 |
Guillermo Bonet
|
2b41bf7eb1
|
refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 07:39:41 +02:00 |
Carlos Satorres
|
c061841cac
|
refs #5919 locker and back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 13:58:33 +02:00 |
Guillermo Bonet
|
d2ce920f13
|
refs #6199 Added minQuantity in catalog and more
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-10 13:49:11 +02:00 |
Carlos Satorres
|
3c58f86c2a
|
refs #5919 locker back y front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 13:44:22 +02:00 |
Carlos Satorres
|
4adee11c63
|
refs #5768 remove comment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 12:35:34 +02:00 |
Jorge Penadés
|
179d8ab87d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 11:30:53 +02:00 |
Guillermo Bonet
|
03afea3b8e
|
refs #6199 Added minQuantity in item
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-10 10:51:02 +02:00 |
Carlos Satorres
|
1adfa33a9a
|
hotfix length sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 14:52:30 +02:00 |
Pablo Natek
|
c4e3fdf510
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 06:03:03 +00:00 |
Carlos Satorres
|
05812c3f35
|
refs #6282 left join
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 07:14:30 +02:00 |
Carlos Satorres
|
62c7dc9db5
|
hotfix-change minus
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 06:16:42 +02:00 |
Pablo Natek
|
f40185c2d4
|
refs #4764 hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:24:52 +02:00 |
Carlos Satorres
|
3fbdae15b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms
|
2023-10-05 14:04:42 +02:00 |
Carlos Satorres
|
3b81b511c2
|
remove consolelog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:01:53 +02:00 |
Carlos Satorres
|
5b6eb0a2a6
|
refs #5768 add address, nickname, pdf, email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:01:07 +02:00 |
Pablo Natek
|
020de5d754
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-05 07:57:46 +00:00 |
Alex Moreno
|
8d7eda5af3
|
refs #5673 fix: add development translation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 09:12:54 +02:00 |
Alex Moreno
|
7a6022efd4
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 06:31:54 +00:00 |
Jorge Penadés
|
0d39471970
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-10-05 08:20:47 +02:00 |
Alex Moreno
|
9538841a30
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:28:02 +02:00 |
Alex Moreno
|
ca86b3cc2f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:27:35 +02:00 |
Alex Moreno
|
7cd2e290ce
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:22:41 +02:00 |
Carlos Satorres
|
f2adbc1716
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms
|
2023-10-04 13:54:18 +02:00 |
Alex Moreno
|
f8a510b330
|
refs #5918 fix(workerTimeControl): update(workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 12:31:46 +02:00 |
Alex Moreno
|
df6d10e514
|
refs #5918 fix(workerTimeControl): resend mail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 12:17:24 +02:00 |
Jorge Penadés
|
c35899542d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 08:40:44 +02:00 |
Alex Moreno
|
45e41de9a9
|
refs #5918 fix(worker_time-control): isMailSended
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-03 14:03:52 +02:00 |
Alex Moreno
|
21ddcb7e8e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-03 11:39:44 +02:00 |
Carlos Satorres
|
bd46a77cb7
|
refs #5768 incoterms addressFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 10:15:16 +02:00 |
Pablo Natek
|
96769d9ff9
|
refs #6213 fixIntermitentError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 08:57:59 +02:00 |
Alex Moreno
|
9baa450298
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 05:25:55 +00:00 |
Pablo Natek
|
7fd2d143c3
|
refs #6213 devMerge
|
2023-10-03 07:08:29 +02:00 |
Alex Moreno
|
4545a63214
|
refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-02 14:51:19 +02:00 |
Pablo Natek
|
99d65804e8
|
refs #6278 fixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 13:29:39 +02:00 |
Jorge Penadés
|
918cff55d9
|
Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 10:06:08 +02:00 |
Jorge Penadés
|
c59b119a4a
|
ref #5417 fix transactions
|
2023-10-02 10:06:04 +02:00 |
Jorge Penadés
|
a00cf557b7
|
Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 07:57:25 +00:00 |
Jorge Penadés
|
2eb9a97ece
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-10-02 09:28:41 +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
|
a7128b8187
|
ref #5417 fix transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 09:04:43 +02:00 |
Jorge Penadés
|
cb2ac21349
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
|
2023-10-02 08:49:27 +02:00 |
Jorge Penadés
|
5f93df26a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl
|
2023-10-02 08:21:09 +02:00 |
Alex Moreno
|
d3706733e4
|
Merge branch 'master' into 5929-hotFix_canEdit_weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 05:06:55 +00:00 |
Alex Moreno
|
7b8518ff5a
|
Merge branch 'dev' into 6033-vnLog_userDescriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 05:04:26 +00:00 |
Jorge Penadés
|
6f4a12e50f
|
ref #5417 date filters added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 14:42:47 +02:00 |
Jorge Penadés
|
3e9d01815a
|
Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-29 10:30:44 +00:00 |
Alex Moreno
|
a0d705683b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-09-29 12:22:42 +02:00 |
Alex Moreno
|
53ab694ad4
|
Merge branch 'dev' into 5890--itemShelvingAsignado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:18:34 +00:00 |
Alex Moreno
|
b33700abc9
|
refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 11:57:25 +02:00 |
Jorge Penadés
|
9536fdba58
|
ref #6119 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:10:58 +02:00 |
Alex Moreno
|
a0a59b672f
|
refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:04:57 +02:00 |
Pablo Natek
|
0fa56149d7
|
refs #6266 smsfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 09:47:22 +02:00 |
Alex Moreno
|
542119983b
|
refs #5929 test: fix test after fix ticket_isEditable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 09:28:23 +02:00 |
Jorge Penadés
|
f1dc809147
|
Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 06:22:51 +00:00 |
Jorge Penadés
|
4d226d9a58
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl
|
2023-09-29 08:20:16 +02:00 |
Jorge Penadés
|
d4e78ea889
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-09-29 08:16:12 +02:00 |
Alex Moreno
|
f3c55cdee9
|
refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 16:00:09 +02:00 |
Carlos Andrés
|
52cba80dc8
|
Merge branch 'dev' into 5890--itemShelvingAsignado
|
2023-09-28 15:13:37 +02:00 |
Alex Moreno
|
1d4001f520
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 12:04:11 +00:00 |
Alex Moreno
|
28dfb895ca
|
refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:49:58 +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 |
Alex Moreno
|
e51df063d3
|
refs #5890 feat: add userId in rawSql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:26:05 +02:00 |
Alex Moreno
|
75e54bd82f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado
|
2023-09-28 13:21:12 +02:00 |
Jorge Penadés
|
e209ab28f4
|
ref #6065 first time hours load fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 11:53:09 +02:00 |
Jorge Penadés
|
869bdab7ce
|
ref #6065 fetchHours relocated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 11:36:03 +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
|
4048627c76
|
refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 08:08:40 +02:00 |
Sergio De la torre
|
18de92f9e7
|
refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 07:51:54 +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
|
ac3e9c811d
|
refs #5890 feat: itemShelvingSaleAsignado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-27 14:01:17 +02:00 |
Jorge Penadés
|
a7c0949f0e
|
ref #6065 replace then by async/await
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-27 08:57:31 +02:00 |
Alex Moreno
|
d313f6ea5c
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 12:59:32 +00: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
|
e1e225a1ef
|
Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 12:42:47 +02:00 |
Jorge Penadés
|
50543963c1
|
ref #5914 refactor createTicketRefund
|
2023-09-26 12:42:45 +02:00 |
Jorge Penadés
|
45fbe6f174
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 06:36:44 +00:00 |
Alex Moreno
|
e36f98195c
|
refs #6033 feat: create user-photo component for worker and user descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 08:15:19 +02:00 |
Jorge Penadés
|
db8dc8487b
|
ref #6246 replace name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:28:08 +02:00 |
Jorge Penadés
|
474399b383
|
ref #5914 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:23:51 +02:00 |
Alex Moreno
|
7a3d3d5e2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 14:14:23 +02:00 |
Jorge Penadés
|
64eb216367
|
ref #5914 fixed back test
|
2023-09-25 14:01:40 +02:00 |
Jorge Penadés
|
f4ce5db93b
|
Merge branch 'dev' into 6246-checkTicketSales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 11:49:18 +00:00 |
Alex Moreno
|
eb0e6dd985
|
refs #6033 feat(VnLog): can use accountDescriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 13:06:28 +02:00 |
Jorge Penadés
|
98ee9bbaf3
|
ref #5914 back test added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 12:54:31 +02:00 |
Alex Moreno
|
d05106cc83
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 10:10:21 +00:00 |
Jorge Penadés
|
c8c06f498c
|
ref #5914 fixed tests e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 10:49:47 +02:00 |
Alex Moreno
|
6cf1095b10
|
refs #6067 feat: vnUser use verify() and more security when update user and mailForward
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 08:33:16 +02:00 |
Pablo Natek
|
af8773612c
|
refs #6213 remove f
gitea/salix/pipeline/head Build queued...
Details
|
2023-09-25 08:23:59 +02:00 |
Pablo Natek
|
fc4019ad69
|
Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 08:23:25 +02:00 |
Pablo Natek
|
9b10a2904c
|
refs #6213 unifyTest
|
2023-09-25 08:23:23 +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 |
Alex Moreno
|
d43b70c971
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:30:28 +02:00 |
Alex Moreno
|
cf36b10763
|
refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:29:48 +02:00 |
Alex Moreno
|
db7f72e262
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-09-22 13:19:35 +02:00 |
Pablo Natek
|
ed157d1fd1
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 11:11:25 +00:00 |
Alex Moreno
|
d16ae47712
|
Merge branch 'dev' into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 11:01:25 +00:00 |
Jorge Penadés
|
6fe52ba3e8
|
ref #6246 check sales and update test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 12:48:54 +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
|
5b22314b07
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms
|
2023-09-22 12:17:23 +02:00 |
Jorge Penadés
|
6bc9b7b232
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-09-22 12:05:12 +02:00 |
Pablo Natek
|
a854fff94f
|
refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 10:59:48 +02:00 |
Carlos Satorres
|
c7f84ad6db
|
refs #5843 add return
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 10:36:51 +02:00 |
Pablo Natek
|
c175bcfc97
|
refs #6159 rename spec
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 09:40:37 +02:00 |
Pablo Natek
|
1357b60b9b
|
refs #6159 fixFixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 09:14:08 +02:00 |
Carlos Satorres
|
c7e26f9155
|
refs #5768 autocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 06:08:07 +02:00 |
Jorge Penadés
|
82f14e62ad
|
ref #5914 tests fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 16:08:55 +02:00 |
Alex Moreno
|
a78348f2de
|
refs #6067 feat(account_basicData): use vnUser/preview
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-21 15:06:14 +02:00 |
Carlos Satorres
|
7b246b1bac
|
refs #5768 trad choose address
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 13:15:00 +02:00 |
Carlos Satorres
|
1f1dfae7e3
|
refs #5843 changes models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 12:50:07 +02:00 |
Jorge Penadés
|
ac4aea7d38
|
ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 09:14:46 +02:00 |
Carlos Satorres
|
cd20a2d06d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 07:32:19 +02:00 |
Pablo Natek
|
324b3ed8ee
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 05:21:06 +00:00 |
Jorge Penadés
|
5b818cef0c
|
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 15:25:20 +02:00 |
Alex Moreno
|
3b90d7e5e5
|
refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 15:10:28 +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 |
Carlos Satorres
|
f92acdfe6f
|
Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 09:52:32 +00:00 |
Jorge Penadés
|
4870b0830b
|
ref #5914 fix refund and change method name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 11:06:30 +02:00 |
Pablo Natek
|
d29c37693d
|
Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 08:53:53 +00: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 |
Javi Gallego
|
72a8256aee
|
Merge pull request 'fixes #6241 dbTest fixed' (!1756) from 6241--arreglar--dbTest into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1756
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-09-20 06:27:21 +00:00 |
Javi Gallego
|
29a186fa18
|
Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued...
Details
|
2023-09-20 08:18:46 +02:00 |
Guillermo Bonet
|
e2229b6762
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 08:18:24 +02:00 |
Guillermo Bonet
|
4ccb09d057
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 08:18:03 +02:00 |
Javi Gallego
|
45cf1b1ff3
|
fixes #6241 dbTest fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 08:12:07 +02:00 |
Guillermo Bonet
|
56c1dbc096
|
Merge branch 'master' into 5995-getExternalCmrRouteFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 12:42:46 +00:00 |
Carlos Satorres
|
daf5b343fd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-19 13:58:13 +02:00 |
Guillermo Bonet
|
2686fd0601
|
refs #6210 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 12:18:46 +02:00 |
Guillermo Bonet
|
77b55e5b09
|
refs #6210 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 12:15:23 +02:00 |
Guillermo Bonet
|
661563a2b6
|
refs #6210 Refactor filter client (zoneFk)
|
2023-09-19 12:14:55 +02:00 |
Pablo Natek
|
971d77a198
|
refs #6213 specChangeId
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 07:46:44 +02:00 |
Pablo Natek
|
361c2b4cad
|
refs #6213 fixSpec
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-19 07:33:28 +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
|
aef34165d2
|
refs #4131 reverse claim changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-18 13:57:17 +02:00 |
Alex Moreno
|
656492b9a6
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-18 10:40:26 +00:00 |
Carlos Satorres
|
cfd080530a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-09-18 11:49:03 +02:00 |
Guillermo Bonet
|
f6d46396b5
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-18 08:15:43 +00:00 |
Pablo Natek
|
c1da4815cb
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-18 08:12:08 +00:00 |
Pablo Natek
|
cdf0951a1b
|
refs #6213 newSuplierSpec
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-18 10:12:32 +02:00 |
Guillermo Bonet
|
6c34421413
|
refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-18 10:03:31 +02:00 |
Pablo Natek
|
44ec197ea0
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-18 06:56:48 +00:00 |
Jorge Penadés
|
32a0aedf11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-18 08:07:27 +02:00 |
Pablo Natek
|
55b53c86c4
|
refs #6213 formatfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-18 07:38:31 +02:00 |
Sergio De la torre
|
881a1ee0b8
|
refs #5652 modify: solved Tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-15 11:24:17 +02:00 |
Sergio De la torre
|
0403c67bad
|
Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-15 05:47:00 +00:00 |
Carlos Satorres
|
2a1e828e14
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-09-15 07:30:46 +02:00 |
Pablo Natek
|
191b254acc
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-14 16:05:25 +00:00 |
Sergio De la torre
|
b756d2f938
|
refs #5652 modify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-14 18:03:30 +02:00 |
Pablo Natek
|
cf138a0814
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-14 13:15:52 +00:00 |
Pablo Natek
|
a44e5206a7
|
refs #6213 fixConcatBug
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-14 14:18:00 +02:00 |
Javi Gallego
|
eff0975eb2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-14 10:27:03 +02:00 |
Javi Gallego
|
82631d6fcd
|
claimingRate divide por 100
|
2023-09-14 10:26:59 +02:00 |
Sergio De la torre
|
43f5bbb04e
|
Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-14 09:05:55 +02:00 |
Sergio De la torre
|
d2cd522842
|
refs #5652 modify:without fit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-14 07:47:10 +02:00 |
Pablo Natek
|
66e851b5ea
|
refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 19:48:58 +02:00 |
Pablo Natek
|
7ab8cb37cd
|
ref #6213 fixformat
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 19:22:21 +02:00 |
Pablo Natek
|
72026332ba
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 13:07:38 +00:00 |
Carlos Satorres
|
12dff3e248
|
Merge branch 'dev' into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 08:52:59 +00:00 |
Javi Gallego
|
7bd3bfddc3
|
fix sin bankEntity ya no falla
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 07:07:22 +02:00 |
Pablo Natek
|
740514c5a8
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-12 13:46:58 +00:00 |
Sergio De la torre
|
1d25355423
|
refs #5652 fix:without fit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-12 08:44:42 +02:00 |
Pablo Natek
|
6a753d26af
|
refs #6213 default account value
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-11 18:28:47 +02:00 |
Sergio De la torre
|
5f5a0645be
|
refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-11 16:16:49 +02:00 |
Pablo Natek
|
cbaf6001a8
|
refs #6213 remove console log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-11 12:36:42 +02:00 |
Pablo Natek
|
ccfd8fad05
|
refs #6213 fixCreateError
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-11 12:32:46 +02:00 |
Carlos Satorres
|
a29b25cffd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-11 10:48:38 +02:00 |
Carlos Satorres
|
544259df9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-09-11 10:47:21 +02:00 |
Javi Gallego
|
08e97b6a19
|
Merge pull request 'fixes #6169 invoiceIn con valores predeterminados' (!1728) from 6169---invoice-in-basic-data--dms-refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1728
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-09-11 07:00:20 +00:00 |
Jorge Penadés
|
48a6bf2969
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-08 08:05:17 +02:00 |
Carlos Satorres
|
c2f73eb548
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
|
2023-09-07 13:38:38 +02:00 |
Carlos Andrés
|
4784e71350
|
refs #6176 book entry deleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-07 13:21:03 +02:00 |
Jorge Penadés
|
427425a750
|
ref #6119 simplifiy component
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-07 09:50:13 +02:00 |
Carlos Andrés
|
0465c2ca54
|
Merge branch 'dev' into 6176-book-entry-deleted
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 19:27:02 +00:00 |
Carlos Andrés
|
0d2db7749f
|
refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 21:22:10 +02:00 |
Carlos Satorres
|
4918e3ccc7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 14:02:53 +02:00 |
Sergio De la torre
|
8218eb2a6b
|
refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-06 09:37:41 +02:00 |
Sergio De la torre
|
dd1f759e20
|
refs #5652 feat:itemTrash_new
|
2023-09-06 09:35:43 +02:00 |
Sergio De la torre
|
2fffa56d70
|
refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 09:18:28 +02:00 |
Javi Gallego
|
6a4d8fbfbf
|
Merge branch 'dev' into 6173-dump-BBDD
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-05 13:48:35 +02:00 |
Carlos Satorres
|
7025326e06
|
Merge branch 'dev' into 6044-fixTickCalendar
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-04 10:31:08 +00:00 |
Javi Gallego
|
c2d8e1c002
|
fixes #6173 show just buyUltimate items
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-04 12:14:52 +02:00 |
Carlos Andrés
|
40468b70e6
|
refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-04 11:59:55 +02:00 |
Javi Gallego
|
ed25bd93d6
|
fixes #6173 lastItemBuy muestra articulos sin podu
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-04 11:13:29 +02:00 |
Jorge Penadés
|
f46d6355dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-04 08:06:47 +02:00 |
Jorge Penadés
|
52d698b0eb
|
ref#6119 link fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-01 12:38:35 +02:00 |
Sergio De la torre
|
022d3d08e6
|
refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-01 12:34:33 +02:00 |
Sergio De la torre
|
3795404789
|
Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 10:15:26 +00:00 |
Guillermo Bonet
|
979315aa5e
|
refs #5995 Implemented downloadCmrsZip
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 12:10:39 +02:00 |
Jorge Penadés
|
9eff7c509f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 12:06:49 +02:00 |
Javi Gallego
|
734b948aac
|
refs #6173 back test fixed and fixtures refactored
|
2023-09-01 11:52:48 +02:00 |
Carlos Satorres
|
9b971abb55
|
refs #6044 class scss
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 11:49:08 +02:00 |
Guillermo Bonet
|
cab3548c9b
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 06:11:08 +00:00 |
Sergio De la torre
|
00201197cc
|
Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 05:24:55 +00:00 |
Sergio De la torre
|
7d8828e604
|
refs #6132 fix: saveSign without route
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 13:50:31 +02:00 |
Carlos Satorres
|
017e0dd948
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-31 13:29:34 +02:00 |
Jorge Penadés
|
c2a54b8c65
|
ref #6119 vnLinkPhone created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 13:02:56 +02:00 |
Javi Gallego
|
92789ba3de
|
refs #6173 fixed backTest
|
2023-08-31 10:04:28 +02:00 |
Javi Gallego
|
ea5e10faed
|
Merge pull request 'test' (!1730) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1730
|
2023-08-31 07:58:48 +00:00 |
Guillermo Bonet
|
0dbb77fc64
|
refs #6023 Transactioned sync
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 09:20:33 +02:00 |
Jorge Penadés
|
05f0f72c73
|
refs #6119 microsip link added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-30 14:14:48 +02:00 |
Javi Gallego
|
30c863722c
|
fixes #6169 no se necesita tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-30 14:14:20 +02:00 |
Javi Gallego
|
fea0db14e2
|
fixes #6169 invoiceIn con valores predeterminados
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-30 13:35:51 +02:00 |
Carlos Satorres
|
0b9199688e
|
refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-30 12:48:57 +02:00 |
Guillermo Bonet
|
d1df8009a6
|
refs #6023 Fix change rol bug
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-29 10:52:05 +02:00 |
Juan Ferrer
|
d60e35d817
|
Merge pull request 'refs #6153 master into test' (!1726) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1726
|
2023-08-29 06:50:27 +00:00 |
Jorge Penadés
|
7f1db050ad
|
Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 12:56:53 +00:00 |
Jorge Penadés
|
5fe12d9281
|
Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 12:43:26 +00:00 |
Jorge Penadés
|
ca28d2d78f
|
ref #5216 myOptions added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 14:37:32 +02:00 |
Alex Moreno
|
2ecc464046
|
refs #5673 feat(claim_development): redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-25 14:26:17 +02:00 |
Alex Moreno
|
45c58feb8c
|
Merge branch 'dev' into 6146-route-sugestedTicket-error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 12:10:52 +00:00 |
Vicent Llopis
|
00b1746fd8
|
Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-25 11:32:58 +00:00 |
Vicent Llopis
|
b304210e8f
|
Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 08:47:12 +00:00 |
Vicent Llopis
|
c4cf5f3a4f
|
Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-25 08:04:42 +00:00 |
Vicent Llopis
|
9da5c4c1db
|
refs #5918 refacotr: cambiado nombre variable
|
2023-08-25 10:04:27 +02:00 |
Javi Gallego
|
1d300237f2
|
Merge branch 'dev' into 6146-route-sugestedTicket-error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 09:59:18 +02:00 |
Javi Gallego
|
f54a239229
|
fixes #6143 fixes: this.bankEntityFk no existe
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 09:46:53 +02:00 |
Jorge Penadés
|
083f19fd41
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
|
2023-08-25 08:11:44 +02:00 |
Javi Gallego
|
a3d301f12e
|
Merge branch 'dev' into 6143-refactor-iban-con-country
|
2023-08-25 07:23:08 +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
|
386de69bce
|
refs #5216 fix error handling
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 12:47:10 +02:00 |
Alex Moreno
|
4c1d9cd767
|
hotFix(priceDifference): import UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 11:32:20 +02:00 |
Jorge Penadés
|
3d4a99b07e
|
refs 5914 transferInvoice created
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-24 10:51:34 +02:00 |
Javi Gallego
|
b5b7770f3f
|
refs #6146 fixes: muestra la agencia de la ruta
|
2023-08-24 10:41:28 +02:00 |
Jorge Penadés
|
bda3937417
|
refs #5216 path replaced and test created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 10:01:07 +02:00 |
Vicent Llopis
|
9a12169ba4
|
Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 07:33:07 +00:00 |
Vicent Llopis
|
beeebbdf9c
|
refs #6013 refactor: siempre se crea una tranacción para cada dia
gitea/salix/pipeline/head Build queued...
Details
|
2023-08-24 09:33:58 +02:00 |
Vicent Llopis
|
1f63648697
|
refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-24 09:10:04 +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 |
Vicent Llopis
|
f8fd2bbd17
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-24 07:50:24 +02:00 |
Vicent Llopis
|
3cffdca0c7
|
Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 05:39:48 +00:00 |
Vicent Llopis
|
dad792cb76
|
refs #5244 move changes sql
gitea/salix/pipeline/head Build queued...
Details
|
2023-08-24 07:40:37 +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 |
Alex Moreno
|
8454d208e1
|
hotFix(route_tickets): orderBy nickname
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:02:52 +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 |
Alex Moreno
|
7349d4496f
|
refs #5351 hotFix(worker_sip): use worker.id not worker.userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 07:34:01 +02:00 |
Javi Gallego
|
4657bf4e43
|
refs #6143 refactor: ibanValidation with countryCode param
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-22 14:58:26 +02:00 |
Alex Moreno
|
5a5e3ebddb
|
refs #5712 hotFix(catalog): undo last fix search_panel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 13:39:57 +02:00 |
Vicent Llopis
|
dd1dbcbd4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 13:39:09 +02:00 |
Vicent Llopis
|
c7c17e6e4a
|
Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-22 11:18:08 +00: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 |
Carlos Satorres
|
b1b6bd13ea
|
refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:45:41 +02: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 |
Guillermo Bonet
|
6d60592fb9
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-21 09:34:32 +02:00 |
Guillermo Bonet
|
86def6e212
|
refs #5995 Changed query getExternalCmrs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-21 08:47:28 +02:00 |
Jorge Penadés
|
040f5be85c
|
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-08-18 12:18:30 +02:00 |
Alex Moreno
|
518d5111e4
|
refs #6127 hotFix(ticketRefund): get ticketFk front ticketService
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-17 08:42:04 +02:00 |
Alex Moreno
|
868fbbfc2e
|
cau #103812 hotFix(supplier): beforeSave name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-16 08:04:32 +02:00 |
Sergio De la torre
|
8d0b3efa11
|
refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-14 09:39:40 +02:00 |
Alex Moreno
|
1ec51d94cf
|
refs #5134 feat: correct sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:53:43 +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 |
Alex Moreno
|
00fa5b7ce3
|
Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 07:38:53 +00:00 |
Jorge Penadés
|
27ab6639c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-08-10 13:26:42 +02:00 |
Alex Moreno
|
afc0c98065
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 11:05:37 +02:00 |
Alex Moreno
|
bdf0138c70
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-08-10 10:40:40 +02:00 |
Guillermo Bonet
|
b197109556
|
refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 10:14:22 +02:00 |
Carlos Satorres
|
a11905ee63
|
Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 08:00:07 +00:00 |
Carlos Satorres
|
8807b9f87f
|
fix upper
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 09:58:48 +02:00 |
Alex Moreno
|
de773bc849
|
Merge branch 'master' into 5995-liliumExternalCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 06:55:56 +00:00 |
Guillermo Bonet
|
d6b30271f2
|
refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 08:12:52 +02:00 |
Guillermo Bonet
|
ed88a5b25f
|
refs #5995 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 07:54:49 +02:00 |
Alex Moreno
|
209cac2a6a
|
Merge branch 'dev' into 5762-recoverPassword-multiplatform
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 13:05:16 +00:00 |
Carlos Satorres
|
5653a39e3b
|
fix fixtures names, socialnames streets
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 13:10:05 +02:00 |
Carlos Satorres
|
f70b767506
|
Merge branch 'dev' into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 08:05:46 +00:00 |
Alex Moreno
|
aee78960b0
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 08:00:54 +02:00 |
Alex Moreno
|
765ab054a1
|
refs #5934 fix(clientSms): add vn-tooltip
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 07:41:38 +02:00 |
Jorge Penadés
|
132640cddf
|
Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-08 15:10:40 +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 |
Alex Moreno
|
19c09d60a2
|
refs #5986 feat(ticket_filter): add classColor column
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 15:04:21 +02:00 |
Guillermo Bonet
|
2f64a41f64
|
refs #5995 Added getExternalCmrs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 14:16:47 +02:00 |
Alex Moreno
|
0d5c6ffdbe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 07:10:25 +02:00 |
Alex Moreno
|
00fcd3a800
|
refs #6083 feat: add lilium ticketSms
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 14:03:07 +02:00 |
Alex Moreno
|
e85cddec3c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 10:19:27 +02:00 |
Alex Moreno
|
26d6bbff4c
|
refs #5929 hotFix: add UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 10:04:46 +02:00 |
Alex Moreno
|
4191d2529d
|
refs #5712 warnFix: getById condition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 07:57:38 +02:00 |
Alex Moreno
|
75d3d12ae9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform
|
2023-08-04 14:31:56 +02:00 |
Guillermo Bonet
|
eeb68e1ad9
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-04 08:54:41 +00:00 |
Alex Moreno
|
700ba4a7b1
|
refs #5914 feat(transferInvoiceOut): optimization
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-04 08:22:43 +02:00 |
Carlos Satorres
|
1308efb98d
|
Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-04 01:21:52 +00:00 |
Alex Moreno
|
83d0a394e3
|
refs #5973 refactor(item_fetched-tags): restyle empty tags
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-03 15:59:09 +02:00 |
Jorge Penadés
|
725fe674c0
|
refs #5914 WIP fixing transacticions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-03 14:01:50 +02:00 |
Guillermo Bonet
|
602f57bca9
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-03 08:54:32 +00:00 |
Carlos Satorres
|
3388fd7c59
|
fix test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-03 10:26:29 +02:00 |
Carlos Satorres
|
4fb0ad415c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head Build queued...
Details
|
2023-08-03 10:03:15 +02:00 |
Carlos Satorres
|
183fdacefc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-03 10:01:11 +02:00 |
Guillermo Bonet
|
8deb8c1f54
|
Merge branch 'master' into 5995-newCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-03 06:50:04 +00:00 |
Guillermo Bonet
|
aab0771e6e
|
refs #5995 Removed my code in closure.js
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 14:37:38 +02:00 |
Alex Moreno
|
fd9b842e6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-08-02 13:58:40 +02:00 |
Guillermo Bonet
|
4a0b8f37cd
|
refs #5995 Load blob
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 13:41:44 +02:00 |
Alex Moreno
|
56cd94feaa
|
refs #5843 fix(timeControl_filter): not use userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 13:26:42 +02:00 |
Guillermo Bonet
|
16353dfddc
|
refs #5995 First commit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 07:35:40 +02:00 |
Jorge Penadés
|
bd122e6327
|
refs #5014 WIP trasactions added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-01 16:13:24 +02:00 |
Alex Moreno
|
b8780dfbbf
|
Merge branch 'master' into hotifx-loadDataDepartment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 12:12:17 +00:00 |
Carlos Satorres
|
2bde94a667
|
Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 11:40:29 +00:00 |