florian HENRY
|
137f1c4e4f
|
Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/resource/class/dolresource.class.php
|
2016-08-18 08:49:54 +02:00 |
|
Laurent Destailleur
|
fead7967f2
|
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/commande/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/resource/class/resource.class.php
|
2016-08-17 16:55:39 +02:00 |
|
florian HENRY
|
f7bb2483d8
|
fix ressource for PGSQL
|
2016-08-17 14:53:51 +02:00 |
|
florian HENRY
|
63c5425991
|
another fix for Ressource module in PgSQL
|
2016-08-17 14:46:15 +02:00 |
|
Laurent Destailleur
|
fdfe333f69
|
Fix strict sql
|
2016-08-02 13:10:09 +02:00 |
|
Laurent Destailleur
|
52fefc2d02
|
Debug module resource
|
2016-06-06 13:14:05 +02:00 |
|
Laurent Destailleur
|
9c3b9a8494
|
NEW: Link on user in leave context reach to leave tab.
|
2016-05-19 13:25:16 +02:00 |
|
Ion Agorria
|
788d499bf6
|
Change resource type to dolresource in class
|
2016-05-11 18:50:02 +02:00 |
|
Laurent Destailleur
|
8fe799f424
|
Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
into aternatik-dol_resource
Conflicts:
dev/initdata/img/printcompany.png
htdocs/compta/bank/card.php
|
2016-04-29 17:51:11 +02:00 |
|
jfefe
|
7c4a9d140b
|
Replace reserved keyword "Resource" by "DolResource"
# Conflicts:
# htdocs/resource/list.php
|
2016-01-21 11:26:21 +01:00 |
|