 Joan Sanchez
|
2dbde24a99
|
Requested changes
gitea/salix/2130-ticket_sms This commit looks good
Details
|
2020-02-21 09:00:13 +01:00 |
 Javi Gallego
|
4d389176fe
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2020-02-21 08:50:50 +01:00 |
|
Joan Sanchez
|
bf4e0d09c5
|
Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good
Details
|
2020-02-21 08:37:37 +01:00 |
|
Javi Gallego
|
a8137c8a6b
|
zoneClosure 3
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2020-02-20 15:15:50 +01:00 |
|
Joan Sanchez
|
2f089681df
|
Don't throw error if no salesPerson is assigned
|
2020-02-20 12:52:05 +01:00 |
|
Joan Sanchez
|
54bc1bc281
|
Merge branch '1835-e2e-item-request' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-20 10:10:18 +00:00 |
Bernat Exposito Domenech
|
cec1f7b90f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor There was a failure building this commit
Details
|
2020-02-20 09:48:12 +01:00 |
Carlos Jimenez Ruiz
|
587653fb40
|
#2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good
Details
|
2020-02-20 09:31:44 +01:00 |
|
Joan Sanchez
|
9e435e9553
|
Some changes
gitea/salix/2112-order_catalog_improvements This commit looks good
Details
|
2020-02-19 12:34:33 +01:00 |
|
Joan Sanchez
|
c9fd48b0cd
|
2112 - Catalog improvements
gitea/salix/2112-order_catalog_improvements This commit looks good
Details
|
2020-02-19 11:57:39 +01:00 |
|
Carlos Jimenez Ruiz
|
081c742dcb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request
|
2020-02-19 11:48:01 +01:00 |
|
Joan Sanchez
|
346d20b066
|
Merge branch '2124-route_basic_data' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-18 12:07:29 +00:00 |
|
Bernat Exposito Domenech
|
bfb8c5e138
|
route.basicData validations
gitea/salix/2124-route_basic_data This commit looks good
Details
|
2020-02-18 12:51:29 +01:00 |
|
Joan Sanchez
|
ba06a59ac8
|
Merge branch '2110-client_sample_validation' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-18 10:53:44 +00:00 |
|
Joan Sanchez
|
af51c2632e
|
Merge branch '2122-entry_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-18 10:20:19 +00:00 |
|
Joan Sanchez
|
2460725d98
|
Refactor + updated tests
gitea/salix/2110-client_sample_validation This commit looks good
Details
|
2020-02-18 11:14:02 +01:00 |
|
Bernat Exposito Domenech
|
6540ef9598
|
change Fk to Id
gitea/salix/2122-entry_index This commit looks good
Details
|
2020-02-18 11:07:55 +01:00 |
|
Bernat Exposito Domenech
|
3f978bd32b
|
entry index refactor
gitea/salix/2122-entry_index This commit looks good
Details
|
2020-02-18 10:33:17 +01:00 |
|
Joan Sanchez
|
7e38100d05
|
Merge branch '845-order_catalog_datalist' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-18 06:58:54 +00:00 |
|
Joan Sanchez
|
30e3880299
|
Removed comments
gitea/salix/845-order_catalog_datalist Build started...
Details
|
2020-02-18 07:50:18 +01:00 |
|
Joan Sanchez
|
61b3ce184c
|
Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-18 06:32:17 +00:00 |
|
Joan Sanchez
|
fe8a0b4583
|
Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good
Details
|
2020-02-18 07:21:35 +01:00 |
|
Joan Sanchez
|
a9b8fab51d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit
Details
|
2020-02-17 14:55:26 +01:00 |
|
Joan Sanchez
|
1ca3753908
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2020-02-17 14:48:11 +01:00 |
|
Joan Sanchez
|
a148daa368
|
2125 - ticket create invalid type fix
gitea/salix/master This commit looks good
Details
|
2020-02-17 14:47:43 +01:00 |
|
Bernat Exposito Domenech
|
f900b7ef62
|
crud model test
|
2020-02-17 13:50:54 +01:00 |
|
Joan Sanchez
|
7d8e88e884
|
Updated unit test
gitea/salix/2113-item_data_add_instrastat This commit looks good
Details
|
2020-02-17 13:32:12 +01:00 |
|
Joan Sanchez
|
844b27acb9
|
2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit
Details
|
2020-02-17 12:47:03 +01:00 |
|
Joan Sanchez
|
578556b1d5
|
2121 - Client balance fix balance on pagination
gitea/salix/2121-client_balance_fix This commit looks good
Details
|
2020-02-17 08:38:19 +01:00 |
|
Joan Sanchez
|
d9ed7cda38
|
Added form dialog
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit
Details
|
2020-02-17 07:22:55 +01:00 |
|
Carlos Jimenez Ruiz
|
4e2ab537ee
|
unstable with the rest of tests
gitea/salix/1835-e2e-item-request This commit looks good
Details
|
2020-02-14 14:52:47 +01:00 |
|
Joan Sanchez
|
84bf95db13
|
2106 - Sms max length fix
gitea/salix/2106-sms_send_with_dots This commit looks good
Details
|
2020-02-14 12:01:17 +01:00 |
|
Joan Sanchez
|
fd45c41210
|
removed focus
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 15:01:24 +01:00 |
|
Joan Sanchez
|
5360c407d5
|
updated unit test
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 14:46:18 +01:00 |
|
Joan Sanchez
|
be07e33e5f
|
updated unit test
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 14:39:33 +01:00 |
|
Joan Sanchez
|
39470e837b
|
2094 Regularize claim send chat even if doesn't have destination
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 13:20:31 +01:00 |
|
Joan Sanchez
|
c5840f322f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 845-order_catalog_datalist
gitea/salix/845-order_catalog_datalist This commit looks good
Details
|
2020-02-13 11:38:18 +01:00 |
|
Bernat Exposito Domenech
|
1887cc8c60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db
|
2020-02-13 08:44:25 +01:00 |
|
Bernat Exposito Domenech
|
4b48a89eaa
|
ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good
Details
|
2020-02-13 08:31:29 +01:00 |
|
Bernat Exposito Domenech
|
4abf87552d
|
db production exported
|
2020-02-12 14:38:51 +01:00 |
|
Carlos Jimenez Ruiz
|
2a7f826cf6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary
gitea/salix/2006-e2e-route-summary This commit looks good
Details
|
2020-02-12 14:36:14 +01:00 |
|
Carlos Jimenez Ruiz
|
e8a178d5f4
|
#2006 e2e route.summary plus refactors
|
2020-02-12 14:36:05 +01:00 |
|
Bernat Exposito Domenech
|
e0f7b917d7
|
db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good
Details
|
2020-02-12 10:39:46 +01:00 |
|
Joan Sanchez
|
c78c154ab0
|
Added datalist
gitea/salix/845-order_catalog_datalist This commit looks good
Details
|
2020-02-11 14:41:59 +01:00 |
|
Bernat Exposito Domenech
|
5375952778
|
translate
gitea/salix/1910-informe_consumo This commit looks good
Details
|
2020-02-11 13:52:05 +01:00 |
|
Bernat Exposito Domenech
|
1d73d9f89d
|
refactor campaing report
gitea/salix/1910-informe_consumo This commit looks good
Details
|
2020-02-11 13:25:41 +01:00 |
 Carlos Jimenez Ruiz
