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

Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php

2018-01-31 20:25:24 +01:00

..

antivir.class.php

…

canvas.class.php

…

ccountry.class.php

…

CMailFile.class.php

Fix sender email when sending a password remind

2018-01-24 15:43:55 +01:00

comment.class.php

…

commondocgenerator.class.php

Update commondocgenerator.class.php

2017-10-22 04:13:49 +02:00

commoninvoice.class.php

Fix send into ledger for expense report. Show accounted status.

2018-01-22 03:07:11 +01:00

commonobject.class.php

Fix merge of thirdparties (pb when merging codes and error management)

2018-01-31 18:01:56 +01:00

commonobjectline.class.php

FIX #7679

2017-10-22 03:47:36 +02:00

commonorder.class.php

…

commonstickergenerator.class.php

…

conf.class.php

Fix extrafields

2018-01-31 14:01:58 +01:00

cookie.class.php

…

coreobject.class.php

…

CSMSFile.class.php

…

cstate.class.php

…

ctypent.class.php

…

ctyperesource.class.php

…

discount.class.php

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

2017-10-13 22:01:56 +02:00

doleditor.class.php

Fix javascript error

2017-12-10 19:54:04 +01:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

Replace deprecated dol_print_graph with DolGraph

2017-11-23 20:24:05 +01:00

dolreceiptprinter.class.php

…

emailsenderprofile.class.php

Work on module builder

2017-10-25 22:02:07 +02:00

events.class.php

…

extrafields.class.php

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

2018-01-31 20:25:24 +01:00

fileupload.class.php

…

fiscalyear.class.php

Debug accountancy

2017-11-28 11:49:11 +01:00

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

…

html.form.class.php

Fix edit of extrafields "link" corrupts the data definition

2018-01-31 10:51:40 +01:00

html.formaccounting.class.php

Fix a lot of request to use the IN getentity instead of =

2017-11-23 15:06:16 +01:00

html.formactions.class.php

Fix several pb in links to projects on create page

2017-12-12 10:37:51 +01:00

html.formadmin.class.php

Work on website

2017-10-26 14:49:30 +02:00

html.formbank.class.php

…

html.formbarcode.class.php

Clean code used for autocompletion

2017-11-24 09:23:18 +01:00

html.formcompany.class.php

Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity

2018-01-25 16:14:39 +00:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

Fix preview link

2018-01-12 16:28:10 +01:00

html.formintervention.class.php

…

html.formmail.class.php

Fix for multicompany

2018-01-30 15:48:09 +01:00

html.formmailing.class.php

…

html.formmargin.class.php

…

html.formorder.class.php

…

html.formother.class.php

NEW Filter export model by user

2018-01-18 12:34:22 +01:00

html.formprojet.class.php

Debug blockedlog with various payments

2018-01-29 18:22:26 +01:00

html.formpropal.class.php

…

html.formsms.class.php

…

html.formsocialcontrib.class.php

Use autocompletion on list of taxes

2017-11-23 15:46:52 +01:00

html.formwebsite.class.php

Removed duplicate code

2017-11-26 22:06:14 +01:00

index.html

…

infobox.class.php

…

interfaces.class.php

…

ldap.class.php

…

link.class.php

…

menu.class.php

Fix responsive

2017-12-01 12:55:28 +01:00

menubase.class.php

Fix substition for menus title and urls

2017-12-09 15:35:01 +01:00

notify.class.php

…

openid.class.php

…

rssparser.class.php

Minor fixes

2017-11-24 18:12:01 +01:00

smtps.class.php

Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice

2017-12-03 20:18:00 +01:00

stats.class.php

Fix scrutinizer reported bugs

2017-12-11 11:48:11 +01:00

translate.class.php

Code comment

2017-12-13 23:37:34 +01:00

utils.class.php

Several fixes

2017-12-12 16:11:40 +01:00

vcard.class.php

…

workboardresponse.class.php

…