 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 |
|
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 |