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

Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php

2014-10-12 02:54:34 +02:00

..

antivir.class.php

Qual: remove PHP closing tag (again)

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

canvas.class.php

Fix: doxygen

2014-09-27 16:00:11 +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

Doxygen

2014-09-18 11:13:23 +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

Fix: column name should not be an numeric

2014-10-03 03:12:39 +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

Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6

2014-09-21 20:30:55 +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

…

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

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +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-10-12 02:54:34 +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

Fix: Restore broken feature. One hook = One call of function per module.

2014-10-05 04:49:46 +02:00

html.form.class.php

Qual: Uniformize translated label of progress on all pages.

2014-10-12 01:04:34 +02:00

html.formactions.class.php

Fix: default setup of type of action

2014-09-15 19:27:45 +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

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

html.formcontract.class.php

More substitutions

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

html.formcron.class.php

…

html.formfile.class.php

Qual: Uniformize translated label of progress on all pages.

2014-10-12 01:04:34 +02:00

html.formintervention.class.php

New: Add option AGENDA_DEFAULT_TYPE

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

html.formmail.class.php

Fixed typo

2014-09-17 16:40:35 +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

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

2014-09-28 02:14:32 +02:00

html.formprojet.class.php

Closed projects are greyed out in project selector

2014-09-17 15:42:48 +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

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

interfaces.class.php

Fix: File names must be in lowercase.

2014-10-11 18:27:30 +02:00

ldap.class.php

Fix: doxygen

2014-09-27 16:00:11 +02:00

link.class.php

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

2014-09-28 02:14:32 +02:00

menu.class.php

…

menubase.class.php

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

2014-09-28 02:14:32 +02:00

mobiledetect.class.php

Fix scrutinizer

2014-10-05 01:22:17 +02:00

notify.class.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

openid.class.php

Removed closing php tag

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

rssparser.class.php

Fix: doxygen

2014-09-27 16:00:11 +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

Qual: Renamed table llx_c_civilite into llx_c_civility

2014-08-12 06:03:27 +02:00

vcard.class.php

Removed closing php tag

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