Joan Sanchez
|
f9f09440ec
|
Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev
gitea/salix/pipeline/head This commit is unstable
Details
Reviewed-on: #1053
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-16 07:10:48 +00:00 |
Alex Moreno
|
54b41faf12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-09-16 08:55:39 +02:00 |
Vicent Llopis
|
f5bbe3a9ac
|
fix: scope updated
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-09-15 11:55:07 +02:00 |
Joan
|
90229112e9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-15 06:35:03 +00:00 |
Alex Moreno
|
e72c0ae919
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 13:09:00 +02:00 |
Alex Moreno
|
06eab58b3d
|
is agency
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 12:45:40 +02:00 |
Alex Moreno
|
8c984b5ebe
|
refactor(client): change rol manager to financialBoss
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 12:32:19 +02:00 |
Alex Moreno
|
6b252f7e33
|
refactor(item_waste): refactor table and add totals in table_head
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 10:13:30 +02:00 |
Alex Moreno
|
49a7a05310
|
feat(travel_extra-community): add vn-anchor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 08:08:07 +02:00 |
Alex Moreno
|
2b101cf7c1
|
refactor(travel_extra-community): use smart-table, fix scroll
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 15:11:14 +02:00 |
Vicent Llopis
|
a6a5a84add
|
fix: incorrect name of function
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 14:42:15 +02:00 |
Joan Sanchez
|
5a46444875
|
Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 13:53:44 +02:00 |
Joan Sanchez
|
5cff983d4c
|
Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-13 10:33:04 +00:00 |
Vicent Llopis
|
6e31865add
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 12:17:30 +02:00 |
Vicent Llopis
|
cc6ba8712c
|
feat: log when a day is excluded
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 12:15:28 +02:00 |
Joan Sanchez
|
1f850d13e9
|
Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1035
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-13 10:00:36 +00:00 |
Vicent Llopis
|
1fd97f167c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 11:35:15 +02:00 |
Vicent Llopis
|
b02aa8466c
|
fix: tfront
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 10:27:17 +02:00 |
Vicent Llopis
|
8c6c7345cd
|
fix: change GET by POST, to solve "Request Header Fields Too Large"
|
2022-09-13 10:27:08 +02:00 |
Joan Sanchez
|
3210f91bf7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-12 12:20:49 +02:00 |
Joan Sanchez
|
de3e14e739
|
4514 - Write permissions for rrhh
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-12 10:23:17 +02:00 |
Joan Sanchez
|
faa3865da1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-09 11:53:57 +02:00 |
Alex Moreno
|
c9721f4c7f
|
fix(entry_latestBuys): save chekeds when crudModel load more data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-08 14:52:43 +02:00 |
Alex Moreno
|
a15c051098
|
fix(monitor_salesFilter): mariadb not optimize query
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-08 08:07:46 +02:00 |
Javi Gallego
|
f0a9441e1f
|
Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-09-07 11:31:47 +02:00 |
Alex Moreno
|
886abfd897
|
fix(monitor): fix left join salesFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-07 08:49:24 +02:00 |
Alex Moreno
|
6fcb1e54b4
|
refactor(claim_action): set translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-06 09:35:01 +02:00 |
Javi Gallego
|
9fe32788fc
|
regularizado
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-24 14:38:05 +02:00 |
Javi Gallego
|
5cf102c7fd
|
sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-24 14:13:26 +02:00 |
Joan Sanchez
|
cceb456209
|
Filter by province
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-12 15:31:59 +02:00 |
Joan Sanchez
|
d0185017b7
|
Removed translate from grouping and packing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-11 08:29:24 +02:00 |
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +02:00 |
Vicent Llopis
|
8f54365350
|
refator: parametrizardo con ?
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 09:19:23 +02:00 |
Joan Sanchez
|
d2b901d47f
|
Relative path for master versions
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-08-09 11:49:28 +02:00 |
Alex Moreno
|
6054e0bef3
|
fix(mdb): use relative path
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-05 13:24:48 +02:00 |
Joan Sanchez
|
1dda78c438
|
Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1036
|
2022-08-04 12:23:27 +00:00 |
Vicent Llopis
|
c3d396b042
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 13:52:59 +02:00 |
Vicent Llopis
|
020990dadc
|
fix: backTest
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 09:53:22 +02:00 |
Juan Ferrer
|
22503375b3
|
Hotfix: User synchronization
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 08:53:31 +02:00 |
Carlos Andrés
|
918a09ad5c
|
#3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 15:17:00 +02:00 |
Vicent Llopis
|
537c383cd2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 13:38:23 +02:00 |
Vicent Llopis
|
224ea61a62
|
fix: delete warehouseFk from itemType model
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 13:07:25 +02:00 |
Vicent Llopis
|
840e792d13
|
fix: backTest
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 12:52:53 +02:00 |
Vicent Llopis
|
605da52286
|
fix: replace it.warehouseFk by userConfig.warehouseFk
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 12:22:03 +02:00 |
Alex Moreno
|
4c60303968
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-27 11:17:35 +02:00 |
Joan Sanchez
|
468da0c5a9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-27 08:12:06 +02:00 |
Joan Sanchez
|
f4825488c6
|
refactor(Tasks API): ghanged method to GET
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-07-26 11:47:43 +02:00 |
Alex Moreno
|
d3852bac5d
|
fix(vnInputTime): quit new date(null)
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-07-26 11:45:12 +02:00 |
Vicent Llopis
|
5446c960fb
|
fix: frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-21 10:11:31 +02:00 |
Vicent Llopis
|
699f19b0d4
|
refactor: change invoice id by refFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-21 10:05:37 +02:00 |
Vicent Llopis
|
cb3e488df9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-20 14:12:08 +02:00 |
Carlos Jimenez Ruiz
|
7437da92a5
|
Merge branch 'dev' into 4294-zone_getEventsFiltered
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-15 12:43:50 +00:00 |
Carlos Jimenez Ruiz
|
c883f45653
|
Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-15 12:18:33 +00:00 |
Carlos Jimenez Ruiz
|
333828c583
|
Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-14 13:40:50 +02:00 |
Vicent Llopis
|
7bf9a8c100
|
delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 11:52:47 +02:00 |
Vicent Llopis
|
6f3d4792d5
|
update backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 10:03:58 +02:00 |
Vicent Llopis
|
eaa7658b23
|
delete it.warehouseFk
|
2022-07-12 10:03:50 +02:00 |
Alex Moreno
|
051a849a21
|
fix(zone): fix getEventsFiltered
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 08:10:29 +02:00 |
Vicent Llopis
|
2d57b3bd54
|
Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 06:10:20 +00:00 |
Carlos Jimenez Ruiz
|
136dcee214
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds
|
2022-07-11 16:39:57 +02:00 |
Carlos Jimenez Ruiz
|
44c29aa489
|
updated file as per convention
|
2022-07-11 11:25:31 +02:00 |
Alex Moreno
|
b3d001bb9d
|
fix(timeEntry): fix back test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-11 08:17:32 +02:00 |
Joan Sanchez
|
fc87039571
|
Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
gitea/salix/pipeline/head This commit is unstable
Details
Reviewed-on: #1011
|
2022-07-01 09:25:07 +00:00 |
Carlos Jimenez Ruiz
|
d0e06a46d0
|
removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-01 09:15:07 +02:00 |
Joan Sanchez
|
d810b3712b
|
Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1017
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-06-30 12:22:41 +00:00 |
Alex Moreno
|
ca767b84f0
|
fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:21:07 +02:00 |
Joan Sanchez
|
ae79163048
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:17:04 +02:00 |
Joan Sanchez
|
140af7e808
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:14:08 +02:00 |
Joan Sanchez
|
ad021265c7
|
Deprecated field taxTypeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 11:42:37 +02:00 |
Carlos Jimenez Ruiz
|
dab8c60f77
|
Merge branch 'dev' into 4268-client_list_scroll
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 08:13:59 +00:00 |
Carlos Jimenez Ruiz
|
14350358d6
|
added max width to email of 400px + title to overflowing content
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-29 15:21:30 +02:00 |
Vicent Llopis
|
748dc1b37e
|
fix: delete engine memory to pass backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-29 14:36:17 +02:00 |
Vicent Llopis
|
24159cd3e8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued...
Details
|
2022-06-29 14:28:54 +02:00 |
Vicent Llopis
|
d49a2666f1
|
refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-29 14:28:23 +02:00 |
Vicent Llopis
|
459a1fe518
|
feat: update instrastat.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-29 14:15:22 +02:00 |
Carlos Jimenez Ruiz
|
57a2cd46ce
|
ticket filter pending uses isNotValidated now
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-29 12:55:11 +02:00 |
Alex Moreno
|
22fd0e91b0
|
title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-28 12:10:37 +02:00 |
Alex Moreno
|
a3f1c36226
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
|
2022-06-28 11:12:06 +02:00 |
Carlos Jimenez Ruiz
|
bdf4ecdf50
|
Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-28 07:03:44 +00:00 |
Javi Gallego
|
4c5c51a319
|
claim basic-data minor bug
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 18:20:26 +02:00 |
Alex Moreno
|
8e2ed4e182
|
fix(worker_getWorkedHours): fix fixtures and test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-27 15:09:43 +02:00 |
Alex Moreno
|
7980a941a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-27 14:03:24 +02:00 |
Alex Moreno
|
a98a927663
|
fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 11:17:45 +02:00 |
Carlos Jimenez Ruiz
|
6370471bd5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 11:01:42 +02:00 |
Vicent Llopis
|
fcf79a507c
|
Merge branch 'dev' into 4213-item.summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 05:32:21 +00:00 |
Alex Moreno
|
4155b45785
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-27 07:22:43 +02:00 |
Carlos Jimenez Ruiz
|
d183ccb843
|
feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-25 15:22:47 +02:00 |
Alex Moreno
|
4d4e09fb9f
|
test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-23 14:07:53 +02:00 |
Carlos Jimenez Ruiz
|
3c963b5ab2
|
refactor(routes json): fixed indentation
|
2022-06-22 16:42:59 +02:00 |
Vicent Llopis
|
2c721867fc
|
feat(item.summary): add description
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-22 14:30:25 +02:00 |
Joan Sanchez
|
2381a5d09a
|
Updated e2e tests
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-22 12:40:11 +02:00 |
Joan Sanchez
|
2a758fd12a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
|
2022-06-22 11:38:01 +02:00 |
Joan Sanchez
|
f7d64e89ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-22 08:59:06 +02:00 |
Joan Sanchez
|
004f1390fc
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-22 08:58:51 +02:00 |
Joan Sanchez
|
e7bf88c703
|
Fix order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-21 14:26:34 +02:00 |
Alex Moreno
|
20f886e933
|
change email and text info in email field
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-21 13:58:47 +02:00 |
Alex Moreno
|
17fd50ee33
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email
|
2022-06-21 13:40:24 +02:00 |
Joan Sanchez
|
9751514b10
|
Merge branch 'dev' into 4138-ticket_create_address_isActive
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-21 11:15:33 +00:00 |
Joan Sanchez
|
e5b1bfeec2
|
Merge branch 'dev' into 4231-worker.calendar_payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-21 10:59:46 +00:00 |
Vicent Llopis
|
ec852b898c
|
fix: check if services exists
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-21 12:44:19 +02:00 |