 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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
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 |