Laurent Destailleur 2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php

2015-07-19 12:04:30 +02:00

..

antivir.class.php

Qual: remove PHP closing tag (again)

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

canvas.class.php

Fix missing test of action when using canvas

2015-02-16 02:02:11 +01:00

ccountry.class.php

Fix: Pb of object with wrong type.

2014-11-15 18:24:38 +01:00

CMailFile.class.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

commondocgenerator.class.php

fix previous commit

2015-07-06 16:59:03 +02:00

commoninvoice.class.php

Add a TODO to explain why we keep some extends into class.

2014-09-23 19:37:59 +02:00

commonobject.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-19 12:04:30 +02:00

commonobjectline.class.php

Add a TODO to explain why we keep some extends into class.

2014-09-23 19:37:59 +02:00

commonorder.class.php

Removed closing php tag

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

conf.class.php

Misc PHPdoc fixes

2015-02-25 18:24:36 +01:00

cookie.class.php

Tag class as deprecated

2015-06-27 21:26:05 +02:00

CSMSFile.class.php

Removed closing php tag

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

ctypent.class.php

Fix missing fields into import of thirdparties.

2015-02-24 15:40:50 +01:00

discount.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

doleditor.class.php

revert bug1840 to eldy solution

2015-03-02 10:13:06 +01:00

dolexception.class.php

…

dolgeoip.class.php

Removed closing php tag

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

dolgraph.class.php

No need to have this protected. Property can be read with method show()

2015-03-13 21:45:52 +01:00

dolprintipp.class.php

PHPCS

2014-12-21 02:21:12 +01:00

events.class.php

Fix: Pb of object with wrong type.

2014-11-15 18:24:38 +01:00

extrafields.class.php

Fix doxygen

2015-04-30 00:07:30 +02:00

fileupload.class.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-09 15:30:41 +02:00

fiscalyear.class.php

Fix: debug of accountancy module

2014-09-09 09:46:57 +02:00

genericobject.class.php

Removed closing php tag

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

google.class.php

…

hookmanager.class.php

A more complete error message

2015-05-07 10:45:35 +02:00

html.form.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-19 12:04:30 +02:00

html.formactions.class.php

Fix: do not show end date when it is same than start date

2015-04-01 12:02:32 +02:00

html.formadmin.class.php

Fixed: Protection to lock language setup in demo mode was not working

2014-11-29 12:11:12 +01:00

html.formbank.class.php

Removed closing php tag

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

html.formbarcode.class.php

Removed closing php tag

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

html.formcompany.class.php

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

html.formcontract.class.php

Update html.formcontract.class.php

2014-11-22 15:41:18 +01:00

html.formcron.class.php

GPLv3

2014-10-30 20:41:08 +01:00

html.formfile.class.php

Corrected weird typo

2015-01-18 16:28:42 +01:00

html.formintervention.class.php

New: Add option AGENDA_DEFAULT_TYPE

2014-09-15 17:34:32 +02:00

html.formmail.class.php

revert bug1840 to eldy solution

2015-03-02 10:13:06 +01:00

html.formmailing.class.php

camel case

2014-05-30 12:01:26 +02:00

html.formorder.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formother.class.php

FIX Better management error into the color conversion functions

2015-06-12 14:37:27 +02:00

html.formprojet.class.php

Fixed undefined variable typo

2015-06-15 09:18:58 +02:00

html.formpropal.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formsms.class.php

Fix: Bugs reported by scrutinizer

2014-11-15 15:19:37 +01:00

html.formsocialcontrib.class.php

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +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

infobox.class.php

Doxygen

2014-11-23 23:22:49 +01:00

interfaces.class.php

Fix: Forging email content must use dol_concatdesc.

2014-11-02 12:32:38 +01:00

ldap.class.php

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

link.class.php

Fix: [ bug #1533 ] Links triggers do not show trigger error message

2014-12-23 11:39:43 +01:00

menu.class.php

…

menubase.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

mobiledetect.class.php

Use span class="badge" for notes.

2014-10-19 19:57:42 +02:00

notify.class.php

Fix: Bad ref used into notification message

2015-04-01 11:30:48 +02:00

openid.class.php

Removed closing php tag

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

rssparser.class.php

FIX Save of filters into export profiles failed.

2015-06-24 18:29:29 +02:00

smtps.class.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

stats.class.php

Error management

2015-04-03 15:25:24 +02:00

translate.class.php

Fix: Avoid to load language when we can not.

2014-11-12 10:25:56 +01:00

vcard.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-19 12:04:30 +02:00