|
420f059211
|
Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2020-02-11 08:30:08 +00:00 |
|
Joan Sanchez
|
91210c3a0d
|
1684 - Log old quantity value
gitea/salix/1684-ticket_transfer_salesLog This commit looks good
Details
|
2020-02-11 08:19:03 +01:00 |
|
Joan Sanchez
|
f2fdce11cd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-10 14:54:59 +01:00 |
|
Joan Sanchez
|
8ad2344735
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2020-02-10 14:54:21 +01:00 |
|
Bernat Exposito Domenech
|
d26597c395
|
fix ticket.sale sms
gitea/salix/master This commit looks good
Details
|
2020-02-10 14:34:53 +01:00 |
|
Bernat Exposito Domenech
|
d1c8c8ad58
|
ticket/client.sms validations
|
2020-02-10 14:33:38 +01:00 |
|
Joan Sanchez
|
e1942875af
|
1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit
Details
|
2020-02-10 14:32:52 +01:00 |
|
Bernat Exposito Domenech
|
f6674448f8
|
ticket/client.sms validations
gitea/salix/2090-sms.validations This commit looks good
Details
|
2020-02-10 13:22:43 +01:00 |
|
Joan Sanchez
|
cdef356e8f
|
Merge branch '2091-ticket_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-10 08:52:34 +00:00 |
|
Joan Sanchez
|
829f9a67bc
|
Merge branch '2007-e2e-invoiceout-summary' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-10 08:47:49 +00:00 |
|
Bernat Exposito Domenech
|
bafec3ce90
|
fix ticket.sale sms
gitea/salix/2091-ticket_sms This commit looks good
Details
|
2020-02-10 09:36:40 +01:00 |
|
Bernat Exposito Domenech
|
7a643eff34
|
fix index step-two
gitea/salix/2041-ticket_datos_basico This commit looks good
Details
|
2020-02-10 07:03:09 +01:00 |
|
Carlos Jimenez Ruiz
|
0a554afdb2
|
2007 e2e invoiceOut summary
gitea/salix/2007-e2e-invoiceout-summary This commit looks good
Details
|
2020-02-07 15:42:11 +01:00 |
|
Bernat Exposito Domenech
|
dd368a8c3f
|
refactor ticket.basicData steps
gitea/salix/2041-ticket_datos_basico This commit looks good
Details
|
2020-02-07 13:38:32 +01:00 |
|
Carlos Jimenez Ruiz
|
f28a80b855
|
#2078 ticket. step-one
|
2020-02-07 11:25:56 +01:00 |
|
Carlos Jimenez Ruiz
|
ca94f03c58
|
Merge branch '2036-claim_action_show_snackbar' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2020-02-07 08:27:36 +00:00 |
|
Joan Sanchez
|
b192cb15c0
|
Show data save snackbar on auto-save
gitea/salix/2036-claim_action_show_snackbar This commit looks good
Details
|
2020-02-07 07:47:11 +01:00 |
|
Bernat Exposito Domenech
|
2f81727594
|
reload_card_volume
gitea/salix/2080-reload_card_volume This commit looks good
Details
|
2020-02-07 07:43:22 +01:00 |
|
Joan Sanchez
|
4deda8588b
|
Merge branch '2029-fix_item_request_filters' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-07 06:09:02 +00:00 |
|
Joan Sanchez
|
b623646f25
|
removed console
gitea/salix/2029-fix_item_request_filters This commit looks good
Details
|
2020-02-07 07:02:27 +01:00 |
|
Javi Gallego
|
5d0f72af4e
|
zoneDoCalc
gitea/salix/test This commit looks good
Details
|
2020-02-06 16:04:23 +01:00 |
|
Bernat Exposito Domenech
|
5cd3bde306
|
ticketRequest front test
gitea/salix/2054-ticket_request_frontTest This commit looks good
Details
|
2020-02-06 14:59:00 +01:00 |
|
Joan Sanchez
|
3e0fd10b41
|
2029 - Item request fixes & searchbar filters working
gitea/salix/2029-fix_item_request_filters This commit looks good
Details
|
2020-02-06 14:33:28 +01:00 |
|
Carlos Jimenez Ruiz
|
a3a7b4cbaa
|
Merge branch '2084-order_catalog_keep_category' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
n1ce
|
2020-02-06 12:52:00 +00:00 |
|
Carlos Jimenez Ruiz
|
652e0e6071
|
Merge branch '2076-item_tags_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-06 12:50:40 +00:00 |
|
Joan Sanchez
|
b647379443
|
removed line
gitea/salix/2084-order_catalog_keep_category This commit looks good
Details
|
2020-02-06 13:42:28 +01:00 |
|
Carlos Jimenez Ruiz
|
b6a2344e14
|
Merge branch '2059-zone_index_searchPanel' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-06 12:14:31 +00:00 |
|
Bernat Exposito Domenech
|
73c4e310f0
|
2059 zone.index buscador avanzado
gitea/salix/2059-zone_index_searchPanel This commit looks good
Details
|
2020-02-06 13:07:01 +01:00 |
|
Joan Sanchez
|
20f9f7af24
|
2084 - Keep categoryId selected on item confirmation
gitea/salix/2084-order_catalog_keep_category This commit looks good
Details
|
2020-02-06 12:46:44 +01:00 |
|
Bernat Exposito Domenech
|
bb09fc9746
|
update ticket.isEditable
gitea/salix/2070-ticket_tracking_update_permissions This commit looks good
Details
|
2020-02-06 11:50:32 +01:00 |
|
Joan Sanchez
|
462cf46753
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor
gitea/salix/2076-item_tags_refactor This commit has test failures
Details
|
2020-02-06 11:26:22 +01:00 |
|
Bernat Exposito Domenech
|
7bb5b19398
|
refactor table holidayType and holidayDetail
gitea/salix/2040-update_view_holidays This commit looks good
Details
|
2020-02-06 09:33:36 +01:00 |
|
Carlos Jimenez Ruiz
|
1e8059c9f5
|
Merge branch '2023-ticket_index_advanced_search' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-06 07:26:39 +00:00 |
|
Joan Sanchez
|
4d723a721e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor
gitea/salix/2076-item_tags_refactor This commit looks good
Details
|
2020-02-06 08:02:59 +01:00 |
|
Joan Sanchez
|
e3b1a4b58a
|
2076 - Item tags refactor
gitea/salix/2076-item_tags_refactor This commit looks good
Details
|
2020-02-06 07:41:51 +01:00 |
|
Carlos Jimenez Ruiz
|
610c21f23d
|
corrected a typo
gitea/salix/1944-ticket-summary This commit looks good
Details
|
2020-02-06 07:39:00 +01:00 |
|
Bernat Exposito Domenech
|
8193b0ffc0
|
update ticket.filter
gitea/salix/2023-ticket_index_advanced_search This commit looks good
Details
|
2020-02-06 07:37:41 +01:00 |
|
Carlos Jimenez Ruiz
|
06c3580bc4
|
#1944 ticket.summary
|
2020-02-05 13:37:36 +01:00 |
|
Carlos Jimenez Ruiz
|
76fc5a3311
|
#1944 ticket.summary
|
2020-02-05 12:44:14 +01:00 |
|
Joan Sanchez
|
218ed38b54
|
changed comment
gitea/salix/2069-ticket_index_scope_days This commit looks good
Details
|
2020-02-05 08:24:29 +01:00 |
|
Joan Sanchez
|
bee814f6a6
|
#2069 bug-fix ticket scope days
gitea/salix/2069-ticket_index_scope_days This commit looks good
Details
|
2020-02-05 08:23:23 +01:00 |
|
Joan Sanchez
|
f86d3a0052
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good
Details
|
2020-02-04 13:23:02 +01:00 |
|
Joan Sanchez
|
041c4966d6
|
changed line
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good
Details
|
2020-02-04 12:29:04 +01:00 |
|
Joan Sanchez
|
494b14bab4
|
added translation
|
2020-02-04 12:28:01 +01:00 |
|
Joan Sanchez
|
5b0bb5dc73
|
updated e2e
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good
Details
|
2020-02-04 11:25:15 +01:00 |
|
Bernat Exposito Domenech
|
89dc8e27e0
|
update models
gitea/salix/2040_view_holiday This commit looks good
Details
|
2020-02-04 11:20:05 +01:00 |
|
Bernat Exposito Domenech
|
fac93bd74c
|
summary
gitea/salix/2056-entry_descriptor There was a failure building this commit
Details
|
2020-02-04 09:34:31 +01:00 |
|
Bernat Exposito Domenech
|
eab2593306
|
update ticket.dms.create
gitea/salix/2075-ticket_gestdoc This commit looks good
Details
|
2020-02-03 14:36:04 +01:00 |
|
Bernat Exposito Domenech
|
759ac5b5c7
|
add icon in worker.index
gitea/salix/2020-worker_index This commit looks good
Details
|
2020-02-03 14:03:09 +01:00 |
|
Bernat Exposito Domenech
|
0681f5efc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2071-ticket_sale_split
gitea/salix/2071-ticket_sale_split This commit looks good
Details
|
2020-02-03 11:12:09 +01:00 |
|
Bernat Exposito Domenech
|
668f20c433
|
update lastActiveTickets
|
2020-02-03 11:12:04 +01:00 |
|
Bernat Exposito Domenech
|
6265796260
|
add icon in ticket.basicData
gitea/salix/2039-ticket_basicData This commit looks good
Details
|
2020-02-03 09:24:49 +01:00 |
|
Joan Sanchez
|
b743938fee
|
merge
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit
Details
|
2020-01-31 08:18:54 +01:00 |
|
Joan Sanchez
|
43693c35ad
|
removed fdescribe
gitea/salix/2064-catalog_refactor This commit looks good
Details
|
2020-01-30 14:35:21 +01:00 |
|
Joan Sanchez
|
8f851d5c15
|
refactor
gitea/salix/2064-catalog_refactor This commit looks good
Details
|
2020-01-30 13:53:14 +01:00 |
|
Joan Sanchez
|
31349b2ebf
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-30 11:54:51 +01:00 |
|
Bernat Exposito Domenech
|
c07d5f337a
|
fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good
Details
|
2020-01-30 11:20:41 +01:00 |
|
Joan Sanchez
|
1be640a59d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
gitea/salix/2003-adress_validate_uee_members This commit has test failures
Details
|
2020-01-29 14:51:37 +01:00 |
|
Joan Sanchez
|
499bd082fc
|
changed messages
gitea/salix/2003-adress_validate_uee_members This commit looks good
Details
|
2020-01-29 14:13:25 +01:00 |
|
Joan Sanchez
|
5ebe800c5f
|
html fix
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2020-01-29 13:41:55 +01:00 |
|
Joan Sanchez
|
a078898627
|
Merge branch '2049-hotfix_percentage' of verdnatura/salix into master
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2020-01-29 10:29:35 +00:00 |
|
Joan Sanchez
|
b27d514918
|
percentage hotfix
gitea/salix/2049-hotfix_percentage This commit looks good
Details
|
2020-01-29 11:09:42 +01:00 |
|
Joan Sanchez
|
b0ec7ce15b
|
updated e2e
gitea/salix/2003-adress_validate_uee_members This commit looks good
Details
|
2020-01-28 11:56:26 +01:00 |
|
Bernat Exposito Domenech
|
35b9820e73
|
update ticket request
gitea/salix/2044-ticket.request There was a failure building this commit
Details
|
2020-01-28 09:05:01 +01:00 |
|
Joan Sanchez
|
35e443a112
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
|
2020-01-28 09:03:33 +01:00 |
|
Joan Sanchez
|
0044bd2efa
|
updated tests
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit
Details
|
2020-01-28 09:03:20 +01:00 |
|
Carlos Jimenez Ruiz
|
87ad594f8a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2020-01-27 14:31:33 +01:00 |
|
Bernat Exposito Domenech
|
849faad6ea
|
add m3Max in agency.basicData
gitea/salix/2022-update_model_zone This commit looks good
Details
|
2020-01-27 09:45:13 +01:00 |
|
Carlos Jimenez Ruiz
|
a1fd5a01a7
|
#1976 Implementar Puppeteer
gitea/salix/puppeteer There was a failure building this commit
Details
|
2020-01-27 00:48:00 +01:00 |
|
Carlos Jimenez Ruiz
|
7fef6dc2b0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2020-01-26 21:59:46 +01:00 |
|
Bernat Exposito Domenech
|
9f73c68210
|
udate client.log styles
gitea/salix/1997-client_log This commit looks good
Details
|
2020-01-24 14:22:11 +01:00 |
|
Joan Sanchez
|
921af4dcc2
|
Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-24 12:52:30 +00:00 |
|
Bernat Exposito Domenech
|
b244df4807
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good
Details
|
2020-01-24 12:56:01 +01:00 |
|
Javi Gallego
|
08fda3ed1b
|
#workedHours
gitea/salix/%232037-worked-hours This commit looks good
Details
|
2020-01-24 12:38:08 +01:00 |
|
Carlos Jimenez Ruiz
|
f74792dbe9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2020-01-24 10:17:08 +01:00 |
|
Joan Sanchez
|
2eeab485e3
|
Merge dev
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit
Details
|
2020-01-24 09:48:59 +01:00 |
|
Joan Sanchez
|
25ffa839a2
|
added incoterms & customs agent to address forms
gitea/salix/2003-adress_validate_uee_members This commit has test failures
Details
|
2020-01-24 09:47:24 +01:00 |
|
Joan Sanchez
|
deada69ca4
|
Added models
gitea/salix/2003-adress_validate_uee_members This commit looks good
Details
|
2020-01-23 14:59:37 +01:00 |
 Bernat Exposito
