 Carlos Jimenez Ruiz
|
c721d9ae82
|
Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-23 12:43:00 +00:00 |
|
Carlos Jimenez Ruiz
|
a76dd11825
|
Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-23 12:33:08 +00:00 |
 Vicent Llopis
|
db7638f153
|
refactor: sectorFk property deleted
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-23 12:45:20 +02:00 |
|
Vicent Llopis
|
9bbdeb2840
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-23 12:41:01 +02:00 |
|
Vicent Llopis
|
1b3f0ee026
|
refactor: added itemPackingType and temperature relations
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-05-23 12:40:11 +02:00 |
|
Vicent Llopis
|
9736a68dd9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 13:16:58 +02:00 |
|
Vicent Llopis
|
875e9503c3
|
refactor: request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 13:16:47 +02:00 |
|
Vicent Llopis
|
a043c5d346
|
refactor: request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 13:10:48 +02:00 |
|
Carlos Jimenez Ruiz
|
d86ac41b70
|
Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 10:54:08 +00:00 |
|
Vicent Llopis
|
f4b080243c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 12:53:23 +02:00 |
|
Vicent Llopis
|
fd80fc58fc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 12:33:23 +02:00 |
|
Vicent Llopis
|
3c9800a7a3
|
refactor: pull request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 12:33:12 +02:00 |
 Joan Sanchez
|
4d093d37bd
|
Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 10:22:48 +00:00 |
|
Carlos Jimenez Ruiz
|
b3c0aa7933
|
Merge branch 'dev' into 4082-zone.basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 10:19:00 +00:00 |
|
Vicent Llopis
|
c125fd54eb
|
refactor: pull request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 12:08:12 +02:00 |
|
Vicent Llopis
|
0425b17b4e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund
|
2022-05-20 11:57:20 +02:00 |
|
Vicent Llopis
|
69e12e0dd8
|
refactor: 'bonus' can be a negative value
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 09:21:33 +02:00 |
 Alex Moreno
|
4a9c5742c0
|
fix(entry_latest-buys): fix multi_check
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-17 13:50:06 +02:00 |
|
Vicent Llopis
|
605ab2ec62
|
refactor: delete sms.detinationFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-17 12:37:54 +02:00 |
|
Vicent Llopis
|
eeede417eb
|
feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-17 12:24:35 +02:00 |
|
Vicent Llopis
|
ebbb0466a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-05-17 10:13:05 +02:00 |
|
Vicent Llopis
|
76515bdd3f
|
add: search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-17 09:54:49 +02:00 |
|
Vicent Llopis
|
3335cb8a01
|
feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-17 08:32:45 +02:00 |
|
Vicent Llopis
|
7ad56327a1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
|
2022-05-17 08:21:49 +02:00 |
|
Carlos Jimenez Ruiz
|
d31f7f1b6b
|
all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-16 10:19:43 +02:00 |
|
Carlos Jimenez Ruiz
|
b5ccd32800
|
Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-16 07:23:08 +00:00 |
|
Vicent Llopis
|
10cd9c5b87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-16 07:22:16 +02:00 |
|
Carlos Jimenez Ruiz
|
990f7fe4b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation
|
2022-05-13 18:37:48 +02:00 |
|
Joan Sanchez
|
9cbee7a38a
|
Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-13 13:05:08 +00:00 |
|
Joan Sanchez
|
913b76880a
|
Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-13 12:59:30 +00:00 |
|
Joan Sanchez
|
f8db3c31df
|
Proper test result
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-05-13 10:02:34 +02:00 |
|
Joan Sanchez
|
6b18432f87
|
Force test to fail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-13 09:53:47 +02:00 |
|
Carlos Jimenez Ruiz
|
cce1d93dde
|
jasmine reporters config for CI
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-12 11:43:41 +02:00 |
 Javi Gallego
