Laurent Destailleur be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php

2014-08-17 19:34:12 +02:00

..

antivir.class.php

Qual: remove PHP closing tag (again)

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

canvas.class.php

Qual: remove PHP closing tag (again)

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

ccountry.class.php

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

2014-08-10 13:37:39 +02:00

CMailFile.class.php

Add comment

2014-08-05 09:27:40 +02:00

commondocgenerator.class.php

Fix: extra fields key.

2014-06-06 16:08:42 +02:00

commoninvoice.class.php

Removed new SQL double-debug

2014-07-02 21:29:07 +02:00

commonobject.class.php

Accept property fk_thirdparty instead of fk_soc

2014-08-14 16:04:42 +02:00

commonobjectline.class.php

Call trigger added in commonobjectline

2014-08-01 08:59:08 +02:00

commonorder.class.php

Removed closing php tag

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

conf.class.php

Fix: Use bad var for test

2014-06-22 13:33:31 +02:00

cookie.class.php

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

2014-07-14 23:36:10 +02:00

CSMSFile.class.php

Removed closing php tag

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

ctypent.class.php

New: Type of thirdparties can accept a country (to show list of types

2014-07-11 13:56:35 +02:00

discount.class.php

Removed duplicated SQL error logging

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

doleditor.class.php

Fix: Allow percent to solve presentation pb by some pages.

2014-07-07 00:14:24 +02:00

dolexception.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

dolgeoip.class.php

Removed closing php tag

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

dolgraph.class.php

Removed closing php tag

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

dolprintipp.class.php

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

events.class.php

Removed duplicated SQL error logging

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

extrafields.class.php

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

2014-08-17 19:34:12 +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

Update

2014-07-05 21:58:39 +02:00

genericobject.class.php

Removed closing php tag

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

google.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

hookmanager.class.php

Removed closing php tag

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

html.form.class.php

Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into

2014-08-14 01:04:15 +02:00

html.formactions.class.php

New: More option to define default filter setting of agenda views.

2014-06-29 23:35:00 +02:00

html.formadmin.class.php

New: Add info page about browser.

2014-07-27 14:13:25 +02: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

Fix pb of links into state-region-country:

2014-08-17 17:47:25 +02:00

html.formcontract.class.php

More substitutions

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

html.formcron.class.php

Qual: Doxygen

2013-08-22 16:49:23 +02:00

html.formfile.class.php

New : add attachments on user cards

2014-08-05 16:01:40 +02:00

html.formmail.class.php

Fix: bad test commande_send -> order_send

2014-08-05 19:55:14 +02: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

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

2014-08-10 13:37:39 +02:00

html.formprojet.class.php

Fix: Removed bad char

2014-08-14 00:55:27 +02:00

html.formpropal.class.php

More substitutions

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

html.formsms.class.php

List cleaner

2014-05-11 21:59:35 +02: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

Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for

2014-08-01 00:53:29 +02:00

interfaces.class.php

Qual: Enable php checkstyle rule Zend.Files.ClosingTag

2014-07-20 15:27:38 +02:00

ldap.class.php

Removed closing php tag

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

link.class.php

Refactor: LINK_* trigger

2014-07-11 15:08:01 +02:00

menu.class.php

Next step for rewriting menu managers.

2013-03-05 15:42:26 +01:00

menubase.class.php

Removed duplicated SQL error logging

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

mobiledetect.class.php

Fix: PHPCS

2014-07-28 19:55:12 +02:00

notify.class.php

More substitutions

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

openid.class.php

Removed closing php tag

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

rssparser.class.php

Qual: remove PHP closing tag (again)

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

smtps.class.php

Removed closing php tag

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

stats.class.php

Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode

2014-07-30 15:47:19 +02:00

translate.class.php

New: When a translation is not available we always jump to en_US and

2014-08-08 10:50:37 +02:00

vcard.class.php

Removed closing php tag

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