Laurent Destailleur 2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php

2015-07-19 12:26:31 +02:00

..

ajaxdirpreview.php

Fix: Message show when dir is out of sync with database cache was wrong.

2014-09-03 16:09:14 +02:00

ajaxdirtree.php

Avoid tooltip into tooltip

2015-02-01 01:28:15 +01:00

bankconciliate.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

box.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

constantonoff.php

Fix: for avoid error with main context hooks, with $langs object for

2015-07-03 22:14:34 +02:00

contacts.php

Add showempty into combobox

2014-05-13 11:40:19 +02:00

extraparams.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

fileupload.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

loadinplace.php

Fix: add possibility to use element id

2014-09-26 09:20:02 +02:00

objectonoff.php

Update objectonoff.php

2014-10-18 22:47:12 +02:00

price.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

row.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

saveinplace.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

security.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

vatrates.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

ziptown.php

Fix: sql request not compatible with pgsql

2014-08-30 20:04:53 +02:00