|
f6ad5696b4
|
Merge branch '2018-deprecate_message_send' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-23 13:14:21 +00:00 |
|
Bernat Exposito Domenech
|
439f9009ff
|
fix model componentType
gitea/salix/2014-remove_bi_from_db This commit looks good
Details
|
2020-01-23 13:47:00 +01:00 |
|
Joan Sanchez
|
57acca2f5e
|
refactor & updated tests
gitea/salix/2018-deprecate_message_send This commit looks good
Details
|
2020-01-23 13:31:07 +01:00 |
|
Bernat Exposito Domenech
|
6700daf0e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good
Details
|
2020-01-23 12:58:47 +01:00 |
|
Bernat Exposito Domenech
|
64bd721287
|
update structure db
|
2020-01-23 12:58:38 +01:00 |
|
Bernat Exposito
|
6c0cc3d204
|
Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-23 10:00:58 +00:00 |
 Juan Ferrer
|
23f066b3f4
|
vnZoneWarehouses: remove bug fixed
gitea/salix/master This commit looks good
Details
|
2020-01-22 16:32:01 +01:00 |
|
Javi Gallego
|
5bd31eb082
|
zoneClosure
gitea/salix/master This commit looks good
Details
|
2020-01-22 10:41:09 +01:00 |
|
Bernat Exposito Domenech
|
960b3c3f75
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-22 09:51:35 +01:00 |
|
Bernat Exposito Domenech
|
0b848adf03
|
fix back test
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2020-01-22 09:43:10 +01:00 |
|
Joan Sanchez
|
c36e62a97b
|
added front unit tests
gitea/salix/1982-travel_add_thermograph This commit looks good
Details
|
2020-01-22 09:04:26 +01:00 |
|
Joan Sanchez
|
2339d347f7
|
Added back unit tests
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-22 08:26:54 +01:00 |
|
Joan Sanchez
|
77f6333aba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
|
2020-01-21 12:23:10 +01:00 |
|
Joan Sanchez
|
f0b4c26aea
|
added travel thermograph create & remove methods
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-21 12:21:53 +01:00 |
|
Joan Sanchez
|
1d6edabb10
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-01-21 09:23:58 +01:00 |
|
Joan Sanchez
|
e93e9d2947
|
getWasteDetail() now calls weekWaste_getDetail()
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2020-01-21 09:17:55 +01:00 |
|
Joan Sanchez
|
5e4ab8b128
|
Loggable errors
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-21 09:00:42 +01:00 |
|
Joan Sanchez
|
41e69a2e9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-20 13:05:06 +01:00 |
|
Joan Sanchez
|
3ff1fb7d2d
|
Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good
Details
|
2020-01-20 11:59:15 +01:00 |
|
Bernat Exposito Domenech
|
8ae5a8705e
|
fix test
gitea/salix/2010-worker_phone_refactor This commit looks good
Details
|
2020-01-20 11:17:04 +01:00 |
|
Bernat Exposito Domenech
|
0fe0596b3e
|
worker phone refactor
|
2020-01-20 11:03:40 +01:00 |
|
Joan Sanchez
|
826dfe8092
|
changes to percentage filter
gitea/salix/master This commit looks good
Details
|
2020-01-17 11:46:45 +01:00 |
|
Joan Sanchez
|
3a4c379033
|
Added waste section
|
2020-01-17 11:44:05 +01:00 |
|
Joan Sanchez
|
65a227db9e
|
uploadFile args
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-17 09:23:32 +01:00 |
|
Joan Sanchez
|
4002b51565
|
added section
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-17 08:43:10 +01:00 |
|
Joan Sanchez
|
1704f5e93b
|
Merge branch '2011-client_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-17 06:48:57 +00:00 |
|
Bernat Exposito Domenech
|
74b688dc4b
|
client phone refactor
gitea/salix/2011-client_phone This commit looks good
Details
|
2020-01-17 07:24:57 +01:00 |
|
Bernat Exposito
|
e1aefc795b
|
Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-16 13:42:12 +00:00 |
|
Joan Sanchez
|
2b2e6532f6
|
changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good
Details
|
2020-01-16 13:39:32 +01:00 |
|
Bernat Exposito Domenech
|
ba2300288f
|
sendSms test
gitea/salix/1998-client_sms This commit looks good
Details
|
2020-01-16 12:40:28 +01:00 |
|
Bernat Exposito Domenech
|
b42b2ec8c3
|
refactor sms send
gitea/salix/1998-client_sms Something is wrong with the build of this commit
Details
|
2020-01-15 13:27:14 +01:00 |
|
Joan Sanchez
|
708789502d
|
Added waste section
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit
Details
|
2020-01-15 13:07:33 +01:00 |
|
Joan Sanchez
|
8f449566bb
|
Merge branch '2000-client.sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-15 08:20:40 +00:00 |
|
Bernat Exposito Domenech
|
1f60aac446
|
export structure db
gitea/salix/1999-travel_basicData This commit looks good
Details
|
2020-01-15 08:19:22 +01:00 |
|
Bernat Exposito Domenech
|
cbda081608
|
refactor sms component
gitea/salix/2000-client.sms This commit looks good
Details
|
2020-01-14 09:10:54 +01:00 |
|
Bernat Exposito Domenech
|
f4e3649d9e
|
new section thermograph
gitea/salix/1981-travel_thermograph This commit looks good
Details
|
2020-01-13 11:53:10 +01:00 |
|
Joan Sanchez
|
048fcb733d
|
added zone name to ticket summary
gitea/salix/1995-ticket_summary_with_zone This commit looks good
Details
|
2020-01-13 07:42:41 +01:00 |
|
Joan Sanchez
|
de05cadef4
|
Merge branch '1975-delivery_note_tags' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-10 11:09:29 +00:00 |
|
Bernat Exposito Domenech
|
6c4e25bfe3
|
create entry.index
gitea/salix/1990-create_entry_section This commit looks good
Details
|
2020-01-10 11:52:35 +01:00 |
|
Joan Sanchez
|
e235bf94a6
|
removed syntax error
gitea/salix/1975-delivery_note_tags This commit looks good
Details
|
2020-01-10 11:31:12 +01:00 |
|
Joan Sanchez
|
16a9a1f5f8
|
updated styles
gitea/salix/1975-delivery_note_tags This commit looks good
Details
|
2020-01-10 11:29:11 +01:00 |
|
Joan Sanchez
|
5cf8328476
|
added more rows to sms textarea
gitea/salix/1975-delivery_note_tags There was a failure building this commit
Details
|
2020-01-09 13:58:50 +01:00 |
|
Carlos Jimenez Ruiz
|
cb2f94cdaf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
gitea/salix/puppeteer There was a failure building this commit
Details
|
2020-01-09 13:10:27 +01:00 |
|
Bernat Exposito Domenech
|
5511ef2537
|
client address index
gitea/salix/1983-client_address There was a failure building this commit
Details
|
2020-01-09 12:39:03 +01:00 |
|
Carlos Jimenez Ruiz
|
83d2ec40d4
|
Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-09 10:50:26 +00:00 |
|
Bernat Exposito Domenech
|
78fab48840
|
update models
gitea/salix/1980-models_Thermograph There was a failure building this commit
Details
|
2020-01-09 11:27:53 +01:00 |
|
Joan Sanchez
|
6f3359c76e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1985-apply_item_type_filter
gitea/salix/1985-apply_item_type_filter There was a failure building this commit
Details
|
2020-01-09 11:24:01 +01:00 |
|
Joan Sanchez
|
7df41fc63c
|
solved bug ordering by tag
gitea/salix/1985-apply_item_type_filter This commit looks good
Details
|
2020-01-09 11:21:54 +01:00 |
|
Bernat Exposito Domenech
|
d432c32577
|
export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good
Details
|
2020-01-09 10:49:09 +01:00 |
|
Bernat Exposito Domenech
|
99f5fbec3c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph
|
2020-01-09 10:17:23 +01:00 |
|
Joan Sanchez
|
c830bc6e8a
|
fixed order by tag
gitea/salix/1985-apply_item_type_filter There was a failure building this commit
Details
|
2020-01-09 09:23:59 +01:00 |
|
Carlos Jimenez Ruiz
|
ff7c6bea6a
|
Merge branch '1986-claim_draggable_pictures' of verdnatura/salix into dev
gitea/salix/dev Build queued...
Details
|
2020-01-09 08:00:35 +00:00 |
|
Joan Sanchez
|
436673986c
|
removed focus
gitea/salix/1985-apply_item_type_filter This commit looks good
Details
|
2020-01-09 08:43:33 +01:00 |
|
Joan Sanchez
|
a2e6719e1e
|
updated unit tests
gitea/salix/1985-apply_item_type_filter This commit looks good
Details
|
2020-01-09 08:42:58 +01:00 |
|
Joan Sanchez
|
e637f32aaa
|
removed opacity effects
gitea/salix/1986-claim_draggable_pictures This commit looks good
Details
|
2020-01-09 08:18:13 +01:00 |
|
Joan Sanchez
|
92b72328b9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1984-travel_summary_total
gitea/salix/1984-travel_summary_total This commit looks good
Details
|
2020-01-09 08:01:07 +01:00 |
|
Bernat Exposito Domenech
|
90b9692fba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph
|
2020-01-09 07:46:57 +01:00 |
|
Joan Sanchez
|
df7493ff14
|
Updated styles
gitea/salix/1986-claim_draggable_pictures This commit looks good
Details
|
2020-01-08 17:03:08 +01:00 |
|
Joan Sanchez
|
0a9eaa406d
|
changed translations
gitea/salix/1984-travel_summary_total This commit looks good
Details
|
2020-01-08 13:55:26 +01:00 |
|
Juan Ferrer
|
a979a17482
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-08 13:53:10 +01:00 |
|
Joan Sanchez
|
f362963dbb
|
Added total by column
gitea/salix/1984-travel_summary_total There was a failure building this commit
Details
|
2020-01-08 13:52:04 +01:00 |
|
Juan Ferrer
|
5d69f50ac0
|
vnZoneDeliveryDays hotfixes
|
2020-01-08 13:27:43 +01:00 |
|
Joan Sanchez
|
5a7bd4e18f
|
filters refactor
gitea/salix/1985-apply_item_type_filter There was a failure building this commit
Details
|
2020-01-08 12:27:18 +01:00 |
|
Juan Ferrer
|
0b7aa7e65e
|
Zone.getEvents hotfix: wrong parameter name
|
2020-01-08 12:14:09 +01:00 |
|
Bernat Exposito Domenech
|
36108038df
|
refactor sintaxis
|
2020-01-08 11:00:50 +01:00 |
|
Bernat Exposito Domenech
|
0ef2d92df7
|
claim.details
gitea/salix/1575-claim_details_discountError This commit looks good
Details
|
2020-01-08 10:08:27 +01:00 |
|
Bernat Exposito Domenech
|
8b0fd79f15
|
claim.details isEditable
gitea/salix/1575-claim_details_discountError This commit looks good
Details
|
2020-01-07 13:03:45 +01:00 |
|
Bernat Exposito Domenech
|
27a469c786
|
route.basic finder
gitea/salix/1947-route_basic_data This commit looks good
Details
|
2020-01-07 08:40:23 +01:00 |
|
Bernat Exposito Domenech
|
730b8e160f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data
|
2020-01-07 08:30:55 +01:00 |
|
Carlos Jimenez Ruiz
|
f0fd018c56
|
Merge branch '1924-worker_calendar_dynamic_holidays' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-07 06:31:05 +00:00 |
|
Bernat Exposito Domenech
|
d8e27a4a5c
|
routebasic
gitea/salix/1947-route_basic_data This commit looks good
Details
|
2020-01-03 14:42:50 +01:00 |
|
Bernat Exposito Domenech
|
904602637d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data
gitea/salix/1947-route_basic_data This commit looks good
Details
|
2020-01-03 14:31:21 +01:00 |
|
Bernat Exposito Domenech
|
814c96434e
|
routebasic
|
2020-01-03 14:31:02 +01:00 |
|
Bernat Exposito Domenech
|
8d01cd38c2
|
refactor client.balance
gitea/salix/1971-frontTest_client.balance This commit looks good
Details
|
2020-01-03 12:48:06 +01:00 |
|
Bernat Exposito Domenech
|
b6353f1b5c
|
test client.balance
gitea/salix/1971-frontTest_client.balance There was a failure building this commit
Details
|
2020-01-03 12:29:13 +01:00 |
|
Joan Sanchez
|
8a36e0913f
|
changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good
Details
|
2020-01-03 08:43:03 +01:00 |
|
Bernat Exposito Domenech
|
b1c23dfca4
|
delete console.log
gitea/salix/1964-client_balance This commit looks good
Details
|
2020-01-02 15:07:25 +01:00 |
|
Bernat Exposito Domenech
|
68f437071f
|
refactor client.balance
gitea/salix/1964-client_balance This commit looks good
Details
|
2020-01-02 14:44:51 +01:00 |
|
Joan Sanchez
|
7fb3f75808
|
changed comparator
gitea/salix/1966-teamBoss_worker_time_control This commit looks good
Details
|
2020-01-02 11:21:11 +01:00 |
|
Joan Sanchez
|
a5eb8e5315
|
extended worker contract ranges & fixed invoice
gitea/salix/dev There was a failure building this commit
Details
|
2020-01-02 11:10:26 +01:00 |
|
Carlos Jimenez Ruiz
|
3ce5d95010
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-31 16:25:01 +01:00 |
|
Joan Sanchez
|
8f92abe49c
|
fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good
Details
|
2019-12-31 14:01:05 +01:00 |
|
Carlos Jimenez Ruiz
|
e922a05e50
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-31 11:40:15 +01:00 |
|
Joan Sanchez
|
b471f51482
|
refactor
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit
Details
|
2019-12-31 10:38:19 +01:00 |
|
Juan Ferrer
|
98cf5a4a18
|
Hotfix: restart interval, vnAgencyEvents
gitea/salix/test There was a failure building this commit
Details
gitea/salix/master This commit looks good
Details
|
2019-12-30 12:36:19 +01:00 |
|
Bernat Exposito Domenech
|
e9d3b14da7
|
refactor models component and componentType
gitea/salix/1965-update_models This commit looks good
Details
|
2019-12-27 08:01:53 +01:00 |
|
Joan Sanchez
|
195163c4f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1945-item_type_category
gitea/salix/1945-item_type_category This commit looks good
Details
|
2019-12-26 13:30:57 +01:00 |
|
Joan Sanchez
|
b74de37c82
|
updated selectors
gitea/salix/dev This commit looks good
Details
|
2019-12-26 13:29:50 +01:00 |
|
Joan Sanchez
|
f2e9dbd597
|
added category name to item type autocompletes
gitea/salix/1945-item_type_category This commit looks good
Details
|
2019-12-26 11:27:44 +01:00 |
|
Joan Sanchez
|
fd594841d5
|
Merge branch '1955-client_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 08:16:08 +00:00 |
|
Carlos Jimenez Ruiz
|
c992cbc5c6
|
Merge branch '1935-ticket_create_auto_fill' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 08:14:22 +00:00 |
|
Joan Sanchez
|
fd8eeb626d
|
removed console.log
gitea/salix/1935-ticket_create_auto_fill This commit looks good
Details
|
2019-12-26 08:45:55 +01:00 |
|
Joan Sanchez
|
d2c5ab7297
|
trigger unit tests
gitea/salix/1949-show_specie_genus This commit looks good
Details
|
2019-12-26 08:43:34 +01:00 |
|
Joan Sanchez
|
c95c7192da
|
Added template to specie autocomplete
|
2019-12-26 08:21:08 +01:00 |
|
Bernat Exposito Domenech
|
0a37f3a1b2
|
update index filter
gitea/salix/1955-client_index This commit looks good
Details
|
2019-12-26 08:20:16 +01:00 |
|
Joan Sanchez
|
5273e90a30
|
Added params to ticket method & updated unit tests
gitea/salix/1935-ticket_create_auto_fill This commit looks good
Details
|
2019-12-26 07:12:34 +01:00 |
|
Juan Ferrer
|
6c57220703
|
InvoiceOut PDF download fix
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-12-24 10:17:41 +01:00 |
|
Bernat Exposito Domenech
|
0827b998a1
|
update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good
Details
|
2019-12-23 15:15:58 +01:00 |
|
Joan Sanchez
|
0799e58558
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-23 08:15:25 +01:00 |
|
Joan Sanchez
|
3d4fc9c18e
|
#1963 Entry & zone style changes
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-12-23 08:05:58 +01:00 |
|
Bernat Exposito Domenech
|
e9d416671d
|
update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good
Details
|
2019-12-20 13:51:04 +01:00 |
|
Joan Sanchez
|
472352e24c
|
Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 10:05:38 +00:00 |
|
Joan Sanchez
|
b9415c0335
|
updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 10:40:12 +01:00 |
|
Joan Sanchez
|
61408bdfd5
|
updated tests
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 09:30:35 +01:00 |
|
Joan Sanchez
|
2330e9fb39
|
Merge branch '1897travel.index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 07:52:28 +00:00 |
|
Bernat Exposito Domenech
|
81bb9cfc88
|
refactor travel filter
gitea/salix/1897travel.index This commit looks good
Details
|
2019-12-20 08:39:34 +01:00 |
|
Bernat Exposito Domenech
|
9a6c8db140
|
focus on the dialog
gitea/salix/1937-workerDepartment This commit looks good
Details
|
2019-12-20 08:32:02 +01:00 |
|
Bernat Exposito Domenech
|
3d21539fb0
|
travel index filter
gitea/salix/1897travel.index This commit looks good
Details
|
2019-12-20 07:55:00 +01:00 |
|
Joan Sanchez
|
42239815e0
|
removed fdescribe
gitea/salix/dev There was a failure building this commit
Details
|
2019-12-19 15:01:33 +01:00 |
|
Joan Sanchez
|
61b9646f5b
|
Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-12-19 14:55:09 +01:00 |
|
Joan Sanchez
|
aa809eea8a
|
trigger build
gitea/salix/master This commit looks good
Details
|
2019-12-19 14:21:18 +01:00 |
|
Joan Sanchez
|
8a54da6fd3
|
fixed dms links
|
2019-12-19 14:13:24 +01:00 |
|
Juan Ferrer
|
9947021736
|
#1953 Temporal fix
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-12-19 12:17:53 +01:00 |
|
Joan Sanchez
|
a1c6c0ab39
|
claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-19 11:37:53 +01:00 |
|
Bernat Exposito Domenech
|
03af680968
|
fix backtest
gitea/salix/1933-fix_backTest This commit looks good
Details
|
2019-12-18 07:30:24 +01:00 |
|
Joan Sanchez
|
f42f46dc42
|
Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good
Details
|
2019-12-17 12:53:06 +00:00 |
|
Joan Sanchez
|
3d83a08eca
|
Merge branch 'test' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-17 12:34:51 +00:00 |
|
Joan Sanchez
|
9d487f3cee
|
updated translation
gitea/salix/1913-stowaway_unboarding This commit looks good
Details
|
2019-12-17 13:25:30 +01:00 |
|
Juan Ferrer
|
39a41f9a64
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/master This commit looks good
Details
|
2019-12-17 12:23:46 +01:00 |
|
Juan Ferrer
|
4da83ef963
|
Hotfixes: vnTicketSale menu, vnItemDiary width
|
2019-12-17 12:23:31 +01:00 |
|
Joan Sanchez
|
8ddcd5a654
|
ACL fixes
gitea/salix/master This commit looks good
Details
|
2019-12-17 12:18:17 +01:00 |
|
Juan Ferrer
|
d1341c2758
|
Hotfixes
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-12-17 09:23:11 +01:00 |
|
Bernat Exposito Domenech
|
aab970e667
|
client.phone section
gitea/salix/1928-client_phone This commit looks good
Details
|
2019-12-17 09:11:28 +01:00 |
|
Joan Sanchez
|
ef95244d07
|
stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good
Details
|
2019-12-17 08:38:36 +01:00 |
|
Carlos Jimenez Ruiz
|
70ca4df29a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-16 13:23:53 +01:00 |
|
Bernat Exposito Domenech
|
d66519a39f
|
set autoincrement db to one
gitea/salix/1926-delete_bs This commit has test failures
Details
|
2019-12-16 08:48:12 +01:00 |
|
Carlos Jimenez Ruiz
|
e6130e78fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-13 15:12:55 +01:00 |
|
Joan Sanchez
|
4a69a7f9b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1919-ticket_service_type
gitea/salix/1919-ticket_service_type This commit looks good
Details
|
2019-12-13 12:31:51 +01:00 |
|
Joan Sanchez
|
da361a8ffb
|
Merge branch '1921-claim_detail_discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-13 11:19:46 +00:00 |
|
Joan Sanchez
|
8808e49a10
|
updated unit test
gitea/salix/1919-ticket_service_type This commit looks good
Details
|
2019-12-13 12:07:36 +01:00 |
|
Joan Sanchez
|
780f1e4773
|
renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit
Details
|
2019-12-13 11:59:25 +01:00 |
|
Bernat Exposito Domenech
|
2e68ad0d01
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone
gitea/salix/1858testworkerPhone This commit looks good
Details
|
2019-12-13 10:54:52 +01:00 |
|
Bernat Exposito Domenech
|
ff117c1811
|
merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good
Details
|
2019-12-13 09:06:39 +01:00 |
|
Joan Sanchez
|
2325127390
|
pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good
Details
|
2019-12-13 08:40:59 +01:00 |
|
Joan Sanchez
|
7bbb9fa321
|
Pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good
Details
|
2019-12-13 08:26:27 +01:00 |
|
Javi Gallego
|
44304e993a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good
Details
|
2019-12-13 08:19:22 +01:00 |
|
Joan Sanchez
|
676b5198a8
|
changed discount popover width + refresh discount
gitea/salix/1921-claim_detail_discount This commit looks good
Details
|
2019-12-13 08:01:13 +01:00 |
|
Juan Ferrer
|
d61b08ed10
|
Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 13:49:05 +00:00 |
|
Javi Gallego
|
ec081e6a3a
|
campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good
Details
|
2019-12-12 13:53:54 +01:00 |
|
Bernat Exposito Domenech
|
a87ce44f08
|
test front worker.phone
gitea/salix/1858testworkerPhone This commit looks good
Details
|
2019-12-12 12:23:31 +01:00 |
|
Carlos Jimenez Ruiz
|
2e905d6858
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-12 11:08:41 +01:00 |
|
Carlos Jimenez Ruiz
|
8a2eda7c08
|
Merge branch '1923-ticket-summary-discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 10:06:47 +00:00 |
|
Joan Sanchez
|
62aae9ce14
|
removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good
Details
|
2019-12-12 09:46:29 +01:00 |
|
Bernat Exposito Domenech
|
e573a2cff0
|
fix error
gitea/salix/1707route.ticket There was a failure building this commit
Details
|
2019-12-12 09:13:24 +01:00 |
|
Bernat Exposito Domenech
|
126a02c1b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1707route.ticket
|
2019-12-12 09:11:45 +01:00 |
|
Carlos Jimenez Ruiz
|
77f9cd8e00
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-12 08:29:23 +01:00 |
|
Carlos Jimenez Ruiz
|
4d493c3572
|
Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-12-12 07:25:22 +00:00 |
|
Joan Sanchez
|
af47ab6cac
|
fixed styles & discounts
gitea/salix/1923-ticket-summary-discount There was a failure building this commit
Details
|
2019-12-12 08:22:04 +01:00 |
|
Carlos Jimenez Ruiz
|
bd0130514c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-12 08:14:25 +01:00 |
|
Juan Ferrer
|
3428dfa6e0
|
Migration complete & test
|
2019-12-11 15:01:01 +01:00 |
|
Carlos Jimenez Ruiz
|
036093a31f
|
Merge branch 'puppeteer' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-11 14:16:23 +01:00 |
|
Bernat Exposito Domenech
|
eb2cfc5535
|
updated selectors
gitea/salix/puppeteer There was a failure building this commit
Details
|
2019-12-11 14:14:44 +01:00 |
|
Bernat Exposito Domenech
|
d0a2f4627b
|
1707 route.ticket sistema tablas que soporte dirección salida para warehouses
gitea/salix/1707route.ticket This commit looks good
Details
|
2019-12-10 12:42:14 +01:00 |
|
Bernat Exposito Domenech
|
17acfc2631
|
update translations
gitea/salix/1900travelCreate This commit looks good
Details
|
2019-12-10 08:18:53 +01:00 |
|
Bernat Exposito Domenech
|
2cc9c5e951
|
create section travel create
gitea/salix/1900travelCreate This commit looks good
Details
|
2019-12-09 12:15:19 +01:00 |
|
Bernat Exposito Domenech
|
f6eabc81da
|
add models and update structure db
gitea/salix/1834createTravelModels This commit looks good
Details
|
2019-12-05 14:20:11 +01:00 |
|
Bernat
|
da2503d4b8
|
fix test
gitea/salix/1904%2FupgradeStructureDb This commit looks good
Details
|
2019-12-04 11:18:26 +01:00 |
|
Bernat
|
f38210ddd2
|
udate structure db
|
2019-12-04 11:09:36 +01:00 |
|
Javi Gallego
|
3c36526f12
|
E2E fix for windows plus refactors
|
2019-11-28 12:54:34 +01:00 |
|
Bernat Exposito
|
a4a48e76a4
|
Merge branch '1762-worker_dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-25 08:33:04 +00:00 |
|
Joan Sanchez
|
f9dba9489f
|
updated tests
gitea/salix/1762-worker_dms This commit looks good
Details
|
2019-11-25 09:17:24 +01:00 |
|
Joan Sanchez
|
8fc76b49c9
|
summary unit tests #1905
gitea/salix/dev This commit looks good
Details
|
2019-11-25 08:35:34 +01:00 |
|
Joan Sanchez
|
974bf67e8d
|
removed focus
gitea/salix/dev This commit looks good
Details
|
2019-11-25 07:46:00 +01:00 |
|
Joan Sanchez
|
a077dd5165
|
test unitario
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 14:34:20 +01:00 |
|
Joan Sanchez
|
3c144ea0cd
|
transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 13:46:38 +01:00 |
|
Juan Ferrer
|
f50f99b962
|
Minor bug & style fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-22 13:23:43 +01:00 |
|
Joan Sanchez
|
5aae48c7dc
|
added gestdoc
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 10:42:05 +01:00 |
|
Joan Sanchez
|
a67f6ec1ae
|
removed zeroFill
gitea/salix/dev This commit looks good
Details
|
2019-11-22 07:41:06 +01:00 |
|
Bernat Exposito
|
9f345fe244
|
Merge branch '1875-send-sms-dialog' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-21 13:13:05 +00:00 |
|
Joan Sanchez
|
27cab0e722
|
added sms option to client descriptor
gitea/salix/1875-send-sms-dialog This commit looks good
Details
|
2019-11-21 14:00:27 +01:00 |
|
Joan Sanchez
|
423240ac7d
|
open dialog
|
2019-11-21 13:02:46 +01:00 |
|
Carlos Jimenez Ruiz
|
f4a62dfa86
|
Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-21 11:30:00 +00:00 |
|
Joan Sanchez
|
fd72f206bc
|
Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 12:00:56 +01:00 |
|
Carlos Jimenez Ruiz
|
6a0783d22f
|
#1891 tests for worker time control function
|
2019-11-21 11:16:10 +01:00 |
|
Joan Sanchez
|
fee0d674a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 11:06:31 +01:00 |
|
Carlos Jimenez Ruiz
|
c04640bd62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 09:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
52a8d5e0c2
|
#1891 tests for worker time control function
|
2019-11-21 09:19:03 +01:00 |
|
Bernat
|
d1dfa126c0
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-21 09:08:43 +01:00 |
|
Carlos Jimenez Ruiz
|
6929e3d497
|
#1889 absences() unit test fixed + refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-20 14:22:44 +01:00 |
|
Joan Sanchez
|
5bb7f7f14a
|
deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:14:11 +01:00 |
|
Joan Sanchez
|
c6d1536500
|
recalculate ticket components
gitea/salix/1770-calculate_components This commit has test failures
Details
|
2019-11-20 06:53:37 +01:00 |
|
Juan Ferrer
|
59fddb5c55
|
vnAgencyEvents: console.log removed
gitea/salix/dev This commit looks good
Details
|
2019-11-19 15:44:33 +01:00 |
|
Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:10 +01:00 |
|
Bernat
|
9743b61f63
|
delete endpoint getWorkerInfo
gitea/salix/dev Build queued...
Details
|
2019-11-19 11:51:47 +01:00 |
|
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-19 11:43:00 +01:00 |
|
Joan Sanchez
|
cba578d42e
|
fixed zoom photo url #1884
gitea/salix/dev This commit looks good
Details
|
2019-11-19 09:24:53 +01:00 |
|
Carlos Jimenez Ruiz
|
f998a04808
|
#1852 worker.time-control
|
2019-11-18 16:37:33 +01:00 |
|
Carlos Jimenez Ruiz
|
eeead2cc86
|
corrected a typo
|
2019-11-18 16:37:03 +01:00 |
|
Carlos Jimenez Ruiz
|
04b4f60c48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 16:35:21 +01:00 |
|
Juan Ferrer
|
4d4e4f31f4
|
vnZoneEvents refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:31:37 +01:00 |
|
Javi Gallego
|
f12b1b8595
|
test fron arreglados
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:03:10 +01:00 |
|
Carlos Jimenez Ruiz
|
3c2ad2df48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 12:35:30 +01:00 |
|
Javi Gallego
|
c736e4de29
|
#1850 descomentar test back
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-18 12:32:50 +01:00 |
|
Carlos Jimenez Ruiz
|
7c199b5d74
|
#1852 worker.time-control
|
2019-11-18 11:00:09 +01:00 |
|
Javi Gallego
|
4b51d607f7
|
error getLanded con drop temporary table
gitea/salix/dev This commit looks good
Details
|
2019-11-15 15:42:00 +01:00 |
|
Joan Sanchez
|
c83a97d7ec
|
holidays fix #1853
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:44:11 +01:00 |
|
Carlos Jimenez Ruiz
|
d1b114de59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-15 10:37:42 +01:00 |
|
Joan Sanchez
|
ddb19cb198
|
added event
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:03:46 +01:00 |
|
Joan Sanchez
|
6e5f460fab
|
#1867 show warehouses on summary
gitea/salix/dev This commit looks good
Details
|
2019-11-15 07:35:51 +01:00 |
|
Juan Ferrer
|
4f5c1404d7
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 15:24:08 +01:00 |
|
Juan Ferrer
|
09a187ecfe
|
Merge
|
2019-11-14 15:05:49 +01:00 |
|
Juan Ferrer
|
2621da8dce
|
Hour formating fix
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 14:40:19 +01:00 |
|
Juan Ferrer
|
64124376f0
|
Final fixes
|
2019-11-14 14:37:18 +01:00 |
|
Carlos Jimenez Ruiz
|
8629b72d55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-14 14:22:22 +01:00 |
|
Carlos Jimenez Ruiz
|
34bd35ce4e
|
#1852 worker.time-control
|
2019-11-14 14:20:05 +01:00 |
|
Joan Sanchez
|
c028233012
|
ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good
Details
|
2019-11-14 14:19:39 +01:00 |
|
Juan Ferrer
|
4436acec10
|
Merge
|
2019-11-14 14:07:48 +01:00 |
|
Joan Sanchez
|
5561ff169e
|
deprecated worker.sendMessage()
|
2019-11-14 11:21:08 +01:00 |
|
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good
Details
|
2019-11-13 13:22:39 +01:00 |
|
Carlos Jimenez Ruiz
|
d12f815c80
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 12:31:13 +01:00 |
|
Joan Sanchez
|
c166067888
|
updated tests & email compatibility with phone
gitea/salix/dev This commit looks good
Details
|
2019-11-13 12:18:30 +01:00 |
|
Bernat
|
dfd29ced70
|
1711 delete references
|
2019-11-13 11:04:52 +01:00 |
|
Carlos Jimenez Ruiz
|
b4669270c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 08:54:27 +01:00 |
|
Joan Sanchez
|
308c4dfb88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-13 08:09:54 +01:00 |
|
Joan Sanchez
|
603bb034a1
|
Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:56:09 +01:00 |
|
Carlos Jimenez Ruiz
|
65b84d752c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 07:51:06 +01:00 |
|
Joan Sanchez
|
7f2af116bc
|
updated translation
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:04:47 +01:00 |
|
Carlos Jimenez Ruiz
|
0730aa1d0e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-12 15:18:41 +01:00 |
|
Joan Sanchez
|
c3962c3d78
|
updated test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 15:07:37 +01:00 |
|
Joan Sanchez
|
b320d64462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-12 14:54:13 +01:00 |
|
Joan Sanchez
|
1b70721b0e
|
#1864 added restrictions, send rocketchat message
|
2019-11-12 14:53:58 +01:00 |
|
Joan Sanchez
|
05c4c9e96a
|
ticket.weekly removed create section already on ticket descriptor #1841
|
2019-11-12 14:48:03 +01:00 |
|
Juan Ferrer
|
1c035ca045
|
All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-12 14:18:46 +01:00 |
|
Carlos Jimenez Ruiz
|
266de44f2f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-12 13:19:34 +01:00 |
|
Bernat
|
7cbbc4c18e
|
#1870 exportar produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-11-12 11:13:20 +01:00 |
|
Juan Ferrer
|
a4f6c64e59
|
Merge
|
2019-11-12 09:24:08 +01:00 |
|
Juan Ferrer
|
f6050a6c65
|
Merge
|
2019-11-12 09:24:01 +01:00 |
|
Carlos Jimenez Ruiz
|
d284e36ee6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-12 08:52:07 +01:00 |
|
Bernat
|
74a2c58954
|
Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 08:51:50 +01:00 |
|
Juan Ferrer
|
95d943e515
|
E2E fixes
|
2019-11-11 16:32:03 +01:00 |
|
Juan Ferrer
|
efa6ddc0f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-11 16:25:00 +01:00 |
|
Joan Sanchez
|
6cedfceddd
|
Show ticket state #1836
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:51:30 +01:00 |
|
Joan Sanchez
|
42524c7f1d
|
increased width to expand class #1845
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:22:25 +01:00 |
|
Joan Sanchez
|
5b2e407870
|
dialog styles
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-11 12:26:22 +01:00 |
|
Joan Sanchez
|
6f7962935d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
|
2019-11-11 11:24:26 +01:00 |
|
Joan Sanchez
|
115156f89d
|
updated unit tests
gitea/salix/1466-print_refactor This commit has test failures
Details
|
2019-11-11 11:23:39 +01:00 |
|
Joan Sanchez
|
0838540789
|
template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-11 11:04:49 +01:00 |
|
Juan Ferrer
|
cf6961f5c5
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures
Details
|
2019-11-10 14:13:55 +01:00 |
|
Juan Ferrer
|
976782738e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-10 13:27:31 +01:00 |
|
Juan Ferrer
|
bee50a6b03
|
Front tests passed
|
2019-11-10 13:10:52 +01:00 |
|
Juan Ferrer
|
515234187a
|
First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit
Details
|
2019-11-10 11:08:44 +01:00 |
|
Carlos Jimenez Ruiz
|
f2de7ddab4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-07 12:17:33 +01:00 |
|
Joan Sanchez
|
5705c37f92
|
show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-07 11:19:05 +01:00 |
|
Bernat
|
84ccfe0422
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-07 07:51:21 +01:00 |
|
Javi Gallego
|
eaa2ef4570
|
zone warehouse error
gitea/salix/dev This commit looks good
Details
|
2019-11-07 07:49:37 +01:00 |
|
Carlos Jimenez Ruiz
|
9442a198b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-06 15:13:14 +01:00 |
|
Bernat
|
4220c995a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-06 14:02:26 +01:00 |
|
Javi Gallego
|
729f6cb767
|
changes to zone
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-11-06 13:44:58 +01:00 |
|
Joan Sanchez
|
3cd92211a1
|
test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-06 10:55:04 +01:00 |
|
Joan Sanchez
|
3d701f534a
|
updated tests
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-06 09:32:54 +01:00 |
|
Joan Sanchez
|
23f6c8843d
|
#1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-06 08:20:45 +01:00 |
|
Carlos Jimenez Ruiz
|
76f3dc48e5
|
#1852 worker.time-control
|
2019-11-05 11:57:05 +01:00 |
|
Joan Sanchez
|
cac8cb6a6a
|
dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-05 09:16:16 +01:00 |
|
Carlos Jimenez Ruiz
|
b9be0188d8
|
manual merge
|
2019-11-05 09:05:00 +01:00 |
|
Carlos Jimenez Ruiz
|
03ab88bcd9
|
#1852 worker.time-control
|
2019-11-05 08:59:48 +01:00 |
|
Bernat
|
1be61b16d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-05 08:56:59 +01:00 |
|
Joan Sanchez
|
5d83849e2b
|
unknown provider
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-11-05 07:19:16 +01:00 |
|
Joan Sanchez
|
14cb32d1c8
|
updated reports
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-04 13:55:20 +01:00 |
|
Joan Sanchez
|
fc2abdc0ab
|
change log columns size
gitea/salix/dev This commit looks good
Details
|
2019-11-04 08:05:00 +01:00 |
|
Juan Ferrer
|
026c608f42
|
Faster module loading & vnAgencyCalendar bug fixes
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-11-01 13:02:47 +01:00 |
|
Juan Ferrer
|
4fcaa2e507
|
Jest fixes
gitea/salix/dev This commit looks good
Details
|
2019-10-31 15:38:20 +01:00 |
|
Juan Ferrer
|
f759c1e11a
|
vnDialog bug fixes & front tests, workerTimeControl date fixes
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-31 15:24:28 +01:00 |
|
Juan Ferrer
|
38b4483edf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-31 13:43:15 +01:00 |
|
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good
Details
|
2019-10-31 12:54:16 +01:00 |
|
Juan Ferrer
|
5a15e65fd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-30 16:57:26 +01:00 |
|
Juan Ferrer
|
c41fb1d0f4
|
#1847 vnDialog refactor
|
2019-10-30 16:57:14 +01:00 |
|
Bernat
|
9353d54b16
|
add alias on weekly filter
|
2019-10-29 14:55:05 +01:00 |
|
Javi Gallego
|
7dfdfc45c7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-29 12:58:39 +01:00 |
|
Javi Gallego
|
700c092b90
|
merge
|
2019-10-29 12:58:26 +01:00 |
quique
|
49b06e3472
|
send rocket chat message
gitea/salix/dev This commit looks good
Details
|
2019-10-29 12:39:25 +01:00 |
|
Javi Gallego
|
1a56f0af96
|
zoneRefactor
|
2019-10-29 12:29:38 +01:00 |
|
Joan Sanchez
|
443aa56fed
|
refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-10-29 07:46:44 +01:00 |
|
Juan Ferrer
|
0a4a22ec87
|
vnInputFile fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-28 21:40:24 +01:00 |
|
Juan Ferrer
|
1b2c383502
|
vnDialog opens in body, nightmare extensions with detailed errors
|
2019-10-28 17:31:33 +01:00 |
|
Juan Ferrer
|
47998aaa97
|
vnDialog opens in body
|
2019-10-27 01:30:01 +02:00 |
|
Juan Ferrer
|
dc18c4ba2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-26 12:05:00 +02:00 |
|
Juan Ferrer
|
5ae558e965
|
Watchers performance fixes
|
2019-10-26 12:04:48 +02:00 |
|
Bernat
|
35966afad0
|
refactor travel
gitea/salix/dev This commit looks good
Details
|
2019-10-25 14:06:32 +02:00 |
|
Bernat
|
4eca2e9453
|
merge
gitea/salix/1776travel.basic-data This commit looks good
Details
|
2019-10-25 13:31:01 +02:00 |
|
Bernat
|
d02c79d2e8
|
#1774 travel.index test and refactor
|
2019-10-25 13:29:05 +02:00 |
|
Bernat
|
9fd0ab0bd3
|
#1775 travel.log crear sección historial
|
2019-10-25 13:28:12 +02:00 |
|
Bernat
|
5547193a31
|
#1776 travel.basicData
|
2019-10-25 13:26:38 +02:00 |
|
Juan Ferrer
|
5fdfda47b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-25 00:53:57 +02:00 |
|
Juan Ferrer
|
c7384bb3ac
|
API path prefix, repeated code removed from tests
|
2019-10-25 00:53:53 +02:00 |
|
Bernat
|
eb384425f2
|
#1777 travel.descriptor
gitea/salix/dev This commit looks good
Details
|
2019-10-24 14:43:11 +02:00 |
|
Bernat
|
afd7c5684a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good
Details
|
2019-10-24 12:49:23 +02:00 |
|
Bernat
|
7bdb497976
|
#1773 travel.summary & #1774
|
2019-10-24 12:49:18 +02:00 |
|
Juan Ferrer
|
ee196df2ff
|
vnCompent with most common services as properties
gitea/salix/dev This commit looks good
Details
|
2019-10-24 12:44:36 +02:00 |
|
Juan Ferrer
|
4685b4166b
|
Improved event handling
gitea/salix/dev This commit looks good
Details
|
2019-10-24 10:17:32 +02:00 |
|
Juan Ferrer
|
53003246c3
|
Merge with upstream
|
2019-10-23 17:42:41 +02:00 |
|
Juan Ferrer
|
2436bf9488
|
Agency events - First stable version
|
2019-10-23 17:38:35 +02:00 |
|
Carlos Jimenez Ruiz
|
6cbfa895da
|
fixed a typo
gitea/salix/dev This commit looks good
Details
|
2019-10-23 15:04:05 +02:00 |
|
Carlos Jimenez Ruiz
|
c84625b0d5
|
#1713 route.tickets boton mas bajo derecha
gitea/salix/dev This commit looks good
Details
|
2019-10-23 09:25:28 +02:00 |
|
Joan Sanchez
|
d1e8f5fb1c
|
removed endpoints
gitea/salix/dev This commit looks good
Details
|
2019-10-23 07:18:09 +02:00 |
|
Joan Sanchez
|
b6d666d223
|
removed IOS worker-time-controls endpoints
gitea/salix/dev This commit has test failures
Details
|
2019-10-23 07:14:12 +02:00 |
|
Joan Sanchez
|
137f701434
|
changed order
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-10-22 14:20:50 +02:00 |
|
Joan Sanchez
|
2ed4cf3e4a
|
Item request refactor #1818
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-22 13:44:36 +02:00 |
|
Joan Sanchez
|
58a763acf5
|
added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-21 14:21:52 +02:00 |
|
Joan Sanchez
|
8e1d594a13
|
was saving data on page load #1820
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-21 13:43:17 +02:00 |
|
Joan Sanchez
|
188f4ae3bf
|
mark item diary line
gitea/salix/dev This commit looks good
Details
|
2019-10-21 11:08:41 +02:00 |
|
Bernat
|
939c507fba
|
#1810 El método listPackaging filtrar por isPackagingReturnable
|
2019-10-21 09:16:52 +02:00 |
|
Bernat
|
6adeb689eb
|
Tarea #1814 refactor fixtures userPhone
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:52:42 +02:00 |
|
Bernat
|
e9f65cd2a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:42:30 +02:00 |
|
Joan Sanchez
|
e2a7c09e4a
|
Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:31:14 +02:00 |
|
Bernat
|
6477a1458d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-21 07:24:56 +02:00 |
|
Joan Sanchez
|
55f3390f85
|
added validation for confirmed purcharse requests
gitea/salix/dev This commit has test failures
Details
|
2019-10-21 07:08:47 +02:00 |
|
Juan Ferrer
|
72017a64ac
|
Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures
Details
|
2019-10-19 01:18:25 +02:00 |
|
Juan Ferrer
|
de9a8443ca
|
Style fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-18 22:28:08 +02:00 |
|
Juan Ferrer
|
485bc43b13
|
Style fixes
|
2019-10-18 22:07:55 +02:00 |
|
Juan Ferrer
|
17a150370c
|
Style fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-18 21:54:13 +02:00 |
|
Juan Ferrer
|
43fd8fe75e
|
Merge
|
2019-10-18 21:37:28 +02:00 |
|
Juan Ferrer
|
457034daad
|
Tests fixed
|
2019-10-18 21:36:30 +02:00 |
|
Bernat
|
85bcb356d4
|
1778 Refactor worker.phone
|
2019-10-18 13:52:15 +02:00 |
|
Bernat
|
b78447bdd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-18 13:51:24 +02:00 |
|
Joan Sanchez
|
18b0ae034c
|
#1815 - show summary correct photos on claim index
gitea/salix/dev This commit looks good
Details
|
2019-10-18 09:53:30 +02:00 |
|
Bernat
|
1cedd6cbfd
|
merge
|
2019-10-18 08:38:25 +02:00 |
|
Bernat
|
7a89ab5335
|
#1778 Refactor worker.phone
|
2019-10-18 08:36:33 +02:00 |
|
Carlos Jimenez Ruiz
|
bdbadaf61a
|
#1819 fixtures
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-17 14:30:52 +02:00 |
|
Joan Sanchez
|
f2a05ff915
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 14:08:29 +02:00 |
|
Bernat
|
7ee03d91f8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-17 14:01:58 +02:00 |
|
Joan Sanchez
|
e1cea99cc0
|
insert timeControl from procedure
gitea/salix/dev This commit looks good
Details
|
2019-10-17 14:01:23 +02:00 |
|
Joan Sanchez
|
04785d3f72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:28:07 +02:00 |
|
Joan Sanchez
|
b2b76b05d8
|
css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:27:50 +02:00 |
|
Carlos Jimenez Ruiz
|
8ce804a099
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-17 11:56:12 +02:00 |
|
Bernat
|
24861fe5b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-17 11:55:36 +02:00 |
|
Joan Sanchez
|
4ca001d98e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 11:09:03 +02:00 |