Laurent Destailleur 29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into ...

defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php

2014-06-26 23:04:26 +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

CMailFile.class.php

Removed closing php tag

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

commondocgenerator.class.php

Fix: extra fields key.

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

commoninvoice.class.php

Fix : duedate was not auto calculated + move calculation function to common invoice class

2014-06-14 12:53:02 +02:00

commonobject.class.php

Merge branch 'patch-11' of github.com:defrance69/dolibarr into

2014-06-26 23:04:26 +02:00

commonobjectline.class.php

Removed closing php tag

2014-05-03 18:18:44 +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

Removed closing php tag

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

cpays.class.php

Removed closing php tag

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

CSMSFile.class.php

Removed closing php tag

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

ctypent.class.php

Removed closing php tag

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

discount.class.php

Removed closing php tag

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

doleditor.class.php

New: DolEditor can accepts percent instead of nb of cols for textarea

2014-05-05 13:41:25 +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: Missing global declaration

2014-04-23 18:23:56 +02:00

events.class.php

Removed closing php tag

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

extrafields.class.php

Perf: Avoid to isntantiate object 'form' into 'subform' classes when

2014-05-01 16:26:57 +02:00

fileupload.class.php

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

2014-06-09 15:30:41 +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

Fix: Add hidden option so we can restore old behaviour (duration is

2014-06-21 16:06:59 +02:00

html.formactions.class.php

New: Filter on event status

2014-06-26 20:24:00 +02:00

html.formadmin.class.php

Removed closing php tag

2014-05-03 18:18:44 +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

Properties "civilite_id" were renamed into "civility_id".

2014-05-05 00:23:09 +02:00

html.formcontract.class.php

Removed closing php tag

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

html.formcron.class.php

Qual: Doxygen

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

html.formfile.class.php

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

2014-06-25 20:22:25 +02:00

html.formmail.class.php

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

2014-06-26 21:38:03 +02:00

html.formmailing.class.php

camel case

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

html.formorder.class.php

Removed closing php tag

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

html.formother.class.php

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

2014-05-29 19:20:48 +02:00

html.formprojet.class.php

Merge branch 'develop' of github.com:atm-maxime/dolibarr into

2014-06-20 17:11:12 +02:00

html.formpropal.class.php

Removed closing php tag

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

html.formsms.class.php

List cleaner

2014-05-11 21:59:35 +02:00

html.formsocialcontrib.class.php

Removed closing php tag

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

index.php

Add empty index file

2011-10-24 10:33:55 +02:00

infobox.class.php

Removed closing php tag

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

interfaces.class.php

Decrease log level for disabled trigger

2014-05-13 10:36:01 +02:00

ldap.class.php

Removed closing php tag

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

link.class.php

Fix undeclared variable

2014-04-23 11:19:34 +02:00

menu.class.php

Next step for rewriting menu managers.

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

menubase.class.php

Removed closing php tag

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

notify.class.php

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

2014-05-06 23:58:17 +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

Removed closing php tag

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

translate.class.php

Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE

2014-06-20 16:20:39 +02:00

vcard.class.php

Removed closing php tag

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