Alex Moreno
|
05be19de2d
|
fix(zone_delivery-days): agencyModeName and defaulter pagination
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-22 10:03:56 +01:00 |
Alex Moreno
|
ca35c88be4
|
feat(print_deliveryNote): add proforma type
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-22 07:38:14 +01:00 |
Vicent Llopis
|
29036cc39d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 13:17:52 +01:00 |
Vicent Llopis
|
fae267f539
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
|
2022-03-21 13:15:46 +01:00 |
Carlos Jimenez Ruiz
|
728a5de311
|
Merge branch 'dev' into 3625-ticket_log_routeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 11:56:44 +00:00 |
Vicent Llopis
|
920bff30c8
|
modify filter sql
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 12:02:17 +01:00 |
Vicent Llopis
|
aba7136f56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
|
2022-03-21 11:47:33 +01:00 |
Alex Moreno
|
8eebe1abbb
|
feat(monito_clients): smart-table and filter by date
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 11:32:26 +01:00 |
Vicent Llopis
|
e4eed95724
|
notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 10:02:56 +01:00 |
Joan Sanchez
|
00c53a7709
|
3668 - Deprecated field "isOfficial"
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-18 11:06:16 +01:00 |
Alex Moreno
|
b56e1810c3
|
test(item_fixedPrice): fix back test & e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-18 10:30:30 +01:00 |
Vicent Llopis
|
894f95cb1f
|
update consulte sql
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-17 15:05:13 +01:00 |
Vicent Llopis
|
bc65beaa76
|
add frontTest
|
2022-03-17 14:51:49 +01:00 |
Vicent Llopis
|
a32f7b5ef1
|
add new row
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-17 14:27:55 +01:00 |
Vicent Llopis
|
644c24fa3b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-17 11:55:07 +01:00 |
Vicent Llopis
|
21198820fc
|
refactor translate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-17 09:54:19 +01:00 |
Vicent Llopis
|
c3fe2dc52b
|
update filter test
|
2022-03-17 09:54:08 +01:00 |
Vicent Llopis
|
14eacec0ff
|
included test
|
2022-03-17 09:53:50 +01:00 |
Alex Moreno
|
e8b4896e98
|
feat(item_fixed-price): add search, and defaultSerach
|
2022-03-17 09:13:09 +01:00 |
Vicent Llopis
|
7e8c15e413
|
modify test updatePortfolio
|
2022-03-17 09:00:01 +01:00 |
Vicent Llopis
|
a9b6dcacfe
|
included sms test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-17 08:13:18 +01:00 |
Vicent Llopis
|
a3dbec82bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database
|
2022-03-17 07:59:07 +01:00 |
Alex Moreno
|
b4e5631cc7
|
feat(item_fixed-price): implement smart-table
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-16 14:58:07 +01:00 |
Vicent Llopis
|
1094bbe92b
|
correction panel-search
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-16 14:42:19 +01:00 |
Vicent Llopis
|
26f77ca07e
|
add panel-search
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-16 13:02:48 +01:00 |
Alex Moreno
|
7a45b6014a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price
|
2022-03-16 07:45:09 +01:00 |
Alex Moreno
|
e0924ea373
|
refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 15:18:27 +01:00 |
Carlos Jimenez Ruiz
|
3098fc36fb
|
Merge branch 'dev' into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 14:14:16 +00:00 |
Vicent Llopis
|
2f53733151
|
refactor translates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 15:05:09 +01:00 |
Vicent Llopis
|
1ecc76067a
|
code to correct insert in model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-15 14:50:09 +01:00 |
Alex Moreno
|
f337f82b35
|
feat(claim): add packages, and next button
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 12:51:33 +01:00 |
Vicent Llopis
|
656efa2be9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 12:23:28 +01:00 |
Alex Moreno
|
4dea046c97
|
feat(ticket_log): add routeFk log
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 10:07:39 +01:00 |
Vicent Llopis
|
ec41123772
|
button for insert rows
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-15 09:36:48 +01:00 |
Alex Moreno
|
f774b1f784
|
typo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 09:13:35 +01:00 |
Alex Moreno
|
bacfa3f1f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3689-deliveryBoss
|
2022-03-14 10:27:00 +01:00 |
Vicent Llopis
|
97f856afcc
|
corrected comment
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-11 12:24:53 +01:00 |
Vicent Llopis
|
6a91fe6c11
|
solved backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-10 14:43:07 +01:00 |
Vicent Llopis
|
7f5b30aa87
|
delete frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-10 10:40:52 +01:00 |
Vicent Llopis
|
ba31d96cdf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
|
2022-03-10 10:36:02 +01:00 |
Vicent Llopis
|
16208a5e11
|
especify PK
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-10 10:35:35 +01:00 |
Vicent Llopis
|
189fe2ed41
|
update acl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-10 08:14:50 +01:00 |
Vicent Llopis
|
a32ebc37da
|
add supplier autonomous
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-09 23:54:23 +01:00 |
Juan Ferrer
|
d49d1b437c
|
User.login() error fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-09 15:34:26 +01:00 |
Vicent Llopis
|
91a23088c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-09 08:40:55 +01:00 |
Alex Moreno
|
9c4d58fc1a
|
refactor(ticket-popup): extends from dialog
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-09 08:08:13 +01:00 |
Alex Moreno
|
b11a6a7c5c
|
feat(route): add ticket-popup and tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-08 15:17:18 +01:00 |
Alex Moreno
|
c8a512db4e
|
unnecessary
|
2022-03-08 15:16:36 +01:00 |
Vicent Llopis
|
97f2341ae0
|
pull request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-08 13:42:44 +01:00 |
Carlos Jimenez Ruiz
|
4fc6da5ba9
|
Merge branch 'dev' into 3626-client_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-08 08:53:03 +00:00 |
Vicent Llopis
|
527387aad5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-08 08:45:40 +01:00 |
Alex Moreno
|
e8d7ce7cc7
|
refactor(ticket): change role productionBoss to deliveryBoss
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 14:50:51 +01:00 |
Vicent Llopis
|
6b51b7ddd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 13:54:33 +01:00 |
Vicent Llopis
|
03c8ceffb2
|
refactor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 13:54:18 +01:00 |
Alex Moreno
|
4e3fe180ca
|
feat(client_descriptor): add supplier quick-link
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 13:25:55 +01:00 |
Vicent Llopis
|
f88f60ef27
|
refactor code and icons
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 12:43:05 +01:00 |
Alex Moreno
|
0359e05def
|
description
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 11:22:16 +01:00 |
Alex Moreno
|
56bdb85af5
|
translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 10:28:55 +01:00 |
Alex Moreno
|
a136d8b03d
|
accept array in params
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 10:10:45 +01:00 |
Alex Moreno
|
b421038bbe
|
typo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 08:11:21 +01:00 |
Alex Moreno
|
dedbccae19
|
description
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 08:07:34 +01:00 |
Alex Moreno
|
2c853a7885
|
test(zone): getZoneClosing() front and back
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 08:02:59 +01:00 |
Alex Moreno
|
efa32a3dc7
|
export structure
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-04 13:04:28 +01:00 |
Alex Moreno
|
138e2ee9b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database
|
2022-03-04 12:25:05 +01:00 |
Alex Moreno
|
a658969afa
|
feat(zone_delivery-days): get real closing hour
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-04 12:24:01 +01:00 |
Vicent Llopis
|
b58020978a
|
fix: check cannot attach more than one file
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-04 11:59:45 +01:00 |
Alex Moreno
|
a434d9268b
|
fix(zone_upcoming-deliveries): fix backgroundcolor
|
2022-03-04 11:48:18 +01:00 |
Vicent Llopis
|
d22be6620c
|
feat: add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-04 11:28:45 +01:00 |
Vicent Llopis
|
cff1e6cfbf
|
feat: check cannot attach more than one pdf
|
2022-03-04 11:28:26 +01:00 |
Carlos Jimenez Ruiz
|
93ab24e853
|
Merge branch 'dev' into 3671-supplier_account
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-04 08:39:52 +00:00 |
Vicent Llopis
|
f972afb13e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
|
2022-03-04 09:38:33 +01:00 |
Vicent Llopis
|
02aeb84c0c
|
jgallego change
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-03 14:42:29 +01:00 |
Vicent Llopis
|
2f87ac8c96
|
add test
|
2022-03-03 14:42:12 +01:00 |
Alex Moreno
|
6748426f67
|
correct loopback form
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-03 13:48:18 +01:00 |
Alex Moreno
|
29d63d1e4d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3671-supplier_account
|
2022-03-03 13:05:08 +01:00 |
Alex Moreno
|
e082d18564
|
change description
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-03 13:03:43 +01:00 |
Alex Moreno
|
f143619777
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3669-order_search-panel
|
2022-03-03 13:03:13 +01:00 |
Carlos Jimenez Ruiz
|
63fc58b6ba
|
Merge branch 'dev' into 3649-claim_log
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-03 12:00:02 +00:00 |
Joan Sanchez
|
9b4d091692
|
Merge branch 'dev' into 3669-order_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-03 10:38:16 +00:00 |
Vicent Llopis
|
4811254ccb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-02 15:07:38 +01:00 |
Vicent Llopis
|
ade34c1e0a
|
add section Autonomous
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-02 14:59:30 +01:00 |
Alex Moreno
|
619baf2896
|
refactor claim_main controller
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-02 11:07:35 +01:00 |
Alex Moreno
|
7c3945a921
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
|
2022-03-02 10:47:56 +01:00 |
Alex Moreno
|
a05223681e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
|
2022-03-02 10:43:06 +01:00 |
Alex Moreno
|
5efb678a53
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-02 10:32:18 +01:00 |
Alex Moreno
|
ccb5261ff6
|
Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-02 10:31:27 +01:00 |
Alex Moreno
|
26ed4b3c30
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
|
2022-03-02 10:24:11 +01:00 |
Carlos Jimenez Ruiz
|
2b0f54c3aa
|
Merge branch 'dev' into 3646-claim-summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-02 09:17:19 +00:00 |
Alex Moreno
|
44318903e7
|
feat(claim): add log section
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-01 15:15:58 +01:00 |
Alex Moreno
|
2026e909e9
|
disable search observation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-01 11:43:35 +01:00 |
Alex Moreno
|
5a906d075a
|
Merge branch '3622-client_defaulter' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter
|
2022-03-01 11:39:20 +01:00 |
Alex Moreno
|
772c85e5cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter
|
2022-03-01 11:39:09 +01:00 |
Joan Sanchez
|
10af48a739
|
Merge branch 'dev' into 3015-route_tickets_unlink
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-01 10:13:41 +00:00 |
Joan Sanchez
|
b71e7440b3
|
Merge branch 'dev' into 3634-rocketchat_status
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-01 09:49:11 +00:00 |
Alex Moreno
|
a27a48f251
|
fix(supplier_account): fix setWireTransfer and add test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-01 10:44:46 +01:00 |
Alex Moreno
|
2137a34b36
|
feat(supplier-account): isPayMethodChecked false when change model
|
2022-03-01 10:44:04 +01:00 |
Joan Sanchez
|
b7dd4952df
|
Merge branch 'dev' into 3622-client_defaulter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-01 09:33:38 +00:00 |
Alex Moreno
|
3f483d36f2
|
refactor(order_search-panel): change orderFk to ticketFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 14:28:16 +01:00 |
Alex Moreno
|
4046617eab
|
short form
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 13:37:44 +01:00 |
Alex Moreno
|
ab6b5aa803
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 13:14:34 +01:00 |
Alex Moreno
|
c9188658ca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 12:40:52 +01:00 |
Alex Moreno
|
60e908d82a
|
feat(claim_summary): parentReload(), and test
|
2022-02-28 12:40:44 +01:00 |
Carlos Jimenez Ruiz
|
2647b4e423
|
Merge branch 'dev' into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 10:05:07 +00:00 |
Carlos Jimenez Ruiz
|
d1c884deb2
|
Merge branch 'dev' into 3609-ticket_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 09:58:27 +00:00 |
Carlos Jimenez Ruiz
|
4b963804c6
|
added transalation to item waste
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 10:54:32 +01:00 |
Carlos Jimenez Ruiz
|
bf0734ca67
|
excluded 3 test suites until db export
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 10:46:14 +01:00 |
Carlos Jimenez Ruiz
|
a2d2e79738
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding
|
2022-02-28 10:21:21 +01:00 |
Alex Moreno
|
5434dd3baf
|
feat(claim_index): implemented smart-table and change state in summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-02-28 07:57:46 +01:00 |
Alex Moreno
|
62286c2f9a
|
refactor(defaulter): simple route
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-25 10:34:17 +01:00 |
Alex Moreno
|
bf712ba5af
|
feat(worker): absences can return all absences of worker
|
2022-02-25 10:33:47 +01:00 |
Vicent Llopis
|
90dc3bc5b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-02-25 08:22:15 +01:00 |
Vicent Llopis
|
7aa6601ec1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database
|
2022-02-25 07:52:22 +01:00 |
Juan Ferrer
|
c3e480b2e7
|
MariaDB user sync disabled in dev environment
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-24 15:02:16 +01:00 |
Vicent Llopis
|
19887bdd16
|
feat: add section autonomous
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-02-24 14:52:32 +01:00 |
Alex Moreno
|
fc3a46eb26
|
refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-24 13:52:26 +01:00 |
Carlos Jimenez Ruiz
|
9ba13f90d3
|
#3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 16:12:29 +01:00 |
Vicent Llopis
|
ca40eee5ad
|
feat: add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 14:53:49 +01:00 |
Alex Moreno
|
c33b8fbb83
|
refactor(worker): absences return one or all abscences
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 14:50:59 +01:00 |
Vicent Llopis
|
9e06538fd0
|
fix: execute updatePortfolio after submit changes
|
2022-02-23 12:57:43 +01:00 |
Alex Moreno
|
52cf79516a
|
refactor(claim_summary): move responsability and improve fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 12:23:47 +01:00 |
Joan Sanchez
|
9d298c2a5e
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 12:07:05 +01:00 |
Alex Moreno
|
a5614e5d5d
|
change client.name for client.socialName
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 09:52:45 +01:00 |
Vicent Llopis
|
c7db8c6b06
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data
|
2022-02-23 09:12:25 +01:00 |
Vicent Llopis
|
30763e5c08
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 09:05:53 +01:00 |
Alex Moreno
|
8a8951b8b0
|
feat(client_defaulter): add columns to search
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-23 08:53:25 +01:00 |
Alex Moreno
|
4e89c66e2c
|
refactor(client_defaulter): add column date
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-22 08:58:22 +01:00 |
Alex Moreno
|
812d79f2d5
|
feat(client_defaulter): implemented smart-table
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-21 15:11:39 +01:00 |
Alex Moreno
|
8bbb5d5c27
|
variable name
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-21 11:28:00 +01:00 |
Alex Moreno
|
6a5d49a535
|
tabulations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-21 08:59:42 +01:00 |
Alex Moreno
|
71ddccb9a1
|
tabulations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-21 08:57:43 +01:00 |
Alex Moreno
|
32e3af0c25
|
tabulations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-21 08:53:37 +01:00 |
Alex Moreno
|
0f4649c50f
|
feat(ticket_descriptor-menu): docuware implemented
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-21 08:48:53 +01:00 |
Alex Moreno
|
06255e0a07
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
|
2022-02-21 08:12:40 +01:00 |
Juan Ferrer
|
17b178b6bf
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-19 14:06:18 +01:00 |
Juan Ferrer
|
6f1bfbd955
|
roleConfig: fixes & refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-19 14:05:35 +01:00 |
Vicent Llopis
|
578685e05e
|
feat(client): add back route 'updatePortfolio'
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-18 13:56:18 +01:00 |
Alex Moreno
|
6b1bd4ee92
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
|
2022-02-18 10:17:18 +01:00 |
Vicent Llopis
|
05aa579156
|
fix: add role salesBoss to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-17 12:29:09 +01:00 |
Alex Moreno
|
89eee042b5
|
refactor(ticket_basic-data): zeroFill and move getMovable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-17 08:02:02 +01:00 |
Alex Moreno
|
d4b06d2d1d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data
|
2022-02-17 07:31:31 +01:00 |
Alex Moreno
|
3aeb2adb56
|
feat(ticket): docuware pdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-02-16 14:57:47 +01:00 |
Vicent Llopis
|
34730f48ed
|
fix: add role salesBoss to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-16 12:51:45 +01:00 |
Vicent Llopis
|
d7f252a57d
|
feat(invoiceIn): add section intrastat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-16 10:30:56 +01:00 |
Alex Moreno
|
651c92698f
|
feat(docuware): start download docuware
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-15 16:48:37 +01:00 |
Carlos Jimenez Ruiz
|
401174b27a
|
removed focus on describe
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-15 13:46:25 +01:00 |
Carlos Jimenez Ruiz
|
71875070e8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-15 13:00:10 +01:00 |
Carlos Jimenez Ruiz
|
ac0e55107a
|
3595 feat(toggleHidden): itemWaste now can hide panels
|
2022-02-15 12:59:57 +01:00 |
Joan Sanchez
|
633679e26e
|
Merge branch 'dev' into 3315-notify_metrics
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-15 10:52:34 +00:00 |
Joan Sanchez
|
5518fac357
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-14 08:44:22 +01:00 |
Alex Moreno
|
9c9bcb68aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data
|
2022-02-10 11:34:38 +01:00 |
Alex Moreno
|
4e5e6dccca
|
fix(test): change movable expeted
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-10 10:15:43 +01:00 |
Alex Moreno
|
b4bed608ab
|
refactor(ticket): getMovable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-09 15:01:02 +01:00 |
Joan Sanchez
|
f4ff854a1f
|
feat(notification): notify client metrics
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3315
|
2022-02-09 14:06:06 +01:00 |
Alex Moreno
|
ef281bb663
|
feat(order_summary): change salesPersonFk for clientFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-09 12:39:08 +01:00 |
Alex Moreno
|
2e649e81d6
|
fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-09 08:23:41 +01:00 |
Joan Sanchez
|
8db6424b6d
|
Merge branch 'dev' into 3585-invoiceIn_dueDate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-08 08:41:02 +00:00 |
Carlos Jimenez Ruiz
|
4f1d34069b
|
corrected some typos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-08 09:27:39 +01:00 |
Carlos Jimenez Ruiz
|
00f8946675
|
feat(entry.buys): each buy groupingMode can now changed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-07 18:01:45 +01:00 |
Carlos Jimenez Ruiz
|
485da4d0a7
|
added groupingMode to getBuys
|
2022-02-07 18:00:23 +01:00 |
Carlos Jimenez Ruiz
|
cb21d4db01
|
removed a typo
|
2022-02-07 17:59:40 +01:00 |
Vicent Llopis
|
f7297801f8
|
add due day section
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-07 12:24:08 +01:00 |
Carlos Jimenez Ruiz
|
9501d93217
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys
|
2022-02-04 15:25:12 +01:00 |
Alex Moreno
|
dc47af7224
|
feat(ticket): isEmpty ticketRequest not necessary isOk
|
2022-02-03 11:51:50 +01:00 |
Carlos Jimenez Ruiz
|
e9189509c2
|
Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-03 09:50:01 +00:00 |
Carlos Jimenez Ruiz
|
4641f53108
|
Merge branch 'dev' into 3586-claim_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-03 09:37:48 +00:00 |
Alex Moreno
|
c004ee638c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-03 10:34:48 +01:00 |
Alex Moreno
|
902714ba7d
|
feat(item_index): add producer basic filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-03 10:32:59 +01:00 |
Alex Moreno
|
1250382209
|
missing zero
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-03 09:52:17 +01:00 |
Alex Moreno
|
91b6dcee05
|
fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-02 14:33:16 +01:00 |
Alex Moreno
|
001aed3cb5
|
fix(claim): filter created
|
2022-02-02 14:32:16 +01:00 |
Joan Sanchez
|
483a67e8b5
|
fix(salesFilter): search by ticket id
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-02 09:26:33 +01:00 |
Alex Moreno
|
cb5c4146cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state
|
2022-02-02 07:23:17 +01:00 |
Joan Sanchez
|
8be7f9153e
|
Removed non compatible ECMA options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 14:50:24 +01:00 |
Carlos Jimenez Ruiz
|
5a9523642d
|
Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 12:07:41 +00:00 |
Joan Sanchez
|
52e5c6bc6b
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 13:01:56 +01:00 |
Alex Moreno
|
13230a2fe9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer
|
2022-02-01 12:40:04 +01:00 |
Alex Moreno
|
a012740742
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 12:38:22 +01:00 |
Carlos Jimenez Ruiz
|
bce66899c5
|
corrected a typo
|
2022-02-01 12:24:11 +01:00 |
Joan Sanchez
|
a8900b06b7
|
Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 10:57:39 +00:00 |
Alex Moreno
|
0eb5d8fe1c
|
feat(icons): import new icons
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 11:48:47 +01:00 |
Carlos Jimenez Ruiz
|
054b112223
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys
|
2022-02-01 11:06:25 +01:00 |
Carlos Jimenez Ruiz
|
01e269db6d
|
Merge branch 'dev' into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 09:03:47 +00:00 |
Alex Moreno
|
56331da20b
|
feat(item_index): add column producer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 09:37:11 +01:00 |
Alex Moreno
|
368498d763
|
refactor(defaulter): array request
|
2022-02-01 08:49:56 +01:00 |
Alex Moreno
|
7cf252a8f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter
|
2022-02-01 07:29:38 +01:00 |
Alex Moreno
|
60adb6f37c
|
translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 07:21:34 +01:00 |
Alex Moreno
|
3d2f661bf0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2022-02-01 07:20:21 +01:00 |
Joan Sanchez
|
9878780006
|
Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-31 15:41:20 +00:00 |
Alex Moreno
|
f21cdeb3b6
|
fix(item_waste): title background dark
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-31 13:27:33 +01:00 |
Alex Moreno
|
78b3df0b6a
|
feat(monitor_ticket): classColor in db
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-31 13:15:37 +01:00 |
Joan Sanchez
|
e618423ef8
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-31 12:27:42 +01:00 |
Alex Moreno
|
746cbede4b
|
feat(client_defaulter): move tool-bar up , add column author
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-31 08:17:15 +01:00 |
Joan Sanchez
|
78507240ee
|
Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-28 13:14:14 +00:00 |
Joan Sanchez
|
db54d92b69
|
Updated E2E
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-28 14:11:26 +01:00 |
Joan Sanchez
|
c5ffc16486
|
Filters items with last item buy
|
2022-01-28 09:35:30 +01:00 |
Alex Moreno
|
072ac5fb6a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter
|
2022-01-28 09:28:13 +01:00 |
Alex Moreno
|
b25ffa8feb
|
feat(ticket_step-two): redirect to new ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-28 09:15:41 +01:00 |
Alex Moreno
|
38100eeda4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2022-01-27 15:15:08 +01:00 |
Carlos Jimenez Ruiz
|
abd758721e
|
Merge branch 'dev' into 3553-travel_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-27 09:36:22 +00:00 |
Carlos Jimenez Ruiz
|
d4d761150e
|
Merge branch 'dev' into 3549-travel_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-27 08:26:28 +00:00 |
Alex Moreno
|
74916c182a
|
Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-27 07:22:39 +01:00 |
Alex Moreno
|
d0c4099255
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2022-01-27 07:20:39 +01:00 |
Joan Sanchez
|
b991fe73b2
|
Merge branch 'dev' into 3536-DbUserSync
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-26 13:45:50 +00:00 |
Alex Moreno
|
5970a6dfde
|
refactor(client_defaulter): title of columns
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 14:05:33 +01:00 |
Alex Moreno
|
8e75a28f7c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 12:46:59 +01:00 |
Alex Moreno
|
65c32c9ed3
|
fix(travel_summary): vn-check change value to ng-model
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 11:40:44 +01:00 |
Joan Sanchez
|
bacc0101db
|
Updated tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 10:55:55 +01:00 |
Alex Moreno
|
0a8153d44c
|
feat(travel_search-panel): add continent filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 10:09:47 +01:00 |
Joan Sanchez
|
f8f9ece4a5
|
refactor(importBuys): get data from last item buy
Refs: 3258
|
2022-01-26 09:20:49 +01:00 |
Alex Moreno
|
f8a0094321
|
word movible
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 08:54:48 +01:00 |
Alex Moreno
|
57e4b400c9
|
Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 07:12:57 +01:00 |
Alex Moreno
|
442d58f59b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2022-01-26 07:11:22 +01:00 |
Alex Moreno
|
f67a4355db
|
refactor(ticket_sale): split e2e, change name backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-25 15:09:29 +01:00 |
Alex Moreno
|
8794f8639f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback
|
2022-01-25 15:04:52 +01:00 |
Alex Moreno
|
2455a24b68
|
feat(client_defaulter): section and test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-25 14:27:30 +01:00 |
Juan Ferrer
|
022c2cde3c
|
Merge branch 'dev' into 3536-DbUserSync
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-25 11:18:50 +01:00 |
Javi Gallego
|
5fbbae7ac6
|
Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-24 15:40:37 +01:00 |
Javi Gallego
|
dad4119300
|
getTotal remove ()
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-24 15:35:32 +01:00 |
Joan Sanchez
|
ddf62d2496
|
Updated back unit test
|
2022-01-21 16:16:39 +01:00 |
Alex Moreno
|
6d9afd5f4c
|
feat(ticket_sale): role restriction to create payBack
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-21 11:40:48 +01:00 |
Juan Ferrer
|
997b7990d4
|
Docker connectTimeout && MySQL/MariaDB user sync
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 15:33:53 +01:00 |
Joan Sanchez
|
4237cd56df
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 14:12:21 +01:00 |
Joan Sanchez
|
2c05ed7c37
|
Disabled auto load
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 13:17:08 +01:00 |
Joan Sanchez
|
b7494afbe2
|
Eliminado orden predeterminado
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 12:57:36 +01:00 |
Joan Sanchez
|
dfd746f84d
|
Sort by clientFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 12:48:12 +01:00 |
Joan Sanchez
|
cf2ad0d61e
|
feat(smartTag): added sort priority between multiple sorting
Refs: 3528
|
2022-01-20 12:29:12 +01:00 |
Joan Sanchez
|
a9e8c5b374
|
Merge branch 'dev' into 3521-Monitors_ticket_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 11:03:33 +00:00 |
Carlos Jimenez Ruiz
|
3741417fd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3521-Monitors_ticket_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 11:06:23 +01:00 |
Carlos Jimenez Ruiz
|
4ac071d55c
|
#3521 refactor(descriptor): navigation to index after deletion
|
2022-01-20 11:06:15 +01:00 |
Joan Sanchez
|
e3795ea072
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 11:05:25 +01:00 |
Joan Sanchez
|
464bc6d767
|
Merge branch 'dev' into 3456-entry_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 09:48:08 +00:00 |
Javi Gallego
|
6d66ab7bea
|
getTotals without transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 10:05:24 +01:00 |
Joan Sanchez
|
74b7b0592e
|
feat(smartTag): added sort priority between multiple sorting
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3528
|
2022-01-20 09:34:53 +01:00 |
Alex Moreno
|
9b5e9a617d
|
feat(entry_basic-data): add new filter in travels
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-20 08:31:30 +01:00 |
Javi Gallego
|
563b93a7be
|
test front checkToBook
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-19 14:21:19 +01:00 |
Javi Gallego
|
3c8e6a16a2
|
Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-19 14:19:29 +01:00 |
Joan Sanchez
|
0b2d62b2bf
|
Added axios as http package
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-18 17:08:58 +01:00 |
Carlos Jimenez Ruiz
|
ef6d8db495
|
added supplierFk to advanced invoiceIn search
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-18 14:44:41 +01:00 |
Joan Sanchez
|
352c3205bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-18 13:57:26 +01:00 |
Alex Moreno
|
e91730cdec
|
fix(sms): static response for backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-18 13:20:35 +01:00 |
Joan Sanchez
|
47c7b36936
|
CSV method refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-18 13:15:42 +01:00 |
Alex Moreno
|
9ddf11c6bc
|
test(ticket): update to advanceable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-18 12:49:16 +01:00 |
Alex Moreno
|
8e1c3e107c
|
refactor(ticket): advanceable code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-18 12:48:39 +01:00 |
Alex Moreno
|
b8355320f2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 14:50:10 +01:00 |
Alex Moreno
|
4b2153d638
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 13:37:25 +01:00 |
Alex Moreno
|
83d2dd2d80
|
refacto(ticket_volume): tests and front js
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 13:17:06 +01:00 |
Alex Moreno
|
b05f464517
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 10:14:58 +01:00 |
Alex Moreno
|
5824acf3bc
|
change tests to advanceable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 10:12:13 +01:00 |
Carlos Jimenez Ruiz
|
941d43b9a2
|
Merge branch 'dev' into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 09:06:27 +00:00 |
Vicent Llopis
|
13ce7991ec
|
refactor: uppercase in model type
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 09:49:45 +01:00 |
Alex Moreno
|
61859a23c9
|
feat(ticket): getAdvanceable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-17 07:14:29 +01:00 |
Alex Moreno
|
0d06ae309b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-14 10:08:01 +01:00 |
Joan Sanchez
|
b86c32c97b
|
fix(importBuy): prevent action
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-14 08:06:38 +01:00 |
Alex Moreno
|
bf6d196414
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-13 08:33:27 +01:00 |
Alex Moreno
|
c87e3e1210
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-13 07:20:23 +01:00 |
Alex Moreno
|
6f7c1b6a46
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 14:56:34 +01:00 |
Alex Moreno
|
757fe73ecd
|
test(ticket_volume): backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 14:55:20 +01:00 |
Alex Moreno
|
c9564e817a
|
test(ticket_volume): frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 14:04:16 +01:00 |
Alex Moreno
|
fba09e8c40
|
feat(ticket_volume): volume for packingType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-12 14:02:58 +01:00 |
Vicent Llopis
|
e850fdaf4e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
|
2022-01-12 12:15:32 +01:00 |
Carlos Jimenez Ruiz
|
98e621305d
|
Merge branch 'dev' into 3490-sms
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 10:29:49 +00:00 |
Carlos Jimenez Ruiz
|
98cd0b659c
|
Merge branch 'dev' into 3506-ticket_sale_transfer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 09:19:51 +00:00 |
Carlos Jimenez Ruiz
|
cc3e2fbc3a
|
can't transfer claimed sales without claimManager role
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 10:17:51 +01:00 |
Alex Moreno
|
b02695a14b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-11 14:49:36 +01:00 |
Alex Moreno
|
94a2d3cc16
|
refactor(supplier): add isFarmer in getSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-11 14:49:22 +01:00 |
Alex Moreno
|
aaae5e157e
|
replace query for searchPanel
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-11 13:52:01 +01:00 |
Vicent Llopis
|
4f0edbda6b
|
add prefix +34
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-11 10:03:59 +01:00 |
Alex Moreno
|
9e491082e7
|
test(send): backTest and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-11 08:39:06 +01:00 |
Carlos Jimenez Ruiz
|
7b5e6e8a23
|
added shorcuts for order, monitor and worker modules
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 16:08:45 +01:00 |
Alex Moreno
|
ebac06e4fc
|
refactor(send): update got sms
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 15:14:05 +01:00 |
Alex Moreno
|
de28bfec8e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms
|
2022-01-10 15:09:08 +01:00 |
Alex Moreno
|
fc69151f7f
|
update sms
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 13:20:57 +01:00 |
Alex Moreno
|
75de01ed72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 12:29:03 +01:00 |
Alex Moreno
|
1983eb012b
|
refactor(sms): got and apiKey
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 12:28:39 +01:00 |
Carlos Jimenez Ruiz
|
5de6f437a8
|
Merge branch 'dev' into 3485-monitors-ticketAddProblem
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 10:41:39 +00:00 |
Alex Moreno
|
5462af91ee
|
extract to variable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 11:38:02 +01:00 |
Alex Moreno
|
1f79a3047d
|
feat(monitors_ticket): add isTooLittle
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 11:26:16 +01:00 |
Alex Moreno
|
860499db82
|
refactor(ticket): add more text in error when change zone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 08:28:57 +01:00 |
Alex Moreno
|
4f799d3e00
|
remove focus test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 08:10:13 +01:00 |
Alex Moreno
|
a528161b93
|
refactor(supplier.summary): separate isFarmer()
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 08:08:41 +01:00 |
Vicent Llopis
|
74d7dad243
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 07:50:39 +01:00 |
Alex Moreno
|
19a6b55a72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
|
2022-01-07 07:43:14 +01:00 |
Joan Sanchez
|
c24df3ade9
|
Updated translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 16:23:58 +01:00 |
Joan Sanchez
|
4e6d8d17f5
|
Throw invalid businessType for new clients
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 15:41:26 +01:00 |
Joan Sanchez
|
2279b3d9ab
|
Prevent businessTypeFk validation for other invalid fields
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 15:17:21 +01:00 |
Alex Moreno
|
e1c9195495
|
update condition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 14:53:29 +01:00 |
Alex Moreno
|
ed84aa46bd
|
feat(client): add more condition for businessType Validation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 14:29:03 +01:00 |
Alex Moreno
|
961dc100cc
|
feat(client): add isWorker condition in hasBusinessType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 12:44:18 +01:00 |
Vicent Llopis
|
d5e4d99625
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 12:30:49 +01:00 |
Carlos Jimenez Ruiz
|
d86aa5535c
|
refactor(createFromSales): now claimManager can claim any time
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-04 16:16:39 +01:00 |
Alex Moreno
|
e4db123672
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-04 13:55:36 +01:00 |
Vicent Llopis
|
914fca0814
|
fix: delete unnecessary ng-if
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-04 10:28:06 +01:00 |
Carlos Jimenez Ruiz
|
8dbd184cce
|
invoiceOut donwload test fixed for any year
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-04 10:01:34 +01:00 |
Alex Moreno
|
2a9cc2f465
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-03 09:54:11 +01:00 |
Carlos Jimenez Ruiz
|
7dbf03ed72
|
front unit test and e2e for change state
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-30 10:45:19 +01:00 |
Carlos Jimenez Ruiz
|
48e4628c48
|
refactor(ticket.summary): change state button is now dropdown
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-30 09:49:11 +01:00 |
Alex Moreno
|
83a28bc0ee
|
test(supplier_summary): test for sageWithholdingFk to isFarmer
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-29 11:52:45 +01:00 |
Alex Moreno
|
e9f77bb9b4
|
feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk
|
2021-12-29 11:51:56 +01:00 |
Carlos Jimenez Ruiz
|
a969f1f234
|
Merge branch 'dev' into 3449-client_credit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 10:48:15 +00:00 |
Carlos Jimenez Ruiz
|
652cbe937f
|
Merge branch 'dev' into 3433-supplier_account
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 10:35:28 +00:00 |
Vicent Llopis
|
7d2820c7ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 11:30:47 +01:00 |
Vicent Llopis
|
ac833ac625
|
feat: add field payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 11:30:28 +01:00 |
Carlos Jimenez Ruiz
|
a1da6081b5
|
Merge branch 'dev' into 3439-item_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 09:51:41 +00:00 |
Carlos Jimenez Ruiz
|
e7f1d7a1ee
|
Merge branch 'dev' into 3451-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 09:16:34 +00:00 |
Alex Moreno
|
8e274f4f17
|
refactor(travel): deprecated travelThermograph.temperature
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-24 10:10:28 +01:00 |
Vicent Llopis
|
e1c4f144a7
|
feat: add code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-23 14:57:22 +01:00 |
Vicent Llopis
|
671a35f8c9
|
upload branch
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-23 13:11:17 +01:00 |
Alex Moreno
|
6a78ac46c7
|
fix(client): check businesTypeFk before clientCredit insert
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-23 08:53:56 +01:00 |
Alex Moreno
|
d1c7dea218
|
fix(supplier_account): get countryFk in model.js
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-23 08:09:48 +01:00 |
Vicent Llopis
|
a6e5123949
|
feat: add filter by item.longName
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-22 13:16:45 +01:00 |
Alex Moreno
|
9287f25f24
|
fix(client_balance): fix if value is 0
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-22 09:46:18 +01:00 |
Alex Moreno
|
e609994efa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 21:01:18 +01:00 |
Alex Moreno
|
18b6efe8f1
|
test(ticket_basic-data): test and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 20:58:58 +01:00 |
Vicent Llopis
|
6bd48ab30b
|
delete comment
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 15:06:57 +01:00 |
Vicent Llopis
|
19e50d2156
|
fix(ticket_sale): front test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 15:00:06 +01:00 |
Vicent Llopis
|
bdb42437ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 14:45:40 +01:00 |
Vicent Llopis
|
5c899d28c3
|
feat(ticket_sale): add tests and refactor backRoute name
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 14:43:53 +01:00 |
Carlos Jimenez Ruiz
|
31da353f07
|
Merge branch 'dev' into 3457-smart_table_order
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 11:44:16 +00:00 |
Joan Sanchez
|
1d28508cba
|
Removed vn-focus directive
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 12:42:18 +01:00 |
Carlos Jimenez Ruiz
|
707c9c33f7
|
Merge branch 'dev' into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 11:27:34 +00:00 |
Joan Sanchez
|
76ec1fceae
|
fear(smart-table): now shows the default order with the column arrows
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3457
|
2021-12-21 09:19:28 +01:00 |
Alex Moreno
|
831bfb0352
|
change route for hasRoute
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 08:52:39 +01:00 |
Alex Moreno
|
405494c85b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
|
2021-12-21 08:31:17 +01:00 |
Vicent Llopis
|
e30fb0fb37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-21 07:10:19 +01:00 |
Alex Moreno
|
f67edffcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 13:51:44 +01:00 |
Alex Moreno
|
50db693e51
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-20 13:50:50 +01:00 |
Alex Moreno
|
b0019d09ad
|
feat(ticket_basic-data_step-two): adapted for available and transfer sales in back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-20 13:50:31 +01:00 |
Carlos Jimenez Ruiz
|
1440f29784
|
Merge branch 'dev' into 3423-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 10:01:08 +00:00 |
Joan Sanchez
|
872f5b488b
|
Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 09:40:34 +00:00 |
Alex Moreno
|
6426a629e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 09:26:54 +01:00 |
Alex Moreno
|
7a0221c17d
|
test(supplier): add backTest to check changes in isPayMethodChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 08:02:28 +01:00 |
Alex Moreno
|
bcc50b0618
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-20 07:33:52 +01:00 |
Carlos Jimenez Ruiz
|
d2db3054a5
|
Merge branch 'dev' into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 14:15:41 +00:00 |
Carlos Jimenez Ruiz
|
7fbbe2fddd
|
ctx was poluted by tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 15:14:31 +01:00 |
Joan Sanchez
|
da59a556ca
|
refactor(monitor): limited width to the client and zone columns
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3458
|
2021-12-17 13:09:00 +01:00 |
Joan Sanchez
|
4cb346c2a8
|
fix(monitor): changed order to prevent row duplication
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3458
|
2021-12-17 12:40:23 +01:00 |
Alex Moreno
|
850ea2ef39
|
getVisible sql
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 12:38:56 +01:00 |
Carlos Jimenez Ruiz
|
d83995e64e
|
filter worker id refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 10:41:59 +01:00 |
Alex Moreno
|
138f2110e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-16 12:15:47 +01:00 |
Carlos Jimenez Ruiz
|
5a448234d6
|
transtaction commits on several endpoints
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-16 10:56:10 +01:00 |
Alex Moreno
|
87f994aa77
|
test(ticket_basci-data_step-two): back and front
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-16 08:14:27 +01:00 |
Carlos Jimenez Ruiz
|
2bfc6a5987
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-15 15:29:28 +01:00 |
Carlos Jimenez Ruiz
|
b4f1e66fed
|
order module transactions
|
2021-12-15 15:29:22 +01:00 |
Vicent Llopis
|
a6b755138f
|
feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-15 15:24:45 +01:00 |
Alex Moreno
|
3e91929d0d
|
half test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-15 15:16:21 +01:00 |
Alex Moreno
|
e01d676bb1
|
feat(ticket_basic-data_step-two): show visible and option withoutNegatives
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-15 14:45:45 +01:00 |
Alex Moreno
|
be3e8ddd98
|
feat(ticket_descriptor): add field client.id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:59:53 +01:00 |
Alex Moreno
|
5960d40891
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:43:40 +01:00 |
Alex Moreno
|
9cfe6b5b7a
|
feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:05:06 +01:00 |
Javi Gallego
|
af670ae3e9
|
fdescribe
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 09:51:12 +01:00 |
Javi Gallego
|
a99174e42a
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2021-12-14 09:50:39 +01:00 |
Joan Sanchez
|
f2a8992410
|
fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3431
|
2021-12-14 09:17:00 +01:00 |
Javi Gallego
|
f669e7148c
|
onAcceptToBook test ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 08:33:29 +01:00 |
Alex Moreno
|
6465a5c460
|
feat(supplier): payMethodChecked for financial
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 08:23:11 +01:00 |
Carlos Jimenez Ruiz
|
6aa3101e42
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-12-02 11:04:44 +01:00 |
Carlos Jimenez Ruiz
|
2ebe6b5342
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 15:26:09 +01:00 |
Carlos Jimenez Ruiz
|
8285a8a8e9
|
refactor(route.tickets): updated error description
|
2021-12-01 15:26:01 +01:00 |
Vicent Llopis
|
ac3dc039fe
|
feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 12:49:53 +01:00 |
Alex Moreno
|
75e32feb16
|
refactor ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 11:39:48 +01:00 |
Alex Moreno
|
77191b6182
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-12-01 11:29:10 +01:00 |
Joan Sanchez
|
7acf7c5bea
|
Changed duplicated button...
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 08:29:05 +01:00 |
Alex Moreno
|
c7e5c25a28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:38 +01:00 |
Alex Moreno
|
decd4b5a95
|
separate sql procedures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:20 +01:00 |
Vicent Llopis
|
238577ec8f
|
refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:57:17 +01:00 |
Alex Moreno
|
d5c0be5a9d
|
refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:47:16 +01:00 |
Carlos Jimenez Ruiz
|
d760eba446
|
Merge branch 'dev' into 3275-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 11:40:54 +00:00 |
Vicent Llopis
|
21bd625b3b
|
add exceprion to half day absence
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 12:31:02 +01:00 |
Alex Moreno
|
85721dcf45
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-11-30 09:51:30 +01:00 |
Carlos Jimenez Ruiz
|
1176b23bb9
|
Merge branch 'dev' into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 08:16:10 +00:00 |
Joan Sanchez
|
5c342ae463
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:11:40 +01:00 |
Vicent Llopis
|
4c064f8a80
|
feat(worker_calendar): add restrictions to add absence and to add hours recorded
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:11:23 +01:00 |
Joan Sanchez
|
495510efed
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:08:19 +01:00 |
Alex Moreno
|
594f258232
|
modify js date format
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 07:16:43 +01:00 |
Alex Moreno
|
85e3b47408
|
test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-29 15:22:16 +01:00 |
Alex Moreno
|
07e092f9bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 11:52:43 +01:00 |
Joan Sanchez
|
f93da5f60d
|
Merge branch 'dev' into 3387-route_ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 09:21:34 +00:00 |
Alex Moreno
|
49e9fcaa7c
|
remove unnecesary on-accept
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 10:11:47 +01:00 |
Alex Moreno
|
8bd1db2e97
|
remove unnecesary on-accept
|
2021-11-29 10:10:53 +01:00 |
Alex Moreno
|
cff4c90651
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-29 10:10:04 +01:00 |
Alex Moreno
|
8ea3307230
|
feat(ticket_sale): allow multi-check for recalculatePrice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 08:30:36 +01:00 |
Joan Sanchez
|
e4d7d957eb
|
Rectified icons
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:48:55 +01:00 |
Joan Sanchez
|
452d4557d1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:11:33 +01:00 |
Joan Sanchez
|
9d6b870940
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:08:50 +01:00 |
Joan Sanchez
|
b0cb7e1424
|
Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:53:39 +01:00 |
Alex Moreno
|
65053f5f28
|
feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:26:48 +01:00 |
Joan Sanchez
|
bcca33bc33
|
Updated icons
|
2021-11-26 13:04:07 +01:00 |
Vicent Llopis
|
e13f2d4ae3
|
feat(route_ticket): add column province and change order other columns
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 10:06:13 +01:00 |
Joan Sanchez
|
c986fe9557
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:59:21 +01:00 |
Joan Sanchez
|
eb101ffc76
|
refactor(fonts): updated fonts and changed invoiceOut icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:59:05 +01:00 |
Joan Sanchez
|
25371ef97b
|
Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:06:58 +01:00 |
Alex Moreno
|
2ab5c9818a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:35:00 +01:00 |
Alex Moreno
|
eea9413628
|
fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:34:32 +01:00 |
Carlos Jimenez Ruiz
|
ba29df16c0
|
Merge branch 'dev' into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 15:02:47 +00:00 |
Vicent Llopis
|
74fbae6510
|
refactor(route_ticket): add style in a style.scss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 15:15:51 +01:00 |
Joan Sanchez
|
6b6a1b4329
|
refactor(fonts): updated fonts and changed invoiceOut icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 14:14:01 +01:00 |
Vicent Llopis
|
6afc694f6c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 14:07:14 +01:00 |
Alex Moreno
|
9fce06dfe0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:53:26 +01:00 |
Carlos Jimenez Ruiz
|
cdbd1964a6
|
Merge branch 'dev' into 3368-export_database
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 10:49:17 +00:00 |
Carlos Jimenez Ruiz
|
5914e8e1ac
|
fixed e2e by adding acls where needed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:30:55 +01:00 |
Alex Moreno
|
815826e891
|
refactor(ticket): modify transferSales.js for avoid unnecessary logs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:23:18 +01:00 |
Joan Sanchez
|
0838f34771
|
Show alias section for marketing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 08:14:48 +01:00 |
Joan Sanchez
|
ab3902ebd8
|
Restricted account creation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 08:08:47 +01:00 |
Joan Sanchez
|
4162f239cf
|
Allow basic-data access for hhrr
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 07:50:01 +01:00 |
Joan Sanchez
|
0fc52cbf1d
|
Updated descriptor ACLs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 07:43:32 +01:00 |
Carlos Jimenez Ruiz
|
09c2b813b5
|
ACL update
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 15:27:09 +01:00 |
Joan Sanchez
|
c3e311f076
|
Updated route acls
|
2021-11-24 15:01:44 +01:00 |
Carlos Jimenez Ruiz
|
c4bc89ee29
|
refactor(entry): back unit tests refactor to transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 14:29:15 +01:00 |
Carlos Jimenez Ruiz
|
c3da93bfd3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-11-24 11:22:16 +01:00 |
Joan Sanchez
|
f98b0c7bbe
|
Merge branch 'dev' into 3363-sale_update_price
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 09:15:13 +00:00 |
Alex Moreno
|
00072a7dd1
|
landing searchable false
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 10:02:52 +01:00 |
Alex Moreno
|
8d33041970
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
|
2021-11-24 09:59:10 +01:00 |
Joan Sanchez
|
8ede14ab40
|
fix(sales): update price on any change affecting the ticket total
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3363
|
2021-11-24 09:25:24 +01:00 |
Alex Moreno
|
aaa49bdf78
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 09:22:24 +01:00 |
Alex Moreno
|
02d89e5774
|
feat(item): add field genericFk in basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 08:51:07 +01:00 |
Alex Moreno
|
e319af6556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 07:30:10 +01:00 |
Carlos Jimenez Ruiz
|
c544cbfec7
|
Merge branch 'dev' into 3350-Smart_table_unit_tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 15:55:45 +00:00 |
Javi Gallego
|
d0326fe354
|
reload section summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-23 15:13:34 +01:00 |
Carlos Jimenez Ruiz
|
320cc6c02c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests
|
2021-11-23 13:52:15 +01:00 |
Alex Moreno
|
abb33c8514
|
feat(client): consumption.decription sortable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 11:39:31 +01:00 |
Carlos Jimenez Ruiz
|
16df8fd2f3
|
Merge branch 'dev' into 3388-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:03:06 +00:00 |
Joan Sanchez
|
07dcdab1ef
|
fix(sale): disabled clear icons
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:57:19 +01:00 |
Carlos Jimenez Ruiz
|
51a3673160
|
Merge branch 'dev' into 3369-filterValue_sqli
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 08:54:50 +00:00 |
Alex Moreno
|
854ed9936d
|
deleted unnecessary comma
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:05:42 +01:00 |
Alex Moreno
|
b460579834
|
feat(entry_latest-buys): add from and to in search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:00:46 +01:00 |
Carlos Jimenez Ruiz
|
1f2417b55e
|
Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:34:55 +00:00 |
Carlos Jimenez Ruiz
|
cae3322c6b
|
Merge branch 'dev' into 3332-item_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:28:21 +00:00 |
Carlos Jimenez Ruiz
|
ec7cb47ad5
|
Merge branch 'dev' into 3375-client_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 14:55:56 +00:00 |
Joan Sanchez
|
4ebad6b372
|
filter order was not properly being applied
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:54:01 +01:00 |
Joan Sanchez
|
3a2e4c54b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli
|
2021-11-22 15:49:43 +01:00 |
Joan Sanchez
|
90ab78d26d
|
Updated unit tests
|
2021-11-22 15:49:32 +01:00 |
Carlos Jimenez Ruiz
|
cbcfdd33ec
|
Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 14:21:46 +00:00 |
Carlos Jimenez Ruiz
|
9fdfe64909
|
Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 13:51:51 +00:00 |
Joan Sanchez
|
a940d14256
|
fix(filterValue): fixed sql injection vulnerability
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: 3369
|
2021-11-22 14:40:03 +01:00 |
Carlos Jimenez Ruiz
|
ff0a3acd6e
|
Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 13:32:18 +00:00 |
Carlos Jimenez Ruiz
|
dd19ac975d
|
Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 13:18:53 +00:00 |
Vicent Llopis
|
cb81ad3722
|
delete unnecessay space
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 14:02:21 +01:00 |
Vicent Llopis
|
709a300388
|
fix: extracting logic gates to constants
|
2021-11-22 13:44:22 +01:00 |
Vicent Llopis
|
abf3c1c84b
|
Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 13:34:44 +01:00 |
Vicent Llopis
|
cdf7c20b16
|
feat(worker_createAbsense): update backTest
|
2021-11-22 13:34:42 +01:00 |
Vicent Llopis
|
a5ba02e2ec
|
feat(route_tickets): update frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 13:28:12 +01:00 |
Vicent Llopis
|
fb6e443f03
|
feat(routes_tickets): button up when add tickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-22 12:52:02 +01:00 |
Alex Moreno
|
80f651f37d
|
add entries less than a year ago
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 12:34:20 +01:00 |
Alex Moreno
|
fe46dbd343
|
feat(entry_last-buys): add filter isFloramondo
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 11:49:30 +01:00 |
Alex Moreno
|
97a66754a7
|
feat(item and entry): add back test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 08:58:54 +01:00 |
Alex Moreno
|
1e6805a161
|
remove unnecessary tabulation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 08:30:28 +01:00 |
Alex Moreno
|
d2729e67e9
|
feat(item and latest-buys: add supplier filter
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 08:27:14 +01:00 |
Carlos Jimenez Ruiz
|
ca0c3be843
|
Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 12:55:11 +00:00 |
Carlos Jimenez Ruiz
|
fad44c0b74
|
Merge branch 'dev' into 3374-itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 11:59:50 +00:00 |
Carlos Jimenez Ruiz
|
e5977be502
|
Merge branch 'dev' into 3374-itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 11:47:37 +00:00 |
Alex Moreno
|
e64e06b9ab
|
feat(client): change phone for payMethod in descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 12:10:53 +01:00 |