Laurent Destailleur 23562a01ab Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang

2015-02-16 20:59:04 +01:00

..

antivir.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01: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

Update commondocgenerator.class.php

2015-01-12 18:18:43 +01:00

commoninvoice.class.php

Type of supplier invoice was broken

2015-01-20 17:55:20 +01:00

commonobject.class.php

Debug serial/lot management

2015-02-16 20:14:16 +01:00

commonobjectline.class.php

…

commonorder.class.php

…

conf.class.php

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

2014-12-07 12:07:53 +01:00

cookie.class.php

…

CSMSFile.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

ctypent.class.php

Fix: Pb of object with wrong type.

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

discount.class.php

Add dol_escape_htmltag and start to adapt boxes

2015-01-22 00:23:55 +01:00

doleditor.class.php

…

dolexception.class.php

…

dolgeoip.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

dolgraph.class.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

dolprintipp.class.php

PHPCS

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

events.class.php

Maxi debug and enhancement of module batch.

2015-02-11 22:54:06 +01:00

extrafields.class.php

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

2015-02-10 21:36:38 +01:00

fileupload.class.php

…

fiscalyear.class.php

…

genericobject.class.php

…

google.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

hookmanager.class.php

better translation and typo

2015-01-01 11:24:00 +01:00

html.form.class.php

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

2015-02-15 19:51:49 +01:00

html.formactions.class.php

Add option AGENDA_ALWAYS_HIDE_AUTO

2014-10-20 12:29:35 +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

…

html.formbarcode.class.php

…

html.formcompany.class.php

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

2015-01-18 17:13:42 +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

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

2015-01-22 21:52:55 +01:00

html.formintervention.class.php

…

html.formmail.class.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

html.formmailing.class.php

…

html.formorder.class.php

…

html.formother.class.php

Select2 component creates problem of sizing with jmobile.

2015-01-31 19:25:26 +01:00

html.formprojet.class.php

Select2 component creates problem of sizing with jmobile.

2015-01-31 19:25:26 +01:00

html.formpropal.class.php

…

html.formsms.class.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

html.formsocialcontrib.class.php

…

index.html

…

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

Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly

2015-02-06 16:33:33 +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

Fix: PHPCS

2014-12-05 20:18:30 +01:00

notify.class.php

Fix: Module notifications DB Error "unknown field type" into third tab

2014-11-06 11:20:47 +01:00

openid.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

rssparser.class.php

Fix bad operator for and

2015-02-03 13:05:28 +01:00

smtps.class.php

Fix: A little clean of dol_hash usage.

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

stats.class.php

…

translate.class.php

Fix: Avoid to load language when we can not.

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

vcard.class.php

…