|
0d63f3c3af
|
Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 11:13:34 +02:00 |
|
Alex Moreno
|
5021315ed4
|
refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 09:47:47 +02:00 |
|
Vicent Llopis
|
6441393249
|
refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-12 08:47:17 +02:00 |
|
Vicent Llopis
|
568579f461
|
refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-12 08:27:04 +02:00 |
|
Alex Moreno
|
7f46d4e50a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 08:06:39 +02:00 |
|
Alex Moreno
|
af1fa8051f
|
refactor(clientCredit): refactor test
|
2022-05-12 08:06:30 +02:00 |
|
Vicent Llopis
|
16fdf982c8
|
feat(item.itemtype): add frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 07:40:24 +02:00 |
|
Carlos Jimenez Ruiz
|
833addcb75
|
gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-11 19:38:10 +02:00 |
|
Vicent Llopis
|
13a6f1f8c1
|
feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-11 14:47:54 +02:00 |
|
Joan Sanchez
|
d39147689d
|
Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-11 12:47:33 +00:00 |
|
Joan Sanchez
|
afe4f0ba94
|
Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-11 12:46:39 +00:00 |
|
Vicent Llopis
|
734f9cb60d
|
feat(item.itemType): added section itemType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-11 07:28:17 +02:00 |
|
Carlos Jimenez Ruiz
|
a7b56b3b89
|
Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 12:19:31 +00:00 |
|
Carlos Jimenez Ruiz
|
a47c0dbaea
|
Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 11:47:14 +00:00 |
|
Carlos Jimenez Ruiz
|
0e65f382f9
|
Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 11:36:35 +00:00 |
|
Alex Moreno
|
5919c42df2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check
|
2022-05-10 11:42:35 +02:00 |
|
Joan Sanchez
|
7f19f0bebe
|
Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #938
|
2022-05-10 08:26:38 +00:00 |
|
Joan Sanchez
|
866834d1d7
|
Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #956
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-05-10 08:25:47 +00:00 |
|
Joan Sanchez
|
aa431bbe0f
|
Merge branch 'dev' into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 08:24:32 +00:00 |
|
Joan Sanchez
|
93829eeff5
|
Merge branch 'dev' into 3948-invoceIn.index
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 08:22:06 +00:00 |
|
Joan Sanchez
|
c0f2b9dca9
|
Merge branch 'dev' into 3996-entry_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 08:09:31 +00:00 |
|
Alex Moreno
|
fde73b35e7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check
|
2022-05-10 08:57:28 +02:00 |
|
Alex Moreno
|
5bad0592a5
|
change errors
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 08:48:51 +02:00 |
|
Alex Moreno
|
263d0e3f79
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive
|
2022-05-10 07:55:41 +02:00 |
|
Vicent Llopis
|
bb4dbb60b8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 07:11:26 +02:00 |
|
Carlos Jimenez Ruiz
|
5c55caaec6
|
Merge branch 'dev' into 3978-invoiceIn.summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 14:59:32 +00:00 |
|
Carlos Jimenez Ruiz
|
e71003778a
|
Merge branch 'dev' into 3950-invoiceIn.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 14:41:33 +00:00 |
|
Carlos Jimenez Ruiz
|
6fb83f5c65
|
Merge branch 'dev' into 3941-order.index
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 14:21:24 +00:00 |
|
Carlos Jimenez Ruiz
|
9c085fa653
|
Merge branch 'dev' into 3927-monitor_ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 14:14:01 +00:00 |
|
Joan Sanchez
|
7365143eac
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 16:09:17 +02:00 |
|
Carlos Jimenez Ruiz
|
93d29bb202
|
Merge branch 'dev' into 3900-client_credit
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 13:16:04 +00:00 |
|
Vicent Llopis
|
f08a384a7c
|
fix: e2e test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-09 14:49:37 +02:00 |
|
Alex Moreno
|
d9055abca9
|
fix(entry_summary): get entry.id
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-09 14:44:30 +02:00 |
|
Carlos Jimenez Ruiz
|
efc43c9611
|
Merge branch 'dev' into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 12:36:27 +00:00 |
|
Vicent Llopis
|
a6b8674302
|
feat(invoiceIn.tax): add button for create an expence
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-09 14:34:20 +02:00 |
|
Alex Moreno
|
a00728384f
|
Merge branch '3409-clientCredit_maxRows' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 13:19:38 +02:00 |
|
Alex Moreno
|
54fdc4b6e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
|
2022-05-09 13:19:20 +02:00 |
|
Joan Sanchez
|
f806a598ea
|
Updated method path
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 13:15:48 +02:00 |
|
Vicent Llopis
|
bd7eb67aeb
|
fix: add CAST DECIMAL(10,2)
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-09 12:31:38 +02:00 |
|
Joan Sanchez
|
f380d5fd28
|
Merge pull request '3942-ticket.volume' (#953) from 3942-ticket.volume into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #953
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-05-09 08:29:23 +00:00 |
|
Alex Moreno
|
d34a8629f7
|
fix(setSaleQuantity): save originalQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-06 13:09:37 +02:00 |
|
Alex Moreno
|
798147ea99
|
jenkins error
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-05 14:40:13 +02:00 |
|
Alex Moreno
|
1e3b05a95d
|
remove console.log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-05 13:32:34 +02:00 |
|
Alex Moreno
|
70aca5d11a
|
fix(worker): fix getMonth
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-05 13:25:57 +02:00 |
|
Vicent Llopis
|
93e3ea103a
|
added frontTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-04 12:05:46 +02:00 |
|
Vicent Llopis
|
9862960c99
|
comment frontTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-04 12:00:39 +02:00 |
|
Vicent Llopis
|
38f5541ef4
|
execute jenkins test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-04 11:27:03 +02:00 |
|
Alex Moreno
|
ac4d4e6db1
|
test and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-04 10:59:37 +02:00 |
|
Javi Gallego
|
dcd5d07a28
|
menu order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-04 10:43:40 +02:00 |
|
Vicent Llopis
|
66685e7541
|
feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-04 10:35:31 +02:00 |
|
Alex Moreno
|
b5a73ec3a2
|
fix(monitor_client): clientsFilter refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-04 10:32:14 +02:00 |
|
Alex Moreno
|
0cae852dea
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-04 10:28:17 +02:00 |
|
Alex Moreno
|
1cc199e26b
|
refactor(client-credit)
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-04 10:26:13 +02:00 |
|
Alex Moreno
|
800b4984ff
|
fix(test): use ctx.options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-04 07:46:47 +02:00 |
|
Alex Moreno
|
e140c9d1f4
|
console.logs
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-03 15:17:34 +02:00 |
|
Alex Moreno
|
f364c19c70
|
fix(monitor_client): fix scroll
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-03 14:08:46 +02:00 |
|
Javi Gallego
|
6584a29ce5
|
create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-03 11:16:56 +02:00 |
|
Joan Sanchez
|
c6e554c608
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-02 14:52:02 +02:00 |
|
Alex Moreno
|
b40b8d931d
|
feat(client_credit): remove de old rows
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-02 11:18:39 +02:00 |
|
Joan Sanchez
|
ea6b1abdd8
|
Invoice queue
|
2022-05-02 09:51:49 +02:00 |
|
Alex Moreno
|
d27a45522b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 12:49:42 +02:00 |
|
Vicent Llopis
|
fec9554d5b
|
feat(invoceIn.index): added 'file' and deleted 'account'
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 12:13:02 +02:00 |
|
Vicent Llopis
|
48f10c4e53
|
feat(invoceIn.create): added nif and deleted currency
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 09:50:43 +02:00 |
|
Carlos Jimenez Ruiz
|
b2f930911f
|
fixed problems in two spec files
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 09:18:06 +02:00 |
|
Vicent Llopis
|
11a7f48bd1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 08:32:02 +02:00 |
|
Vicent Llopis
|
c10e4c04b6
|
refactor: delete file
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 08:23:35 +02:00 |
|
Javi Gallego
|
9973eeddb9
|
Merge remote-tracking branch 'origin/3750-claim_photo' into 3851-dms_delete
|
2022-04-29 07:51:17 +02:00 |