Jorge Padawan
|
3517bdea41
|
Añadido a las foreignKeys el valor UNIQUE
|
2020-12-23 13:31:55 +01:00 |
Bernat Exposito
|
a21476e3df
|
fix searchbar index
|
2020-12-23 12:42:41 +01:00 |
Jorge Padawan
|
a19064cb1b
|
Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays
|
2020-12-23 12:23:37 +01:00 |
Javi Gallego
|
36bace2a94
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
|
2020-12-22 07:42:28 +01:00 |
Javi Gallego
|
340927799c
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
|
2020-12-21 09:53:00 +01:00 |
Javi Gallego
|
3a6d62ac7d
|
xdiario
|
2020-12-21 09:52:27 +01:00 |
Joan Sanchez
|
d8a2184695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-18 17:24:30 +01:00 |
Joan Sanchez
|
42cd2356a2
|
Refactor v2
|
2020-12-18 17:23:04 +01:00 |
Bernat Exposito
|
d1793351fb
|
Merge pull request 'fixtures amended for calendar testing' (#484) from 2622-route_tickets_refactor into dev
Reviewed-on: #484
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-12-18 12:33:18 +00:00 |
Carlos Jimenez Ruiz
|
177d3cd35b
|
fixtures amended for calendar testing
|
2020-12-18 13:16:44 +01:00 |
Jorge Benedito
|
29ec268113
|
Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
|
2020-12-18 08:34:00 +00:00 |
Javi Gallego
|
87adbbfa3c
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
|
2020-12-18 08:21:36 +01:00 |
Bernat Exposito
|
0b5a98c2fe
|
export production
|
2020-12-17 15:17:03 +01:00 |
Jorge Padawan
|
33237dad86
|
Add acl to supplier billing data
|
2020-12-17 12:29:37 +01:00 |
Joan Sanchez
|
5ecd589106
|
Updated delivery note
|
2020-12-16 09:24:11 +01:00 |
Javi Gallego
|
2bb9125eee
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
|
2020-12-16 08:34:54 +01:00 |
Javi Gallego
|
963db11686
|
funcionalidad
|
2020-12-16 08:33:08 +01:00 |
Joan Sanchez
|
0a4016be41
|
Updated unit tests & changed ACL
|
2020-12-11 15:04:55 +01:00 |
Joan Sanchez
|
59c622481f
|
Updated image fixtures
|
2020-12-10 13:21:11 +01:00 |
Joan Sanchez
|
260b502cd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-10 07:30:31 +01:00 |
Bernat Exposito
|
6605e5ae4c
|
zoneLog
|
2020-12-02 12:05:47 +01:00 |
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
|
2020-11-27 13:10:39 +01:00 |
Bernat Exposito
|
06e7583f2b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
|
2020-11-25 12:47:17 +01:00 |
Bernat Exposito
|
78f25e0b46
|
export production
|
2020-11-25 12:37:44 +01:00 |
Javi Gallego
|
b23a441f31
|
fixtures
|
2020-11-23 12:20:58 +01:00 |
Joan Sanchez
|
d40ea52560
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
|
2020-11-20 15:06:34 +01:00 |
Joan Sanchez
|
7693a1c449
|
2569 - Section changes
|
2020-11-20 15:05:57 +01:00 |
Joan Sanchez
|
8a3f5345f4
|
Merge branch 'dev' into 2575-image_download
|
2020-11-16 13:54:47 +00:00 |
Joan Sanchez
|
359dcc904d
|
Version merge
|
2020-11-16 09:08:39 +01:00 |
Joan Sanchez
|
8194801308
|
Supplier cargo migration to vn
|
2020-11-16 08:48:42 +01:00 |
Juan Ferrer
|
80cbb53dfe
|
Merge branch 'test' into dev
|
2020-11-13 10:49:59 +01:00 |
Juan Ferrer
|
cdf6cb661f
|
Login sync fixes
|
2020-11-13 10:33:34 +01:00 |
Bernat Exposito
|
6fc14d569c
|
Merge branch 'dev' into 2575-image_download
|
2020-11-13 08:32:39 +00:00 |
Joan Sanchez
|
cb8e9655af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-13 07:22:12 +01:00 |
Juan Ferrer
|
4b46b0787b
|
User syncronization fixes, improvements, refactor
|
2020-11-12 23:20:25 +01:00 |
Bernat Exposito
|
5be616ad91
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
|
2020-11-12 08:04:38 +01:00 |
Bernat Exposito
|
eb8931bca5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-11 13:57:37 +01:00 |
Joan Sanchez
|
db4f226f6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-11 12:39:15 +01:00 |
Bernat Exposito
|
1e95f0105a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-11 10:52:46 +01:00 |
Bernat Exposito
|
75ffa108fb
|
refactor back download
|
2020-11-11 10:52:35 +01:00 |
Joan Sanchez
|
08af948eb0
|
Merge branch 'dev' into 2574-itemTag_refactor
|
2020-11-10 12:39:17 +00:00 |
Bernat Exposito
|
e4e4f37609
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-10 08:46:37 +01:00 |
Bernat Exposito
|
4ea5993dcc
|
user image
|
2020-11-10 08:39:34 +01:00 |
Juan Ferrer
|
2628faa9d0
|
Sync hotfixes
|
2020-11-06 22:55:47 +01:00 |
Carlos Jimenez Ruiz
|
ead0994032
|
timeControlCalculate procedure updated
|
2020-11-05 10:33:02 +01:00 |
Joan Sanchez
|
4c88a46b63
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor
|
2020-11-05 09:12:25 +01:00 |
Joan Sanchez
|
a325ef2a78
|
2574 - ItemTag refactor sourceTable
|
2020-11-04 11:29:10 +01:00 |
Bernat Exposito
|
2dc51e6125
|
update acl
|
2020-11-03 09:34:50 +01:00 |
Bernat Exposito
|
61c3d2233b
|
delete old sqls
|
2020-11-03 09:34:35 +01:00 |
Carlos Jimenez Ruiz
|
d533e9da2e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-03 09:22:07 +01:00 |
Bernat Exposito
|
8976034bb0
|
fix fixtures
|
2020-11-03 08:15:49 +01:00 |
Bernat Exposito
|
f2ee122778
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
|
2020-11-03 07:51:25 +01:00 |
Juan Ferrer
|
fc957eda6c
|
Merge branch 'test' into dev
|
2020-11-02 19:58:45 +01:00 |
Juan Ferrer
|
b3ab1fe059
|
Sync fixes & improvements
|
2020-11-02 19:58:07 +01:00 |
Joan Sanchez
|
413283288f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 15:38:23 +01:00 |
Bernat Exposito
|
b2d69127cb
|
Merge branch 'dev' into 2565-address_fixtures
|
2020-11-02 14:31:36 +00:00 |
Joan Sanchez
|
15b7280222
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 14:31:39 +01:00 |
Joan Sanchez
|
590de622f5
|
Added model validations
|
2020-11-02 14:30:33 +01:00 |
Bernat Exposito
|
d07e95a7e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-11-02 11:14:42 +01:00 |
Bernat Exposito
|
e700f11863
|
acls
|
2020-11-02 11:14:21 +01:00 |
Bernat Exposito
|
7e2555ddf1
|
export production
|
2020-11-02 10:58:27 +01:00 |
Juan Ferrer
|
b6da896fe7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-02 10:11:34 +01:00 |
Bernat Exposito
|
d6c5e0ef0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures
|
2020-11-02 09:27:35 +01:00 |
Joan Sanchez
|
565bd013bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 08:32:46 +01:00 |
Juan Ferrer
|
e25a978b19
|
Merge branch 'test' into dev
|
2020-11-01 00:03:05 +01:00 |
Juan Ferrer
|
9b4f8697b9
|
User sync fixes
|
2020-10-31 21:16:58 +01:00 |
Bernat Exposito
|
459f4068ab
|
fix fixtures
|
2020-10-31 11:05:16 +01:00 |
Juan Ferrer
|
15c39f93ca
|
root id changed from 0 to 100 due to loopback join problems with id 0
|
2020-10-31 01:10:32 +01:00 |
Juan Ferrer
|
9b563cb8bf
|
LDAP & Samba synchronization fixes + improvements
|
2020-10-31 00:02:27 +01:00 |
Javi Gallego
|
b50ae7b8ca
|
testback arreglados
|
2020-10-30 15:50:59 +01:00 |
Joan Sanchez
|
245b32a47f
|
Added section
|
2020-10-30 15:11:45 +01:00 |
Bernat Exposito
|
39de960b9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-10-30 10:23:47 +01:00 |
Bernat Exposito
|
7200aa3dfc
|
fixtures and sql for supplierContact
|
2020-10-30 10:23:42 +01:00 |
Javi Gallego
|
59cbe276f4
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-30 10:08:38 +01:00 |
Javi Gallego
|
31b5a140d4
|
test completados
|
2020-10-30 10:07:53 +01:00 |
Javi Gallego
|
3fdc9c315d
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-30 08:40:47 +01:00 |
Bernat Exposito
|
ea8d9e70b0
|
supplier log
|
2020-10-30 08:27:02 +01:00 |
Bernat Exposito
|
792b689b58
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log
|
2020-10-29 13:40:21 +01:00 |
Bernat Exposito Domenech
|
a5e6f99b1f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-29 08:06:50 +01:00 |
Bernat Exposito Domenech
|
77bc1b562e
|
create section supplier log
|
2020-10-28 09:08:27 +01:00 |
Joan Sanchez
|
3675f7ed34
|
2511 - Changed salesAssitant role to claimManager
|
2020-10-26 12:16:57 +01:00 |
Bernat Exposito Domenech
|
1699e0619c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-26 08:43:20 +01:00 |
Bernat Exposito Domenech
|
58168e78ab
|
test, translate and supplier searpanel, summary
|
2020-10-26 08:38:43 +01:00 |
Bernat Exposito Domenech
|
fe2f12cd8f
|
first test step
|
2020-10-22 09:35:11 +02:00 |
Javi Gallego
|
7dfe7ee379
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-21 12:35:09 +02:00 |
Joan Sanchez
|
5daee49382
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-10-21 11:52:02 +02:00 |
Javi Gallego
|
ef7a886d86
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-21 10:13:04 +02:00 |
Joan Sanchez
|
f7e9372bf0
|
2525 - Change to past date
|
2020-10-20 15:12:00 +02:00 |
Javi Gallego
|
4aea284703
|
WIP: a falta de e2e
|
2020-10-20 14:42:23 +02:00 |
Bernat Exposito Domenech
|
7eed2ddd59
|
export structure and fix test
|
2020-10-20 12:47:37 +02:00 |
Carlos Jimenez Ruiz
|
cc99c1e980
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation
|
2020-10-16 13:04:58 +02:00 |
Bernat Exposito
|
0fbbe9b2ae
|
Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-10-15 07:57:57 +00:00 |
Bernat Exposito Domenech
|
cc35998f62
|
new module supplier, created section index and searchpanel
|
2020-10-15 08:15:04 +02:00 |
Joan Sanchez
|
6fa8aae161
|
2509 - Added forms to create new locations
|
2020-10-14 11:33:42 +02:00 |
Joan Sanchez
|
e48effca08
|
Stop container before remove
|
2020-10-13 12:28:58 +02:00 |
Joan Sanchez
|
f00828cf57
|
Merge branch 'dev' into 2481-campaign_filter
|
2020-10-06 05:44:11 +00:00 |
Javi Gallego
|
77064d85a0
|
Merge branch 'dev' into 2443
|
2020-10-05 12:54:02 +00:00 |
Javi Gallego
|
531bb6da25
|
quito copy
|
2020-10-05 13:22:56 +02:00 |
Joan Sanchez
|
86025b88e3
|
Merge branch 'dev' into 2481-campaign_filter
|
2020-10-05 09:36:02 +00:00 |
Joan Sanchez
|
cef2dc982f
|
Updated sql
|
2020-10-05 10:47:12 +02:00 |
Joan Sanchez
|
ad11a92c87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar
|
2020-10-05 10:02:44 +02:00 |
Joan Sanchez
|
cdde4d95d7
|
Added filter
|
2020-10-05 07:53:03 +02:00 |
Joan Sanchez
|
420dfdbdff
|
Send notification by email
|
2020-10-02 12:23:48 +02:00 |
Javi Gallego
|
8d1709ea51
|
Merge branch 'dev' into 2443
|
2020-10-01 16:46:33 +02:00 |
Javi Gallego
|
78e22df177
|
test e2e de expense ok
|
2020-10-01 16:45:28 +02:00 |
Juan Ferrer
|
6d8b13423f
|
SQL hotfix
|
2020-10-01 10:02:19 +02:00 |
Javi Gallego
|
2714857227
|
Merge branch 'dev' into 2443
|
2020-09-30 14:07:38 +02:00 |
Juan Ferrer
|
611aa9cafa
|
SQL hotfix
|
2020-09-29 10:55:04 +02:00 |
Joan Sanchez
|
ec2385cd15
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-29 06:53:14 +00:00 |
Bernat Exposito Domenech
|
5f9ef3aea3
|
export structure db
|
2020-09-29 07:37:29 +02:00 |
Juan Ferrer
|
991bece64a
|
SQL fixes
|
2020-09-28 21:25:53 +02:00 |
Juan Ferrer
|
82de0a30a4
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-28 10:41:16 +02:00 |
Juan Ferrer
|
5264b615d4
|
Optimización docker salix-db
|
2020-09-28 10:40:50 +02:00 |
Joan Sanchez
|
0438171a47
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-28 06:09:48 +00:00 |
Bernat Exposito Domenech
|
790c9bfe6f
|
update models and fixtures
|
2020-09-25 14:50:04 +02:00 |
Javi Gallego
|
c909470f41
|
merge
|
2020-09-25 08:10:37 +02:00 |
Joan Sanchez
|
de3c7acb08
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-24 12:30:44 +00:00 |
Joan Sanchez
|
164f636f3f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2020-09-24 09:02:16 +02:00 |
Joan Sanchez
|
44e23ca560
|
Removed sql version
|
2020-09-24 09:00:42 +02:00 |
Bernat Exposito Domenech
|
ca41b93995
|
mail models and fix checkInbox
|
2020-09-23 08:09:06 +02:00 |
Bernat Exposito Domenech
|
d4c819ebf7
|
new models and fixtures
|
2020-09-23 07:59:10 +02:00 |
Bernat Exposito Domenech
|
ce1c4e6f60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-09-22 14:00:52 +02:00 |
Bernat Exposito Domenech
|
06f03c6b84
|
mail models and fix checkInbox
|
2020-09-22 13:59:00 +02:00 |
Juan Ferrer
|
81de97c071
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-21 18:33:28 +02:00 |
Juan Ferrer
|
9528fe0a19
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-21 17:47:55 +02:00 |
Juan Ferrer
|
5e056c315f
|
Tests fixed
|
2020-09-21 17:46:40 +02:00 |
Juan Ferrer
|
1c621cff85
|
Fixtures fixes
|
2020-09-21 16:43:17 +02:00 |
Juan Ferrer
|
3880e21ce3
|
Test fixes
|
2020-09-21 16:09:34 +02:00 |
Juan Ferrer
|
fc6a19b60d
|
Merge branch 'dev' into 2177-userModule
|
2020-09-21 14:10:15 +02:00 |
Juan Ferrer
|
b9c526c29c
|
LDAP user & role syncronization
|
2020-09-21 13:24:43 +02:00 |
Javi Gallego
|
8fb674819a
|
ticket service
|
2020-09-21 10:35:39 +02:00 |
Carlos Jimenez Ruiz
|
f50f4514fd
|
fixtures enhanced for tags
|
2020-09-16 11:11:18 +02:00 |
Joan Sanchez
|
1f1b09d456
|
Updated unit tests
|
2020-09-15 14:14:13 +02:00 |
Carlos Jimenez Ruiz
|
bf17d428e4
|
entry basic data + some minor refactors
|
2020-09-11 14:51:58 +02:00 |
Juan Ferrer
|
61f3f82117
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-11 14:39:02 +02:00 |
Juan Ferrer
|
4b5d2cd0dd
|
2177 account module
LDAP test
RC1
SQL version changed
Tests fixes
Back & front tests fixed
All tests passed
Front and back tests plus some fixes
|
2020-09-11 14:36:16 +02:00 |
Carlos Jimenez Ruiz
|
270e665291
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color
|
2020-09-10 14:38:48 +02:00 |
Bernat Exposito Domenech
|
0cf99a5a83
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
|
2020-09-10 11:34:35 +02:00 |
Bernat Exposito Domenech
|
87fab5f57c
|
delete duplicated fixtures
|
2020-09-10 11:34:32 +02:00 |
Bernat Exposito Domenech
|
4f50106e92
|
fix fixtures
|
2020-09-10 08:08:00 +02:00 |
Bernat Exposito Domenech
|
fb3f01151c
|
update fixtures
|
2020-09-09 13:49:03 +02:00 |
Bernat Exposito Domenech
|
9ff7232b50
|
export production and fix test
|
2020-09-09 12:54:10 +02:00 |
Bernat Exposito Domenech
|
ed926c39a1
|
fix e2e
|
2020-09-09 11:27:00 +02:00 |
Bernat Exposito Domenech
|
d90fb3444c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-09-08 08:30:00 +02:00 |
Bernat Exposito Domenech
|
174cea7bc3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
|
2020-09-08 07:17:23 +02:00 |
Joan Sanchez
|
3efe14fc53
|
Removed unused vars
|
2020-09-07 12:52:27 +02:00 |
Joan Sanchez
|
ee52581a06
|
Updated param description
|
2020-09-07 12:52:21 +02:00 |
Joan Sanchez
|
8faddef7e8
|
Renamed sql file
|
2020-09-07 12:52:13 +02:00 |
Joan Sanchez
|
812847d82e
|
Changed sql folder
|
2020-09-07 12:52:06 +02:00 |
Joan Sanchez
|
e6804f6ee3
|
Removed procedures
|
2020-09-07 12:51:58 +02:00 |
Joan Sanchez
|
c3e8c0cc58
|
Changes
|
2020-09-07 12:51:49 +02:00 |
Joan Sanchez
|
fa634d2dad
|
2285 - Added closure paths
|
2020-09-07 12:51:38 +02:00 |
Joan Sanchez
|
bb092b1de9
|
Removed unused vars
|
2020-09-07 12:16:20 +02:00 |
Joan Sanchez
|
c10e24b7cd
|
Updated param description
|
2020-09-07 11:50:23 +02:00 |
Joan Sanchez
|
173aac0ba6
|
Renamed sql file
|
2020-09-07 11:45:54 +02:00 |
Joan Sanchez
|
13b3353e9a
|
Changed sql folder
|
2020-09-07 11:45:29 +02:00 |
Joan Sanchez
|
7b42497f88
|
Removed procedures
|
2020-09-07 11:44:44 +02:00 |
Joan Sanchez
|
f3a7fc514a
|
Changes
|
2020-09-07 10:54:39 +02:00 |
Joan Sanchez
|
66f4674392
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure
|
2020-09-07 10:05:52 +02:00 |
Joan Sanchez
|
52cbcf1fa3
|
Updated description
|
2020-09-07 08:34:04 +02:00 |
Carlos Jimenez Ruiz
|
c3c7ef901a
|
version pre-hex in vn.ink table
|
2020-09-04 12:40:23 +02:00 |
Carlos Jimenez Ruiz
|
c796132e77
|
e2e + fixtures amended + refactor
|
2020-09-02 15:20:28 +02:00 |
Carlos Jimenez Ruiz
|
9fa3f17a9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-09-01 17:45:00 +02:00 |
Joan Sanchez
|
cb4fe1f610
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
|
2020-09-01 07:37:48 +00:00 |
Joan Sanchez
|
5a16a10b8f
|
Merge branch 'dev' into 2409-last_entries_contextmenu
|
2020-09-01 06:55:13 +00:00 |
Javi Gallego
|
b4952002a3
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
|
2020-09-01 06:49:09 +00:00 |
Joan Sanchez
|
8ae7871318
|
Removed procedure
|
2020-09-01 07:56:56 +02:00 |
Javi Gallego
|
daee9081d1
|
test excepto invoiceOut
|
2020-08-31 12:29:51 +02:00 |
Javi Gallego
|
8b26c41b7f
|
campo packageFk
|
2020-08-28 17:06:27 +02:00 |
Carlos Jimenez Ruiz
|
c70ad808a0
|
refactor
|
2020-08-27 17:54:43 +02:00 |
Carlos Jimenez Ruiz
|
d156ca95ba
|
front and back unit tests
|
2020-08-27 15:14:30 +02:00 |
Joan Sanchez
|
17542472da
|
2391 - Editable description
|
2020-08-27 08:24:21 +02:00 |
Carlos Jimenez Ruiz
|
3a82ef0e06
|
2375 entry lastBuy seccion
|
2020-08-26 16:33:47 +02:00 |
Joan Sanchez
|
4d8a84e774
|
Fixed back unit tests
|
2020-08-20 08:45:03 +02:00 |
Joan Sanchez
|
7fdfd92a1c
|
Removed sql
|
2020-08-19 13:13:16 +02:00 |
Joan Sanchez
|
f0818acf32
|
2387 - Fixed error when deleting a zone
|
2020-08-19 13:04:12 +02:00 |
Carlos Jimenez Ruiz
|
3a723a2e3d
|
zone descriptor e2e
|
2020-08-14 15:35:50 +02:00 |
Bernat Exposito Domenech
|
0d689a8c01
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
|
2020-08-13 10:43:25 +02:00 |
Bernat Exposito Domenech
|
689245c27d
|
fix test
|
2020-08-12 14:23:13 +02:00 |
Bernat Exposito Domenech
|
f180b73656
|
delete deprecated sql
|
2020-08-12 13:18:55 +02:00 |
Bernat Exposito Domenech
|
1e56619c33
|
export structure and fix test
|
2020-08-12 13:07:58 +02:00 |
Bernat Exposito Domenech
|
96af9bdcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-08-11 11:12:52 +02:00 |
Bernat Exposito Domenech
|
9a4e20bb31
|
new models and fixtures
|
2020-08-11 11:03:43 +02:00 |
Joan Sanchez
|
e2c742c893
|
#2383 - Changed model
|
2020-08-10 14:29:25 +02:00 |
Juan Ferrer
|
bbc5193970
|
#2381 First working version
|
2020-08-07 14:35:20 +02:00 |
Carlos Jimenez Ruiz
|
9402f368f6
|
ticket index and zone descriptor refactor
|
2020-07-30 12:51:19 +02:00 |
Joan Sanchez
|
0348b79f0d
|
Merge branch 'dev' into 1880-refactor_loggable
|
2020-07-16 12:03:22 +00:00 |
Bernat Exposito Domenech
|
8c926a1a7f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable
|
2020-07-16 13:20:41 +02:00 |
Joan Sanchez
|
cfceaa531e
|
Merge branch 'dev' into 2350-order_index
|
2020-07-16 11:18:22 +00:00 |
Joan Sanchez
|
171deeb82c
|
Merge branch 'dev' into 2350-order_index
|
2020-07-16 11:12:34 +00:00 |
Joan Sanchez
|
fa43c2ea2f
|
Merge branch 'dev' into 2369-export_db
|
2020-07-16 10:45:15 +00:00 |
Bernat Exposito Domenech
|
064b950773
|
export production
|
2020-07-16 12:10:18 +02:00 |
Bernat Exposito Domenech
|
f7100f11ee
|
first step add right menu in ticket components
|
2020-07-16 07:43:07 +02:00 |
Bernat Exposito Domenech
|
02c82f894a
|
fix e2e errors
|
2020-07-09 14:14:11 +02:00 |
Bernat Exposito Domenech
|
7d6ac265b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
|
2020-07-09 08:17:03 +02:00 |
Joan Sánchez
|
01b32d2b89
|
Calendar changes
|
2020-07-08 15:05:56 +02:00 |
Joan Sánchez
|
dd8e03dd0f
|
Added absence selection
|
2020-07-07 14:29:57 +02:00 |
Joan Sanchez
|
53d672152b
|
Merge branch 'dev' into 2343-exportar_produccion
|
2020-07-07 06:19:12 +00:00 |
Bernat Exposito Domenech
|
122dacffb5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
|
2020-07-06 10:20:59 +02:00 |
Bernat Exposito Domenech
|
c42c6c19d6
|
changes in order index
|
2020-07-02 07:46:55 +02:00 |
Joan Sanchez
|
b40e09a6cb
|
Methods refactor & updated back unit tests
|
2020-07-01 14:28:05 +02:00 |
Joan Sanchez
|
0a327087ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
|
2020-07-01 11:57:16 +02:00 |
Javi Gallego
|
039eec7d26
|
test excepto fallo e2e
|
2020-06-30 10:16:22 +02:00 |
Javi Gallego
|
db06626675
|
refactor
|
2020-06-29 14:26:27 +02:00 |
Bernat Exposito Domenech
|
ea1eb16060
|
export structure
|
2020-06-29 07:32:08 +02:00 |
Joan Sanchez
|
beb1dd4973
|
absenceType fixture
|
2020-06-27 12:16:56 +02:00 |
Javi Gallego
|
962436b8bb
|
2344 ticket sale descuento usuario
|
2020-06-25 17:12:53 +02:00 |
Joan Sanchez
|
b46cc20511
|
Min TLS v1.0
|
2020-06-17 14:03:14 +02:00 |
Joan Sanchez
|
dd7e6e5716
|
2300 - WaitForHealthy
|
2020-06-16 12:27:17 +02:00 |
Joan Sanchez
|
5d9ed49451
|
2285 - Added closure paths
|
2020-06-16 08:17:01 +02:00 |
Joan Sanchez
|
ed83fd5f73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption
|
2020-06-15 09:00:24 +02:00 |
Joan Sanchez
|
b3db5681fe
|
2290 - Added consumption section
|
2020-06-12 09:18:19 +02:00 |
Carlos Jimenez Ruiz
|
d4f1a90f87
|
ip botained for ci and localhost
|
2020-06-11 10:37:55 +02:00 |
Carlos Jimenez Ruiz
|
477b1c8e1e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker
|
2020-06-11 10:13:54 +02:00 |
Javi Gallego
|
b40be5cca9
|
2035
|
2020-06-05 10:01:21 +02:00 |
Carlos Jimenez Ruiz
|
3ea3f707bc
|
gulpfile refactor and removed unused code
|
2020-06-04 21:09:06 +02:00 |
Joan Sanchez
|
0637302a0b
|
Removed focus
|
2020-06-04 09:49:13 +02:00 |
Bernat Exposito Domenech
|
b3eba1c75a
|
fix dbtest and export production
|
2020-06-02 13:53:54 +02:00 |
Joan Sanchez
|
751f79373a
|
Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:28:14 +00:00 |
Bernat Exposito Domenech
|
546272cc3f
|
zone delete
|
2020-06-02 08:59:04 +02:00 |
Carlos Jimenez Ruiz
|
9deb518064
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent
|
2020-05-28 09:55:05 +02:00 |
Carlos Jimenez Ruiz
|
9bf509cd5d
|
customs agent e2e path + small fixes
|
2020-05-28 09:54:31 +02:00 |
Joan Sanchez
|
5c3e8e9465
|
Added insert ignore
|
2020-05-28 08:09:12 +02:00 |
Joan Sanchez
|
a3e7771295
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix
|
2020-05-28 08:08:00 +02:00 |
Carlos Jimenez Ruiz
|
2345a922c8
|
now we can create thermographs for travelThermograph
|
2020-05-27 13:11:41 +02:00 |
Bernat Exposito Domenech
|
89ce963a4c
|
update db
|
2020-05-27 08:35:24 +02:00 |
Joan Sanchez
|
d24f04912e
|
2205 - Prevent relations to being logged in
|
2020-05-26 14:37:34 +02:00 |
Bernat Exposito Domenech
|
41bf237289
|
dbtest zone_getEvent
|
2020-05-26 12:07:52 +02:00 |
Bernat Exposito
|
26930c5091
|
Merge pull request 'test ticket_makecomponentupdate' (#277) from 2229-dbtest_ticket_componentMakeUpdate into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-26 08:46:54 +00:00 |
Bernat Exposito Domenech
|
9e85e8187c
|
skipped
|
2020-05-26 09:58:08 +02:00 |
Bernat Exposito Domenech
|
a77467fb0e
|
skip test
|
2020-05-26 09:53:30 +02:00 |
Bernat Exposito Domenech
|
1de6b2bd77
|
test ticket_makecomponentupdate
|
2020-05-26 09:28:41 +02:00 |
Bernat Exposito Domenech
|
8c2f57e380
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries
|
2020-05-21 15:26:04 +02:00 |
Bernat Exposito Domenech
|
52241e6f2c
|
update itemLastENtries
|
2020-05-21 15:26:00 +02:00 |
Joan Sanchez
|
ce43c1f2d9
|
Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-21 12:27:14 +00:00 |
Joan Sanchez
|
80a5200281
|
Unified sql
|
2020-05-20 17:03:29 +02:00 |
Bernat Exposito Domenech
|
d4dd5eae0c
|
update fixtures
|
2020-05-20 14:06:51 +02:00 |
Bernat Exposito Domenech
|
8ca12d9fdd
|
fix bugs in travel summary
|
2020-05-20 13:19:02 +02:00 |
Bernat Exposito Domenech
|
bf9ebe21b6
|
comment test skipped
|
2020-05-20 10:38:11 +02:00 |
Bernat Exposito Domenech
|
84f804eaf4
|
skip dbTest until the procedure works fine
|
2020-05-19 14:42:32 +02:00 |
Javi Gallego
|
692af6078c
|
Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
Javi Gallego
|
a7e6e3d4b7
|
cr juan
|
2020-05-19 08:46:42 +02:00 |
Bernat Exposito
|
5f8a2a24f5
|
Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-05-19 06:42:07 +00:00 |
Joan Sanchez
|
af0d0f1fbe
|
Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-19 06:18:23 +00:00 |
Joan Sanchez
|
4aea769797
|
2246 Added claim state priority field
|
2020-05-18 13:46:45 +02:00 |
Joan Sanchez
|
53b55468fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
|
2020-05-18 11:45:43 +02:00 |
Bernat Exposito Domenech
|
37d5cf5975
|
delete old db changes
|
2020-05-18 10:29:57 +02:00 |
Joan Sanchez
|
42bec3a944
|
1833 Claim action refactor
|
2020-05-15 14:47:19 +02:00 |
Bernat Exposito Domenech
|
5ceb26c6da
|
update structure and fix test
|
2020-05-15 13:11:23 +02:00 |
Javi Gallego
|
3815edfbea
|
falta CR
|
2020-05-15 12:17:34 +02:00 |
Joan Sanchez
|
94a219760c
|
2223 Added pickup checkbox
|
2020-05-13 15:04:57 +02:00 |
Juan Ferrer
|
58be5ef78e
|
Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev
|
2020-05-08 10:16:31 +00:00 |
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
|
2020-05-06 18:42:50 +02:00 |
Javi Gallego
|
ceb3d1f4cf
|
all filters tested
|
2020-04-30 07:20:43 +02:00 |
Javi Gallego
|
6dacf20bd9
|
ticket.index modificar orden de las secciones
|
2020-04-23 17:59:46 +02:00 |
Javi Gallego
|
dbb2257430
|
test de zone_getLanded y zone_getFromGeo
|
2020-04-20 13:49:33 +02:00 |
Joan Sanchez
|
2ad14230b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz
|
2020-04-17 14:22:46 +02:00 |
Javi Gallego
|
09e425c33c
|
2174 ticket.weekly con campo agencyModeFk con E2E
|
2020-04-08 12:33:36 +02:00 |
Javi Gallego
|
ea1cc68d29
|
test passed
|
2020-04-03 17:52:47 +02:00 |
Javi Gallego
|
0b966cbb76
|
Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia
|
2020-04-03 08:28:49 +02:00 |
Ainki
|
42f3bfb86d
|
test, fitxures and changes
|
2020-03-30 14:28:29 +02:00 |
Javi Gallego
|
729daf8b34
|
Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
|
2020-03-27 12:16:47 +01:00 |
Joan Sanchez
|
d640b66ef5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
|
2020-03-27 11:22:00 +01:00 |
Joan Sanchez
|
d4ca58edad
|
Updated back unit test
|
2020-03-27 09:10:30 +01:00 |
Javi Gallego
|
0a8272a730
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
|
2020-03-26 17:52:41 +01:00 |
Javi Gallego
|
d53cedd5d4
|
preparado para PR
|
2020-03-26 17:41:40 +01:00 |
Joan Sanchez
|
f231fabef1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
|
2020-03-25 16:14:13 +01:00 |
Bernat Exposito
|
77e8bbc2ce
|
Merge branch '2182_worker_log' of verdnatura/salix into dev
|
2020-03-25 07:53:23 +00:00 |
Javi Gallego
|
0561f19313
|
version 1
|
2020-03-24 17:34:23 +01:00 |
Javi Gallego
|
a30a4bf961
|
quitado el campo provincia
|
2020-03-24 17:32:30 +01:00 |
Bernat Exposito Domenech
|
423f59dfb0
|
worker log
|
2020-03-24 12:20:53 +01:00 |
Juan Ferrer
|
84bf240e71
|
All tests passed, but some intermittence in e2e
|
2020-03-23 23:57:11 +01:00 |
Joan Sanchez
|
27b1376799
|
changes
|
2020-03-23 11:21:25 +01:00 |
Javi Gallego
|
7fe9c7babc
|
getWarehouse
|
2020-03-20 11:36:14 +01:00 |
Bernat Exposito Domenech
|
a19a0578e9
|
structure DB
|
2020-03-16 10:25:49 +01:00 |
Joan Sanchez
|
fd91c3061a
|
Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
|
2020-03-06 11:19:26 +00:00 |
Bernat Exposito Domenech
|
ead7a20ecd
|
traductions
|
2020-03-06 11:47:14 +01:00 |
Bernat Exposito Domenech
|
0f8d199d2f
|
workerTimeControlCheck dbTest fix
|
2020-03-06 07:14:40 +01:00 |
Bernat Exposito Domenech
|
85ac133d00
|
update db test
|
2020-03-05 15:01:03 +01:00 |
Bernat Exposito Domenech
|
63faeab909
|
fix db test
|
2020-03-05 14:06:55 +01:00 |
Bernat Exposito Domenech
|
f3e4bc7aeb
|
workerTImeControlCheck test
|
2020-03-05 10:50:07 +01:00 |
Carlos Jimenez Ruiz
|
0f3ceea653
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test
|
2020-03-04 15:13:03 +01:00 |
Carlos Jimenez Ruiz
|
0179461cb3
|
timeBusiness and timeControl db tests
|
2020-03-04 15:12:36 +01:00 |
Joan Sanchez
|
516b112354
|
Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev
|
2020-03-04 12:15:41 +00:00 |
Joan Sanchez
|
d6278e0df9
|
2164 - Show confirmation only when data is not empty
|
2020-03-04 09:26:12 +01:00 |
Joan Sanchez
|
f16553ecba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
|
2020-03-03 13:59:33 +01:00 |
Bernat Exposito Domenech
|
686382a0e6
|
entryLog section
|
2020-03-02 11:57:09 +01:00 |
Joan Sanchez
|
04917f980f
|
Updated E2E
|
2020-03-02 09:30:54 +01:00 |
Bernat Exposito Domenech
|
5e86f67b37
|
dbtest workerTimeControCheck
|
2020-03-02 08:18:41 +01:00 |
Joan Sanchez
|
28553a1c0d
|
Worker dms changes
|
2020-03-02 07:50:07 +01:00 |
Joan Sanchez
|
8a4e2620c2
|
Changed sprint
|
2020-02-27 07:55:21 +01:00 |
Joan Sanchez
|
886bc45525
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-02-27 07:54:22 +01:00 |
Joan Sanchez
|
a063722fbe
|
Changed SQL sprint
|
2020-02-27 07:53:38 +01:00 |
Joan Sanchez
|
21be73b734
|
2127 - Disable preview on sepa core sample
|
2020-02-27 07:40:43 +01:00 |
Joan Sanchez
|
d66c53dbf2
|
2127 - Disable preview on sepa core sample
|
2020-02-26 14:30:30 +01:00 |
Carlos Jimenez Ruiz
|
0bf0ed78ee
|
Merge branch '2056-entry_descriptor' of verdnatura/salix into dev
|
2020-02-25 10:49:40 +00:00 |
Joan Sanchez
|
70b0143f0a
|
Renamed sql version
|
2020-02-25 08:53:09 +01:00 |
Joan Sanchez
|
447cdc686e
|
2138 - Added field m3Max to zoneEvent
|
2020-02-25 08:08:13 +01:00 |
Bernat Exposito Domenech
|
79fca8b70b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
|
2020-02-24 09:25:39 +01:00 |
Joan Sanchez
|
224241a954
|
Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev
|
2020-02-24 08:02:51 +00:00 |
Bernat Exposito Domenech
|
50a8da2064
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
|
2020-02-21 12:48:37 +01:00 |
Bernat Exposito Domenech
|
9779c6d2ba
|
entry summary and descriptor
|
2020-02-21 12:48:34 +01:00 |
Javi Gallego
|
4d389176fe
|
Merge branch 'test' into dev
|
2020-02-21 08:50:50 +01:00 |
Javi Gallego
|
a8137c8a6b
|
zoneClosure 3
|
2020-02-20 15:15:50 +01:00 |
Joan Sanchez
|
54bc1bc281
|
Merge branch '1835-e2e-item-request' of verdnatura/salix into dev
|
2020-02-20 10:10:18 +00:00 |
Joan Sanchez
|
64e4593156
|
Renamed version number
|
2020-02-20 10:46:43 +01:00 |
Carlos Jimenez Ruiz
|
587653fb40
|
#2119 e2e item.request
|
2020-02-20 09:31:44 +01:00 |
Bernat Exposito Domenech
|
aecfe2b8a9
|
report entry-order
|
2020-02-20 09:31:09 +01:00 |
Bernat Exposito Domenech
|
3f978bd32b
|
entry index refactor
|
2020-02-18 10:33:17 +01:00 |
Joan Sanchez
|
61b3ce184c
|
Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev
|
2020-02-18 06:32:17 +00:00 |
Joan Sanchez
|
fe8a0b4583
|
Added translation. taxClassCode.sql removed
|
2020-02-18 07:21:35 +01:00 |
Joan Sanchez
|
a9b8fab51d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-02-17 14:55:26 +01:00 |
Joan Sanchez
|
844b27acb9
|
2118 - Create new intrastat
|
2020-02-17 12:47:03 +01:00 |
Javi Gallego
|
03f0a415f9
|
zoneClosure fase 2
|
2020-02-17 12:01:11 +01:00 |
Bernat Exposito Domenech
|
b78858eb7c
|
export structure db
|
2020-02-13 09:30: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
|
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
|
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
|
2020-02-12 10:39:46 +01:00 |
Joan Sanchez
|
f2fdce11cd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-02-10 14:54:59 +01:00 |
Bernat Exposito Domenech
|
dd368a8c3f
|
refactor ticket.basicData steps
|
2020-02-07 13:38:32 +01:00 |
Javi Gallego
|
5d0f72af4e
|
zoneDoCalc
|
2020-02-06 16:04:23 +01:00 |
Joan Sanchez
|
1be640a59d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
|
2020-01-29 14:51:37 +01:00 |
Joan Sanchez
|
c174d0a29e
|
acl fix
|
2020-01-29 14:50:53 +01:00 |
Joan Sanchez
|
a6d94737af
|
changed version
|
2020-01-29 13:15:24 +01:00 |
Joan Sanchez
|
a078898627
|
Merge branch '2049-hotfix_percentage' of verdnatura/salix into master
|
2020-01-29 10:29:35 +00:00 |
Bernat Exposito Domenech
|
58717a7c46
|
fix order e2e
|
2020-01-28 11:59:36 +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
|
2020-01-28 09:03:20 +01:00 |
Bernat Exposito Domenech
|
849faad6ea
|
add m3Max in agency.basicData
|
2020-01-27 09:45:13 +01:00 |
Joan Sanchez
|
921af4dcc2
|
Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
|
2020-01-24 12:52:30 +00:00 |
Bernat Exposito Domenech
|
2bcd0caa06
|
update structure db
|
2020-01-24 12:55:54 +01:00 |
Javi Gallego
|
08fda3ed1b
|
#workedHours
|
2020-01-24 12:38:08 +01:00 |
Joan Sanchez
|
25ffa839a2
|
added incoterms & customs agent to address forms
|
2020-01-24 09:47:24 +01:00 |
Joan Sanchez
|
deada69ca4
|
Added models
|
2020-01-23 14:59:37 +01:00 |
Bernat Exposito Domenech
|
937ddd7880
|
fix table componentType
|
2020-01-23 13:53:39 +01:00 |
Bernat Exposito Domenech
|
cf130b800a
|
fix db test
|
2020-01-23 13:01:29 +01:00 |
Bernat Exposito Domenech
|
6700daf0e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
|
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
|
2020-01-23 10:00:58 +00:00 |
Bernat Exposito Domenech
|
2790cc8057
|
update structure
|
2020-01-22 14:34:45 +01:00 |
Javi Gallego
|
5bd31eb082
|
zoneClosure
|
2020-01-22 10:41:09 +01:00 |
Bernat Exposito Domenech
|
0b848adf03
|
fix back test
|
2020-01-22 09:43:10 +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
|
2020-01-21 12:21:53 +01:00 |
Joan Sanchez
|
20b4f6ec74
|
updated tests
|
2020-01-21 09:33:26 +01:00 |
Joan Sanchez
|
5e4ab8b128
|
Loggable errors
|
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
|
2020-01-20 13:05:06 +01:00 |
Joan Sanchez
|
3ff1fb7d2d
|
Added back unit tests
|
2020-01-20 11:59:15 +01:00 |
Joan Sanchez
|
3226081081
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2015-chat_sendCheckingPresence
|
2020-01-20 11:46:57 +01:00 |
Bernat Exposito Domenech
|
0fe0596b3e
|
worker phone refactor
|
2020-01-20 11:03:40 +01:00 |
Joan Sanchez
|
59d0ecca67
|
send message to worker or channel
|
2020-01-20 07:33:24 +01:00 |
Joan Sanchez
|
826dfe8092
|
changes to percentage filter
|
2020-01-17 11:46:45 +01:00 |
Joan Sanchez
|
3a4c379033
|
Added waste section
|
2020-01-17 11:44:05 +01:00 |
Joan Sanchez
|
4002b51565
|
added section
|
2020-01-17 08:43:10 +01:00 |
Joan Sanchez
|
1704f5e93b
|
Merge branch '2011-client_phone' of verdnatura/salix into dev
|
2020-01-17 06:48:57 +00:00 |
Bernat Exposito Domenech
|
74b688dc4b
|
client phone refactor
|
2020-01-17 07:24:57 +01:00 |
Joan Sanchez
|
3cba6f0293
|
Translated family names
|
2020-01-16 14:35:40 +01:00 |
Joan Sanchez
|
2b2e6532f6
|
changes to percentage filter
|
2020-01-16 13:39:32 +01:00 |
Bernat Exposito Domenech
|
1307f6c5fb
|
update structure
|
2020-01-15 13:43:38 +01:00 |
Joan Sanchez
|
708789502d
|
Added waste section
|
2020-01-15 13:07:33 +01:00 |
Bernat Exposito Domenech
|
1f60aac446
|
export structure db
|
2020-01-15 08:19:22 +01:00 |
Bernat Exposito Domenech
|
6c4e25bfe3
|
create entry.index
|
2020-01-10 11:52:35 +01:00 |
Carlos Jimenez Ruiz
|
83d2ec40d4
|
Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
|
2020-01-09 10:50:26 +00:00 |
Bernat Exposito Domenech
|
d432c32577
|
export production and create new models
|
2020-01-09 10:49:09 +01:00 |
Joan Sanchez
|
5a7bd4e18f
|
filters refactor
|
2020-01-08 12:27:18 +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 |
Bernat Exposito Domenech
|
814c96434e
|
routebasic
|
2020-01-03 14:31:02 +01:00 |
Joan Sanchez
|
8a36e0913f
|
changed fixtures for dynamic holidays
|
2020-01-03 08:43:03 +01:00 |
Joan Sanchez
|
a5eb8e5315
|
extended worker contract ranges & fixed invoice
|
2020-01-02 11:10:26 +01:00 |
Joan Sanchez
|
8f92abe49c
|
fixed procedure bug
|
2019-12-31 14:01:05 +01:00 |
Joan Sanchez
|
417642ac9e
|
updated UserPhone acl
|
2019-12-31 11:07:46 +01:00 |
Joan Sanchez
|
0ece53a35e
|
Send chat message with user avatar
|
2019-12-27 08:49:51 +01:00 |
Bernat Exposito Domenech
|
0827b998a1
|
update structure sql
|
2019-12-23 15:15:58 +01:00 |
Bernat Exposito Domenech
|
e9d416671d
|
update fixtures and structure db
|
2019-12-20 13:51:04 +01:00 |
Joan Sanchez
|
472352e24c
|
Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
|
2019-12-20 10:05:38 +00:00 |
Joan Sanchez
|
72d591e143
|
sql changes
|
2019-12-20 10:59:17 +01:00 |
Joan Sanchez
|
b9415c0335
|
updated sql
|
2019-12-20 10:40:12 +01:00 |
Joan Sanchez
|
61b9646f5b
|
Merge branch 'test' into dev
|
2019-12-19 14:55:09 +01:00 |
Joan Sanchez
|
a1c6c0ab39
|
claim regularize refactor
|
2019-12-19 11:37:53 +01:00 |
Bernat Exposito Domenech
|
aab970e667
|
client.phone section
|
2019-12-17 09:11:28 +01:00 |
Joan Sanchez
|
ef95244d07
|
stowaway refactor
|
2019-12-17 08:38:36 +01:00 |
Bernat Exposito Domenech
|
c1db827889
|
update structure db
|
2019-12-16 11:33:10 +01:00 |
Bernat Exposito Domenech
|
e4c17492f0
|
update structure
|
2019-12-16 09:22:59 +01:00 |
Bernat Exposito Domenech
|
d66519a39f
|
set autoincrement db to one
|
2019-12-16 08:48:12 +01:00 |
Bernat Exposito Domenech
|
ff117c1811
|
merge conflicts structure.sql
|
2019-12-13 09:06:39 +01:00 |
Bernat Exposito
|
c65364cda4
|
Merge branch '1907manaSpellers' of verdnatura/salix into dev
|
2019-12-13 07:57:36 +00:00 |
Bernat Exposito Domenech
|
dd86961542
|
update structure
|
2019-12-13 08:46:40 +01:00 |
Javi Gallego
|
44304e993a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
|
2019-12-13 08:19:22 +01:00 |
Bernat Exposito
|
6d1bd7575d
|
Merge branch '1925excludeTables' of verdnatura/salix into dev
|
2019-12-13 06:17:03 +00:00 |
Juan Ferrer
|
d61b08ed10
|
Merge branch '1922-mysql8' of verdnatura/salix into dev
|
2019-12-12 13:49:05 +00:00 |
Bernat Exposito Domenech
|
e8c216799c
|
update estructure
|
2019-12-12 14:28:58 +01:00 |
Javi Gallego
|
ec081e6a3a
|
campo claimDestinationFk ya no esta como required
|
2019-12-12 13:53:54 +01:00 |
Joan Sanchez
|
62aae9ce14
|
removed password from fixtures
|
2019-12-12 09:46:29 +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 |
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
|
2019-12-10 12:42:14 +01:00 |
Bernat Exposito Domenech
|
2cc9c5e951
|
create section travel create
|
2019-12-09 12:15:19 +01:00 |
Bernat Exposito Domenech
|
f6eabc81da
|
add models and update structure db
|
2019-12-05 14:20:11 +01:00 |
Bernat
|
261b9686a0
|
update procedures db
|
2019-12-04 11:10:24 +01:00 |
Bernat
|
f38210ddd2
|
udate structure db
|
2019-12-04 11:09:36 +01:00 |
Bernat
|
8f4e44aa37
|
update procedures db
|
2019-11-27 13:37:36 +01:00 |
Bernat
|
dcdd4473b1
|
fix structure db
|
2019-11-27 11:57:09 +01:00 |
Bernat
|
89e127f0ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references
|
2019-11-26 14:26:50 +01:00 |
Bernat
|
18b5342609
|
update fixtures and structure db
|
2019-11-26 14:15:43 +01:00 |
Bernat Exposito
|
a4a48e76a4
|
Merge branch '1762-worker_dms' of verdnatura/salix into dev
|
2019-11-25 08:33:04 +00:00 |
Joan Sanchez
|
f9dba9489f
|
updated tests
|
2019-11-25 09:17:24 +01:00 |
Bernat
|
5040d1d4a8
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-22 14:34:28 +01:00 |
Joan Sanchez
|
a077dd5165
|
test unitario
|
2019-11-22 14:34:20 +01:00 |
Bernat Exposito
|
6a153bd69d
|
Merge branch 'timeControl_calculate' of verdnatura/salix into dev
|
2019-11-22 09:55:31 +00:00 |
Bernat
|
1ce0c63bf2
|
1711Eliminar_referencias_vn2008
|
2019-11-22 08:23:31 +01:00 |
Carlos Jimenez Ruiz
|
dca7dd5fc7
|
rejected last modifications
|
2019-11-21 14:51:11 +01:00 |
Carlos Jimenez Ruiz
|
33e9cf9816
|
Javi validation
|
2019-11-21 14:39:09 +01:00 |
Carlos Jimenez Ruiz
|
a45ca84e7f
|
workerTimeControlCalculate procedure refactor
|
2019-11-21 14:23:22 +01:00 |
Bernat
|
038ba3edb2
|
1711 update structure db
|
2019-11-21 13:18:30 +01:00 |
Carlos Jimenez Ruiz
|
f4a62dfa86
|
Merge branch '1770-calculate_components' of verdnatura/salix into dev
|
2019-11-21 11:30:00 +00:00 |
Juan Ferrer
|
30ac174b1e
|
SQL grouping quoted
|
2019-11-21 12:01:21 +01:00 |
Joan Sanchez
|
fd72f206bc
|
Recalculate ticket components #1770
|
2019-11-21 12:00:56 +01:00 |
Carlos Jimenez Ruiz
|
8202a6f419
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 11:17:17 +01:00 |
Joan Sanchez
|
56a73f152e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-21 09:33:10 +01:00 |
Joan Sanchez
|
5f28d39bbf
|
dynamic header & footer texts by company #1336
|
2019-11-21 09:33:08 +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
|
0473f1de82
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-21 09:09:17 +01:00 |
Bernat
|
525e115781
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-21 07:24:31 +01:00 |
Bernat
|
a1784470cc
|
update scheme db
|
2019-11-20 12:42:10 +01:00 |
Joan Sanchez
|
37618efb58
|
changed userPhone fkeys
|
2019-11-20 11:37:13 +01:00 |
Joan Sanchez
|
5bb7f7f14a
|
deprecated getItemVisibleAvailable() #1887
|
2019-11-20 11:14:11 +01:00 |
Bernat
|
2bfa0873a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 13:49:24 +01:00 |
Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
|
2019-11-19 13:49:10 +01:00 |
Bernat
|
20088c6712
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 13:40:50 +01:00 |
Bernat
|
ee3a83ac0a
|
update structure and fixtures
|
2019-11-19 13:40:29 +01:00 |
Joan Sanchez
|
e499d44018
|
dont use payMethodId on view #1854
|
2019-11-19 12:53:25 +01:00 |
Bernat
|
b608273510
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 12:51:11 +01:00 |
Bernat
|
99585b9cc9
|
fix fixtures
|
2019-11-19 12:50:50 +01:00 |
Joan Sanchez
|
3d90e80c82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 11:53:04 +01:00 |
Joan Sanchez
|
f9deb9f52d
|
send closure error by email
|
2019-11-19 11:53:01 +01:00 |
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 11:43:00 +01:00 |
Bernat
|
0b58b5d09a
|
update fixtures tblContadores
|
2019-11-19 11:40:46 +01:00 |
Carlos Jimenez Ruiz
|
e74cb52867
|
Merge branch '1391-ticket_closure' of verdnatura/salix into dev
LGTM
|
2019-11-19 07:02:12 +00:00 |
Joan Sanchez
|
06e4cbb783
|
renamed view atenderFk to
|
2019-11-19 07:41:02 +01:00 |
Carlos Jimenez Ruiz
|
f5aacc804d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 16:46:51 +01:00 |
Juan Ferrer
|
bdb03729b7
|
zone_getOptionsForShipment fixes
|
2019-11-18 16:36:08 +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
|
2019-11-18 16:31:37 +01:00 |
Joan Sanchez
|
8643030bf0
|
restructure router methods, added closure method
|
2019-11-18 15:04:51 +01:00 |
Javi Gallego
|
60cdc1114c
|
#1602 back confirm.js
|
2019-11-18 14:48:37 +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
|
4b51d607f7
|
error getLanded con drop temporary table
|
2019-11-15 15:42:00 +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
|
2019-11-15 10:03:46 +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 |
Javi Gallego
|
1301ea5962
|
test buyUltimateFromInterval arreglado
|
2019-11-14 13:40:53 +01:00 |
Javi Gallego
|
5da4722bdd
|
No borra warehouse de zone
|
2019-11-14 10:36:21 +01:00 |
Joan Sanchez
|
e0ed9072c9
|
unified LCR and CORE #1868
|
2019-11-14 08:16:52 +01:00 |
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
|
2019-11-13 13:22:39 +01:00 |
Bernat
|
a3159f7dbd
|
dumped data updated
|
2019-11-13 10:41:14 +01:00 |
Joan Sanchez
|
308c4dfb88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
|
2019-11-13 08:09:54 +01:00 |
Joan Sanchez
|
c3962c3d78
|
updated test
|
2019-11-12 15:07:37 +01:00 |
Joan Sanchez
|
b320d64462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
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 |
Bernat
|
7cbbc4c18e
|
#1870 exportar produccion a la local
|
2019-11-12 11:13:20 +01:00 |
Bernat
|
e8862b5b56
|
fix sql userPhone
|
2019-11-12 08:52:09 +01:00 |
Joan Sanchez
|
6cedfceddd
|
Show ticket state #1836
|
2019-11-11 13:51:30 +01:00 |
Joan Sanchez
|
963ac3ad77
|
dumpedfixtures rollback
|
2019-11-11 11:56:13 +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
|
5705c37f92
|
show attachments on email templates attachment component
|
2019-11-07 11:19:05 +01:00 |
Javi Gallego
|
bd630aa562
|
ticketCalculateClon
|
2019-11-07 11:12:05 +01:00 |
Javi Gallego
|
eaa2ef4570
|
zone warehouse error
|
2019-11-07 07:49:37 +01:00 |
Javi Gallego
|
729f6cb767
|
changes to zone
|
2019-11-06 13:44:58 +01:00 |
Joan Sanchez
|
114e8c87d6
|
export sample table
|
2019-11-06 10:56:18 +01:00 |
Joan Sanchez
|
3cd92211a1
|
test fixed & export sample table
|
2019-11-06 10:55:04 +01:00 |
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
|
2019-10-31 12:54:16 +01:00 |
Javi Gallego
|
763f8f53f8
|
fixtures y algunos test de zone
|
2019-10-30 18:33:08 +01:00 |
Javi Gallego
|
700c092b90
|
merge
|
2019-10-29 12:58:26 +01:00 |
Javi Gallego
|
1a56f0af96
|
zoneRefactor
|
2019-10-29 12:29:38 +01:00 |
Bernat
|
cb90e86f64
|
#1846 exportar produccion a la local
|
2019-10-29 11:28:35 +01:00 |
Bernat
|
9fd0ab0bd3
|
#1775 travel.log crear sección historial
|
2019-10-25 13:28:12 +02:00 |
Bernat
|
eb384425f2
|
#1777 travel.descriptor
|
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
|
2019-10-24 12:49:23 +02:00 |
Bernat
|
7bdb497976
|
#1773 travel.summary & #1774
|
2019-10-24 12:49:18 +02:00 |
Carlos Jimenez Ruiz
|
c84625b0d5
|
#1713 route.tickets boton mas bajo derecha
|
2019-10-23 09:25:28 +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
|
2019-10-21 08:52:42 +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
|
2019-10-17 14:30:52 +02:00 |
Joan Sanchez
|
6ed5695063
|
Added zoneFk to routes. solved #1713
|
2019-10-16 07:18:05 +02:00 |
Bernat
|
25bd28990a
|
Refactor #1812 refactor phone
|
2019-10-15 14:44:00 +02:00 |
Bernat
|
ed1ed7f50b
|
#1738 exportar estructura y datos de produccion a la local
|
2019-10-15 07:23:34 +02:00 |
Joan Sanchez
|
05d0f50606
|
changed warehouse from ticket id 17
|
2019-10-10 09:58:34 +02:00 |
Joan Sanchez
|
eb655215f4
|
merge pull changes
|
2019-10-08 09:23:29 +02:00 |
Joan Sanchez
|
9473636b5b
|
treeview refactor
|
2019-10-02 09:54:52 +02:00 |
Joan Sanchez
|
183d770483
|
first changes
|
2019-10-01 15:09:55 +02:00 |
Juan Ferrer
|
60f611b76b
|
Merge branch 'test' into dev
|
2019-09-26 12:47:45 +02:00 |
Juan Ferrer
|
445668d57f
|
Refactor agency SQL scripts
|
2019-09-26 12:47:16 +02:00 |
Juan Ferrer
|
5262cd7e43
|
Merge branch 'test' into dev
|
2019-09-26 10:09:17 +02:00 |
Juan Ferrer
|
c0f39ba87f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-26 10:09:07 +02:00 |
Juan Ferrer
|
3d4b7601be
|
SQL scripts
|
2019-09-26 10:08:37 +02:00 |
Bernat
|
f28305de9b
|
Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
|
2019-09-26 09:13:18 +02:00 |
Juan Ferrer
|
91e4e62a1c
|
Merge branch 'test' into dev
|
2019-09-26 08:44:00 +02:00 |
Bernat
|
bf5a9967cf
|
Refactor #1682 modificar modelos componentRate y componentTypeRate
|
2019-09-24 13:45:54 +02:00 |
Joan Sanchez
|
bd8a1ee00e
|
merge with dev
|
2019-09-23 15:02:27 +02:00 |
Joan Sanchez
|
6910e6048b
|
fixed sql
|
2019-09-23 14:50:30 +02:00 |
Joan Sanchez
|
f2d9323c4f
|
Deprecated ticketCalculate
|
2019-09-23 14:47:27 +02:00 |
Joan Sanchez
|
e55b8b7b6b
|
precio por kilo #1690
|
2019-09-23 14:41:54 +02:00 |
Joan Sanchez
|
7daf2e4328
|
merge with master
|
2019-09-19 11:48:41 +02:00 |
Joan Sanchez
|
4d894365eb
|
Fixed production errors #1699
|
2019-09-19 09:42:41 +02:00 |
Joan Sanchez
|
73b1f18759
|
Fixed production errors #1699
|
2019-09-19 08:58:42 +02:00 |
Bernat
|
cbbce91def
|
#1693 export structure, data and fix back test
|
2019-09-17 13:52:29 +02:00 |
Bernat
|
40cfa19d01
|
bug claimDms
|
2019-09-16 12:51:51 +02:00 |
Bernat
|
a1e0da8905
|
Tarea #1689 exportat procedimientos a local desde produccion
|
2019-09-12 07:22:12 +02:00 |
Joan Sanchez
|
7a1ae9177b
|
Special characters not allowed on socialName #1635
|
2019-09-09 09:05:13 +02:00 |
Carlos Jimenez Ruiz
|
56c291a160
|
merge
|
2019-09-06 11:45:55 +02:00 |
Carlos Jimenez Ruiz
|
ce9fb14b62
|
#1655 e2e ticket.sale Añadir lineas
|
2019-09-06 11:43:15 +02:00 |
Bernat
|
e8cb57e27a
|
#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen
|
2019-09-06 09:47:58 +02:00 |
Bernat
|
a2228fa15f
|
Tarea #1673 exportar estructura y datos de produccion a la local
|
2019-09-04 09:06:08 +02:00 |
Joan Sanchez
|
d3441fa1b3
|
Ticket step one refactor #1669
|
2019-09-04 08:04:31 +02:00 |
Bernat
|
fc872a2b21
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-03 14:38:40 +02:00 |
Carlos Jimenez Ruiz
|
e1b5b449ce
|
#1656 ticket.regularizar eliminar ticket
|
2019-09-03 09:57:53 +02:00 |
Bernat
|
b9c13ac3a3
|
#1664 , table city deprecated
|
2019-09-02 14:58:58 +02:00 |
Joan Sanchez
|
67733e6e08
|
merge
|
2019-09-02 09:57:46 +02:00 |
Carlos Jimenez Ruiz
|
11b99d9a5f
|
#1618 e2e ticket.basicData.stepOne
|
2019-08-20 14:18:32 +02:00 |
Bernat
|
3cea9cf405
|
#1637 update fixtures for dms
|
2019-08-12 14:07:30 +02:00 |
Joan Sanchez
|
0918f154e9
|
transfer partially sale #1251
|
2019-08-09 08:04:44 +02:00 |
Joan Sanchez
|
a5486ec694
|
Get allowed content-types from model #1598
|
2019-08-08 08:37:03 +02:00 |
Bernat
|
4e329a4201
|
Bug/Test #1607 ticket.updateDiscount and fix test
|
2019-08-02 12:24:08 +02:00 |
Bernat
|
58ed37aa76
|
Bug/Test #1607 ticket.updateDiscount and fix test
|
2019-08-02 12:23:50 +02:00 |
Joan Sanchez
|
07519a4369
|
mege from test branch
|
2019-07-31 11:34:54 +02:00 |
Joan Sanchez
|
77d8ac82a5
|
contabilize worker.calenday holidays, updated styles
|
2019-07-31 09:51:08 +02:00 |
Joan Sanchez
|
eccf381e56
|
contabilize worker.calenday holidays, updated styles
|
2019-07-31 09:50:47 +02:00 |
Bernat
|
7571cd6e1b
|
Bug/Test #1607 ticket.updateDiscount and fix test
|
2019-07-31 07:46:24 +02:00 |
Bernat
|
4bc7d88162
|
refactor fixtures #1620
|
2019-07-30 11:57:28 +02:00 |
Joan Sanchez
|
fb4ce77c01
|
claim upload pictures #1593
|
2019-07-30 08:51:38 +02:00 |
Bernat
|
46dac984ab
|
Refactor #1620 Eliminar referencias al esquema vn2008
|
2019-07-29 15:02:43 +02:00 |
Bernat
|
772095fc1e
|
Tarea #1617 eliminar vn2008.Gastos de export.data.sh
|
2019-07-29 11:37:44 +02:00 |
Bernat
|
e6ac764762
|
Tarea #1617 eliminar tablas de export.data.sh
|
2019-07-29 09:51:49 +02:00 |
Joan Sanchez
|
64a4e5f43d
|
ticket.basicData Select zone for productionBoss #1604
|
2019-07-26 11:48:01 +02:00 |
Juan Ferrer
|
ab2a47d363
|
Docker size reduced
|
2019-07-25 17:35:51 +02:00 |
Bernat
|
d608c80028
|
Bug #1616 fix db test
|
2019-07-25 13:32:25 +02:00 |
Joan Sanchez
|
6d5412227a
|
Changed invoiceOut pdf to hasPdf
|
2019-07-24 12:42:33 +02:00 |
Bernat
|
8089c32ec2
|
Tarea #1611 export db roduction to local
|
2019-07-23 14:56:57 +02:00 |
Bernat
|
97f2229090
|
Tarea #1603 ticket.index ticket.sales problems icon
|
2019-07-23 11:15:06 +02:00 |
Joan Sanchez
|
2c39103e93
|
fixed dms back unit tests
|
2019-07-17 07:45:43 +02:00 |
Joan Sanchez
|
a7b15c2dfc
|
fixed dms back unit tests
|
2019-07-16 14:48:48 +02:00 |
Joan Sanchez
|
7b610d62b6
|
removed console.log
|
2019-07-11 07:19:22 +02:00 |
Joan Sanchez
|
6f3b023644
|
Create postcode form #1585
|
2019-07-08 14:07:09 +02:00 |
Bernat
|
b98b534eec
|
Tarea #1583 exportar produccio a la local
|
2019-07-05 14:16:33 +02:00 |
Bernat
|
65ec629221
|
Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse
|
2019-07-03 08:29:40 +02:00 |
Carlos Jimenez Ruiz
|
4b0a71644f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-07-02 14:44:39 +02:00 |
Carlos Jimenez Ruiz
|
4ac419b419
|
#1528 e2e claim/detail
|
2019-07-02 14:44:36 +02:00 |
Joan Sanchez
|
bddfbc4b34
|
add new item from ticket.sale #1414, checkedLines fixed
|
2019-07-02 12:12:15 +02:00 |
Bernat
|
dd38a21e8d
|
Refactor #1569 claim.delete, update fixtures and fix test
|
2019-07-01 11:56:16 +02:00 |
Bernat
|
b3ade3c7f5
|
Tarea #1511
refactr fixtures expedition
|
2019-06-27 13:20:30 +02:00 |
Bernat
|
fb2545994c
|
Refactor #1563 fixtures item
|
2019-06-27 12:38:30 +02:00 |
Joan Sanchez
|
507bc8c2ce
|
updated fonts & calendar acls
|
2019-06-27 11:48:33 +02:00 |
Bernat
|
e945967762
|
Refactor #1563 fixtures item,sale,saleComponent
|
2019-06-27 09:03:03 +02:00 |
Carlos Jimenez Ruiz
|
c352a12d49
|
merge
|
2019-06-26 15:02:22 +02:00 |
Carlos Jimenez Ruiz
|
fe7278af66
|
#1387 e2e Ticket Edit sale path
|
2019-06-26 14:19:08 +02:00 |
Joan Sanchez
|
8ff61a5d3a
|
added zone prices, radio-group and calendar refactor #1320
|
2019-06-26 13:35:38 +02:00 |
Bernat
|
13abed3d00
|
#1517 update ticketGetProblems
|
2019-06-25 15:02:25 +02:00 |
Bernat
|
682a75ac76
|
#1533 update fixtures and fix test
|
2019-06-25 14:00:55 +02:00 |
Bernat
|
1227f7ac83
|
Test #1549 Arreglar test de back
|
2019-06-21 13:19:51 +02:00 |
Bernat
|
7f2b61b39c
|
Test #1549 fix back test
|
2019-06-21 07:50:56 +02:00 |
Carlos Jimenez Ruiz
|
200488ab30
|
removed typo from fixtures sql
|
2019-06-20 14:42:47 +02:00 |
Carlos Jimenez Ruiz
|
73ccf9a107
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-19 14:42:59 +02:00 |
Carlos Jimenez Ruiz
|
560cce7c8c
|
#1537 refactor fixtures
|
2019-06-19 14:40:47 +02:00 |
Carlos Jimenez Ruiz
|
63febf8bd0
|
#1537 refactor fixtures + e2e fixes
|
2019-06-19 09:03:45 +02:00 |
Bernat
|
1336bf092d
|
Test #1540 Reparar test back db
|
2019-06-19 07:20:02 +02:00 |
Joan Sanchez
|
9e03c5ff84
|
sql update dmsType codes
|
2019-06-17 09:15:31 +02:00 |
Carlos Jimenez Ruiz
|
fcc0ad6098
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-14 12:27:54 +02:00 |
Carlos Jimenez Ruiz
|
b8a4861f01
|
#1526 refactor fixtures
|
2019-06-14 12:27:41 +02:00 |
Joan Sanchez
|
9c00e7e67c
|
Autocomplete geolocation from postcode #1519 and #1531
|
2019-06-13 13:08:11 +02:00 |
Carlos Jimenez Ruiz
|
921af523f8
|
#1526 refactor fixtures
|
2019-06-12 11:38:31 +02:00 |
Bernat
|
4729a7e9a9
|
Bug #1514 route.volume No actualiza el volumen
|
2019-06-11 12:25:17 +02:00 |
Bernat
|
2504d06bab
|
Bug/Test #1515 Dump structure de production a dev
|
2019-06-11 12:23:55 +02:00 |
Carlos Jimenez Ruiz
|
e0cc80277c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-07 14:13:49 +02:00 |
Joan Sanchez
|
43e87a1cb1
|
mege from test to dev - no structure
|
2019-06-07 13:07:23 +02:00 |
Joan Sanchez
|
4545d1f649
|
merge from test to dev - no structure
|
2019-06-07 13:06:54 +02:00 |
Carlos Jimenez Ruiz
|
3ce4eafcee
|
merge
|
2019-06-07 09:24:27 +02:00 |
Carlos Jimenez Ruiz
|
777b0b3a38
|
#1400 report.sepaCore IBAN portugal
|
2019-06-07 09:18:54 +02:00 |
Bernat
|
ea38ff221d
|
#1467 ticket filter with hours
|
2019-06-07 07:45:12 +02:00 |
Joan Sanchez
|
c28734ff61
|
added dms tasks #1499, #1469, #1468, #1484
|
2019-06-06 13:59:11 +02:00 |
Bernat
|
3a338739d1
|
Tarea #1462 Route.descriptior Añadir menú - actualizar m3
|
2019-06-05 13:51:34 +02:00 |
Joan Sanchez
|
59a958841e
|
fixed nodeAdd
|
2019-06-05 07:37:29 +02:00 |
Joan Sanchez
|
b9b1c2b2c7
|
added sql schema prefix
|
2019-06-05 07:31:23 +02:00 |
Joan Sanchez
|
16d91d0999
|
fixed zoneNest add new country
|
2019-06-04 21:05:43 +02:00 |
Juan Ferrer
|
47c47435fa
|
webZone SQL fixes
|
2019-06-04 13:23:36 +02:00 |
Javi Gallego
|
0f5ebf42ec
|
Tarea #1506 worker.pbx quitar campo password
|
2019-06-04 12:54:41 +02:00 |
Javi Gallego
|
78704995a2
|
comentarios de return
|
2019-06-04 12:20:33 +02:00 |
Juan Ferrer
|
50c25b42ce
|
SQL script moved to previous version
|
2019-06-04 09:23:50 +02:00 |
Juan Ferrer
|
5517ac265d
|
SQL webZone fixes
|
2019-06-04 09:14:42 +02:00 |
quique
|
a6a6ea5b06
|
WorkerTimerControl App
|
2019-06-03 09:41:54 +02:00 |
quique
|
b034333cdb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-03 09:20:35 +02:00 |
quique
|
8005b0a892
|
WorkerTimeControl App
|
2019-06-03 09:20:20 +02:00 |
Bernat
|
62fe9d760c
|
#1488 #1489 ticket sale updatePrice and backTest
|
2019-06-03 08:01:24 +02:00 |
Bernat
|
97459bd7e6
|
1497
|
2019-05-31 11:33:28 +02:00 |
Carlos Jimenez Ruiz
|
a179cc8491
|
#1492 e2e proyecto Zone
|
2019-05-30 14:17:11 +02:00 |
Bernat
|
d4a3a1a72e
|
export production structure and fixtures updated
|
2019-05-30 13:45:13 +02:00 |
Javi Gallego
|
e01765e34e
|
test back-front fixed
|
2019-05-30 08:41:08 +02:00 |
Bernat
|
7a7ea03bff
|
1485 refactor updatePrice
|
2019-05-29 12:41:26 +02:00 |
Bernat
|
69434caa52
|
#1470 update fixtures, client.dms gestdoc
|
2019-05-28 11:26:54 +02:00 |
Carlos Jimenez Ruiz
|
46a7661975
|
#1454 update table bi.tarifa_componentes
|
2019-05-27 14:10:14 +02:00 |
Carlos Jimenez Ruiz
|
d041354210
|
#1454 update table bi.tarifa_componentes
|
2019-05-27 14:08:34 +02:00 |
Carlos Jimenez Ruiz
|
33f81ee4b7
|
#1472 update table vn2008.gesttip
|
2019-05-27 11:04:57 +02:00 |
Bernat
|
59069749a2
|
1461 fix test back
|
2019-05-27 09:19:23 +02:00 |
Javi Gallego
|
f871879ee5
|
merge fixtures dinamicas para zoneCalendar
|
2019-05-23 13:33:06 +02:00 |
Bernat
|
7bbabffc26
|
merge update fixtures zones
|
2019-05-23 13:29:24 +02:00 |
Javi Gallego
|
c5743ce37a
|
fallos de tablas
|
2019-05-23 13:25:26 +02:00 |
Bernat
|
e12d29ad62
|
merge fixtures for zone
|
2019-05-23 13:24:31 +02:00 |
Javi Gallego
|
c311b0ae65
|
dump y procedimientos volcados
|
2019-05-23 13:18:15 +02:00 |
Joan Sanchez
|
34542ce12f
|
message send ACL fix #1464
|
2019-05-23 11:39:14 +02:00 |
Bernat
|
ae2fa8d0af
|
1459 export production to local
|
2019-05-23 09:31:37 +02:00 |
Bernat
|
443feef673
|
#1456 fixtores for dms and model
|
2019-05-23 09:30:29 +02:00 |
Bernat
|
33b1cca215
|
#1456 update fixtures and add dms view
|
2019-05-22 12:09:15 +02:00 |
Carlos Jimenez Ruiz
|
66ddd56dec
|
removed string format from id field
|
2019-05-22 12:02:25 +02:00 |
Carlos Jimenez Ruiz
|
4c8aa7ff6e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-22 11:59:14 +02:00 |
Carlos Jimenez Ruiz
|
e474abbc3a
|
ACL error fixed
|
2019-05-22 11:59:07 +02:00 |
Joan Sanchez
|
fe250b8269
|
fixed workerTimeControl fixtures
|
2019-05-21 13:48:19 +02:00 |
Bernat
|
2636e2d221
|
#1454 update table bi.tarifa_componentes
|
2019-05-21 12:46:22 +02:00 |
Carlos Jimenez Ruiz
|
28057ecf3f
|
#1445 e2e ticket.services
|
2019-05-20 11:16:56 +02:00 |
Joan Sanchez
|
183bf137f6
|
added workerTimeControl #1360
|
2019-05-17 13:27:51 +02:00 |
Bernat
|
d0c4a4d478
|
update worker fixtures
|
2019-05-17 11:09:24 +02:00 |
Javi Gallego
|
0d0f354902
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-09 11:25:51 +02:00 |
Javi Gallego
|
ac5b17be31
|
ticket View
|
2019-05-09 11:25:46 +02:00 |
Bernat
|
1f128797c3
|
export production to local, fix test and add fixtures
|
2019-05-09 09:32:04 +02:00 |
Javi Gallego
|
4281181602
|
alter table ticket
|
2019-05-08 15:34:10 +02:00 |
Carlos Jimenez Ruiz
|
189cefe327
|
#1407 email core francia LCR
|
2019-05-08 11:09:27 +02:00 |
Carlos Jimenez Ruiz
|
c9521d1024
|
#1407 email core francia LCR
|
2019-05-08 10:42:26 +02:00 |
Carlos Jimenez Ruiz
|
62550b76f6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-08 08:48:57 +02:00 |
Carlos Jimenez Ruiz
|
92b171cfce
|
#1407 email core francia LCR
|
2019-05-08 08:48:47 +02:00 |
Javi Gallego
|
810f4462f6
|
fixtures acl
|
2019-05-07 10:41:20 +02:00 |
Bernat
|
86e0d66f55
|
#926 update fixtures and model claimState
|
2019-05-07 08:18:14 +02:00 |
Carlos Jimenez Ruiz
|
8771098045
|
#1350 route.index
|
2019-05-03 18:23:44 +02:00 |
Carlos Jimenez Ruiz
|
b60ee825ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-03 17:38:47 +02:00 |
Bernat
|
91e8b1f81b
|
update fixtures, #1388 ticket descript change shiiped hour
|
2019-05-03 12:23:57 +02:00 |
Carlos Jimenez Ruiz
|
8bfcdf435f
|
#1351 e2e order.catalog + extensions refactor
|
2019-05-02 11:23:54 +02:00 |
Joan Sanchez
|
599f6b467e
|
fixed ticketConfig sql script
|
2019-05-01 19:23:05 +02:00 |
Joan Sanchez
|
2b7287dabb
|
added ticket.dms #1373
|
2019-05-01 18:49:39 +02:00 |
Joan Sanchez
|
1a524e33b1
|
regenerate invoiceOut ACL
|
2019-04-30 11:29:57 +02:00 |
Bernat
|
a81e705251
|
#1341 invoiceOut.descriptor book invoiceOut
|
2019-04-30 11:03:48 +02:00 |
Joan Sanchez
|
69403223d8
|
fixed treeview #1374
|
2019-04-29 11:49:43 +02:00 |
Bernat
|
a8a5193a86
|
1389 update fixtures for invoiceOut and fix test
|
2019-04-29 11:40:54 +02:00 |
Bernat
|
ed8705a50c
|
#1340 invoiceOut.descriptor delete invoiceOut
|
2019-04-26 12:05:49 +02:00 |
Javi Gallego
|
a920bc1d8f
|
tablas dms
|
2019-04-25 18:30:11 +02:00 |
Bernat
|
94480a8189
|
#1329 fix test and fixtures, update ticket-service
|
2019-04-24 07:43:11 +02:00 |
Carlos Jimenez Ruiz
|
8d5cc93ddb
|
#1359 refactor absences
|
2019-04-23 13:29:52 +02:00 |
Bernat
|
bc005b2310
|
#1346 fix confirm.js and update item request
|
2019-04-18 11:02:28 +02:00 |
Carlos Jimenez Ruiz
|
e34cb8ce84
|
#1351 e2e order.catalog
|
2019-04-17 09:37:55 +02:00 |
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
Javi Gallego
|
ce2615e2d0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-16 08:09:20 +02:00 |
Javi Gallego
|
28bbc024b2
|
#1195 claim.action regularize
|
2019-04-16 08:09:16 +02:00 |
Carlos Jimenez Ruiz
|
9c596b06c8
|
merge
|
2019-04-15 14:37:12 +02:00 |
Carlos Jimenez Ruiz
|
82ed0078d2
|
#1339 Print - Hoja de rutas
|
2019-04-15 14:34:33 +02:00 |
Joan Sanchez
|
45055034dc
|
invoiceOutMake in prod
|
2019-04-15 11:35:00 +02:00 |
Joan Sanchez
|
ac8a27d2f4
|
Added ticket invoice #1310
|
2019-04-12 13:54:31 +02:00 |
Bernat
|
c6203a0654
|
fix test ticketservice, update selectors and acl
|
2019-04-11 12:25:01 +02:00 |
Bernat
|
6d9fee06f6
|
new models and cau 10507
|
2019-04-11 11:44:34 +02:00 |
Javi Gallego
|
50d70f0f6f
|
Tarea #1259 crear modelo ticketServiceType
|
2019-04-10 14:44:41 +02:00 |
Carlos Jimenez Ruiz
|
0343aea2a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-10 09:48:52 +02:00 |
Carlos Jimenez Ruiz
|
17f5e46497
|
#1284 Print - Informe zona
|
2019-04-10 09:45:45 +02:00 |
Joan Sanchez
|
20ba05a655
|
item filter by id or barcode
|
2019-04-10 09:32:29 +02:00 |
Juan Ferrer
|
f46d50fc48
|
DB versioning fixes
|
2019-04-08 09:38:38 +02:00 |
Bernat
|
ad830e52fc
|
update structure db from production
|
2019-04-05 09:20:22 +02:00 |
Gerard
|
cfdeb387a1
|
#1241 routes.tickets
|
2019-04-04 13:06:41 +02:00 |
Bernat
|
eaa3a36fde
|
update fixtures and structure
|
2019-04-04 09:02:39 +02:00 |
Carlos Jimenez Ruiz
|
09288c2c12
|
merge
|
2019-04-03 15:19:05 +02:00 |
Carlos Jimenez Ruiz
|
971a2ab891
|
#1270
ticket.index advanced search mostrar dias en el futuro
|
2019-04-03 15:16:32 +02:00 |
Juan Ferrer
|
eab2a29cb5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-03 13:40:35 +02:00 |
Juan Ferrer
|
b7092d97d3
|
DB versioning fixes
|
2019-04-03 13:39:35 +02:00 |
Joan Sanchez
|
3a19141d58
|
added smsConfig fixture
|
2019-04-03 12:27:08 +02:00 |
Juan Ferrer
|
a12ef2c290
|
DB versioning fixes
|
2019-04-03 12:09:45 +02:00 |
Juan Ferrer
|
479b4c68c8
|
DB versioning fixes
|
2019-04-03 11:21:54 +02:00 |
Juan Ferrer
|
836f210f6c
|
DB versioning code refactor
|
2019-04-03 11:02:19 +02:00 |
Juan Ferrer
|
13ca2f7e52
|
DB versioning
|
2019-04-03 10:29:05 +02:00 |
Carlos Jimenez Ruiz
|
0334b8f24e
|
moved sql only local files outside of changes
|
2019-04-02 12:32:09 +02:00 |
Joan Sanchez
|
377f38b10d
|
moved procedures to only-local
|
2019-04-02 11:40:18 +02:00 |
Joan Sanchez
|
48cd9e2919
|
price fixes
|
2019-04-01 09:13:24 +02:00 |
Joan Sanchez
|
5898d07822
|
Merge branch 'test' into dev
|
2019-04-01 09:02:13 +02:00 |
Joan Sanchez
|
dfe1a68d35
|
fix ticket basic data allow change company #1277
|
2019-04-01 09:01:11 +02:00 |
Bernat
|
6fb94188f5
|
cau 10246 add new procedure
|
2019-03-29 13:15:55 +01:00 |
Bernat
|
7e2f07aa83
|
cau 10249 update structure
|
2019-03-29 12:07:48 +01:00 |
Joan Sanchez
|
8110325af8
|
send sms from ticket descriptor & ticket line #991
|
2019-03-29 07:29:09 +01:00 |
Carlos Jimenez Ruiz
|
2263da2e05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-28 11:55:31 +01:00 |
Carlos Jimenez Ruiz
|
a14ba28629
|
#1263 invoiceOut.summary
|
2019-03-28 11:55:23 +01:00 |
Gerard
|
8fc9581b8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-27 08:56:39 +01:00 |
Gerard
|
650e5b8626
|
#1257 route.log
|
2019-03-27 08:56:25 +01:00 |
Joan Sanchez
|
56f352686c
|
added sms endpoint #1149
|
2019-03-27 08:48:13 +01:00 |
Bernat
|
4e27581045
|
cau 10269 fix test and update fixtures
|
2019-03-27 08:44:15 +01:00 |
Gerard
|
316ab3d8b9
|
rollback due import-changes not importing sql
|
2019-03-26 14:16:52 +01:00 |
Gerard
|
243357e72c
|
sqls moved due dev merge with test
|
2019-03-26 12:54:02 +01:00 |
Bernat
|
4e1e3bdeeb
|
cau 10270 refactor fixtures and fix test
|
2019-03-26 10:25:11 +01:00 |
Carlos Jimenez Ruiz
|
d322c941a4
|
#1226 Ticket.index advanced filter añadir factura
|
2019-03-25 15:16:56 +01:00 |
Bernat
|
3340163315
|
refactor worker fixtures
|
2019-03-25 10:00:49 +01:00 |
Carlos Jimenez Ruiz
|
92738759a3
|
#1235 route.basic-data
|
2019-03-23 16:16:47 +01:00 |
Joan Sanchez
|
4a4b997e1b
|
added subName to fetched-tags #1246
|
2019-03-22 15:05:15 +01:00 |
Joan Sanchez
|
c5e953f922
|
worker calendar front & back unit tests #1248
|
2019-03-22 12:51:44 +01:00 |
Joan Sanchez
|
6eaf317b5e
|
added worker calendar #1147
|
2019-03-22 08:28:57 +01:00 |
Carlos Jimenez Ruiz
|
92347cd9c4
|
#1233 route.index
|
2019-03-21 13:46:14 +01:00 |
Bernat
|
cf513a5329
|
update structure db from production
|
2019-03-21 11:46:42 +01:00 |
Carlos Jimenez Ruiz
|
163bf2464b
|
removed deprecated logic test
|
2019-03-21 08:37:24 +01:00 |
Bernat
|
57bc9f1132
|
add new db schema, delete sql and fix test
|
2019-03-21 06:54:27 +01:00 |
Juan Ferrer
|
36c9c11d77
|
Merge branch 'test' into dev
|
2019-03-20 13:11:51 +01:00 |
Juan Ferrer
|
e147f318cb
|
Merge
|
2019-03-20 12:22:34 +01:00 |
Juan Ferrer
|
1f3117e7e5
|
Import SQL changes
|
2019-03-20 12:21:32 +01:00 |
Bernat
|
41e1505b1a
|
#1233 new models and fixtures
|
2019-03-20 10:10:36 +01:00 |
Bernat
|
981800a0e2
|
import production structure db to local and fix test
|
2019-03-20 08:52:54 +01:00 |
Carlos Jimenez Ruiz
|
d7d8bff92b
|
#1196 worker.descriptor correo
|
2019-03-15 12:58:26 +01:00 |
Gerard
|
3761e88734
|
Merge branch 'test' into dev
|
2019-03-15 08:36:53 +01:00 |
Gerard
|
01d645e93c
|
ticketGetProblems Fixed
|
2019-03-15 08:36:03 +01:00 |
Joan Sanchez
|
274d744b69
|
added clone zone button #1159
|
2019-03-14 15:07:24 +01:00 |
Bernat
|
2c600a5af4
|
cau 10144 upadte structure db
|
2019-03-13 09:45:49 +01:00 |
Joan Sanchez
|
6405688610
|
prevent local sql execution for nst scheme
|
2019-03-13 07:25:54 +01:00 |
Juan Ferrer
|
0b560e1749
|
DB import script fixes
|
2019-03-12 16:38:43 +01:00 |
Gerard
|
0be2831d0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-12 15:58:02 +01:00 |
Gerard
|
54fbc07a36
|
test fixes
|
2019-03-12 15:57:37 +01:00 |
Joan Sanchez
|
92170c34d5
|
worker department #1133
|
2019-03-12 15:04:09 +01:00 |
Bernat
|
b8ea54dfc4
|
update structure db
|
2019-03-12 13:48:25 +01:00 |
Bernat
|
55fd1c233e
|
import-changes
|
2019-03-12 12:20:14 +01:00 |
Gerard
|
fb75ff0eae
|
#1222 Activar log en el modulo ítem
|
2019-03-12 11:47:53 +01:00 |
Bernat
|
99ef9d71fe
|
new acl
|
2019-03-08 13:45:38 +01:00 |
Gerard
|
7f0d3279d1
|
#1189 ticket.index mostrar mas informacion
|
2019-03-08 08:14:22 +01:00 |
Joan Sanchez
|
9f3f0224ab
|
recovered sql
|
2019-03-07 13:53:06 +01:00 |
Bernat
|
b709930db5
|
cau 10041 update fixtures for workers and fix test
|
2019-03-07 07:51:29 +01:00 |
Bernat
|
5efce3699c
|
cau 9994 new procedure ticketCalculateSale
|
2019-03-06 11:45:05 +01:00 |
Joan Sanchez
|
3c6d27a285
|
order sales by concept #1166
|
2019-03-04 12:04:23 +01:00 |
Joan Sanchez
|
7fd8615157
|
added comment to sql changes
|
2019-03-04 08:35:39 +01:00 |
Bernat
|
02f99d3eb2
|
cau 9995 - 10013 fix test and update structure
|
2019-03-04 08:13:09 +01:00 |