 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 |
 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 |
 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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
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 |
 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 |
 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 |
|
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 |
 Carlos Satorres
|
1adfa33a9a
|
hotfix length sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 14:52: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 |
|
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 |
|
Pablo Natek
|
99d65804e8
|
refs #6278 fixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 13:29:39 +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 |
|
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 |
|
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 |
|
Jorge Penadés
|
4b213c1c9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:31:45 +02:00 |
|
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:18:15 +02:00 |
|
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 07:42:44 +02:00 |
|
Sergio De la torre
|
2ea2943eca
|
refs #5134 feat: models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 13:12:18 +02:00 |
|
Jorge Penadés
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Carlos Satorres
|
f60b6b84fe
|
refs #5843 fix back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 11:58:36 +02:00 |
|
Jorge Penadés
|
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
|
29a186fa18
|
Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued...
Details
|
2023-09-20 08:18:46 +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 |
|
Carlos Satorres
|
daf5b343fd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-19 13:58:13 +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 |
|
Pablo Natek
|
66e851b5ea
|
refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 19:48:58 +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 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 |
|
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 |
|
Javi Gallego
|
734b948aac
|
refs #6173 back test fixed and fixtures refactored
|
2023-09-01 11:52:48 +02: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 |
|
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 |
 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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Alex Moreno
|
3eacb4dbd9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:05:04 +02:00 |
|
Alex Moreno
|
508a4b2d34
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:04:27 +02:00 |
|
Jorge Penadés
|
82d08261e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
|
2023-08-23 10:25:48 +02:00 |
|
Vicent Llopis
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |