 Carlos Jimenez Ruiz
|
464366fdbe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
|
2021-01-18 17:17:02 +01:00 |
|
Carlos Jimenez Ruiz
|
3251d737e6
|
fixed price index implementation
|
2021-01-18 14:16:39 +01:00 |
Jorge Padawan
|
daa8bafb09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-01-15 08:56:20 +01:00 |
 Bernat Exposito
|
975e158ebb
|
itemTag trigger
|
2021-01-13 08:17:41 +01:00 |
 Javi Gallego
|
6acfe7f1cf
|
minorBugs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 17:18:37 +01:00 |
|
Javi Gallego
|
d3b5300553
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-11 16:30:14 +01:00 |
|
Bernat Exposito
|
8b3af8851c
|
fix trigger itemTag
|
2021-01-11 11:29:47 +01:00 |
|
Jorge Padawan
|
b8827ec63d
|
Fix problems with ACL and the autocomplete of bank entity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-08 16:45:20 +01:00 |
|
Jorge Padawan
|
6017894ba9
|
first step bankEntity
|
2021-01-07 15:14:38 +01:00 |
|
Javi Gallego
|
c0cc91b6c3
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-07 09:11:34 +01:00 |
|
Javi Gallego
|
1291fc4b6c
|
acl
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-04 11:49:32 +01:00 |
|
Carlos Jimenez Ruiz
|
e356dd9e5e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries
|
2020-12-30 14:55:14 +01:00 |
 Joan Sanchez
|
2886e02328
|
Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 08:50:12 +01:00 |
|
Joan Sanchez
|
f4ff31a294
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log
|
2020-12-29 08:09:49 +01:00 |
|
Joan Sanchez
|
910caf5689
|
2661 - Added clone options
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-28 14:53:26 +01:00 |
|
Jorge Padawan
|
3517bdea41
|
Añadido a las foreignKeys el valor UNIQUE
|
2020-12-23 13:31:55 +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 |
|
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 |
|
Jorge Padawan
|
33237dad86
|
Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 12:29:37 +01:00 |
|
Joan Sanchez
|
0a4016be41
|
Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-11 15:04:55 +01:00 |
|
Bernat Exposito
|
6605e5ae4c
|
zoneLog
|
2020-12-02 12:05:47 +01:00 |
|
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
|
Joan Sanchez
|
d40ea52560
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:06:34 +01:00 |
|
Joan Sanchez
|
7693a1c449
|
2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:05:57 +01:00 |
|
Joan Sanchez
|
8a3f5345f4
|
Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 13:54:47 +00:00 |
|
Joan Sanchez
|
359dcc904d
|
Version merge
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 09:08:39 +01:00 |
|
Joan Sanchez
|
8194801308
|
Supplier cargo migration to vn
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 08:32:39 +00:00 |
|
Joan Sanchez
|
cb8e9655af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 13:57:37 +01:00 |
|
Joan Sanchez
|
db4f226f6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:39:15 +01:00 |
|
Bernat Exposito
|
75ffa108fb
|
refactor back download
|
2020-11-11 10:52:35 +01:00 |
|
Bernat Exposito
|
e4e4f37609
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-06 22:55:47 +01:00 |
|
Carlos Jimenez Ruiz
|
ead0994032
|
timeControlCalculate procedure updated
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 10:33:02 +01:00 |
|
Bernat Exposito
|
2dc51e6125
|
update acl
gitea/salix/pipeline/head This commit looks good
Details
|
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
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:45 +01:00 |
|
Juan Ferrer
|
b3ab1fe059
|
Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 15:38:23 +01: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 |
|
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 |
|
Juan Ferrer
|
15c39f93ca
|
root id changed from 0 to 100 due to loopback join problems with id 0
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 01:10:32 +01:00 |
|
Juan Ferrer
|
9b563cb8bf
|
LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 00:02:27 +01:00 |
|
Javi Gallego
|
b50ae7b8ca
|
testback arreglados
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 15:50:59 +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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 10:08:38 +01:00 |
|
Javi Gallego
|
3fdc9c315d
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:40:47 +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
|
77bc1b562e
|
create section supplier log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 09:08:27 +01:00 |
|
Joan Sanchez
|
3675f7ed34
|
2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 12:16:57 +01: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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 11:52:02 +02:00 |
|
Javi Gallego
|
ef7a886d86
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:42:23 +02:00 |
|
Bernat Exposito Domenech
|
7eed2ddd59
|
export structure and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 12:47:37 +02:00 |
|
Joan Sanchez
|
6fa8aae161
|
2509 - Added forms to create new locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 11:33:42 +02:00 |
|
Joan Sanchez
|
f00828cf57
|
Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 05:44:11 +00:00 |
|
Javi Gallego
|
77064d85a0
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 12:54:02 +00:00 |
|
Javi Gallego
|
531bb6da25
|
quito copy
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 13:22:56 +02:00 |
|
Joan Sanchez
|
86025b88e3
|
Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 09:36:02 +00:00 |
|
Joan Sanchez
|
cef2dc982f
|
Updated sql
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 07:53:03 +02:00 |
|
Joan Sanchez
|
420dfdbdff
|
Send notification by email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-02 12:23:48 +02:00 |
|
Javi Gallego
|
8d1709ea51
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 16:46:33 +02:00 |
|
Juan Ferrer
|
6d8b13423f
|
SQL hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 10:02:19 +02:00 |
|
Javi Gallego
|
2714857227
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-30 14:07:38 +02:00 |
|
Juan Ferrer
|
611aa9cafa
|
SQL hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 10:55:04 +02:00 |
|
Juan Ferrer
|
991bece64a
|
SQL fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 21:25:53 +02:00 |
|
Juan Ferrer
|
5264b615d4
|
Optimización docker salix-db
|
2020-09-28 10:40:50 +02:00 |
|
Javi Gallego
|
c909470f41
|
merge
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-25 08:10:37 +02:00 |
|
Joan Sanchez
|
164f636f3f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 09:02:16 +02:00 |
|
Joan Sanchez
|
44e23ca560
|
Removed sql version
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 09:00:42 +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 |
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 13:24:43 +02:00 |
|
Javi Gallego
|
8fb674819a
|
ticket service
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 10:35:39 +02:00 |
Carlos Jimenez Ruiz
|
bf17d428e4
|
entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-11 14:51:58 +02:00 |
|
Juan Ferrer
|
4b5d2cd0dd
|
2177 account module
gitea/salix/pipeline/head There was a failure building this commit
Details
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 |
|
Bernat Exposito Domenech
|
9ff7232b50
|
export production and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 12:54:10 +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 |
|
Joan Sanchez
|
3efe14fc53
|
Removed unused vars
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 12:52:27 +02:00 |