 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 |
|
Joan Sanchez
|
79f9e616d2
|
added treeview unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 11:08:40 +02:00 |
|
Carlos Jimenez Ruiz
|
e0d9f69aef
|
corrected a description
|
2019-10-16 10:59:42 +02:00 |
|
Joan Sanchez
|
6d159c50a0
|
css fixes
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-16 09:52:46 +02:00 |
|
Joan Sanchez
|
dadfc92ebd
|
pull from dev
|
2019-10-16 09:52:32 +02:00 |
|
Joan Sanchez
|
7aaa8f4a5e
|
refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-16 08:56:13 +02:00 |
|
Juan Ferrer
|
e1e65e8b2e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-16 08:23:16 +02:00 |
|
Bernat
|
061e978a26
|
#1758 Añadir los alias como prefijos en los filtros
|
2019-10-16 08:08:10 +02:00 |
|
Carlos Jimenez Ruiz
|
a501cb8887
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-16 08:03:09 +02:00 |
|
Carlos Jimenez Ruiz
|
b37e308a4b
|
#1811 send.js unit test
|
2019-10-16 08:01:34 +02:00 |
|
Joan Sanchez
|
6ed5695063
|
Added zoneFk to routes. solved #1713
gitea/salix/dev This commit looks good
Details
|
2019-10-16 07:18:05 +02:00 |
|
Juan Ferrer
|
a2881e5b1a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-15 16:19:38 +02:00 |
|
Juan Ferrer
|
3bf44d08de
|
vnDatePicker refactor
|
2019-10-15 16:19:35 +02:00 |
|
Bernat
|
25bd28990a
|
Refactor #1812 refactor phone
gitea/salix/dev This commit looks good
Details
|
2019-10-15 14:44:00 +02:00 |
|
Bernat
|
c6a078d82d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-15 14:35:58 +02:00 |
|
Carlos Jimenez Ruiz
|
3595524286
|
#1794 index de balance pierde la companyFk
gitea/salix/dev This commit looks good
Details
|
2019-10-15 13:18:56 +02:00 |
|
Joan Sanchez
|
3853fc7404
|
descuadre de horas #1766 rollback
gitea/salix/dev This commit looks good
Details
|
2019-10-15 08:50:11 +02:00 |
|
Bernat
|
fe5a77257f
|
#1758 Añadir los alias como prefijos en los filtros
|
2019-10-15 08:32:25 +02:00 |
|
Carlos Jimenez Ruiz
|
c46797d57e
|
removed third party endpoint test
gitea/salix/dev This commit looks good
Details
|
2019-10-15 08:15:04 +02:00 |
|
Carlos Jimenez Ruiz
|
1086d3d362
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-15 07:43:51 +02:00 |
|
Bernat
|
793dd06e8d
|
merge
gitea/salix/1763-worker_time_control_add This commit looks good
Details
|
2019-10-15 07:30:23 +02:00 |
|
Bernat
|
ed1ed7f50b
|
#1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-10-15 07:23:34 +02:00 |
|
Carlos Jimenez Ruiz
|
c57583e64b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-14 15:20:10 +02:00 |
|
Carlos Jimenez Ruiz
|
5b47eb54b2
|
#1767 client.balance.index, campo referencia
|
2019-10-14 15:20:03 +02:00 |
|
Joan Sanchez
|
e79456374c
|
fixed item-popover width
gitea/salix/dev This commit looks good
Details
|
2019-10-14 14:54:11 +02:00 |
|
Joan Sanchez
|
300ba61fd3
|
#1759 Forzar desenrutado al cambiar datos básicos de ticket
|
2019-10-14 14:43:10 +02:00 |
|
Joan Sanchez
|
ecda659a8c
|
Bug #1796 fixed edit discount dialog position
gitea/salix/dev This commit looks good
Details
|
2019-10-14 14:17:18 +02:00 |
|
Joan Sanchez
|
1f8f5af301
|
fixed transaction params
gitea/salix/dev Build queued...
Details
|
2019-10-14 11:50:45 +02:00 |
|
Joan Sanchez
|
81097287fa
|
#1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good
Details
|
2019-10-14 11:44:54 +02:00 |
|
Carlos Jimenez Ruiz
|
4a6ff9ca20
|
removed useless FIXME comments as per #1782
gitea/salix/dev This commit looks good
Details
|
2019-10-14 10:59:10 +02:00 |
|
Joan Sanchez
|
4a2d61ddcb
|
#1769 removed route report from ticket descriptor
gitea/salix/dev This commit looks good
Details
|
2019-10-14 08:52:48 +02:00 |
|
Joan Sanchez
|
cd2b02b0c6
|
Bug/Test #1753 - Added dateTime filter
|
2019-10-14 08:52:48 +02:00 |
|
Bernat
|
e267bf93a4
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-10-14 07:01:29 +02:00 |
|
Bernat
|
d637ed2599
|
1717, route basic data
|
2019-10-14 06:58:02 +02:00 |