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 |
|
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 |
 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 |
|
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 |
|
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
|
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
|
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 |
|
Juan Ferrer
|
3428dfa6e0
|
Migration complete & test
|
2019-12-11 15:01:01 +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 |