 Joan Sanchez
|
7c7aba86a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-03 09:36:55 +01:00 |
 Carlos Jimenez Ruiz
|
97667595e5
|
removed unused ACL and fixed typos
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-02 10:33:35 +01:00 |
|
Carlos Jimenez Ruiz
|
177ed24892
|
css amends and sql fixtures for production
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-02 09:58:17 +01:00 |
|
Carlos Jimenez Ruiz
|
cd084a53e5
|
styling update + acls
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-01 16:13:47 +01:00 |
|
Carlos Jimenez Ruiz
|
bebaef7879
|
sql changes moved to correct folder
|
2021-03-01 13:07:23 +01:00 |
|
Joan Sanchez
|
718021cff8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
|
2021-03-01 11:49:31 +01:00 |
|
Carlos Jimenez Ruiz
|
3dff5f06ff
|
starred modules front and backend 1st steps
|
2021-02-26 09:08:31 +01:00 |
Jorge Padawan
|
29ca6c52af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 12:32:26 +01:00 |
|
Jorge Padawan
|
a2ad1887a4
|
ACL bug fixed + package lock updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 15:20:30 +01:00 |
|
Jorge Padawan
|
86580727e5
|
Requested changes resolved
|
2021-02-12 11:47:53 +01:00 |
|
Jorge Padawan
|
a1ca8d90c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-11 16:07:04 +01:00 |
|
Joan Sanchez
|
c270ec6207
|
Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-11 15:06:41 +01:00 |
|
Joan Sanchez
|
84c82ed32d
|
2595 - Added invoiceIn module
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-10 15:03:11 +01:00 |
|
Jorge Padawan
|
2cf37a9e96
|
Added permissions to role administrative
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-10 09:10:15 +01:00 |
|
Carlos Jimenez Ruiz
|
83ed70abda
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-09 10:43:26 +01:00 |
|
Carlos Jimenez Ruiz
|
3d948ef317
|
warning color added lines with clientType loses
|
2021-02-09 10:43:19 +01:00 |
|
Carlos Jimenez Ruiz
|
a62bebd51e
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-08 10:14:41 +01:00 |
|
Carlos Jimenez Ruiz
|
76d6e2d4b7
|
worker added to supplier basic data and summary
|
2021-02-05 15:26:49 +01:00 |
|
Joan Sanchez
|
ea1066d664
|
Added changes version 10281
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 14:08:12 +01:00 |
|
Joan Sanchez
|
4ac207c568
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 12:58:50 +01:00 |
|
Joan Sanchez
|
f5f4c5936d
|
2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 09:29:47 +01:00 |
|
Carlos Jimenez Ruiz
|
c442eaa0c7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
|
2021-01-29 09:13:58 +01:00 |
|
Joan Sanchez
|
ca47fe6827
|
2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 12:23:18 +01:00 |
 Bernat Exposito
|
01c96272bd
|
export production
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-26 10:55:30 +01:00 |
 Javi Gallego
|
d61ab94398
|
acl conflicto
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-25 07:49:57 +01:00 |
|
Javi Gallego
|
93417e9676
|
refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-22 14:45:02 +01:00 |
|
Javi Gallego
|
e1711af265
|
sin keep
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 14:32:35 +01:00 |
|
Javi Gallego
|
7bdfb36f25
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 14:30:46 +01:00 |
|
Carlos Jimenez Ruiz
|
c4f673e089
|
relocated sql code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 11:28:47 +01:00 |
|
Javi Gallego
|
aab9797d3f
|
Merge branch 'dev' into 2479-factura-ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 13:40:55 +01:00 |
|
Javi Gallego
|
3dc50e8a16
|
test ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 13:39:40 +01:00 |
|
Carlos Jimenez Ruiz
|
0cf3f198ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 11:50:32 +01:00 |
|
Carlos Jimenez Ruiz
|
90c6d2fe3e
|
SQLs moved to current version folder
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 11:30:22 +01:00 |
|
Jorge Padawan
|
6acb5c221e
|
Changes folder of ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 10:55:21 +01:00 |
|
Carlos Jimenez Ruiz
|
42e7fa7047
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 10:25:39 +01:00 |
|
Javi Gallego
|
a6dfdc971a
|
receipt_beforInsert
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:54:55 +01:00 |
|
Carlos Jimenez Ruiz
|
ef3b48005e
|
sql changes now in correct version
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 09:23:58 +01:00 |
|
Carlos Jimenez Ruiz
|
843608c47f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-20 09:17:55 +01:00 |
|
Joan Sanchez
|
a67c8e4fbd
|
Renamed version
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 08:22:23 +01:00 |
|
Joan Sanchez
|
94b8fa7c4e
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-01-20 08:22:05 +01:00 |
|
Joan Sanchez
|
24982ba030
|
Renamed version
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 08:21:45 +01:00 |
|
Joan Sanchez
|
ffb76e6cb5
|
Added new db version
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 08:12:40 +01:00 |
|
Javi Gallego
|
e47e5b9ec4
|
merged carpetas de cambios
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 11:32:47 +01:00 |
|
Javi Gallego
|
043a74b548
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 10:20:45 +01:00 |
|
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 |