Laurent Destailleur eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php

2017-09-13 20:57:53 +02:00

..

antivir.class.php

…

canvas.class.php

…

ccountry.class.php

…

CMailFile.class.php

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

2017-08-28 12:53:02 +02:00

commondocgenerator.class.php

Other fix

2017-08-18 11:35:20 +02:00

commoninvoice.class.php

…

commonobject.class.php

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

2017-09-13 20:57:53 +02:00

commonobjectline.class.php

…

commonorder.class.php

…

commonstickergenerator.class.php

…

conf.class.php

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

2017-09-12 13:26:25 +02:00

cookie.class.php

…

coreobject.class.php

…

CSMSFile.class.php

Fix nostop option

2017-09-01 17:08:47 +02:00

cstate.class.php

…

ctypent.class.php

…

ctyperesource.class.php

…

discount.class.php

Fix #7335 #7365 Better fix

2017-09-11 15:04:29 +02:00

doleditor.class.php

NEW Include a color syntaxed HTML editor for emailing edition.

2017-09-01 13:09:13 +02:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

Fix: avoid error "A non-numeric value encountered"

2017-08-23 21:01:14 +02:00

dolprintipp.class.php

…

dolreceiptprinter.class.php

…

events.class.php

FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes

2017-07-26 21:22:53 +02:00

extrafields.class.php

Better autosize of extrafields

2017-09-11 01:05:55 +02:00

fileupload.class.php

…

fiscalyear.class.php

Standardize picto status

2017-06-20 02:29:29 +02:00

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

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

2017-06-09 12:50:56 +02:00

html.form.class.php

Merge pull request #7345 from AXeL-dev/develop

2017-09-08 21:22:38 +02:00

html.formaccounting.class.php

Fix usage of constant. No need to have a dedicated setup as it should be

2017-06-22 14:48:13 +02:00

html.formactions.class.php

FIX Several problem with the last event box on project/tasks

2017-09-13 15:16:06 +02:00

html.formadmin.class.php

Fix lang selection

2017-08-25 17:13:33 +02:00

html.formbank.class.php

…

html.formbarcode.class.php

…

html.formcompany.class.php

Fix: Added name to contributors

2017-09-01 16:10:19 +01:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

NEW Move the upload input on top right in ECM module

2017-08-20 21:23:19 +02:00

html.formintervention.class.php

…

html.formmail.class.php

Fix selection of email templates

2017-09-08 14:40:39 +02:00

html.formmailing.class.php

Fix phpcs

2017-07-13 23:46:01 +02:00

html.formmargin.class.php

…

html.formorder.class.php

…

html.formother.class.php

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

2017-06-18 21:13:48 +02:00

html.formprojet.class.php

Some fixes in various payment

2017-09-11 14:29:27 +02:00

html.formpropal.class.php

…

html.formsms.class.php

Fix nostop option

2017-09-01 17:08:47 +02:00

html.formsocialcontrib.class.php

…

html.formwebsite.class.php

Fix bug reported by scrutinizer

2017-09-12 19:21:26 +02:00

index.html

…

infobox.class.php

Merge 5.0

2017-06-12 18:22:51 +02:00

interfaces.class.php

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

2017-08-04 15:39:00 +02:00

ldap.class.php

…

link.class.php

…

menu.class.php

Fix position of top menu does not follow 'position' field.

2017-06-27 04:25:41 +02:00

menubase.class.php

Fix warning when module position is not correct

2017-07-11 12:54:49 +02:00

notify.class.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

openid.class.php

…

rssparser.class.php

…

smtps.class.php

FIX link in to email and option for tls

2017-08-28 00:09:21 +02:00

stats.class.php

…

translate.class.php

…

utils.class.php

Fix the delete dir functions does not return real nb of deleted files.

2017-07-13 00:26:05 +02:00

vcard.class.php

…

workboardresponse.class.php

…