Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +02:00
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Ion
6428c2157c
Add country to resource
2017-11-23 00:26:25 +01:00
Laurent Destailleur
b405a877b9
Use automcomplete on resource combo list
2017-11-22 14:47:35 +01:00
Laurent Destailleur
4ad0d5df43
Fix scrutinizer issues
2017-11-19 16:55:28 +01:00
Laurent Destailleur
2668b80599
Standardize code
2017-11-12 14:21:34 +01:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
c108f11c01
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/compta/bank/index.php
2017-09-03 00:58:45 +02:00
Regis Houssin
45136de664
Fix: documents dir not rename and delete
2017-08-30 11:26:48 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
5ebe711665
Look and feel v6
2017-05-23 13:38:48 +02:00
Laurent Destailleur
a79903a2fc
Fix responsive design
2017-02-23 01:29:35 +01:00
florian HENRY
32ebe8f4d7
fix : ressource extrafield in list
2017-01-26 14:38:49 +01:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +02:00
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
ddc480b6c9
other fix for PgSQL and style
2016-08-17 14:51:25 +02:00
florian HENRY
63c5425991
another fix for Ressource module in PgSQL
2016-08-17 14:46:15 +02:00
florian HENRY
5c51cb0f29
FIX : PgSQL Module Ressource list crash #5637
2016-08-17 14:40:05 +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
9b6e5196ea
Debug module resource. Filter on agenda.
2016-06-06 13:05:36 +02:00
Laurent Destailleur
9c3b9a8494
NEW: Link on user in leave context reach to leave tab.
2016-05-19 13:25:16 +02:00
Laurent Destailleur
d083ad9382
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
htdocs/resource/class/html.formresource.class.php
2016-05-17 18:21:22 +02:00
Laurent Destailleur
668df6cb7d
Debug resource module
2016-05-17 10:51:13 +02:00
Laurent Destailleur
63d0710842
FIX Creation of the second ressource type fails.
2016-05-17 10:44:30 +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
Sebastien Bechet
82f74ceb38
Postgresql compatibility patch + cosmetic
2016-03-22 10:09:41 +01:00
jfefe
7c4a9d140b
Replace reserved keyword "Resource" by "DolResource"
...
# Conflicts:
# htdocs/resource/list.php
2016-01-21 11:26:21 +01:00
braito4
47ee8993d3
fix travis
2015-12-28 11:47:12 +01:00
braito4
07f7717b51
Fix Warning #4229 PHP7
2015-12-28 11:28:18 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Laurent Destailleur
480a398f36
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/holiday/card.php
htdocs/resource/list.php
2015-12-03 13:06:20 +01:00
Frédéric FRANCE
e6033369a8
Update resource.class.php
2015-11-26 20:33:07 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Ion Agorria
f3cd9da73d
Resource fixes
2015-08-12 21:48:00 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00