Laurent Destailleur 31c42c9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/societe/canvas/actions_card_common.class.php

2018-08-13 01:23:03 +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 8.0

2018-07-02 12:16:51 +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

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

2018-07-02 12:16:51 +02:00

commonobject.class.php

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

2018-08-12 16:30:21 +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 pull request #9021 from grandoc/8.0

2018-06-29 20:02: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

Fix js when no data

2018-06-11 14:22:01 +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 8.0

2018-08-08 17:31:23 +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

Fix hack with hook to solve a problem to let a chance of external

2018-06-28 22:59:53 +02:00

html.form.class.php

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

2018-08-13 01:23:03 +02:00

html.formaccounting.class.php

New : Translate list element in journal selection

2018-05-07 09:20:19 +01:00

html.formactions.class.php

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

2018-07-06 16:09:32 +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

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

2018-05-22 20:26:09 +02:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

Fix look and feel v8

2018-06-26 11:25:28 +02:00

html.formintervention.class.php

…

html.formmail.class.php

Fix template email message html/nohtml

2018-06-27 12:11:49 +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

Fix: wrong table name

2018-06-27 09:33:09 +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

Fix can use actionmsg for generic trigger

2018-05-17 17:58:29 +02:00

html.formsocialcontrib.class.php

…

html.formticket.class.php

FIX Init of contact in combo list when thirdparty not yet known

2018-07-16 10:46:10 +02:00

html.formwebsite.class.php

Empty page first

2018-05-25 15:43:08 +02:00

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

Fix travis

2018-07-03 13:49:41 +02:00

notify.class.php

Fix problem in some vars as reported in #8955

2018-07-16 09:57:45 +02:00

openid.class.php

…

rssparser.class.php

Lowercase NULL, TRUE, FALSE according to PSR2

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

smtps.class.php

FIX better text content for multipart email

2018-06-18 23:26:21 +02:00

stats.class.php

…

translate.class.php

Update translate.class.php

2018-05-25 11:07:11 +02: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

…