Laurent Destailleur 546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php

2018-05-05 14:40:39 +02:00

..

antivir.class.php

…

canvas.class.php

…

ccountry.class.php

…

CMailFile.class.php

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

2018-04-23 23:09:53 +02:00

comment.class.php

…

commondocgenerator.class.php

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

2018-04-12 13:31:14 +02:00

commoninvoice.class.php

…

commonobject.class.php

Do not display multicurrency cols if currency of object is same as main currency

2018-05-02 11:30:35 +02:00

commonobjectline.class.php

…

commonorder.class.php

fix scrutinizer

2018-03-21 08:35:03 +01:00

commonstickergenerator.class.php

…

conf.class.php

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

2018-04-20 01:47:54 +02:00

coreobject.class.php

…

CSMSFile.class.php

…

cstate.class.php

…

ctypent.class.php

…

ctyperesource.class.php

…

discount.class.php

Doxygen

2018-03-27 18:00:17 +02:00

doleditor.class.php

Fix PSR2

2018-04-22 20:08:29 +02:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

Lowercase NULL, TRUE, FALSE according to PSR2

2018-04-16 13:51:16 +02:00

dolreceiptprinter.class.php

…

emailsenderprofile.class.php

…

events.class.php

…

extrafields.class.php

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

2018-04-23 23:09:53 +02:00

fileupload.class.php

Lowercase NULL, TRUE, FALSE according to PSR2

2018-04-16 13:51:16 +02:00

fiscalyear.class.php

…

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

NEW Add hook setContentSecurityPolicy

2018-04-30 15:17:38 +02:00

html.form.class.php

Fix: use "socpeople" instead "societe"

2018-04-27 10:42:10 +02:00

html.formaccounting.class.php

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

2018-05-05 14:34:54 +02:00

html.formactions.class.php

NEW Look and feel v8 - Show Picto "+" on all links "Add record"

2018-04-18 03:26:15 +02:00

html.formadmin.class.php

…

html.formbank.class.php

…

html.formbarcode.class.php

Fix: best visibility of choices

2018-03-27 18:12:42 +02:00

html.formcompany.class.php

Fix Sqli

2018-03-15 01:55:47 +01:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018

2018-04-21 12:05:50 +02:00

html.formintervention.class.php

…

html.formmail.class.php

NEW add any predefined mail content

2018-04-17 16:03:12 +02:00

html.formmailing.class.php

…

html.formmargin.class.php

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

2018-03-16 12:20:42 +01:00

html.formorder.class.php

…

html.formother.class.php

Standardize code

2018-04-29 19:52:14 +02:00

html.formprojet.class.php

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

2018-03-11 00:10:13 +01:00

html.formpropal.class.php

…

html.formsms.class.php

Error management

2018-03-13 12:54:53 +01:00

html.formsocialcontrib.class.php

…

html.formticketsup.class.php

Debug module ticket

2018-04-30 10:33:36 +02:00

html.formwebsite.class.php

…

index.html

…

infobox.class.php

…

interfaces.class.php

Too verbose log

2018-03-25 13:40:22 +02:00

ldap.class.php

Lowercase NULL, TRUE, FALSE according to PSR2

2018-04-16 13:51:16 +02:00

link.class.php

…

menu.class.php

…

menubase.class.php

Better logging

2018-05-01 18:58:19 +02:00

notify.class.php

…

openid.class.php

…

rssparser.class.php

Lowercase NULL, TRUE, FALSE according to PSR2

2018-04-16 13:51:16 +02:00

smtps.class.php

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

2018-04-23 23:09:53 +02:00

stats.class.php

…

translate.class.php

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

2018-03-15 02:13:29 +01:00

utils.class.php

FIX auto open contract if one result found

2018-03-24 18:28:06 +01:00

vcard.class.php

…

workboardresponse.class.php

…