Joan Sanchez
|
d4b1105cda
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-05 13:39:11 +02:00 |
Carlos Jimenez Ruiz
|
870314277f
|
add sale and canbeInvoice refactor + tests
|
2021-08-05 13:32:35 +02:00 |
Carlos Jimenez Ruiz
|
82259eee16
|
added catalog calculate join to show only available item types
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-04 11:48:21 +02:00 |
Carlos Jimenez Ruiz
|
51a8077f4d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-03 11:17:07 +02:00 |
Carlos Jimenez Ruiz
|
3d2de99129
|
vn-popover containing non-descriptor components now relocates correctly for ticket.sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-03 11:16:43 +02:00 |
Joan Sanchez
|
41a1b3d909
|
2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-02 13:35:38 +02:00 |
Carlos Jimenez Ruiz
|
a771fd584f
|
minor refactors + missing transaction on discount
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-30 10:29:57 +02:00 |
Carlos Jimenez Ruiz
|
9578895f95
|
backend unit tests adapted
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-29 17:40:45 +02:00 |
Carlos Jimenez Ruiz
|
8d682f4e03
|
chat notifications for many sales modifications
|
2021-07-29 17:20:57 +02:00 |
Joan Sanchez
|
c9f235df97
|
Merge branch 'dev' into 3032-ticket_card_components_volume_error
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-28 07:35:28 +00:00 |
Carlos Jimenez Ruiz
|
6e3a18a923
|
removed test for deprecated function
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 18:18:32 +02:00 |
Carlos Jimenez Ruiz
|
88ecaff1d2
|
prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 16:17:47 +02:00 |
Carlos Jimenez Ruiz
|
6d4b97443e
|
autoload refreshes the model when url is set
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-07-27 15:59:59 +02:00 |
Joan Sanchez
|
8b005ae012
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 12:24:45 +02:00 |
Joan Sanchez
|
531937ebbc
|
2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 09:07:04 +02:00 |
Carlos Jimenez Ruiz
|
caedfff34e
|
Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-23 15:18:08 +02:00 |
Carlos Jimenez Ruiz
|
b837a8c328
|
fixed a selector for ticket sale
|
2021-07-23 15:17:30 +02:00 |
Carlos Jimenez Ruiz
|
72535f87e1
|
Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-23 12:47:36 +00:00 |
Carlos Jimenez Ruiz
|
abbce74100
|
clone invoiceIn from descriptor
|
2021-07-23 14:06:48 +02:00 |
Carlos Jimenez Ruiz
|
c1162b1b8a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-21 10:07:21 +02:00 |
Carlos Jimenez Ruiz
|
0676eb5f30
|
web access inputs can't be modified together anymore
|
2021-07-21 10:06:50 +02:00 |
Joan Sanchez
|
9d855a80d5
|
3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 12:33:27 +02:00 |
Joan Sanchez
|
f24e7cafce
|
Merge branch 'dev' into 2989-client_debt_sample
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:07:36 +00:00 |
Joan Sanchez
|
1b373503a6
|
Added translation & removed fields property
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 11:07:04 +02:00 |
Joan Sanchez
|
3080936963
|
Merge branch 'dev' into 3025-client_summary_additions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 08:10:42 +00:00 |
Joan Sanchez
|
266ffde86b
|
Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 07:53:56 +00:00 |
Carlos Jimenez Ruiz
|
af321be095
|
Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 07:52:42 +00:00 |
Carlos Jimenez Ruiz
|
4cbaf247ed
|
removed unused showfield in model log
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:33:45 +02:00 |
Joan Sanchez
|
bfd6c995ad
|
2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:09:46 +02:00 |
Carlos Jimenez Ruiz
|
0163b6c21b
|
added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 15:59:39 +02:00 |
Carlos Jimenez Ruiz
|
e784403fd4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3027-itemBotanical_deprecated_column
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 14:46:32 +02:00 |
Carlos Jimenez Ruiz
|
29f1f7e89e
|
itemTaxCountry and item bonanical no longer use the bonanical prop
|
2021-07-19 14:46:18 +02:00 |
Joan Sanchez
|
63b502b368
|
Updated model ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 13:01:06 +02:00 |
Joan Sanchez
|
e9b6c6b63e
|
3026 - Send invoice PDF
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 12:31:09 +02:00 |
Carlos Jimenez Ruiz
|
e5b1f47478
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 11:20:38 +02:00 |
Joan Sanchez
|
94b668c01e
|
Filter item from a dialog
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-15 13:41:29 +02:00 |
Javi Gallego
|
ee30bc9e1e
|
test fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-15 12:51:10 +02:00 |
Carlos Jimenez Ruiz
|
559eaf5853
|
the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 11:22:04 +02:00 |
Carlos Jimenez Ruiz
|
9f5df91be4
|
workers without active contract no longer set calendar and timeControl at fault
|
2021-07-14 11:21:29 +02:00 |
Joan Sanchez
|
ff71e6f2c7
|
2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 11:14:53 +02:00 |
Joan Sanchez
|
675a48d8ad
|
Merge branch 'dev' into 3018-time_control_info
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 08:36:09 +00:00 |
Carlos Jimenez Ruiz
|
ae4f1d1730
|
the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 10:09:24 +02:00 |
Javi Gallego
|
c509509963
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 07:57:22 +02:00 |
Joan Sanchez
|
4eabba115f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-13 11:21:26 +02:00 |
Joan Sanchez
|
ea78db1441
|
3012 - Hotfix: Get ticket list
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-13 08:59:36 +02:00 |
Javi Gallego
|
3ec8d4583f
|
bug
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:29:53 +02:00 |
Javi Gallego
|
2f265760b4
|
permisos invoceInTax
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:27:36 +02:00 |
Carlos Jimenez Ruiz
|
98a691c152
|
minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:00:20 +02:00 |
Carlos Jimenez Ruiz
|
1835171fe8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-more_module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 13:56:58 +02:00 |
Carlos Jimenez Ruiz
|
21e34de1dd
|
item module transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 12:54:59 +02:00 |
Carlos Jimenez Ruiz
|
dd3473b93d
|
small refactors correcting constants and adding transactions
|
2021-07-12 12:50:15 +02:00 |
Joan Sanchez
|
c0d75e20d8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 08:32:11 +02:00 |
Joan Sanchez
|
878e989c02
|
HOTFIX: Disable address without a province
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 08:29:21 +02:00 |
Carlos Jimenez Ruiz
|
3b2b4e3819
|
client module changes for transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-08 15:53:30 +02:00 |
Javi Gallego
|
3ca2dd820d
|
Merge branch 'dev' into 2940-invoiceInTax-section
|
2021-07-08 08:20:30 +02:00 |
Javi Gallego
|
d57c71dba7
|
minor fix
|
2021-07-08 08:19:30 +02:00 |
Carlos Jimenez Ruiz
|
10c7aa70d6
|
claim module transactions for filter, summary and isEditable
|
2021-07-05 12:00:49 +02:00 |
Javi Gallego
|
2ec2a89f88
|
test ok
|
2021-07-03 09:19:03 +02:00 |
Joan Sanchez
|
ae091a3b11
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 14:41:45 +02:00 |
Joan Sanchez
|
35e3c8ce65
|
HOTFIX: 3009 - Unlock report button
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 14:35:24 +02:00 |
Joan Sanchez
|
48730be203
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 14:12:37 +02:00 |
Joan Sanchez
|
057d138991
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-07-02 13:44:44 +02:00 |
Joan Sanchez
|
4849355c9b
|
Changed limit value
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 13:22:37 +02:00 |
Joan Sanchez
|
9ad54b9622
|
HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 13:17:48 +02:00 |
Joan Sanchez
|
eeb9a1861e
|
HOTFIX: Added pagination
|
2021-07-02 13:10:46 +02:00 |
Joan Sanchez
|
249f5074df
|
Show client id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 10:57:17 +02:00 |
Carlos Jimenez Ruiz
|
d20b717c1b
|
tested controller modifications accordingly
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 16:19:59 +02:00 |
Carlos Jimenez Ruiz
|
0c71b915ca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2967-zone_deliverydays_keep_search_on_url
|
2021-07-01 15:04:45 +02:00 |
Carlos Jimenez Ruiz
|
03b1ab0166
|
Merge branch 'dev' into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 12:30:54 +00:00 |
Joan Sanchez
|
3246101574
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 14:03:28 +02:00 |
Joan Sanchez
|
319a168b89
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:43:13 +02:00 |
Joan Sanchez
|
92b6318c79
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:31:04 +02:00 |
Joan Sanchez
|
79f20a404d
|
Merge branch 'dev' into 3003-worker_sections_without_contract_faults
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 11:18:15 +00:00 |
Carlos Jimenez Ruiz
|
be850571d9
|
updated the field name
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:14:36 +02:00 |
Carlos Jimenez Ruiz
|
243636ccf6
|
item category name as category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 12:34:30 +02:00 |
Carlos Jimenez Ruiz
|
8cf2b241cd
|
route delivery days now gets params from url
|
2021-07-01 12:08:48 +02:00 |
Carlos Jimenez Ruiz
|
3ea2772e1e
|
Merge branch 'dev' into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 09:54:57 +00:00 |
Joan Sanchez
|
c8bfc911c2
|
2974 - Get amount unpaid from customer_risk
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 08:33:56 +02:00 |
Joan Sanchez
|
7e836e570f
|
2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 16:10:26 +02:00 |
Joan Sanchez
|
d30a3490fe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 15:21:47 +02:00 |
Carlos Jimenez Ruiz
|
4148500c61
|
workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 14:05:16 +02:00 |
Carlos Jimenez Ruiz
|
d946750113
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 10:48:27 +02:00 |
Carlos Jimenez Ruiz
|
2469540f66
|
item category filter is now working again
|
2021-06-30 10:48:19 +02:00 |
Javi Gallego
|
9054aa0885
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-30 08:30:40 +02:00 |
Javi Gallego
|
9371c49922
|
cambios solicitados
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-30 08:26:03 +02:00 |
Joan Sanchez
|
33d03c8f21
|
Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 06:15:05 +00:00 |
Carlos Jimenez Ruiz
|
08360bfdc4
|
deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 18:01:33 +02:00 |
Carlos Jimenez Ruiz
|
15c7c0cb4b
|
read acl set on the model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 15:31:58 +02:00 |
Carlos Jimenez Ruiz
|
a51494e784
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2949-client_basicdata_businesstype
|
2021-06-29 15:03:56 +02:00 |
Carlos Jimenez Ruiz
|
01a9154015
|
Merge branch 'dev' into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:23:47 +00:00 |
Carlos Jimenez Ruiz
|
d67e36212f
|
added validation for the dms id field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 11:59:21 +02:00 |
Carlos Jimenez Ruiz
|
f30cd1aeda
|
added business type to client basic data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:51:27 +02:00 |
Carlos Jimenez Ruiz
|
f3193f0dc1
|
added businesType model and relation to client
|
2021-06-29 10:51:01 +02:00 |
Javi Gallego
|
59fac7edfa
|
fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:33:01 +02:00 |
Javi Gallego
|
e217f02321
|
test front
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 08:59:55 +02:00 |
Carlos Jimenez Ruiz
|
8ca3e0d120
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 16:45:19 +02:00 |
Carlos Jimenez Ruiz
|
e2ff3ff17f
|
validation message for dup entry
|
2021-06-28 13:30:49 +02:00 |
Joan Sanchez
|
c6504140af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 12:23:11 +02:00 |
Joan Sanchez
|
52e6c9d793
|
CSS fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 12:06:21 +02:00 |
Carlos Jimenez Ruiz
|
0e47cf72e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
|
2021-06-28 11:19:07 +02:00 |
Carlos Jimenez Ruiz
|
e054145b49
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2996-route_tickets_recalc
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 10:44:19 +02:00 |
Carlos Jimenez Ruiz
|
32d0aa4e10
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 10:17:30 +02:00 |
Carlos Jimenez Ruiz
|
e9bcddc29f
|
invoice modules transactions and tests
|
2021-06-28 10:15:54 +02:00 |
Joan Sanchez
|
65ac3fc205
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:58:27 +02:00 |
Joan Sanchez
|
66a2563552
|
Added line break
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-28 08:48:35 +02:00 |
Joan Sanchez
|
e7dcb54efb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:33:41 +02:00 |
Joan Sanchez
|
ef9f3b13e4
|
html fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:28:31 +02:00 |
Carlos Jimenez Ruiz
|
8b9bfb4ba0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 10:12:52 +02:00 |
Carlos Jimenez Ruiz
|
832452df95
|
ticketDms import
|
2021-06-25 10:12:41 +02:00 |
Carlos Jimenez Ruiz
|
2548fdc891
|
#3000 add buyer to ticket isEditable
|
2021-06-25 09:46:18 +02:00 |
Javi Gallego
|
02cd2283a7
|
summary total
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 09:30:24 +02:00 |
Javi Gallego
|
82e65ec1c3
|
rellena campo rate
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 07:47:53 +02:00 |
Joan Sanchez
|
0941b2423e
|
2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 13:33:51 +02:00 |
Joan Sanchez
|
db30ac3175
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 11:40:23 +02:00 |
Carlos Jimenez Ruiz
|
3bfc08b117
|
route.summary order by priority
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 10:06:31 +02:00 |
Carlos Jimenez Ruiz
|
320c04b2d3
|
update volume is not called when add/remove tickets from route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 09:54:07 +02:00 |
Joan Sanchez
|
362c404aba
|
Css fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 09:16:59 +02:00 |
Carlos Jimenez Ruiz
|
6aae09f070
|
front unit tests final amend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:21:48 +02:00 |
Carlos Jimenez Ruiz
|
2da72fc993
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
|
2021-06-23 14:20:12 +02:00 |
Carlos Jimenez Ruiz
|
12c9f3fd7d
|
Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
|
2021-06-23 14:18:23 +02:00 |
Joan Sanchez
|
b2feb5227c
|
Merge branch 'dev' into 2974-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-23 12:15:36 +00:00 |
Carlos Jimenez Ruiz
|
029b2f2fdd
|
Merge branch 'dev' into 2955-entry_summary_show_receved_sent
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-23 12:12:37 +00:00 |
Carlos Jimenez Ruiz
|
9389bbf779
|
front unit tests fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:32:23 +02:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:24:23 +02:00 |
Carlos Jimenez Ruiz
|
c88033a69d
|
deprecated listWorkers endpoint as it was not in use
|
2021-06-23 13:22:35 +02:00 |
Joan Sanchez
|
deaade92b0
|
Shortened packing type
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 14:27:45 +02:00 |
Joan Sanchez
|
256203944e
|
HOTFIX: Prevent error on tickets without state
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 14:11:33 +02:00 |
Joan Sanchez
|
a1b4164b5d
|
2974 - Client balance default company and fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 13:57:32 +02:00 |
Joan Sanchez
|
79296ac857
|
2974 - Client balance default company and fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 11:57:43 +02:00 |
Carlos Jimenez Ruiz
|
565f343e19
|
added isDelivered, isReceived and removed travel descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 09:39:33 +02:00 |
Carlos Jimenez Ruiz
|
0421fd8828
|
back end unit tests for zone endpoints
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-21 15:04:23 +02:00 |
Carlos Jimenez Ruiz
|
b651fdebe6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
|
2021-06-21 14:35:01 +02:00 |
Joan Sanchez
|
8c0171096f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-21 09:19:00 +00:00 |
Carlos Jimenez Ruiz
|
48a2bb7b10
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
|
2021-06-21 09:08:03 +02:00 |
Carlos Jimenez Ruiz
|
05c630533a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 16:38:33 +02:00 |
Joan Sanchez
|
8f24c3f39b
|
Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 14:34:48 +00:00 |
Joan Sanchez
|
9506a8fd90
|
Disabled sortable column
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 16:34:34 +02:00 |
Joan Sanchez
|
6acf922d3b
|
Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 14:15:42 +00:00 |
Joan Sanchez
|
dd7f37e36c
|
Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #663
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-18 14:15:15 +00:00 |
Joan Sanchez
|
a4f20daf17
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 16:14:30 +02:00 |
Joan Sanchez
|
a50eebfed4
|
Replaced salesPerson by packages column
|
2021-06-18 16:07:13 +02:00 |
Carlos Jimenez Ruiz
|
4656b2e25a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 15:54:41 +02:00 |
Carlos Jimenez Ruiz
|
1afae3d56d
|
address nickname now gets updated when client or address updates
|
2021-06-18 15:54:33 +02:00 |
Carlos Jimenez Ruiz
|
ba0fdcd743
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 15:05:10 +02:00 |
Carlos Jimenez Ruiz
|
82cb9ed749
|
zone module endpoints now have transactions
|
2021-06-18 15:05:03 +02:00 |
Joan Sanchez
|
20e933ed07
|
2980 - Invoice in fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 13:29:59 +02:00 |
Joan Sanchez
|
0ff114ff36
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 12:32:37 +02:00 |
Joan Sanchez
|
c622f24b0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 11:12:58 +02:00 |
Carlos Jimenez Ruiz
|
e74f1f109e
|
Merge branch 'dev' into 2906-deliveryNote_packages
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:27:46 +00:00 |
Joan Sanchez
|
325afe2245
|
2906 - Number of packages
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:42:55 +02:00 |
Joan Sanchez
|
b36b48f4b3
|
Merge branch 'dev' into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 06:04:33 +00:00 |
Joan Sanchez
|
bc7c288742
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:03:55 +02:00 |
Joan Sanchez
|
8695fadc18
|
Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 05:21:01 +00:00 |
Javi Gallego
|
a6c093cf16
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 07:07:52 +02:00 |
Joan Sanchez
|
bbbf008076
|
Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-17 16:09:17 +02:00 |
Joan Sanchez
|
bb80621890
|
2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-17 15:09:04 +02:00 |
Carlos Jimenez Ruiz
|
b906a8e91d
|
added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-17 11:52:12 +02:00 |
Javi Gallego
|
e2f32a60fd
|
cambio campos en front
|
2021-06-17 07:30:22 +02:00 |
Javi Gallego
|
dc0212d2fc
|
chip
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 18:36:42 +02:00 |
Carlos Jimenez Ruiz
|
7370269e4d
|
ticket.sale now shows Packing type
|
2021-06-16 17:06:11 +02:00 |
Carlos Jimenez Ruiz
|
47ad63c154
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 12:29:46 +02:00 |
Carlos Jimenez Ruiz
|
588a499c44
|
editLatestsBuys now is called only with id and itemFk
|
2021-06-16 12:29:40 +02:00 |
Carlos Jimenez Ruiz
|
f5ad0c9c1c
|
Merge branch 'dev' into 2961-summary_tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 10:18:47 +00:00 |
Joan Sanchez
|
447d8341e7
|
Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 09:49:12 +00:00 |
Joan Sanchez
|
76623d8c95
|
Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 09:47:45 +00:00 |
Joan Sanchez
|
0ce782a4de
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 11:40:00 +02:00 |
Joan Sanchez
|
3e938fa9fb
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 11:15:17 +02:00 |
Carlos Jimenez Ruiz
|
b9cdc5ed6a
|
Merge branch 'dev' into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 08:19:01 +00:00 |
Joan Sanchez
|
efc9edb384
|
Fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 10:13:06 +02:00 |
Joan Sanchez
|
df94190a8c
|
Removed console log
|
2021-06-16 09:59:54 +02:00 |
Carlos Jimenez Ruiz
|
34e0d0b7cf
|
translations update
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 09:50:32 +02:00 |
Joan Sanchez
|
225bfd09b9
|
Missing translation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 09:47:54 +02:00 |
Joan Sanchez
|
c10f792619
|
Merge branch 'dev' into 2929-entry_latestsbuys_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 07:44:30 +00:00 |
Joan Sanchez
|
353d0e352d
|
2961 - Show tickets on summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 09:43:07 +02:00 |
Joan Sanchez
|
55908c0fca
|
Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-16 07:41:16 +00:00 |
Carlos Jimenez Ruiz
|
1a053942a1
|
Merge branch 'dev' into 2963-creditInsurance_acl
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 14:41:52 +00:00 |
Carlos Jimenez Ruiz
|
8c1df0743d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 16:41:12 +02:00 |
Carlos Jimenez Ruiz
|
8aa3d269ea
|
Travel descriptor now shows delete option if there are no entries
|
2021-06-15 16:41:01 +02:00 |
Joan Sanchez
|
9591f04853
|
Merge branch 'dev' into 2938-entry_buy_style
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 12:18:59 +00:00 |
Joan Sanchez
|
92e8f528e8
|
2963 - Show section to all employee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 14:16:12 +02:00 |
Joan Sanchez
|
2469409068
|
2941 - Monitor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 13:48:42 +02:00 |
Carlos Jimenez Ruiz
|
db3d5ca4d8
|
added missing html closing tag
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 13:14:21 +02:00 |
Carlos Jimenez Ruiz
|
7004ad5ade
|
removed several columns from bulk edit and added packingOut
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 12:47:40 +02:00 |
Javi Gallego
|
500b68162b
|
summary con chip
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 09:58:21 +02:00 |
Javi Gallego
|
5369e8d97e
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 09:09:08 +02:00 |
Javi Gallego
|
a8e01909d0
|
ancho ok
|
2021-06-15 09:02:00 +02:00 |
Carlos Jimenez Ruiz
|
9c0cff2f3a
|
removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 16:09:28 +02:00 |
Carlos Jimenez Ruiz
|
88a5443d64
|
table style changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 15:52:46 +02:00 |
Carlos Jimenez Ruiz
|
e85b7b9817
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
|
2021-06-14 12:07:54 +02:00 |
Carlos Jimenez Ruiz
|
cdbab4d7bf
|
Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 10:00:47 +00:00 |
Carlos Jimenez Ruiz
|
c09d25ba48
|
Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:59:13 +00:00 |
Joan Sanchez
|
59e90c2c10
|
Removed commented block
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 11:58:39 +02:00 |
Joan Sanchez
|
722c9ad4d4
|
Merge branch 'dev' into 2957-ticket_summary_postcode
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:42:40 +00:00 |
Carlos Jimenez Ruiz
|
7f69909bbd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 11:39:04 +02:00 |
Carlos Jimenez Ruiz
|
f36b54f97b
|
invoiceOut summary tickets pagination + refactor
|
2021-06-14 11:38:57 +02:00 |
Joan Sanchez
|
a303b98093
|
Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:37:23 +00:00 |
Javi Gallego
|
44ce54ede4
|
seccion en summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:47:04 +02:00 |
Joan Sanchez
|
de30a2d978
|
Total holidays fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 08:09:53 +02:00 |
Carlos Jimenez Ruiz
|
5d8a9938d6
|
formattedAddress tests amended for postcode
|
2021-06-13 19:16:35 +02:00 |
Carlos Jimenez Ruiz
|
48f80fad8f
|
added postcode to summary + basic data translation
|
2021-06-13 19:11:05 +02:00 |
Carlos Jimenez Ruiz
|
7bf832079d
|
route.tickets suggested tickets now shows both descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 13:02:18 +02:00 |
Joan Sanchez
|
17a6dfc81b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 10:58:40 +02:00 |
Joan Sanchez
|
a72010554c
|
Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 10:58:00 +02:00 |
Carlos Jimenez Ruiz
|
c776d34cdf
|
invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 17:08:21 +02:00 |
Joan Sanchez
|
e8fd1c9c9c
|
Merge branch 'dev' into 2951-fix_unit_test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 14:24:17 +00:00 |
Joan Sanchez
|
be791d1f00
|
2951 - Added transaction to updateVolume() method
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 16:08:44 +02:00 |
Joan Sanchez
|
3f3e5c2735
|
Unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 16:05:10 +02:00 |
Joan Sanchez
|
1b62233ea7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
|
2021-06-10 14:22:13 +02:00 |
Joan Sanchez
|
8284702603
|
2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 11:24:32 +02:00 |
Carlos Jimenez Ruiz
|
fc3af7b6a6
|
ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-09 14:25:50 +02:00 |
Javi Gallego
|
acf03959f5
|
creada seccion invoiceInTax
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-09 10:20:18 +02:00 |
Carlos Jimenez Ruiz
|
f969323a86
|
ticket create now takes clientFk from params
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-08 17:30:00 +02:00 |
Joan Sanchez
|
3c8629b3f3
|
Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-08 16:36:16 +02:00 |
Carlos Jimenez Ruiz
|
76e723cc34
|
Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-08 07:47:42 +00:00 |
Javi Gallego
|
8878a2280a
|
models
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-08 08:04:38 +02:00 |
Carlos Jimenez Ruiz
|
238975644f
|
Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 13:02:27 +00:00 |
Carlos Jimenez Ruiz
|
3894fe94ec
|
Merge branch 'dev' into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 13:02:20 +00:00 |
Joan Sanchez
|
8fa64122f8
|
Ammends
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-07 14:58:24 +02:00 |
Carlos Jimenez Ruiz
|
a46fef5295
|
endpoint minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 14:26:34 +02:00 |
Carlos Jimenez Ruiz
|
8fd7faa47b
|
fixed bug module importation + rewritten tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 11:12:56 +02:00 |
Javi Gallego
|
c90fa41fae
|
accountingType.isAutoConciliated == true
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 07:57:46 +02:00 |
Carlos Jimenez Ruiz
|
647b7a93cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 17:16:10 +02:00 |
Carlos Jimenez Ruiz
|
b38605442e
|
transactions for entry module endpoints
|
2021-06-04 17:16:02 +02:00 |
Joan Sanchez
|
c853cfc86f
|
Refactor
|
2021-06-04 15:49:48 +02:00 |
Joan Sanchez
|
2c0fc7e45e
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 11:46:37 +02:00 |
Joan Sanchez
|
6b65aa87d8
|
HOTFIX: Max width for client name field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 11:46:09 +02:00 |
Joan Sanchez
|
b77ecc2c06
|
changes2
|
2021-06-04 11:45:35 +02:00 |
Joan Sanchez
|
f8df3f1f3d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
|
2021-06-04 11:10:43 +02:00 |
Joan Sanchez
|
651a9356f3
|
Merge branch 'dev' into 2932-invoiceIn_log
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 07:54:18 +00:00 |
Javi Gallego
|
2604c81533
|
falta solucionar test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-04 08:24:33 +02:00 |
Joan Sanchez
|
e1c1bb8425
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 08:00:08 +02:00 |
Joan Sanchez
|
8bb254e93f
|
HOTFIX: Ticket monitor clientGetDebt
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:29:45 +02:00 |
Joan Sanchez
|
edf18938a6
|
HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:21:43 +02:00 |
Carlos Jimenez Ruiz
|
b0bed3c1c4
|
invoiceInLog section, model and table
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:14:52 +02:00 |
Joan Sanchez
|
d1daed3540
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 13:39:51 +02:00 |
Joan Sanchez
|
5962a68d15
|
HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 12:40:27 +02:00 |
Joan Sanchez
|
3fcd78e1f3
|
Changes
|
2021-06-03 11:00:40 +02:00 |
Carlos Jimenez Ruiz
|
86631c84d0
|
moved transferor from fiscal data to basic data + e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-02 17:35:30 +02:00 |
Joan Sanchez
|
655380a52c
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-02 10:33:10 +02:00 |
Joan Sanchez
|
07026a68bb
|
#2934 - HOTFIX: Route suggested tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-02 10:29:56 +02:00 |
Joan Sanchez
|
a594e63566
|
Chip color
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-01 11:39:40 +02:00 |
Javi Gallego
|
70fc260eae
|
vnConfig solucionado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-01 10:10:09 +02:00 |
Javi Gallego
|
3a5d84b34c
|
rutas reparadas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-31 08:21:16 +02:00 |
Joan Sanchez
|
a24cfe0087
|
Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-27 09:42:27 +00:00 |
Joan Sanchez
|
27cd54bef1
|
Updated icons title
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-27 11:41:45 +02:00 |
Joan Sanchez
|
920e7b1daf
|
E2E fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-26 13:05:58 +02:00 |
Carlos Jimenez Ruiz
|
3f167de10f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-26 09:14:30 +02:00 |
Carlos Jimenez Ruiz
|
d6ef5352a2
|
sale module now has canEdit endpoint to check arrays of sales
|
2021-05-26 09:14:18 +02:00 |
Joan Sanchez
|
099ff657e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 14:08:02 +02:00 |
Joan Sanchez
|
f6a0bcb12c
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 13:33:17 +02:00 |
Joan Sanchez
|
26cc3a3dec
|
2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 10:01:18 +02:00 |
Carlos Jimenez Ruiz
|
e418d6239b
|
fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-24 11:28:23 +02:00 |
Carlos Jimenez Ruiz
|
2a4ff5a97b
|
fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-24 10:31:51 +02:00 |
Carlos Jimenez Ruiz
|
9a1b6e4653
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 15:33:23 +02:00 |
Carlos Jimenez Ruiz
|
5c18c5c94c
|
ticket module descriptor now takes warehouseFk from the ticket
|
2021-05-21 15:31:28 +02:00 |
Carlos Jimenez Ruiz
|
1bfe537186
|
claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig
|
2021-05-21 15:31:05 +02:00 |
Joan Sanchez
|
60185bdf34
|
Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 07:24:34 +00:00 |
Joan Sanchez
|
a103c8d7fc
|
2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 08:49:32 +02:00 |
Joan Sanchez
|
6f245698f2
|
Merge branch 'dev' into 2620-mostrar-disponible
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 06:29:43 +00:00 |
Joan Sanchez
|
b7049122fe
|
Url fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-20 10:28:37 +02:00 |
Joan Sanchez
|
fbc11b7a39
|
Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-20 08:23:45 +00:00 |
Javi Gallego
|
df073cce2f
|
refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 17:04:13 +02:00 |
Carlos Jimenez Ruiz
|
2494af0113
|
removed unused relation from item @addSale
|
2021-05-19 15:33:35 +02:00 |
Carlos Jimenez Ruiz
|
5eb0ab8296
|
add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 15:25:49 +02:00 |
Carlos Jimenez Ruiz
|
72a0b774de
|
add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 14:15:28 +02:00 |
Joan Sanchez
|
a5c3ba3926
|
2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 10:26:58 +02:00 |
Joan Sanchez
|
714142f868
|
Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 12:53:33 +00:00 |
Joan Sanchez
|
98d7f246a4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 14:44:38 +02:00 |
Joan Sanchez
|
a9e33abacc
|
FIX: Show employee list
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 14:44:24 +02:00 |
Carlos Jimenez Ruiz
|
e10dc53a9c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text
|
2021-05-18 14:22:36 +02:00 |
Joan Sanchez
|
3402bd119d
|
Css fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 13:46:43 +02:00 |
Carlos Jimenez Ruiz
|
06d396a76a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 13:22:57 +02:00 |
Carlos Jimenez Ruiz
|
c0e2ff12da
|
moved vn-log to salix components + css changes and renamed worker-log to log
|
2021-05-18 13:22:40 +02:00 |
Joan Sanchez
|
5c760b3faa
|
Max height
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 12:21:01 +02:00 |
Joan Sanchez
|
b87e79b9d3
|
Changes
|
2021-05-18 11:58:32 +02:00 |
Joan Sanchez
|
6ec28cbc86
|
Removed transaction block
|
2021-05-18 11:58:32 +02:00 |
Joan Sanchez
|
bc7f2d8193
|
Responsive
|
2021-05-18 11:58:32 +02:00 |
Joan Sanchez
|
bb67277c68
|
#2913, #2914 - Changes to sales monitors
|
2021-05-18 11:58:32 +02:00 |
Joan Sanchez
|
400bf7b4f2
|
Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 10:05:13 +02:00 |
Joan Sanchez
|
5d278f416f
|
Removed transaction block
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 10:04:01 +02:00 |
Joan Sanchez
|
bf250b77ef
|
Responsive
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 09:12:47 +02:00 |
Joan Sanchez
|
10387ee40b
|
#2913, #2914 - Changes to sales monitors
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 08:41:36 +02:00 |
Carlos Jimenez Ruiz
|
5843140cf5
|
minor refactor for code usage instead of description
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-17 12:27:26 +02:00 |
Carlos Jimenez Ruiz
|
e848b94859
|
removed LEFT from join
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-17 09:42:48 +02:00 |
Carlos Jimenez Ruiz
|
3a25dbc3b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-17 09:05:15 +02:00 |
Joan Sanchez
|
085a5a104b
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-17 08:39:55 +02:00 |
Joan Sanchez
|
b67c95e5f0
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-17 07:38:04 +02:00 |
Joan Sanchez
|
378175224c
|
HOTFIX: Buyer ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-17 07:24:24 +02:00 |
Carlos Jimenez Ruiz
|
b902a4dd4a
|
front unit test fix
|
2021-05-14 19:56:54 +02:00 |
Carlos Jimenez Ruiz
|
97e9dc57bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-14 19:22:15 +02:00 |
Carlos Jimenez Ruiz
|
1e8ab4d348
|
added transactions to several endpoints
|
2021-05-14 19:21:04 +02:00 |
Joan Sanchez
|
e45af1c60a
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-14 13:56:04 +02:00 |
Joan Sanchez
|
c0f2590b61
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-14 12:56:10 +02:00 |
Joan Sanchez
|
e39758ee16
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-14 12:46:54 +02:00 |
Joan Sanchez
|
a70b29f9bf
|
#2916 - HOTFIX: Grouping selection limit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-14 12:44:23 +02:00 |
Carlos Jimenez Ruiz
|
2b83abeefd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
|
2021-05-14 10:13:02 +02:00 |
Joan Sanchez
|
c4357ea577
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 12:27:01 +02:00 |
Joan Sanchez
|
e6f7ef41b0
|
Hotfix: Catalog items without ink
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 12:21:12 +02:00 |
Joan Sanchez
|
ac02f8b309
|
Ticket request hotfix
|
2021-05-13 12:18:21 +02:00 |
Joan Sanchez
|
24981912e4
|
2907 - Proper claim rate percentage
|
2021-05-13 12:13:15 +02:00 |
Joan Sanchez
|
6fdb91fdc8
|
Removed line
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 10:20:22 +02:00 |
Carlos Jimenez Ruiz
|
95666ccc1d
|
Merge branch 'dev' into 2905-restore_ticket_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 07:44:01 +00:00 |
Joan Sanchez
|
4a1d286a95
|
2907 - Proper claim rate percentage
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 09:17:49 +02:00 |
Joan Sanchez
|
af49a66911
|
Unit test fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 08:57:49 +02:00 |
Joan Sanchez
|
e6e91ced99
|
2905 - Restore ticket shipped and landed
|
2021-05-13 08:56:26 +02:00 |
Joan Sanchez
|
8af66a7ca5
|
HOTFIX: Sort by column
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-12 15:11:07 +02:00 |
Joan Sanchez
|
b3cbf9374c
|
Hotfix: Catalog items without ink
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-12 14:22:29 +02:00 |
Joan Sanchez
|
9363726d67
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-12 13:37:01 +02:00 |
Joan Sanchez
|
873fc54dff
|
More ammends
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-12 13:18:58 +02:00 |
Joan Sanchez
|
65f0cb4612
|
More ammends
|
2021-05-12 13:14:41 +02:00 |
Joan Sanchez
|
6f5df10413
|
Removed controller
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-12 13:06:36 +02:00 |
Joan Sanchez
|
eecba426ee
|
Removed unused class
|
2021-05-12 13:00:54 +02:00 |
Joan Sanchez
|
b828609d33
|
Ammends
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-12 12:39:45 +02:00 |
Joan Sanchez
|
2e7d56cc26
|
Test fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-12 12:11:27 +02:00 |
Carlos Jimenez Ruiz
|
83d6581349
|
indentation correction
|
2021-05-12 09:52:04 +02:00 |
Carlos Jimenez Ruiz
|
457d23dc16
|
reoute tickets order columns + endpoint refactor
|
2021-05-12 09:51:32 +02:00 |
Joan Sanchez
|
e22da9b0d5
|
Merge branch 'dev' into 2863-monitor_module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-12 07:14:08 +00:00 |
Joan Sanchez
|
88616862cb
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-12 09:12:46 +02:00 |
Carlos Jimenez Ruiz
|
d4eedc69e1
|
indentation on route filter
|
2021-05-11 12:53:08 +02:00 |
Joan Sanchez
|
6ae8b72268
|
Merge branch 'dev' into 2902-error-getSuggestedTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-11 09:52:42 +00:00 |
Joan Sanchez
|
d2169000f4
|
Merge branch 'dev' into 2863-monitor_module
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-11 07:46:18 +00:00 |
Joan Sanchez
|
dc44af148d
|
2863 - Added sales monitor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-11 09:43:15 +02:00 |
Carlos Jimenez Ruiz
|
ac917b6115
|
mino changes on translations
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-10 10:46:17 +02:00 |
Carlos Jimenez Ruiz
|
58447c8168
|
transaltion changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-10 10:39:51 +02:00 |
Carlos Jimenez Ruiz
|
657896bce0
|
increased section width
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-10 10:32:00 +02:00 |
Javi Gallego
|
84cd89d7f7
|
modifica la descripcion de la compensacion
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-07 08:45:20 +02:00 |
Javi Gallego
|
19b35f5f6c
|
landed en lugar de shipped
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-07 07:52:03 +02:00 |
Javi Gallego
|
f1c30ca6d1
|
cambio landed por created
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-06 08:13:17 +02:00 |
Carlos Jimenez Ruiz
|
245243aa14
|
routes without vehicle or vehicles without drop off now throw
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-05 13:36:54 +02:00 |
Joan Sanchez
|
db148c8177
|
2863 - Added monitor module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-04 12:44:21 +02:00 |
Joan Sanchez
|
1efe8cb683
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-03 14:03:41 +02:00 |
Carlos Jimenez Ruiz
|
47e36913a1
|
Merge branch 'dev' into 2770-supplier_address
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-03 11:55:55 +00:00 |
Joan Sanchez
|
8f3d2d892d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-03 12:13:20 +02:00 |
Joan Sanchez
|
03e77685a1
|
SMS hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-03 12:09:12 +02:00 |
Joan Sanchez
|
4d90006aa6
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-30 14:27:50 +02:00 |
Joan Sanchez
|
07dbeaf515
|
2727 - Send consumption report to an email address
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-04-30 13:50:41 +02:00 |
Joan Sanchez
|
fcc8ab4236
|
Added model ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-30 10:08:40 +02:00 |
Joan Sanchez
|
dbe22844a6
|
Removed unused method
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-30 09:53:20 +02:00 |
Joan Sanchez
|
5445764043
|
Added supplier address fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-30 08:26:05 +02:00 |
Joan Sanchez
|
61a63ad76f
|
Merge branch 'dev' into 2770-supplier_address
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-29 12:42:42 +00:00 |
Joan Sanchez
|
330b6bdf8a
|
2770 - Added supplier addresses section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-29 14:41:10 +02:00 |
Joan Sanchez
|
5a53cb09da
|
Create receipt button changed role to salesAssistant
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-29 08:48:11 +02:00 |
Carlos Jimenez Ruiz
|
eea8ed9a3c
|
front unit test entry import buys fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-28 22:56:02 +02:00 |
Carlos Jimenez Ruiz
|
3c280eed2e
|
e2e path for entry buy after entry import path
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-04-28 18:29:29 +02:00 |
Carlos Jimenez Ruiz
|
9ef4497ea6
|
translations and tittles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-28 12:11:49 +02:00 |
Carlos Jimenez Ruiz
|
d3b22d7078
|
controller refactor to remove repeated code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-28 11:55:04 +02:00 |
Carlos Jimenez Ruiz
|
e53298f35c
|
test new uses transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-28 11:24:02 +02:00 |
Carlos Jimenez Ruiz
|
ddc19ddbcd
|
enpoint now receives all data for a buy + css refactor
|
2021-04-28 11:15:02 +02:00 |
Carlos Jimenez Ruiz
|
65457d6dac
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-28 10:32:35 +02:00 |
Carlos Jimenez Ruiz
|
daa94e4eb5
|
entry buy index
|
2021-04-28 10:32:24 +02:00 |
Javi Gallego
|
9ee1385cd1
|
test ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-26 12:33:33 +02:00 |
Javi Gallego
|
2395a0af63
|
done
|
2021-04-26 12:24:16 +02:00 |
Javi Gallego
|
4a7a4f6dcf
|
test ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-22 09:06:08 +02:00 |
Carlos Jimenez Ruiz
|
0abb8f2d5f
|
Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-21 13:21:16 +00:00 |
Carlos Jimenez Ruiz
|
94cd6cfb3e
|
watcher aint looking after data changed to disable test conn button
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-19 13:23:08 +02:00 |
Carlos Jimenez Ruiz
|
857c508391
|
Merge branch 'dev' into 2729-prices_popover
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-19 07:59:09 +00:00 |
Javi Gallego
|
cd4f93f326
|
minor fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-16 18:35:03 +02:00 |
Javi
|
f7fa363fa5
|
Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-16 18:32:00 +02:00 |
Carlos Jimenez Ruiz
|
420f05bb03
|
mocked api client due to service instability
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-16 12:40:41 +02:00 |
Carlos Jimenez Ruiz
|
56ec7b4729
|
input number made wider
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-16 10:17:59 +02:00 |
Carlos Jimenez Ruiz
|
9a4c056059
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover
|
2021-04-16 10:07:18 +02:00 |
Carlos Jimenez Ruiz
|
17904c4edb
|
only undo and save buttons are disabled until data changed now
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-16 09:20:02 +02:00 |
Joan Sanchez
|
2cdafeecf4
|
Added unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-15 14:30:47 +02:00 |
Joan Sanchez
|
bf976a3e8f
|
2729 - Prices popover refactor
|
2021-04-15 14:30:30 +02:00 |
Carlos Jimenez Ruiz
|
2ebd812a1f
|
updated model + translations
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-15 11:54:40 +02:00 |
Carlos Jimenez Ruiz
|
41ab1bbe35
|
fixed a test where invoiceIn was nested into the summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-15 10:50:10 +02:00 |
Carlos Jimenez Ruiz
|
38f43eca3b
|
invoiceIn basicData + index preview of summary
|
2021-04-15 10:47:39 +02:00 |
Carlos Jimenez Ruiz
|
69069d5e28
|
invoiceIn summary frontend
|
2021-04-15 10:46:23 +02:00 |
Carlos Jimenez Ruiz
|
ec378a17ae
|
invoiceIn model updated a summary registered
|
2021-04-15 10:45:27 +02:00 |
Carlos Jimenez Ruiz
|
8faa1531c6
|
summary route + test
|
2021-04-15 10:44:25 +02:00 |
Carlos Jimenez Ruiz
|
d8628379dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary
|
2021-04-14 11:11:40 +02:00 |
Carlos Jimenez Ruiz
|
b2ecd7d3c2
|
Merge branch 'dev' into 2878-activeWorkers_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-14 08:15:06 +00:00 |
Joan Sanchez
|
dac95805e8
|
2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-14 09:02:08 +02:00 |
Joan Sanchez
|
78313bd9a7
|
Updated unit tests
|
2021-04-14 08:15:03 +02:00 |
Joan Sanchez
|
6b8074e32f
|
2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-13 14:08:10 +02:00 |
Carlos Jimenez Ruiz
|
01f0fed0c3
|
Merge branch 'dev' into 2483-email_replyTo
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-13 08:41:56 +00:00 |
Joan Sanchez
|
7033ec2c11
|
Added missing translations
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-13 10:39:42 +02:00 |
Carlos Jimenez Ruiz
|
90a7c803fd
|
descriptor invoiceIn amount
|
2021-04-12 16:32:13 +02:00 |
Carlos Jimenez Ruiz
|
b6f31d7d44
|
invoiceIn descriptor implementation
|
2021-04-12 12:43:17 +02:00 |
Carlos Jimenez Ruiz
|
6f0c48847a
|
Merge branch 'dev' into 2815-ticket_without_state
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-08 11:53:25 +00:00 |
Joan Sanchez
|
af0307a419
|
2859 - Force translation for SMS
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-08 13:39:11 +02:00 |
Joan Sanchez
|
418d7a2d12
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 14:14:31 +02:00 |
Joan Sanchez
|
e40911e833
|
2815 - Fix ticket without state
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 13:39:36 +02:00 |
Joan Sanchez
|
465955d0c5
|
2483 - Added replyTo param when sending an email to client
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-04-07 13:09:53 +02:00 |
Carlos Jimenez Ruiz
|
2d041142c3
|
Merge branch 'dev' into 2631-notify_incomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 09:30:05 +00:00 |
Joan Sanchez
|
93399d6de6
|
Updated description
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 11:18:44 +02:00 |
Joan Sanchez
|
6c36ab3905
|
Removed back button
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 10:47:31 +02:00 |
Joan Sanchez
|
d4c6695629
|
2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 07:45:00 +02:00 |
Joan Sanchez
|
65dc0e3780
|
2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-06 13:46:38 +02:00 |
Joan Sanchez
|
5ef3ff40ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail
|
2021-04-06 09:14:11 +02:00 |
Joan Sanchez
|
a2144405ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-02 17:04:37 +02:00 |
Joan Sanchez
|
9bbf43c590
|
Replace http with https
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-02 14:34:16 +02:00 |
Javi Gallego
|
47a3779c45
|
Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 18:39:18 +02:00 |
Javi Gallego
|
336472291d
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 18:38:40 +02:00 |
Javi Gallego
|
eec901684a
|
reviso test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 17:36:27 +02:00 |
Carlos Jimenez Ruiz
|
893de63f74
|
Merge branch 'dev' into 2866-descriptor_photo
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 14:51:05 +00:00 |
Joan Sanchez
|
b4cceff4cb
|
2866 - Limit descriptor photo size to width 100%
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 14:20:00 +02:00 |
Joan Sanchez
|
fa0b01a0d5
|
Fixed buttons alignment
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 14:00:34 +02:00 |
Joan Sanchez
|
91c26ee5a5
|
Removed filter import
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 13:55:01 +02:00 |
Joan Sanchez
|
389f10bda0
|
Removed entry import
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 13:51:55 +02:00 |
Joan Sanchez
|
f89419962d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index
|
2021-04-01 13:42:38 +02:00 |
Javi Gallego
|
67f822ebdc
|
Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-01 13:14:26 +02:00 |
Joan Sanchez
|
41ee6e70a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail
|
2021-04-01 08:42:02 +02:00 |
Javi Gallego
|
c036c7c7fe
|
model ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-31 07:33:00 +02:00 |
Carlos Jimenez Ruiz
|
694055f85c
|
width changed from medium to large
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 16:19:54 +02:00 |
Carlos Jimenez Ruiz
|
75155c796d
|
removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 15:59:30 +02:00 |
Carlos Jimenez Ruiz
|
4207bfcc70
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 15:19:38 +02:00 |
Carlos Jimenez Ruiz
|
061626e521
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 14:51:05 +02:00 |
Carlos Jimenez Ruiz
|
847e0bd2c8
|
tests fixed for production sneaky changes
|
2021-03-30 14:43:21 +02:00 |
Joan Sanchez
|
e2a9a64f88
|
#2871 and #2868. Included ticket filter unit test
|
2021-03-30 11:20:26 +02:00 |
Joan Sanchez
|
4aa616601e
|
2615 - Waste changes
|
2021-03-30 10:28:44 +02:00 |
Carlos Jimenez Ruiz
|
e025368af1
|
updaloadFile transaction commit conditional
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 10:17:16 +02:00 |
Carlos Jimenez Ruiz
|
dbf5296041
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 09:56:12 +02:00 |
Carlos Jimenez Ruiz
|
70f6728c8f
|
started to created date changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-30 09:55:51 +02:00 |
Carlos Jimenez Ruiz
|
8797444553
|
importTicketSales refactor + tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 15:42:29 +02:00 |
Carlos Jimenez Ruiz
|
c1f457c263
|
allowContentTypes and removeFile refactors
|
2021-03-29 15:42:14 +02:00 |
Carlos Jimenez Ruiz
|
740cc79bc0
|
uploadFile refactor
|
2021-03-29 15:19:43 +02:00 |
Carlos Jimenez Ruiz
|
de2a17e840
|
removeFile and filter refactors
|
2021-03-29 15:18:49 +02:00 |
Carlos Jimenez Ruiz
|
8d8bdacd86
|
updateClaimAction refactor + tests
|
2021-03-29 15:18:14 +02:00 |
Carlos Jimenez Ruiz
|
3054cbcadb
|
updateClaim refactor + tests
|
2021-03-29 15:17:10 +02:00 |
Carlos Jimenez Ruiz
|
c4cbc064c9
|
regularice claim refactor + test
|
2021-03-29 15:15:58 +02:00 |
Carlos Jimenez Ruiz
|
ee79f23185
|
createFromSales refactor + tests
|
2021-03-29 15:14:23 +02:00 |
Joan Sanchez
|
eddd769af0
|
Excluded unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 08:39:33 +02:00 |
Joan Sanchez
|
3f0fe15763
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 07:50:34 +02:00 |
Joan Sanchez
|
dbb6ccd89d
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 07:50:16 +02:00 |
Joan Sanchez
|
13d71b590a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 07:33:49 +02:00 |
Joan Sanchez
|
407c0e6280
|
Supplier "Contacts" changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 07:33:20 +02:00 |
Joan Sanchez
|
320e3143cd
|
Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-26 12:51:14 +01:00 |
Joan Sanchez
|
4dbcc0dd5c
|
HOTFIX: Ticket filter changed ticketGetTotal() args
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-26 12:32:32 +01:00 |
Carlos Jimenez Ruiz
|
767665e3c9
|
endpoint indentation + type updated yo array of objects
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-26 10:39:19 +01:00 |
Carlos Jimenez Ruiz
|
f46c18b6b0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum
|
2021-03-26 10:33:58 +01:00 |
Carlos Jimenez Ruiz
|
3c8ed85e69
|
sum is now made on backend and html amends
|
2021-03-26 10:33:53 +01:00 |
Carlos Jimenez Ruiz
|
1cc4e60bad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-24 16:45:57 +01:00 |
Carlos Jimenez Ruiz
|
41bb4cbaab
|
deprecated vat and subTotal related methods + tests fixed
|
2021-03-24 16:43:54 +01:00 |
jorgebl
|
393b9ba38c
|
Correct name
|
2021-03-24 14:17:27 +01:00 |
jorgebl
|
81fbc81314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-24 13:54:41 +01:00 |
jorgebl
|
e01b7420d9
|
Added total cost of item
|
2021-03-24 13:54:29 +01:00 |
Joan Sanchez
|
e767e95729
|
Loggable fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-24 13:09:35 +01:00 |
Joan Sanchez
|
c65fbef3df
|
Merge branch 'dev' into 2819-notify_assignment
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-24 11:47:38 +00:00 |
Joan Sanchez
|
32805dbafb
|
Added model unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-24 12:45:26 +01:00 |
Joan Sanchez
|
0e9b3bd39a
|
Missing translation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-24 11:12:36 +01:00 |
Carlos Jimenez Ruiz
|
409f56ec7f
|
e2e path resurrected for route tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-23 17:19:05 +01:00 |
Joan Sanchez
|
b3d333368b
|
#2819 - Notify worker assignment
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-23 16:19:45 +01:00 |
Carlos Jimenez Ruiz
|
89d123c7f8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-23 13:19:30 +01:00 |
Carlos Jimenez Ruiz
|
a78a73486a
|
updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-23 13:19:11 +01:00 |
jorgebl
|
868a0dbff7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-23 09:43:34 +01:00 |
Carlos Jimenez Ruiz
|
84378fd607
|
tickets already in route are no longer shown + tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 16:13:12 +01:00 |
jorgebl
|
e96fd3d1f7
|
Changed message
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 16:11:52 +01:00 |
Carlos Jimenez Ruiz
|
0023a88bfc
|
restored the auto state to its previous version
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-22 11:32:57 +01:00 |
jorgebl
|
7e903f91a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 10:32:33 +01:00 |
Carlos Jimenez Ruiz
|
1e247e63a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
|
2021-03-22 10:32:07 +01:00 |
Joan Sanchez
|
eb12126603
|
Rollback test changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 10:27:07 +01:00 |
jorgebl
|
322a12e65c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
|
2021-03-22 10:24:01 +01:00 |
jorgebl
|
5f95bf4e15
|
Removed vn-horizontal and styles in the spans
|
2021-03-22 10:23:52 +01:00 |
Joan Sanchez
|
6da84e46c1
|
Added throw error
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 10:20:04 +01:00 |
jorgebl
|
b7b86cd719
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
|
2021-03-22 09:39:06 +01:00 |
Joan Sanchez
|
985bcc61b1
|
Rollback
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 09:11:02 +01:00 |
Joan Sanchez
|
59bf458ca5
|
Removed xdescribe
|
2021-03-22 09:10:45 +01:00 |
Joan Sanchez
|
29979d5367
|
Rollback
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 09:10:12 +01:00 |
Joan Sanchez
|
7ac4d67f97
|
Empty value not being logged in
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-22 09:08:27 +01:00 |
Joan Sanchez
|
6210e60896
|
2669 - Changes to the translate values function
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-19 19:20:19 +01:00 |
Carlos Jimenez Ruiz
|
674d5df96c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
|
2021-03-18 15:03:00 +01:00 |
jorgebl
|
18a9d0c786
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-18 13:48:37 +01:00 |
jorgebl
|
e12be7bf0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message
|
2021-03-18 13:40:56 +01:00 |
Carlos Jimenez Ruiz
|
af7f885d2b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
|
2021-03-16 14:36:14 +01:00 |
Carlos Jimenez Ruiz
|
117ea137c1
|
ticket index auto-state false for single results
|
2021-03-16 12:08:48 +01:00 |
Carlos Jimenez Ruiz
|
1d521fa9a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
|
2021-03-16 10:57:24 +01:00 |
jorgebl
|
684705e3ec
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
|
2021-03-16 08:44:09 +01:00 |
jorgebl
|
1fc53f5565
|
QA removed styles in the html and put the translate
|
2021-03-16 08:44:05 +01:00 |
Joan Sanchez
|
565162740a
|
Updated unit tests
|
2021-03-15 16:35:55 +01:00 |
Joan Sanchez
|
0ec6d273e6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-15 13:49:16 +01:00 |
Joan Sanchez
|
bd081f9fd6
|
2734 - Make invoice PDF refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-15 13:43:22 +01:00 |
Carlos Jimenez Ruiz
|
afb8df1429
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance
|
2021-03-15 11:32:57 +01:00 |
Carlos Jimenez Ruiz
|
fb418edc7b
|
backend modifications for route tickets
|
2021-03-15 11:32:17 +01:00 |
Joan Sanchez
|
92aa9eb933
|
Removed ticket total temporary table
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-15 06:52:15 +01:00 |
Joan Sanchez
|
c3bb099b85
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-03-15 06:50:42 +01:00 |
Joan Sanchez
|
6cb620a41d
|
Ticket filter fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-14 17:20:42 +01:00 |
Joan Sanchez
|
7b94cc2942
|
Ticket filter test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-14 17:12:31 +01:00 |
Carlos Jimenez Ruiz
|
2b8286eb28
|
deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 17:15:26 +01:00 |
jorgebl
|
d2879087ff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 12:41:06 +01:00 |
Carlos Jimenez Ruiz
|
7c34555afd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 12:30:55 +01:00 |
jorgebl
|
c74b635a1a
|
Translate and show url of item
|
2021-03-12 12:24:08 +01:00 |
jorgebl
|
fdecf6510f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 10:02:56 +01:00 |
Joan Sanchez
|
f92db8c5a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 08:52:07 +01:00 |
Joan Sanchez
|
4c7d95f001
|
Requested changes + e2e updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 08:45:41 +01:00 |
Joan Sanchez
|
be37334f49
|
Requested changes
|
2021-03-12 08:17:56 +01:00 |
Carlos Jimenez Ruiz
|
674b959bbc
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 15:14:08 +01:00 |
Carlos Jimenez Ruiz
|
05ee2ee2d3
|
ticket.sale front unit test fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 10:44:34 +01:00 |
Joan Sanchez
|
1ed4dd27d6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 08:59:02 +01:00 |
Joan Sanchez
|
1719f53111
|
2734 - Recreate invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 08:58:34 +01:00 |
Carlos Jimenez Ruiz
|
4c0d583556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT
|
2021-03-10 19:25:43 +01:00 |
Carlos Jimenez Ruiz
|
0cb7ddd9ce
|
ticket.total with and witout VAT refactor
|
2021-03-10 19:25:26 +01:00 |
Joan Sanchez
|
e29dd4db42
|
Updated it description
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 11:14:50 +01:00 |
Joan Sanchez
|
a0358044a1
|
Acl fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 11:11:04 +01:00 |
Joan Sanchez
|
a7c2e08f8f
|
ACl fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 11:04:56 +01:00 |
Joan Sanchez
|
b39ec70a2c
|
Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 09:54:14 +00:00 |
Joan Sanchez
|
c144d9ed47
|
Unit test changed query path
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 10:53:22 +01:00 |
Joan Sanchez
|
a4d2c531a3
|
Changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-10 10:29:58 +01:00 |
jorgebl
|
2f68509e65
|
WIP: added styles
|
2021-03-10 09:49:24 +01:00 |
jorgebl
|
45f9c1188d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
|
2021-03-10 09:48:17 +01:00 |
Joan Sanchez
|
2a2e276c6b
|
Added back unit test plus fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 09:01:32 +01:00 |
Joan Sanchez
|
ab755e29c7
|
Merge branch 'dev' into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 14:01:04 +00:00 |
Joan Sanchez
|
31205f4556
|
Added front unit test
|
2021-03-09 13:39:22 +01:00 |
Joan Sanchez
|
5cbd8d632d
|
Changes
|
2021-03-09 10:01:40 +01:00 |
Joan Sanchez
|
9da59949fd
|
Merge branch 'dev' into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 08:31:03 +00:00 |
jorgebl
|
59882cca77
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 09:26:02 +01:00 |
jorgebl
|
2d36d4e610
|
Added line break in vn-icon
|
2021-03-09 09:25:10 +01:00 |
Joan Sanchez
|
ff6c80aa7e
|
Merge branch 'dev' into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 08:24:10 +00:00 |
jorgebl
|
1922280c61
|
QA rename some descriptions in test and reworked the test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 17:49:04 +01:00 |
jorgebl
|
1379691576
|
Added icon for supplier descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:52:11 +01:00 |
jorgebl
|
43dc158d7c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:17:38 +01:00 |
jorgebl
|
5cb959f5b8
|
removed controller.data from submit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:12:13 +01:00 |
jorgebl
|
27816b29e7
|
Removed ids on controller.data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:06:35 +01:00 |
jorgebl
|
134365dd9c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 12:55:44 +01:00 |
jorgebl
|
d09e47835e
|
Rename the statements for correctly description the action
|
2021-03-08 12:40:13 +01:00 |
jorgebl
|
6e08a66343
|
Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical
|
2021-03-08 12:38:54 +01:00 |
jorgebl
|
32ea2dbda6
|
Added permisions from models in table salix ACL
|
2021-03-08 12:32:35 +01:00 |
Carlos Jimenez Ruiz
|
5c776c0f11
|
Merge branch 'dev' into 2703-ticket_step_one
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 09:48:38 +00:00 |
Joan Sanchez
|
2aff48c42d
|
2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 09:34:58 +01:00 |
jorgebl
|
192d7627b0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4
|
2021-03-08 09:12:34 +01:00 |
jorgebl
|
28b9da82ed
|
change conditional
|
2021-03-08 09:12:10 +01:00 |
Joan Sanchez
|
d7651ba4ac
|
2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 07:53:00 +01:00 |
jorgebl
|
1fd18cae5a
|
QA
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 11:40:01 +01:00 |
jorgebl
|
4ae418698b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component
|
2021-03-05 11:39:25 +01:00 |
Joan Sanchez
|
7ec9ddb6d9
|
Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 09:23:31 +01:00 |
jorgebl
|
b6bf61f410
|
description put correctly
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 09:09:09 +01:00 |
jorgebl
|
63ac492845
|
Added message for duplicated names
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 08:45:14 +01:00 |
jorgebl
|
4cc3fc90c5
|
conditionals if name already exists
|
2021-03-04 21:30:56 +01:00 |
jorgebl
|
5ebd70a8f0
|
Fixed error filter on itemBotanical when item hasn't specie and genus data + front test
|
2021-03-04 20:11:10 +01:00 |
jorgebl
|
12ad71d0fe
|
translate some words
|
2021-03-04 20:08:07 +01:00 |
jorgebl
|
300f78f31e
|
added permisions logistic boss
|
2021-03-04 20:07:45 +01:00 |
jorgebl
|
92db67292c
|
Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-04 07:56:31 +01:00 |
Joan Sanchez
|
0b532880c0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-04 07:54:15 +01:00 |
jorgebl
|
cdd903dedf
|
removed line break because the app interpretate it's a space
|
2021-03-03 15:09:01 +01:00 |
jorgebl
|
763eb412c0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component
|
2021-03-03 13:39:47 +01:00 |
jorgebl
|
56154181aa
|
QA done
|
2021-03-03 13:39:25 +01:00 |
Joan Sanchez
|
b22f58ae80
|
Issued filter fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-03 12:28:37 +01:00 |
Joan Sanchez
|
e50dcf467f
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-03 12:21:04 +01:00 |
jorgebl
|
2ba7e922e6
|
Put time in 00:00 when field "shipped" change
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-03 10:57:00 +01:00 |
Joan Sanchez
|
7c7aba86a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-03 09:36:55 +01:00 |
Joan Sanchez
|
e52f0eea92
|
Added front unit tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-03 07:44:09 +01:00 |
jorgebl
|
60ca3e87a5
|
Test git
|
2021-03-02 16:53:54 +01:00 |
jorgebl
|
3c82a4997b
|
Test gitea
|
2021-03-02 16:52:14 +01:00 |
Joan Sanchez
|
fed3657487
|
Export changes & backtest fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-02 14:59:02 +01:00 |
jorgebl
|
022d31c952
|
remove line break
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-02 14:43:55 +01:00 |
jorgebl
|
325a7e7235
|
Translate note
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-02 12:50:07 +01:00 |
jorgebl
|
d6c1f73cf6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component
|
2021-03-02 12:46:19 +01:00 |
jorgebl
|
a7973ba276
|
Resolved question PR
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-01 11:59:05 +01:00 |
jorgebl
|
69550dc380
|
Added number of rows that are going to be modificated
|
2021-03-01 11:54:02 +01:00 |
Joan Sanchez
|
718021cff8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
|
2021-03-01 11:49:31 +01:00 |
jorgebl
|
094552e0f2
|
Added ellipsize and align label
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-26 12:32:05 +01:00 |
jorgebl
|
3fcd5f9dbc
|
removed line break
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-26 11:40:46 +01:00 |
jorgebl
|
af8f4e88f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2786-get_tags_from_item
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-26 11:36:56 +01:00 |
jorgebl
|
f63baafe7d
|
get values from model item
|
2021-02-26 11:36:22 +01:00 |
jorgebl
|
0d7a41f862
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-25 15:52:18 +01:00 |
jorgebl
|
b9594f5238
|
Add descriptor popover
|
2021-02-25 15:51:51 +01:00 |
jorgebl
|
4cedd53bce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-25 11:02:51 +01:00 |
jorgebl
|
c55d65a7fd
|
QA refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-25 10:49:19 +01:00 |
jorgebl
|
218a506a4b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-25 09:54:21 +01:00 |
Joan Sanchez
|
89abf424fb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-25 08:17:26 +01:00 |
jorgebl
|
c9730929e8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 16:14:41 +01:00 |
jorgebl
|
1f1db53d41
|
Summary boss shown on descriptor
|
2021-02-24 16:12:44 +01:00 |
Joan Sanchez
|
c2a2204437
|
Regex change
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 16:04:09 +01:00 |
Joan Sanchez
|
ddb77a5c05
|
Regex change
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 15:55:09 +01:00 |
Joan Sanchez
|
d3879635a8
|
Regex changes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2021-02-24 15:54:02 +01:00 |
jorgebl
|
06dcb4b28c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
|
2021-02-24 14:54:23 +01:00 |
jorgebl
|
f1c481de64
|
QA refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 14:49:58 +01:00 |
Joan Sanchez
|
1c819e692e
|
Floramondo image download fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 14:37:49 +01:00 |
jorgebl
|
d551389d3a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 12:26:05 +01:00 |
jorgebl
|
df9ca2ad3e
|
Fixed filter description
|
2021-02-24 12:24:50 +01:00 |
jorgebl
|
3af50dfc80
|
QA refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 11:32:31 +01:00 |
Joan Sanchez
|
347ac77878
|
Changes to file names
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 09:59:41 +01:00 |
jorgebl
|
7895af8a54
|
Fixed test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 17:00:31 +01:00 |
jorgebl
|
e32914d990
|
Fixed error test
|
2021-02-23 16:27:18 +01:00 |
jorgebl
|
3eae322a6a
|
Added scope days and test
|
2021-02-23 16:09:29 +01:00 |
jorgebl
|
71eeaadb43
|
Removed focus on test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 14:54:07 +01:00 |
jorgebl
|
2e75bf376c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 11:53:07 +01:00 |
jorgebl
|
da20eac685
|
Putting propertie name for order and showing the 3 digits of type
|
2021-02-23 11:52:29 +01:00 |
jorgebl
|
799bb3a955
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 11:10:06 +01:00 |
jorgebl
|
9855bd14fe
|
Translate Boss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 11:08:57 +01:00 |
jorgebl
|
5e549b4d0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 10:42:19 +01:00 |
jorgebl
|
69f53972d5
|
Added filter for selection
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-22 16:43:40 +01:00 |
jorgebl
|
5ef48919ec
|
Added translate multiplier
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-22 13:41:31 +01:00 |
jorgebl
|
3c3dc861ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item
|
2021-02-22 13:37:43 +01:00 |
jorgebl
|
56424925e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-22 13:02:32 +01:00 |
jorgebl
|
77d8388c43
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-22 09:59:38 +01:00 |
jorgebl
|
5692b5f07e
|
Added conditional and test
|
2021-02-22 09:53:03 +01:00 |
jorgebl
|
8deb11d333
|
Added boss on basic data and summary
|
2021-02-19 17:45:45 +01:00 |
Joan Sanchez
|
ddb443ab8f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-18 13:17:34 +01:00 |
Joan Sanchez
|
8ddbcc24a7
|
Added priority to image download queue
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-18 13:03:49 +01:00 |
Jorge Padawan
|
3763b95f62
|
Added multiplier in sections and filter selection
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-17 15:38:57 +01:00 |
Jorge Padawan
|
aa29f546ae
|
put global bank entity model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-17 15:05:17 +01:00 |
Jorge Padawan
|
d5e53909c6
|
Fixed test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 13:32:09 +01:00 |
Jorge Padawan
|
29ca6c52af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 12:32:26 +01:00 |
Jorge Padawan
|
f10092d2cf
|
Added autocomplete on bank entity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 12:07:04 +01:00 |
Jorge Padawan
|
0732ff38b1
|
Quit clogs
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 11:04:46 +01:00 |
Jorge Padawan
|
b71b959b49
|
Formated sql and tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 11:01:50 +01:00 |
Jorge Padawan
|
aaf77677d1
|
Aligned title with column
gitea/salix/pipeline/head Build queued...
Details
|
2021-02-16 15:50:48 +01:00 |
Jorge Padawan
|
ac4a19841d
|
Added shrink for date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-16 15:40:20 +01:00 |
Jorge Padawan
|
2296727f8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-16 08:32:24 +01:00 |
Javi Gallego
|
7c0e690f8f
|
sin console
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-15 14:34:13 +01:00 |
Jorge Padawan
|
bf3391f7f2
|
added test of lastActiveTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-15 13:20:17 +01:00 |
Jorge Padawan
|
4e36fd118e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-15 10:45:46 +01:00 |
Javi Gallego
|
737f5a1c91
|
Merge branch 'dev' into refactor-loopback-context
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 18:11:50 +01:00 |
Jorge Padawan
|
366f241b3f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 17:04:10 +01:00 |
Jorge Padawan
|
4bcb948aff
|
Updated code for better read
|
2021-02-12 16:41:29 +01:00 |
Jorge Padawan
|
4b1d86c9b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-12 15:12:15 +01:00 |
Javi Gallego
|
a3d7fc9313
|
done
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 13:18:02 +01:00 |
Joan Sanchez
|
d7ad90d573
|
Updated caniuse
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 12:25:44 +01:00 |
Joan Sanchez
|
e7c1dc2210
|
Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 12:19:42 +01:00 |
Jorge Padawan
|
1512a34a73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:57:54 +01:00 |
Jorge Padawan
|
1ef2c2ff0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:48:00 +01:00 |
Jorge Padawan
|
dad3e7c155
|
Requested changes realized
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:27:24 +01:00 |
Jorge Padawan
|
2a2009b287
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-12 11:25:44 +01:00 |
Jorge Padawan
|
211ffb8f30
|
Delete supplierAccount from this branch
|
2021-02-12 09:50:23 +01:00 |
Jorge Padawan
|
433a0094c4
|
Fixed errors detected
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 09:11:43 +01:00 |
Jorge Padawan
|
eb3ac6de72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:48:58 +01:00 |
Jorge Padawan
|
53b06bc464
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:41:41 +01:00 |
Jorge Padawan
|
1634c81682
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:38:27 +01:00 |
Jorge Padawan
|
0c335b9705
|
Put bankEntity on global components, and fixed conflict updates
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:35:23 +01:00 |
Jorge Padawan
|
a1ca8d90c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-11 16:07:04 +01:00 |
Joan Sanchez
|
c270ec6207
|
Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-11 15:06:41 +01:00 |
Carlos Jimenez Ruiz
|
3374356d58
|
both created tickets are now discarded after tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 11:53:30 +01:00 |
Jorge Padawan
|
f146c6a279
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
|
2021-02-11 11:15:10 +01:00 |
Jorge Padawan
|
745d25f0c7
|
Showed filter on browser search bar
|
2021-02-11 11:14:52 +01:00 |
Jorge Padawan
|
31e5d3fd1e
|
Created test and optimized sql query
|
2021-02-11 08:32:16 +01:00 |
Jorge Padawan
|
bb02a0de6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-10 16:59:29 +01:00 |
Joan Sanchez
|
84c82ed32d
|
2595 - Added invoiceIn module
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-10 15:03:11 +01:00 |
Jorge Padawan
|
2cf37a9e96
|
Added permissions to role administrative
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-10 09:10:15 +01:00 |
Jorge Padawan
|
1c6bddbfb6
|
Added functionality to autocomplete the inputs
|
2021-02-10 08:47:58 +01:00 |
Joan Sanchez
|
dcad6dc8c8
|
Merge branch 'dev' into 2725-ticket-create-crear-shimpent
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-10 07:21:29 +00:00 |
Javi Gallego
|
f87ea1b051
|
arrow-spacing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-10 08:13:45 +01:00 |
Javi Gallego
|
3a3dae179c
|
done
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-10 07:58:11 +01:00 |
Carlos Jimenez Ruiz
|
8b97236f22
|
texfield no longer performs queries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-09 12:53:40 +01:00 |
Carlos Jimenez Ruiz
|
83ed70abda
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-09 10:43:26 +01:00 |
Carlos Jimenez Ruiz
|
3d948ef317
|
warning color added lines with clientType loses
|
2021-02-09 10:43:19 +01:00 |
Joan Sanchez
|
c092bf58b4
|
Import buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-09 07:59:55 +01:00 |
Carlos Jimenez Ruiz
|
a62bebd51e
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-08 10:14:41 +01:00 |
Jorge Padawan
|
1adaeca615
|
Added controller with sql
|
2021-02-08 08:41:26 +01:00 |
Joan Sanchez
|
411053bbec
|
Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-05 16:51:50 +00:00 |
Carlos Jimenez Ruiz
|
5ce8d8eb8c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2737-supplier_basic_data_worker
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2021-02-05 15:26:54 +01:00 |
Carlos Jimenez Ruiz
|
76d6e2d4b7
|
worker added to supplier basic data and summary
|
2021-02-05 15:26:49 +01:00 |
Jorge Padawan
|
c3109c142a
|
Line breaks have been put for better understanding
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-05 13:11:18 +01:00 |
Jorge Padawan
|
25de8904b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-05 13:04:52 +01:00 |
Jorge Padawan
|
8dc291798f
|
Added tooltip on address and removed workhouse
|
2021-02-05 13:04:32 +01:00 |
Joan Sanchez
|
3f4e102860
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-05 12:18:32 +01:00 |
Joan Sanchez
|
2c9fd45958
|
2778 - Allow edit order number
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-05 12:09:48 +01:00 |
Joan Sanchez
|
4fb466d8b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-05 08:41:30 +01:00 |
Joan Sanchez
|
3dd8ff5194
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-05 08:28:32 +01:00 |
Joan Sanchez
|
5bd7e4a67f
|
Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-05 08:05:57 +01:00 |
Joan Sanchez
|
f041e0d897
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-04 18:44:25 +01:00 |
Joan Sanchez
|
84cef1949b
|
Image size fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-04 18:28:58 +01:00 |
Carlos Jimenez Ruiz
|
f1704f94f1
|
invoiceOut advanced search by fiscal id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-04 13:43:21 +01:00 |
Carlos Jimenez Ruiz
|
a9b0a5c2bd
|
order fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-04 10:04:16 +01:00 |
Carlos Jimenez Ruiz
|
532cb582cf
|
columns moved and no refresh on stateState changes
|
2021-02-03 17:01:43 +01:00 |
Joan Sanchez
|
215e0c9fc4
|
Image download fix for images without extension
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 15:01:09 +01:00 |
Joan Sanchez
|
a845f53f0a
|
Bug fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 12:43:30 +01:00 |
Carlos Jimenez Ruiz
|
ff94b182a1
|
error is not a required field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 10:16:46 +01:00 |
Joan Sanchez
|
38311f526d
|
Calculate volume
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 09:03:03 +01:00 |
Carlos Jimenez Ruiz
|
dd9e9bac9b
|
removed unused character
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 14:02:57 +01:00 |
Carlos Jimenez Ruiz
|
a77c5c5b66
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
|
2021-02-02 14:02:30 +01:00 |
Carlos Jimenez Ruiz
|
a0d6e53dbb
|
polutd test removed
|
2021-02-02 14:00:35 +01:00 |
Jorge Padawan
|
186e59c7ae
|
.
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 13:18:17 +01:00 |
Jorge Padawan
|
b57578f933
|
Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 13:12:54 +01:00 |
Jorge Padawan
|
b576c0ad69
|
Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 13:11:17 +01:00 |
Jorge Padawan
|
1a87eb3085
|
Remove bad code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 12:52:24 +01:00 |
Jorge Padawan
|
218a19d7da
|
Removed bad code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 12:37:00 +01:00 |
Jorge Padawan
|
c7424997d5
|
Removed bad code
|
2021-02-02 12:22:18 +01:00 |
Jorge Padawan
|
ee6b694637
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 11:58:07 +01:00 |
Jorge Padawan
|
a1a3607d3c
|
Remove bad code
|
2021-02-02 11:57:42 +01:00 |
Jorge Padawan
|
6fed5a21b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 11:50:09 +01:00 |
Jorge Padawan
|
a2e78a8f25
|
Merge branch '2617-add_scope_days_on_travel_index' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
|
2021-02-02 11:49:53 +01:00 |
Jorge Padawan
|
60015178a6
|
Remove bad code
|
2021-02-02 11:49:42 +01:00 |
Joan Sanchez
|
f6af7f14af
|
Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #523
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-02-02 10:06:22 +00:00 |
Carlos Jimenez Ruiz
|
6a2c131593
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:59:59 +01:00 |
Jorge Padawan
|
f0f96f1ab5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:27:52 +01:00 |
Jorge Padawan
|
db5e786235
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:26:27 +01:00 |
Jorge Padawan
|
7b7571ae77
|
Fixed problems with default search
|
2021-02-02 10:26:10 +01:00 |
Jorge Padawan
|
9d96a4a6a1
|
Fixed problems test e2e
|
2021-02-02 10:17:13 +01:00 |
Joan Sanchez
|
dea858c314
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:12:37 +01:00 |
Joan Sanchez
|
524d1274c9
|
Merge branch 'dev' into 2762-worker_delete_entry
gitea/salix/pipeline/head Build queued...
Details
|
2021-02-02 09:11:48 +00:00 |
Joan Sanchez
|
a21d8acde6
|
2762 - Delete entry ass teamBoss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:07:13 +01:00 |
Joan Sanchez
|
3f4ebdebf6
|
Merge branch 'dev' into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 08:22:34 +00:00 |
Joan Sanchez
|
20116ac620
|
2741 - Claim detail deletion visual fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 09:08:11 +01:00 |
Jorge Padawan
|
94897a830a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
|
2021-02-02 08:48:03 +01:00 |
Jorge Padawan
|
e1db173185
|
Changed scope days value to a correct sentence
|
2021-02-01 13:29:12 +01:00 |
Jorge Padawan
|
6bba5ec126
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 13:21:16 +01:00 |
Jorge Padawan
|
3f963f2d99
|
changed message
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 13:19:26 +01:00 |
Jorge Padawan
|
4f644cb708
|
Changed name of value on scope days test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 13:13:18 +01:00 |
Jorge Padawan
|
811edc054b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
|
2021-02-01 13:09:47 +01:00 |
Joan Sanchez
|
4ac207c568
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 12:58:50 +01:00 |
Javi Gallego
|
a08c5c6ff7
|
error de ruta arreglado
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 10:51:17 +01:00 |
Carlos Jimenez Ruiz
|
17c784e06f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
|
2021-02-01 09:52:42 +01:00 |
Joan Sanchez
|
f5f4c5936d
|
2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 09:29:47 +01:00 |
Jorge Padawan
|
7408d22b66
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-01 09:05:06 +01:00 |
Jorge Padawan
|
9cf5d73be7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-29 16:15:26 +01:00 |
Jorge Padawan
|
b600c18950
|
Add scope days on travel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-29 11:45:35 +01:00 |
Joan Sanchez
|
f66a5ecfdc
|
2748 - Added module keybinds
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-29 09:46:57 +01:00 |
Carlos Jimenez Ruiz
|
c442eaa0c7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
|
2021-01-29 09:13:58 +01:00 |
Jorge Padawan
|
81f5192d08
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-29 08:55:17 +01:00 |
Carlos Jimenez Ruiz
|
5d82d469a7
|
Merge branch 'dev' into 2580-fetched_tags_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 16:04:37 +00:00 |
Jorge Padawan
|
69e8dfc334
|
Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
|
2021-01-28 16:10:23 +01:00 |
Joan Sanchez
|
7bcbf5303e
|
Fix where
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 16:08:57 +01:00 |
Joan Sanchez
|
9d5d2e9177
|
Added method prune again
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 15:57:33 +01:00 |
Carlos Jimenez Ruiz
|
4ab42e5850
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 15:10:54 +01:00 |
Carlos Jimenez Ruiz
|
5c466e1163
|
vn-fetched-tags visual refactor
|
2021-01-28 15:10:47 +01:00 |
Jorge Padawan
|
797f96f4c8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
|
2021-01-28 14:14:22 +01:00 |
Jorge Padawan
|
bef8fca529
|
Rework the test on main section
|
2021-01-28 14:14:14 +01:00 |
Joan Sanchez
|
ca47fe6827
|
2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 12:23:18 +01:00 |
Javi Gallego
|
4b302915b5
|
fallo validateasync
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-27 09:14:37 +01:00 |
Bernat Exposito
|
df073094f8
|
fix test updateVolume
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-26 09:07:00 +01:00 |
Joan Sanchez
|
8c71d76988
|
2752 - Import json file
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-26 07:21:05 +01:00 |
Javi Gallego
|
3026ca8d69
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 14:16:41 +01:00 |
Jorge Padawan
|
2b4f4cf8f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 11:04:45 +01:00 |
Jorge Padawan
|
6d9967ba9f
|
Add list of emails from client
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 10:59:24 +01:00 |
Carlos Jimenez Ruiz
|
3f12bfe8ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2745-ticket_descriptor_regenerate_invoice_e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 09:28:07 +01:00 |
Carlos Jimenez Ruiz
|
fb798f4300
|
regenerate invoice added to descriptor path
|
2021-01-25 09:28:01 +01:00 |
Javi Gallego
|
d61ab94398
|
acl conflicto
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 07:49:57 +01:00 |
Joan Sanchez
|
7bd89009cb
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 07:26:35 +01:00 |
Joan Sanchez
|
257b61d256
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 07:25:02 +01:00 |
Joan Sanchez
|
a6e4d68017
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 15:05:39 +00:00 |
Javi Gallego
|
16931693c7
|
slice error
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 15:46:03 +01:00 |
Javi Gallego
|
93417e9676
|
refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-22 14:45:02 +01:00 |
Javi Gallego
|
161514582d
|
movido de directorio
|
2021-01-22 14:41:40 +01:00 |
Javi Gallego
|
228a642634
|
Merge branch 'dev' into 2479-factura-ticket
|
2021-01-22 14:31:28 +01:00 |
Javi Gallego
|
7bdfb36f25
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 14:30:46 +01:00 |
Joan Sanchez
|
4d1c2ff8ee
|
Requested changed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 12:57:21 +01:00 |
Joan Sanchez
|
d26505d25e
|
Requested changed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 12:56:46 +01:00 |
Carlos Jimenez Ruiz
|
9a349e789c
|
added missin icon property to fixedPrice route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 12:15:03 +01:00 |
Carlos Jimenez Ruiz
|
293dbb3948
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component
|
2021-01-22 12:14:19 +01:00 |
Carlos Jimenez Ruiz
|
5ea222dc00
|
fixed translations
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 12:02:03 +01:00 |
Carlos Jimenez Ruiz
|
c3ac7b671f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 11:32:35 +01:00 |
Carlos Jimenez Ruiz
|
4bf6051e73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-01-22 10:19:39 +01:00 |
Joan Sanchez
|
ad7be8f9b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 07:27:51 +01:00 |
Joan Sanchez
|
1c7325c1c0
|
2739 - Invoice fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 07:26:29 +01:00 |
Bernat Exposito
|
b25ef7016a
|
cr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 18:42:40 +01:00 |
Javi Gallego
|
aab9797d3f
|
Merge branch 'dev' into 2479-factura-ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 13:40:55 +01:00 |
Javi Gallego
|
3dc50e8a16
|
test ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 13:39:40 +01:00 |
Carlos Jimenez Ruiz
|
0cf3f198ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 11:50:32 +01:00 |
Jorge Padawan
|
05d6484a33
|
Add message if BIC already exist
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 10:48:25 +01:00 |
Carlos Jimenez Ruiz
|
42e7fa7047
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 10:25:39 +01:00 |
Carlos Jimenez Ruiz
|
9fc14c70ae
|
bug fixed
|
2021-01-21 10:25:25 +01:00 |
Bernat Exposito
|
81c14a649b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 09:46:22 +01:00 |
Bernat Exposito
|
678ee0644d
|
delete order by in entry index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 09:45:18 +01:00 |
Joan Sanchez
|
5e4c320310
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 09:26:02 +01:00 |
Bernat Exposito
|
eda65c14c1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2717-order_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 08:48:24 +01:00 |
Carlos Jimenez Ruiz
|
17b7ffeec3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
|
2021-01-20 16:04:13 +01:00 |
Carlos Jimenez Ruiz
|
2f5eaf7318
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 14:51:37 +01:00 |
Jorge Padawan
|
e205ebba72
|
Added main spec and fixed line on search-panel spec
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 14:49:06 +01:00 |
Carlos Jimenez Ruiz
|
01191b3f0f
|
excluded faling tests for future fixing
|
2021-01-20 14:43:20 +01:00 |
Carlos Jimenez Ruiz
|
fcf60ac297
|
excluded failing test for future fixing
|
2021-01-20 14:40:32 +01:00 |
Carlos Jimenez Ruiz
|
fe04f00c28
|
fixed unit test for upsertFixedPrice
|
2021-01-20 14:39:23 +01:00 |
Jorge Padawan
|
d8c4fa1e22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 14:37:29 +01:00 |
Joan Sanchez
|
6451d9d511
|
Merge branch 'dev' into 2677-rating_component
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:03:33 +00:00 |
Joan Sanchez
|
5df35ea8e9
|
Removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 14:01:57 +01:00 |
Joan Sanchez
|
f125f7c80d
|
Changed weekly translation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:57:48 +01:00 |
Javi Gallego
|
4cdbb85e30
|
primer comit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:53:49 +01:00 |
Joan Sanchez
|
c9dc9495dc
|
2677 - Added rating component to order catalog
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:51:30 +01:00 |
Jorge Padawan
|
0183f956d7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:23:40 +01:00 |
Jorge Padawan
|
91979f5d69
|
Add scopeDays to search bar on route
|
2021-01-20 13:19:28 +01:00 |
Bernat Exposito
|
0f17fca0a1
|
pr order by changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 11:42:45 +01:00 |
Bernat Exposito
|
c1202789dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index
|
2021-01-20 11:31:06 +01:00 |
Bernat Exposito
|
a3d4f674c6
|
order index changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 11:28:15 +01:00 |
Carlos Jimenez Ruiz
|
843608c47f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-20 09:17:55 +01:00 |
Joan Sanchez
|
3a2db713e0
|
Removed unused $httpBackend
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 07:38:09 +01:00 |
Carlos Jimenez Ruiz
|
7ec1e4272a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
|
2021-01-19 20:56:40 +01:00 |
Carlos Jimenez Ruiz
|
f946e63a86
|
e2e path for item fixed price
|
2021-01-19 20:56:33 +01:00 |
Carlos Jimenez Ruiz
|
fc0f9730da
|
Merge branch 'dev' into 1823-catalog_no_refresh
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 14:13:38 +00:00 |
Joan Sanchez
|
bbfb230427
|
Removed clog
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 14:30:06 +01:00 |
Joan Sanchez
|
9935f7f4ee
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 14:27:58 +01:00 |
Joan Sanchez
|
6d35a4a160
|
1823 - Added independent order object from card
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 13:57:04 +01:00 |
Bernat Exposito
|
e9f408d5ba
|
delete comments
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 13:44:14 +01:00 |
Carlos Jimenez Ruiz
|
4f7c2f3afd
|
added placeholder and fixed css
|
2021-01-19 13:30:07 +01:00 |
Joan Sanchez
|
dfbf114161
|
Merge branch 'dev' into 2708-travel_extracommunity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-19 12:10:06 +00:00 |
Joan Sanchez
|
8c8891f8e3
|
Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-19 13:06:10 +01:00 |
Bernat Exposito
|
426249f9bf
|
entry index changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 12:50:11 +01:00 |
Carlos Jimenez Ruiz
|
e859a1b837
|
removed incorrect icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 11:14:43 +01:00 |
Javi Gallego
|
043a74b548
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 10:20:45 +01:00 |
Joan Sanchez
|
b99ac2c9d5
|
Merge branch 'dev' into 2678-Delete_description_on_travel_thermograph
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 08:51:38 +00:00 |
Javi Gallego
|
49b0bca721
|
refactor autocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 09:27:15 +01:00 |
Jorge Padawan
|
aea07832b1
|
Delete description from thermograph create
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 09:24:37 +01:00 |
Carlos Jimenez Ruiz
|
464366fdbe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
|
2021-01-18 17:17:02 +01:00 |
Carlos Jimenez Ruiz
|
52a1e3f652
|
fixed price controller tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 16:32:54 +01:00 |
Carlos Jimenez Ruiz
|
3ec641f733
|
filter unit tests
|
2021-01-18 15:42:38 +01:00 |
Joan Sanchez
|
d6ac9dba4c
|
Updated e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 14:53:15 +01:00 |
Joan Sanchez
|
895fd4c9e8
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 14:22:27 +01:00 |
Carlos Jimenez Ruiz
|
8d6dd3e03a
|
minor refactors
|
2021-01-18 14:17:01 +01:00 |
Carlos Jimenez Ruiz
|
3251d737e6
|
fixed price index implementation
|
2021-01-18 14:16:39 +01:00 |
Joan Sanchez
|
b142d5800e
|
Merge branch 'dev' into 2724-ticket_service_fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 11:24:11 +00:00 |
Jorge Benedito
|
622c43f4a0
|
Merge branch 'dev' into 2721-Add_column_stem_multiplier
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 10:53:49 +00:00 |
Jorge Padawan
|
97c8faaf50
|
Add column multiplier on item section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 11:43:48 +01:00 |
Joan Sanchez
|
239e64db48
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 09:08:50 +01:00 |
Joan Sanchez
|
783a8dee48
|
2724 - Fix: Create new service type
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-18 08:55:57 +01:00 |
Joan Sanchez
|
ddf5993277
|
2708 - Added report
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-18 08:33:20 +01:00 |
Bernat Exposito
|
7da3aad2de
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2602-entry_index_searchBar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 08:19:20 +01:00 |
Bernat Exposito
|
25535576c5
|
pr changes resolved
|
2021-01-18 08:19:17 +01:00 |
Jorge Padawan
|
fe6124b691
|
Put log in the section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-15 13:57:36 +01:00 |
Jorge Padawan
|
51627af395
|
Fixed open popup
|
2021-01-15 13:13:51 +01:00 |
Jorge Padawan
|
c5ace0a939
|
create the tests fields for create Account section
|
2021-01-15 11:24:32 +01:00 |
Jorge Padawan
|
daa8bafb09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-01-15 08:56:20 +01:00 |
Joan Sanchez
|
8fed9dacd7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-14 13:56:35 +01:00 |
Joan Sanchez
|
efb0d2f380
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-14 13:42:09 +01:00 |
Joan Sanchez
|
53e80d29c8
|
Consumption hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-14 13:41:50 +01:00 |
Bernat Exposito
|
a45a76018b
|
entry search panel changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-14 09:26:50 +01:00 |
Joan Sanchez
|
33289b3ac1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-13 11:18:02 +01:00 |
Joan Sanchez
|
5059abca80
|
Dms edit hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-13 10:40:51 +01:00 |
Joan Sanchez
|
7bcad01bef
|
Disabled loggable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 14:25:47 +01:00 |
Joan Sanchez
|
dd29b351d2
|
Disabled loggable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 14:25:01 +01:00 |
Jorge Padawan
|
6bc7602d53
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-01-12 11:10:05 +01:00 |
Jorge Padawan
|
4e1b9b911b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-01-12 11:05:35 +01:00 |
Jorge Padawan
|
1a4c631c70
|
Fix for good practique code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 11:00:42 +01:00 |
Jorge Padawan
|
b4899fc0ff
|
Fix for good practique code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 10:17:12 +01:00 |
Jorge Padawan
|
9ca2e677bd
|
Fix for good practique code
|
2021-01-12 10:15:33 +01:00 |
Jorge Padawan
|
509de4fa0a
|
Fix for good practique code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 10:11:37 +01:00 |
Jorge Padawan
|
809811ea10
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 07:40:10 +01:00 |
Jorge Padawan
|
f45aa7937d
|
Added conditionals with rols to display or not the icons with link
|
2021-01-12 07:39:12 +01:00 |
Javi Gallego
|
6acfe7f1cf
|
minorBugs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 17:18:37 +01:00 |
Javi Gallego
|
d3b5300553
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 16:30:14 +01:00 |
Joan Sanchez
|
7568a1c066
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 14:54:24 +01:00 |
Jorge Padawan
|
af55e2cc32
|
Add tooltip and modified sref for previews
|
2021-01-11 10:36:20 +01:00 |
Bernat Exposito
|
5f1cdc790a
|
Merge branch '2609-travel_index_addEntry' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 10:20:59 +01:00 |
Joan Sanchez
|
035bdfb1ad
|
Rounded box
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 10:08:33 +01:00 |
Bernat Exposito
|
0e0ce9f3e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
|
2021-01-11 09:44:20 +01:00 |
Joan Sanchez
|
ffdc753ad4
|
2691 - Added "or" between date ranges and scope days
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 08:48:53 +01:00 |
Javi Gallego
|
ea6e234cde
|
minor fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 08:01:57 +01:00 |
Jorge Padawan
|
b8827ec63d
|
Fix problems with ACL and the autocomplete of bank entity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-08 16:45:20 +01:00 |
Jorge Padawan
|
403964934d
|
Change order of iban and entity name
|
2021-01-08 16:01:13 +01:00 |
Jorge Padawan
|
5a30bf5fa4
|
2650 add links to edit on summaries
|
2021-01-08 15:43:33 +01:00 |
Javi Gallego
|
6c2138a69a
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-08 15:24:05 +01:00 |
Javi Gallego
|
a9ec319d4f
|
test
|
2021-01-08 15:22:41 +01:00 |
Joan Sanchez
|
f8ba2534cc
|
2691 - Scope days changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-08 14:32:48 +01:00 |
Jorge Padawan
|
5e201419f8
|
Second step, add component bankEntity
|
2021-01-08 10:46:50 +01:00 |
Joan Sanchez
|
1cc2710231
|
Fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-08 10:16:38 +01:00 |
Jorge Padawan
|
344840d2c9
|
First step add-button-edit-summaries
|
2021-01-08 08:43:28 +01:00 |
Jorge Padawan
|
31f18db72d
|
first step bankEntity
|
2021-01-07 15:14:50 +01:00 |
Jorge Padawan
|
6017894ba9
|
first step bankEntity
|
2021-01-07 15:14:38 +01:00 |
Joan Sanchez
|
88b2041fde
|
Changed order
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-07 14:33:42 +01:00 |
Joan Sanchez
|
7172d6bcd1
|
Merge branch 'dev' into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-07 13:32:37 +00:00 |
Joan Sanchez
|
56925be41f
|
2708 - Extra community changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-07 14:21:17 +01:00 |
Javi Gallego
|
c0cc91b6c3
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-07 09:11:34 +01:00 |
Joan Sanchez
|
c454273405
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-06 12:44:28 +01:00 |
Joan Sanchez
|
e5b13267e2
|
2605 - Ticket request send chat notification
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-05 15:03:35 +01:00 |
Joan Sanchez
|
94c8c115e5
|
Font hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-05 13:51:17 +01:00 |
Joan Sanchez
|
062e1514c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-01-04 13:50:55 +01:00 |
Javi Gallego
|
1291fc4b6c
|
acl
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-04 11:49:32 +01:00 |
Bernat Exposito
|
ccfeea8e74
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
|
2021-01-04 10:55:53 +01:00 |
Bernat Exposito
|
f0fb906670
|
add in travel index, entry create
|
2021-01-04 10:54:46 +01:00 |
Carlos Jimenez Ruiz
|
b843914cec
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation
|
2020-12-31 16:13:40 +01:00 |
Joan Sanchez
|
a521ad4262
|
Fixed claim basicData back error
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 14:18:06 +01:00 |
Carlos Jimenez Ruiz
|
fee454ca44
|
Merge branch 'dev' into 2696-geo_autocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 11:53:50 +00:00 |
Carlos Jimenez Ruiz
|
4e7d64e5ca
|
re-enabled working unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 11:17:42 +01:00 |
Carlos Jimenez Ruiz
|
0471855372
|
Merge branch 'dev' into 2696-geo_autocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 10:02:52 +00:00 |
Carlos Jimenez Ruiz
|
5dd7db23ec
|
submit should always be enabled for creation forms
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 10:39:37 +01:00 |
Joan Sanchez
|
6bbe33433d
|
2696 - Geo autocompletion fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 10:30:51 +01:00 |
Carlos Jimenez Ruiz
|
3b73e1bee2
|
supplier updateFiscalData changed to table config
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 10:28:35 +01:00 |
Carlos Jimenez Ruiz
|
4754d5481b
|
added street arg to updateFiscalData method
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 10:13:42 +01:00 |
Carlos Jimenez Ruiz
|
92d9435125
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries
|
2020-12-31 09:27:38 +01:00 |
Jorge Padawan
|
b403899072
|
modificated value of "order" on client and supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-30 15:39:27 +01:00 |
Carlos Jimenez Ruiz
|
e356dd9e5e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries
|
2020-12-30 14:55:14 +01:00 |
Jorge Padawan
|
f2742b88a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2689-add_id_in_typeTransaction_client_and_supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-30 10:49:58 +01:00 |
Jorge Padawan
|
c9ae5989f9
|
Add id on description of typeTransiction on client and supplier
|
2020-12-30 10:49:02 +01:00 |
Javi Gallego
|
0d5540b639
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 17:00:45 +01:00 |
Javi Gallego
|
3db3d65600
|
test
|
2020-12-29 17:00:22 +01:00 |
Joan Sanchez
|
c2d50c6044
|
Dup entry error handler
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 14:02:26 +01:00 |
Joan Sanchez
|
a3f17ae302
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries
|
2020-12-29 13:55:06 +01:00 |
Joan Sanchez
|
2886e02328
|
Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 08:50:12 +01:00 |
Joan Sanchez
|
f4ff31a294
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log
|
2020-12-29 08:09:49 +01:00 |
Joan Sanchez
|
f29840b37b
|
Buyer ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 07:52:36 +01:00 |
Carlos Jimenez Ruiz
|
4a60e1da1e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation
|
2020-12-28 15:36:35 +01:00 |
Joan Sanchez
|
910caf5689
|
2661 - Added clone options
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-28 14:53:26 +01:00 |
Jorge Padawan
|
5af51763d6
|
Created back test field for entryObservation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-28 12:55:28 +01:00 |
Carlos Jimenez Ruiz
|
e6106b1aa9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-24 11:31:27 +01:00 |
Carlos Jimenez Ruiz
|
8ede30398b
|
clone feature for routes index
|
2020-12-24 11:31:20 +01:00 |
Joan Sanchez
|
c192a0e125
|
Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-24 08:59:33 +00:00 |
Jorge Padawan
|
259842c22d
|
Retirado el parametro required por no utilizarse
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 13:32:58 +01:00 |
Joan Sanchez
|
87f9a39e50
|
Merge branch 'dev' into 2666-closure_invalid_email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:29:36 +00:00 |
Bernat Exposito
|
a21476e3df
|
fix searchbar index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:42:41 +01:00 |
Jorge Padawan
|
2948747da3
|
Seccion nueva, "Note" mas campo entryObservation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:25:12 +01:00 |
Juan Ferrer
|
d064bc0417
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 00:00:38 +01:00 |
Joan Sanchez
|
6416b0ad79
|
2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-22 14:56:21 +01:00 |
Javi Gallego
|
0c7ddd863d
|
xdiario test ok
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-22 10:08:11 +01:00 |
Javi Gallego
|
36bace2a94
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-22 07:42:28 +01:00 |
Carlos Jimenez Ruiz
|
be1a317df8
|
Merge branch 'dev' into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:02:05 +00:00 |
Joan Sanchez
|
35dc2a533b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:52:08 +01:00 |
Joan Sanchez
|
1419acb8a7
|
2663 - Drag & drop ticket to route index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:48:47 +01:00 |
Carlos Jimenez Ruiz
|
ec0ae8f07c
|
years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 13:52:37 +01:00 |
Carlos Jimenez Ruiz
|
482cbd7195
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 12:39:26 +01:00 |
Carlos Jimenez Ruiz
|
369a79b79f
|
route.tickets refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 12:37:36 +01:00 |
Carlos Jimenez Ruiz
|
ffc9b8dba9
|
Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #470
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-12-21 09:55:45 +00:00 |
Javi Gallego
|
340927799c
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 09:53:00 +01:00 |
Javi Gallego
|
3a6d62ac7d
|
xdiario
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 09:52:27 +01:00 |
Bernat Exposito
|
d4ab25f974
|
Merge pull request '2616-supplier_consumption' (#480) from 2616-supplier_consumption into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #480
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-21 07:08:12 +00:00 |
Bernat Exposito
|
1a641d1d4b
|
cr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 22:31:46 +01:00 |
Joan Sanchez
|
6717853efb
|
Updated front tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 18:02:41 +01:00 |
Joan Sanchez
|
d8a2184695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-18 17:24:30 +01:00 |
Joan Sanchez
|
42cd2356a2
|
Refactor v2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:23:04 +01:00 |
Jorge Padawan
|
2fe22efe36
|
filter vehicles by worehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 15:12:52 +01:00 |
Bernat Exposito
|
ac6d97c026
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 10:10:09 +01:00 |
Bernat Exposito
|
b9344832d6
|
cr changes
|
2020-12-18 10:08:51 +01:00 |
Jorge Benedito
|
29ec268113
|
Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
|
2020-12-18 08:34:00 +00:00 |
Javi Gallego
|
87adbbfa3c
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 08:21:36 +01:00 |
Jorge Padawan
|
33237dad86
|
Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 12:29:37 +01:00 |
Jorge Benedito Llopis
|
7b3128d646
|
Remove manager restriction to edit client credits
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 10:07:17 +01:00 |
Javi Gallego
|
9abf23072a
|
frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 16:25:19 +01:00 |
Carlos Jimenez Ruiz
|
9df29b8be3
|
supplier.billingData buttons css update
|
2020-12-16 15:44:35 +01:00 |
Carlos Jimenez Ruiz
|
c13e9383ba
|
css refactor + watcher from credit insurance
|
2020-12-16 13:46:04 +01:00 |
Carlos Jimenez Ruiz
|
ec7ad986ac
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 11:36:21 +01:00 |
Carlos Jimenez Ruiz
|
6261f10576
|
last account module refactors
|
2020-12-16 11:36:11 +01:00 |
Carlos Jimenez Ruiz
|
57a6df762a
|
zone module refactors
|
2020-12-16 11:22:13 +01:00 |
Carlos Jimenez Ruiz
|
2a63a3b0a4
|
account or user module refactors
|
2020-12-16 11:07:06 +01:00 |
Carlos Jimenez Ruiz
|
e9f73c3299
|
worker module refactors
|
2020-12-16 10:32:32 +01:00 |
Carlos Jimenez Ruiz
|
2e9267a25e
|
route module refactors
|
2020-12-16 10:21:35 +01:00 |
Carlos Jimenez Ruiz
|
0258c4a276
|
ticket module refactors
|
2020-12-16 10:21:20 +01:00 |
Javi Gallego
|
2bb9125eee
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 08:34:54 +01:00 |
Javi Gallego
|
963db11686
|
funcionalidad
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 08:33:08 +01:00 |
Bernat Exposito
|
e1ac64a8d9
|
supplier consumption
|
2020-12-16 08:05:41 +01:00 |
Carlos Jimenez Ruiz
|
116730a3b2
|
claim module refactors
|
2020-12-15 17:24:13 +01:00 |
Carlos Jimenez Ruiz
|
5295d3ed06
|
supplier module refactors
|
2020-12-15 17:09:05 +01:00 |
Carlos Jimenez Ruiz
|
975e5c3b00
|
travel module refactors
|
2020-12-15 17:05:15 +01:00 |
Carlos Jimenez Ruiz
|
b071bfd229
|
entry module refactors
|
2020-12-15 16:53:56 +01:00 |
Carlos Jimenez Ruiz
|
eb19bce1ba
|
client module refactors + dialog css
|
2020-12-15 16:51:36 +01:00 |
Carlos Jimenez Ruiz
|
6f29dabec4
|
order module refactor
|
2020-12-15 16:16:02 +01:00 |
Carlos Jimenez Ruiz
|
1ba83e7741
|
cancel button css + item module refactor
|
2020-12-15 16:07:34 +01:00 |
Jorge Benedito Llopis
|
8e11cef8eb
|
Code review refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-15 09:59:53 +01:00 |
Carlos Jimenez Ruiz
|
8e13fa7852
|
entry module refactors
|
2020-12-14 17:35:32 +01:00 |
Jorge Benedito Llopis
|
f62d3139bb
|
Supplier.billingData section
|
2020-12-14 16:09:17 +01:00 |
Carlos Jimenez Ruiz
|
3ad6534160
|
client module refactors
|
2020-12-13 14:57:42 +01:00 |
Carlos Jimenez Ruiz
|
c0289f87e9
|
order module refactors
|
2020-12-13 13:55:54 +01:00 |
Carlos Jimenez Ruiz
|
cbaa95ebda
|
item module refactors
|
2020-12-13 13:54:17 +01:00 |
Joan Sanchez
|
0a4016be41
|
Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-11 15:04:55 +01:00 |
Joan Sanchez
|
59c622481f
|
Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-10 13:21:11 +01:00 |
Joan Sanchez
|
260b502cd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-10 07:30:31 +01:00 |
Bernat Exposito
|
a1d8b3175e
|
ticket descriptor translate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-09 15:26:57 +01:00 |
Juan Ferrer
|
6f6f23bec4
|
LDAP user sync only syncs changed attributes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-09 12:28:18 +01:00 |
Bernat Exposito
|
96f603a44b
|
refactor descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-04 13:40:58 +01:00 |
Joan Sanchez
|
4f40075c2e
|
Merge branch 'dev' into 2657-zone_log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-03 11:16:18 +00:00 |
Bernat Exposito
|
aaee855da3
|
fix ticket component
gitea/salix/pipeline/head Build started...
Details
|
2020-12-03 10:26:49 +01:00 |
Bernat Exposito
|
6eeecc553b
|
zoneLog calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-02 12:49:50 +01:00 |
Bernat Exposito
|
6605e5ae4c
|
zoneLog
|
2020-12-02 12:05:47 +01:00 |
Juan Ferrer
|
b2a3adc96f
|
LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-30 18:50:04 +01:00 |
Juan Ferrer
|
61bb2f14ba
|
LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-30 18:45:50 +01:00 |
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
Bernat Exposito
|
06e7583f2b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-25 12:47:17 +01:00 |
Bernat Exposito
|
78f25e0b46
|
export production
|
2020-11-25 12:37:44 +01:00 |
Joan Sanchez
|
5ff364dcf0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2588-summaries_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-25 08:01:47 +01:00 |
Joan Sanchez
|
8eb14a8bdc
|
2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 14:56:10 +01:00 |
Joan Sanchez
|
561991f18c
|
2628 - Remove item name from search on tag removal
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 13:54:31 +01:00 |
Joan Sanchez
|
d9e14a0c3a
|
2629 - Open ticket lines on new window
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 12:10:02 +01:00 |
Joan Sanchez
|
b2794dc413
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 10:52:35 +01:00 |
Carlos Jimenez Ruiz
|
fbb2fc3bdd
|
Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #464
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-11-24 09:33:44 +00:00 |
Joan Sanchez
|
3329d33ec9
|
Merge branch 'dev' into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 09:27:14 +00:00 |
Bernat Exposito
|
6a7568eb29
|
Merge branch 'dev' into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 07:36:52 +00:00 |
Joan Sanchez
|
80bae4de0a
|
2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 08:22:54 +01:00 |
Carlos Jimenez Ruiz
|
4172d0bb9b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 18:51:16 +01:00 |
Carlos Jimenez Ruiz
|
1b46359574
|
removed focus on describe
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 18:42:11 +01:00 |
Joan Sanchez
|
52eb39ccda
|
Removed autoload from crud-model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 14:12:43 +01:00 |
Joan Sanchez
|
2469ce827e
|
Removed commented code
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 14:02:07 +01:00 |
Joan Sanchez
|
c654e14cfe
|
2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 13:41:51 +01:00 |
Bernat Exposito
|
37ac312bd5
|
pr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 13:05:24 +01:00 |
Bernat Exposito
|
b07ae3f60c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop
|
2020-11-23 13:04:38 +01:00 |
Bernat Exposito
|
82a7dd0f92
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2579-worker_time_control
|
2020-11-23 11:49:07 +01:00 |
Joan Sanchez
|
93ca804573
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 11:25:15 +01:00 |
Joan Sanchez
|
3acc943d85
|
2639 - Permisos para añadir greuge con rol claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 11:10:16 +01:00 |
Joan Sanchez
|
03158f04ae
|
Updated front unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 08:12:33 +01:00 |
Joan Sanchez
|
d40ea52560
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:06:34 +01:00 |
Joan Sanchez
|
7693a1c449
|
2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:05:57 +01:00 |
Bernat Exposito
|
4d91b26537
|
checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-20 13:35:01 +01:00 |
Bernat Exposito
|
4b40038200
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-20 12:12:11 +01:00 |
Bernat Exposito
|
f64a566447
|
route.ticket drag and drop validation
|
2020-11-20 12:12:06 +01:00 |
Carlos Jimenez Ruiz
|
0465a38684
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2590-client_descriptor_invoices
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-19 10:52:19 +01:00 |
Carlos Jimenez Ruiz
|
e8df57dae2
|
hasToInvoice gets enabled with isActive
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-19 10:51:28 +01:00 |
Bernat Exposito
|
8d60f3fa45
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2587-supplier_minor_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-19 09:17:58 +01:00 |
Carlos Jimenez Ruiz
|
fcca5c5eab
|
added a quick link to invoices
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 17:22:40 +01:00 |
Carlos Jimenez Ruiz
|
79ab228bca
|
ticket descriptor path updated
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 15:00:41 +01:00 |
Bernat Exposito
|
85b2c96ffd
|
cr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 14:44:07 +01:00 |
Bernat Exposito
|
fcd7217435
|
fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 12:10:37 +01:00 |
Bernat Exposito
|
781766a155
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2587-supplier_minor_changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-18 11:47:37 +01:00 |
Bernat Exposito
|
801fdb076b
|
supplier changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-18 11:47:23 +01:00 |
Joan Sanchez
|
9f5ba5bb85
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 10:44:00 +01:00 |
Joan Sanchez
|
ac5f30924a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 08:20:46 +01:00 |
Joan Sanchez
|
0fc01b2316
|
1419 - Claim update discount hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 08:16:37 +01:00 |
Carlos Jimenez Ruiz
|
7dc8ae9dbc
|
e2e path for travel descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-17 16:52:19 +01:00 |
Carlos Jimenez Ruiz
|
a7c830d87a
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-17 15:54:45 +01:00 |
Carlos Jimenez Ruiz
|
cb88265471
|
removed commented code
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-17 11:04:17 +01:00 |
Carlos Jimenez Ruiz
|
dc7a6d4ce1
|
dot menu along with clone option
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 19:04:37 +01:00 |
Joan Sanchez
|
8a3f5345f4
|
Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 13:54:47 +00:00 |
Carlos Jimenez Ruiz
|
c0b2ef9666
|
travel descriptor quicklinks
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 14:50:03 +01:00 |
Carlos Jimenez Ruiz
|
55a1ae0348
|
added entry descriptor to item last entries
|
2020-11-16 14:43:35 +01:00 |
Joan Sanchez
|
f4e9fc83ec
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-16 10:48:16 +01:00 |
Juan Ferrer
|
235f0980a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 15:03:48 +01:00 |
Juan Ferrer
|
dde89e3b9f
|
Merge branch 'test' into dev
|
2020-11-13 13:50:15 +01:00 |
Carlos Jimenez Ruiz
|
1e35e199f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2604-travel_index_colors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 13:22:09 +01:00 |
Juan Ferrer
|
6e5eac1f78
|
Account synchronization fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 13:20:37 +01:00 |
Carlos Jimenez Ruiz
|
8373c6f5d1
|
filter by selection + unit tests for travel index
|
2020-11-13 13:04:22 +01:00 |
Juan Ferrer
|
80cbb53dfe
|
Merge branch 'test' into dev
|
2020-11-13 10:49:59 +01:00 |
Juan Ferrer
|
c20abad1ba
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2020-11-13 10:33:38 +01:00 |
Juan Ferrer
|
cdf6cb661f
|
Login sync fixes
|
2020-11-13 10:33:34 +01:00 |
Joan Sanchez
|
031051abcb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-13 09:33:24 +01:00 |
Bernat Exposito
|
6fc14d569c
|
Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 08:32:39 +00:00 |
Joan Sanchez
|
4acdfd6d4e
|
Th refactor
|
2020-11-13 09:30:40 +01:00 |
Joan Sanchez
|
0edd6071c8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 07:43:02 +01:00 |
Joan Sanchez
|
2680ad2c07
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 07:39:24 +01:00 |
Joan Sanchez
|
d174d7b15b
|
Contextmenu filter hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 07:38:18 +01:00 |
Joan Sanchez
|
cb8e9655af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 07:22:12 +01:00 |
Juan Ferrer
|
2a30f93e00
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 23:20:33 +01:00 |
Juan Ferrer
|
4b46b0787b
|
User syncronization fixes, improvements, refactor
|
2020-11-12 23:20:25 +01:00 |
Carlos Jimenez Ruiz
|
7f899cc4e9
|
index navigation through anchors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 16:03:23 +01:00 |
Joan Sanchez
|
785453fab3
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 15:01:11 +01:00 |
Carlos Jimenez Ruiz
|
b9e3db61db
|
ticket advanced search grouped state translations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 13:33:33 +01:00 |
Joan Sanchez
|
23e8d64678
|
Contextmenu hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 13:18:31 +01:00 |
Carlos Jimenez Ruiz
|
a62698330a
|
small refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 09:45:41 +01:00 |
Bernat Exposito
|
2454999938
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-12 08:14:55 +01:00 |
Carlos Jimenez Ruiz
|
95a62f66ad
|
2548 item diary columns width
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 16:58:56 +01:00 |
Carlos Jimenez Ruiz
|
9a8a32ee9b
|
denied & accepted no longer show deny icon
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 16:08:27 +01:00 |
Carlos Jimenez Ruiz
|
ba86693891
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 15:14:05 +01:00 |
Carlos Jimenez Ruiz
|
6cd1332a18
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 14:45:22 +01:00 |
Joan Sanchez
|
b6f29d205c
|
Merge branch 'dev' into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 13:06:14 +00:00 |
Bernat Exposito
|
eb8931bca5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 13:57:37 +01:00 |
Joan Sanchez
|
378982389a
|
Requested chagnes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 13:44:42 +01:00 |
Carlos Jimenez Ruiz
|
74e4a4e42a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:45:58 +01:00 |
Carlos Jimenez Ruiz
|
3a0ff3be38
|
summary title amended + clientDescriptor for alias
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:45:45 +01:00 |
Joan Sanchez
|
db4f226f6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:39:15 +01:00 |
Joan Sanchez
|
75ff7c297f
|
Removed max width
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:37:59 +01:00 |
Joan Sanchez
|
024fda0f65
|
2591 - Data checked icon
|
2020-11-11 12:37:45 +01:00 |
Joan Sanchez
|
a0d50410aa
|
Added section
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:34:07 +01:00 |
Carlos Jimenez Ruiz
|
5d70794326
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:02:49 +01:00 |
Carlos Jimenez Ruiz
|
c2f92cb127
|
small refactor
|
2020-11-11 12:02:40 +01:00 |
Bernat Exposito
|
1e95f0105a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-11 10:52:46 +01:00 |
Joan Sanchez
|
9d5765724b
|
Removed max width
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 09:17:34 +01:00 |
Joan Sanchez
|
5a08798b22
|
2591 - Data checked icon
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 09:11:11 +01:00 |
Joan Sanchez
|
d959dbc058
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 07:34:34 +01:00 |
Carlos Jimenez Ruiz
|
e22e74a725
|
expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 16:47:39 +01:00 |
Joan Sanchez
|
53566be56a
|
Merge branch 'dev' into 2584-client_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 14:03:38 +00:00 |
Carlos Jimenez Ruiz
|
45a2a2d8e6
|
Merge branch 'dev' into 2584-client_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 13:30:38 +00:00 |
Joan Sanchez
|
dfbe1a02d2
|
Removed unused import
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 14:06:41 +01:00 |
Joan Sanchez
|
08af948eb0
|
Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 12:39:17 +00:00 |
Bernat Exposito
|
44d3cf748b
|
change id in ticketLastState model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 11:44:41 +01:00 |
Joan Sanchez
|
a93d9f91cc
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 10:38:25 +01:00 |
Carlos Jimenez Ruiz
|
282adfa7b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-09 16:06:29 +01:00 |
Carlos Jimenez Ruiz
|
54d31f15bb
|
fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-09 14:53:26 +01:00 |
Joan Sanchez
|
637116b17d
|
Added descriptor-menu component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-09 14:52:25 +01:00 |
Juan Ferrer
|
58563edbab
|
Focus fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-07 21:05:14 +01:00 |
Juan Ferrer
|
0e2c6ed79a
|
Account focus fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-07 14:05:48 +01:00 |
Juan Ferrer
|
2628faa9d0
|
Sync hotfixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-06 22:55:47 +01:00 |
Joan Sanchez
|
bcd5e6ea76
|
2584 - Client consumption fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-06 08:21:25 +01:00 |
Carlos Jimenez Ruiz
|
a4ad852390
|
translations refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 13:59:24 +01:00 |
Bernat Exposito
|
8765a18bbb
|
fix supplier routes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 11:46:15 +01:00 |
Bernat Exposito
|
0e3d636845
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2544-supplier_basicData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 10:50:21 +01:00 |
Joan Sanchez
|
a30cfd2218
|
Added unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 09:21:20 +01:00 |
Joan Sanchez
|
4c88a46b63
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor
|
2020-11-05 09:12:25 +01:00 |
Carlos Jimenez Ruiz
|
cd04ad8518
|
Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 15:21:23 +01:00 |
Carlos Jimenez Ruiz
|
c826c1ccc1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-04 15:19:07 +01:00 |
Joan Sanchez
|
b65f48f0d9
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 14:35:27 +01:00 |
Joan Sanchez
|
2a0d2f4394
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor
|
2020-11-04 14:34:59 +01:00 |
Joan Sanchez
|
c5421ee543
|
Merge branch 'dev' into 2534-sage_taxDataChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 12:39:30 +00:00 |
Joan Sanchez
|
0570d83a6d
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 13:38:09 +01:00 |
Joan Sanchez
|
16b774d585
|
Catalog tag selection
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-04 13:19:43 +01:00 |
Joan Sanchez
|
2b6048ca4d
|
Removed comment block
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 12:45:02 +01:00 |
Carlos Jimenez Ruiz
|
d933568745
|
Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-04 11:49:11 +01:00 |
Joan Sanchez
|
fd05455027
|
Postcode auto-fill fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 11:37:54 +01:00 |
Joan Sanchez
|
a325ef2a78
|
2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-04 11:29:10 +01:00 |
Carlos Jimenez Ruiz
|
d533e9da2e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-03 09:22:07 +01:00 |
Juan Ferrer
|
fc957eda6c
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:45 +01:00 |
Juan Ferrer
|
b3ab1fe059
|
Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:07 +01:00 |
Joan Sanchez
|
413283288f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 15:38:23 +01:00 |
Joan Sanchez
|
15b7280222
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 14:31:39 +01:00 |
Joan Sanchez
|
590de622f5
|
Added model validations
|
2020-11-02 14:30:33 +01:00 |
Carlos Jimenez Ruiz
|
7ac1807495
|
removed focus from html template
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 14:04:11 +01:00 |
Carlos Jimenez Ruiz
|
ffaf93ab83
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-11-02 11:14:20 +01:00 |
Juan Ferrer
|
b6da896fe7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-02 10:11:34 +01:00 |
Carlos Jimenez Ruiz
|
117270e3fc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-11-02 09:19:23 +01:00 |
Joan Sanchez
|
61e63cdd48
|
Updated unit tests
|
2020-11-02 08:53:28 +01:00 |
Joan Sanchez
|
565bd013bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 08:32:46 +01:00 |
Joan Sanchez
|
9e3186c0df
|
Updated unit tests
|
2020-11-02 08:16:42 +01:00 |
Juan Ferrer
|
e25a978b19
|
Merge branch 'test' into dev
|
2020-11-01 00:03:05 +01:00 |
Juan Ferrer
|
414c0931eb
|
Sync management UI
|
2020-10-31 22:56:02 +01:00 |
Juan Ferrer
|
9b4f8697b9
|
User sync fixes
|
2020-10-31 21:16:58 +01:00 |
Bernat Exposito
|
c1125916f6
|
supplier basicData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 11:22:56 +01:00 |
Juan Ferrer
|
937d5beefe
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 03:13:17 +01:00 |
Juan Ferrer
|
f39fa33b83
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 02:53:48 +01:00 |
Juan Ferrer
|
7763bcc1ef
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 02:34:59 +01:00 |
Juan Ferrer
|
fdf6df4ca8
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 02:31:42 +01:00 |
Juan Ferrer
|
1354d4647d
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 02:26:17 +01:00 |
Juan Ferrer
|
ae94d7db02
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 02:20:43 +01:00 |
Juan Ferrer
|
ba5a03c980
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 01:56:19 +01:00 |
Juan Ferrer
|
76ee8e6f38
|
User sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 00:40:54 +01:00 |
Juan Ferrer
|
9b563cb8bf
|
LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 00:02:27 +01:00 |
Javi Gallego
|
a472ce9a81
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 17:24:20 +01:00 |
Javi Gallego
|
b50ae7b8ca
|
testback arreglados
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 15:50:59 +01:00 |
Joan Sanchez
|
245b32a47f
|
Added section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-30 15:11:45 +01:00 |
Bernat Exposito
|
89c9a1e858
|
add title in notes.contact
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 13:26:56 +01:00 |
Bernat Exposito
|
18ebbe80d7
|
supplier contact
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 11:40:12 +01:00 |
Javi Gallego
|
71fe677a7e
|
fix getSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 10:50:13 +01:00 |
Carlos Jimenez Ruiz
|
28ec55b440
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 10:46:05 +01:00 |
Carlos Jimenez Ruiz
|
2f6b3f0c38
|
small refactors for #2512
|
2020-10-30 10:45:55 +01:00 |
Javi Gallego
|
59cbe276f4
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 10:08:38 +01:00 |
Javi Gallego
|
31b5a140d4
|
test completados
|
2020-10-30 10:07:53 +01:00 |
Javi Gallego
|
3fdc9c315d
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:40:47 +01:00 |
Bernat Exposito
|
ea8d9e70b0
|
supplier log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:27:02 +01:00 |
Bernat Exposito
|
e75c275409
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log
|
2020-10-30 08:24:13 +01:00 |
Joan Sanchez
|
ea6fc0fb04
|
Card fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 07:23:21 +01:00 |
Carlos Jimenez Ruiz
|
25684ec521
|
small refactor timeControl index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-29 13:46:36 +01:00 |
Bernat Exposito
|
792b689b58
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log
|
2020-10-29 13:40:21 +01:00 |
Bernat Exposito Domenech
|
ea03d06a62
|
Merge branch '2522-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2522-ticket_component
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-29 11:46:57 +01:00 |
Bernat Exposito Domenech
|
551feed16f
|
fix translate
|
2020-10-29 11:46:37 +01:00 |
Bernat Exposito
|
361af260a5
|
Merge branch 'dev' into 2522-ticket_component
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-29 10:11:24 +00:00 |
Bernat Exposito Domenech
|
42d16d0258
|
ticket component refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-29 11:09:58 +01:00 |
Bernat Exposito Domenech
|
403d4b9118
|
cr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-29 08:17:06 +01:00 |
Bernat Exposito Domenech
|
a4bf680ca5
|
Merge branch '2502-supplier_summary' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-29 08:07:58 +01:00 |
Bernat Exposito Domenech
|
a5e6f99b1f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-29 08:06:50 +01:00 |
Bernat Exposito Domenech
|
8d32f93512
|
cr changes
|
2020-10-29 07:44:04 +01:00 |
Joan Sanchez
|
146b4f5bcd
|
2534 - Fill sage data before enable taxDataChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 14:12:57 +01:00 |
Carlos Jimenez Ruiz
|
a4c57d7618
|
e2e path for supplier summary and descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 12:29:50 +01:00 |
Carlos Jimenez Ruiz
|
687d9618cb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-28 12:16:18 +01:00 |
Joan Sanchez
|
109fcb3ca4
|
2532 - Added icon taxDataChecked on ticket index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 09:57:39 +01:00 |
Carlos Jimenez Ruiz
|
8dba3fbb93
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-28 09:54:26 +01:00 |
Bernat Exposito Domenech
|
77bc1b562e
|
create section supplier log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 09:08:27 +01:00 |
Joan Sanchez
|
4a8eadfc6a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2511-claim_claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 14:43:05 +01:00 |
Joan Sanchez
|
343358c231
|
Updated translations
|
2020-10-27 14:42:43 +01:00 |
Joan Sanchez
|
770b6a30bb
|
Added unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 14:35:04 +01:00 |
Joan Sanchez
|
7f63213de0
|
Merge branch 'dev' into 2540-entry_descriptorPopover
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 13:22:41 +00:00 |
Joan Sanchez
|
e3145944a4
|
Merge pull request 'link zone in ticket summary' (#427) from 2513_ticket-summary into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #427
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-10-27 13:22:14 +00:00 |
Bernat Exposito Domenech
|
665d46dec3
|
fix translate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 12:44:46 +01:00 |
Joan Sanchez
|
3d86e59890
|
#2540 - Added entry descriptor popover to referenced places
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 12:02:49 +01:00 |
Bernat Exposito Domenech
|
15a906af24
|
link zone in ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 08:45:34 +01:00 |
Joan Sanchez
|
3675f7ed34
|
2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 12:16:57 +01:00 |
Bernat Exposito Domenech
|
1699e0619c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 08:43:20 +01:00 |
Bernat Exposito Domenech
|
d06d935c70
|
fix client fiscal data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 08:43:08 +01:00 |
Bernat Exposito Domenech
|
58168e78ab
|
test, translate and supplier searpanel, summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-26 08:38:43 +01:00 |
Joan Sanchez
|
5ba439d9bf
|
2524 - Added search by socialName
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 08:13:13 +01:00 |
Carlos Jimenez Ruiz
|
a797a2db8b
|
fixed the absences unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-23 13:34:57 +02:00 |
Joan Sanchez
|
3779a7c7a5
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-10-22 13:00:48 +02:00 |
Bernat Exposito Domenech
|
e3757e9191
|
changes supplier models
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-22 13:00:11 +02:00 |
Joan Sanchez
|
f87a7664e5
|
Added loggable utils
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-22 11:24:53 +02:00 |
Bernat Exposito Domenech
|
fe2f12cd8f
|
first test step
|
2020-10-22 09:35:11 +02:00 |
Joan Sanchez
|
0466d50c00
|
2518 - Item tag search
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-22 07:50:01 +02:00 |
Joan Sanchez
|
fc9b9eb718
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-22 07:49:04 +02:00 |
Joan Sanchez
|
d3532608e1
|
Changed oldValue
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 14:05:14 +02:00 |
Joan Sanchez
|
628154b7e8
|
Trigger jenkins
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 13:40:54 +02:00 |
Joan Sanchez
|
c87783b446
|
2528 - Rocket notifications hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 13:25:52 +02:00 |
Javi Gallego
|
7dfe7ee379
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-21 12:35:09 +02:00 |
Joan Sanchez
|
5daee49382
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 11:52:02 +02:00 |
Carlos Jimenez Ruiz
|
1b4015a4dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 10:46:38 +02:00 |
Joan Sanchez
|
3c37f0e993
|
Merge branch 'dev' into 2428-anchor_directive
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 08:32:31 +00:00 |
Javi Gallego
|
ef7a886d86
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 10:13:04 +02:00 |
Carlos Jimenez Ruiz
|
e989ef6a06
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData
|
2020-10-21 09:06:52 +02:00 |
Bernat Exposito Domenech
|
0f6e1eae24
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-21 08:22:51 +02:00 |
Joan Sanchez
|
3730bf86cc
|
Updated destinatary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 16:05:05 +02:00 |
Joan Sanchez
|
86d3e2d689
|
Changed message destinatary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 16:03:07 +02:00 |
Joan Sanchez
|
611e1a3802
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 15:13:12 +02:00 |
Joan Sanchez
|
f7e9372bf0
|
2525 - Change to past date
|
2020-10-20 15:12:00 +02:00 |
Joan Sanchez
|
ffcb3629c5
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 15:01:02 +02:00 |
Joan Sanchez
|
7d0790684b
|
2525 - Change to past date
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:54:23 +02:00 |
Javi Gallego
|
4aea284703
|
WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:42:23 +02:00 |
Bernat Exposito Domenech
|
7eed2ddd59
|
export structure and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 12:47:37 +02:00 |
Joan Sanchez
|
12bf0e6df7
|
Credit insurance hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 11:44:14 +02:00 |
Joan Sanchez
|
0acb1e649d
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 10:46:04 +02:00 |
Joan Sanchez
|
d68aacc78a
|
2525 - Ticket basic data validate zone
|
2020-10-20 10:46:03 +02:00 |
Joan Sanchez
|
ef42e95cef
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 10:29:16 +02:00 |
Joan Sanchez
|
c61c25fb91
|
2525 - Ticket basic data validate zone
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-20 10:19:12 +02:00 |
Bernat Exposito Domenech
|
256206ace4
|
supplier summary dscriptor and card
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-20 09:44:44 +02:00 |
Carlos Jimenez Ruiz
|
133a4cc907
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData
|
2020-10-20 09:20:27 +02:00 |
Joan Sanchez
|
5f93848afd
|
Added unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 07:43:36 +02:00 |
Carlos Jimenez Ruiz
|
a61a6e7c6a
|
e2e path updated + test fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-19 20:49:38 +02:00 |
Joan Sanchez
|
011bba1660
|
Added vn-anchor to client and ticket index
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-19 09:05:38 +02:00 |
Carlos Jimenez Ruiz
|
cc99c1e980
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation
|
2020-10-16 13:04:58 +02:00 |
Carlos Jimenez Ruiz
|
b96007aa62
|
fixed login/out problems at random + others
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-16 11:16:24 +02:00 |
Joan Sanchez
|
6412f29685
|
2428 - Added anchor directive
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-16 10:40:45 +02:00 |
Carlos Jimenez Ruiz
|
c622175192
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 18:57:33 +02:00 |
Carlos Jimenez Ruiz
|
dd6035606f
|
some more tests fixed + refactors
|
2020-10-15 18:57:27 +02:00 |
Joan Sanchez
|
334891cfe9
|
2497 - Groupped lines
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 14:40:41 +02:00 |
Joan Sanchez
|
39ea51764b
|
Some fixes made
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 13:59:28 +02:00 |
Joan Sanchez
|
ca7601a9f2
|
2433 - Added sage fields
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 11:53:01 +02:00 |
Bernat Exposito
|
0fbbe9b2ae
|
Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-10-15 07:57:57 +00:00 |
Bernat Exposito Domenech
|
a5b8df2121
|
fix translate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 09:41:36 +02:00 |
Bernat Exposito Domenech
|
cc35998f62
|
new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 08:15:04 +02:00 |
Joan Sanchez
|
9c962cb0b4
|
Merge branch 'dev' into 2509-add_geolocation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 09:35:42 +00:00 |
Joan Sanchez
|
6fa8aae161
|
2509 - Added forms to create new locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 11:33:42 +02:00 |
Carlos Jimenez Ruiz
|
64b65d204a
|
excluded confirm with no easy fix for pollution
|
2020-10-14 11:16:23 +02:00 |
Carlos Jimenez Ruiz
|
30d00d0f63
|
fix getWasteDetail test
|
2020-10-14 10:53:20 +02:00 |
Joan Sanchez
|
2e3402b0cd
|
Updated method description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 07:18:39 +02:00 |
Carlos Jimenez Ruiz
|
2045e35170
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2473-restore_ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 15:41:04 +02:00 |
Carlos Jimenez Ruiz
|
984a91d544
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
|
2020-10-13 11:04:23 +02:00 |
Carlos Jimenez Ruiz
|
c04b7a0657
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 10:31:06 +02:00 |
Joan Sanchez
|
bcf566ce28
|
Merge branch 'dev' into 2499-sale_quantity_zero
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 08:11:56 +00:00 |
Joan Sanchez
|
f59bb07aaf
|
Merge pull request 'route ticket fixes' (#407) from 2452-route_tickets into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #407
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-10-13 08:11:01 +00:00 |
Joan Sanchez
|
7538b1c941
|
Merge branch 'dev' into 1447-updateClaim_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 06:56:23 +00:00 |
Bernat Exposito Domenech
|
8a58017597
|
fix route/ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 08:50:47 +02:00 |
Joan Sanchez
|
3f8a675785
|
2499 - Allow zero quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 08:42:13 +02:00 |
Bernat Exposito Domenech
|
6e081df4e8
|
fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 08:17:00 +02:00 |
Carlos Jimenez Ruiz
|
b6b84cfea7
|
more tests fixed + small refactors
|
2020-10-08 16:00:19 +02:00 |
Joan Sanchez
|
498841b274
|
Added unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-08 14:22:55 +02:00 |
Joan Sanchez
|
355f95ae40
|
2473 - Added ticket restore option
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-08 13:42:20 +02:00 |
Joan Sanchez
|
eceb33cce0
|
2473 - Added restore method
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-07 11:00:26 +02:00 |
Bernat Exposito Domenech
|
e5557be3dc
|
route ticket fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-07 10:52:28 +02:00 |
Carlos Jimenez Ruiz
|
641eb93282
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
|
2020-10-06 14:50:23 +02:00 |
Bernat Exposito Domenech
|
fcebbb68b6
|
delete comments
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 14:46:58 +02:00 |
Joan Sanchez
|
a29d92718a
|
Updated description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 14:37:03 +02:00 |
Joan Sanchez
|
254c391138
|
Removed test exclusion
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 14:32:24 +02:00 |
Bernat Exposito Domenech
|
3d39467613
|
refactor updateclaim
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 14:23:35 +02:00 |