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

Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql

2017-03-05 22:11:35 +01:00

..

antivir.class.php

…

canvas.class.php

…

ccountry.class.php

…

CMailFile.class.php

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

2017-01-16 00:01:37 +01:00

commondocgenerator.class.php

…

commoninvoice.class.php

Fix translation

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

commonobject.class.php

Several fix for a better management of #6424

2017-02-22 17:46:54 +01:00

commonobjectline.class.php

…

commonorder.class.php

…

commonstickergenerator.class.php

…

conf.class.php

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

2017-03-05 22:11:35 +01:00

cookie.class.php

…

CSMSFile.class.php

…

cstate.class.php

…

ctypent.class.php

…

discount.class.php

Prepare database to follow supplier discounts

2017-02-24 15:22:32 +01:00

doleditor.class.php

Upgrade to ckeditor 4.6.2.

2017-02-28 10:49:58 +01:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

…

dolprintipp.class.php

…

dolreceiptprinter.class.php

…

events.class.php

Fix context must be provided to triggers using ->context no a dedicated

2017-02-28 12:07:05 +01:00

extrafields.class.php

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

2017-01-20 21:02:05 +01:00

fileupload.class.php

…

fiscalyear.class.php

[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.

2017-02-08 06:51:42 +01:00

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

NEW Can set number of dump to keep with job "local database backup"

2017-02-27 02:04:25 +01:00

html.form.class.php

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

2017-02-23 02:55:50 +01:00

html.formaccounting.class.php

Fix bad help

2017-03-03 18:00:53 +01:00

html.formactions.class.php

INIT pdf supplier payment

2017-02-10 17:28:00 +01:00

html.formadmin.class.php

…

html.formbank.class.php

…

html.formbarcode.class.php

…

html.formcompany.class.php

Fix missing info admin picto. Fix colspan.

2017-01-23 17:31:39 +01:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment

2017-02-17 16:40:14 +01:00

html.formintervention.class.php

…

html.formmail.class.php

Add object extrafields to mail form

2017-02-26 03:42:42 +01:00

html.formmailing.class.php

…

html.formmargin.class.php

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

2017-01-28 15:12:14 +01:00

html.formorder.class.php

…

html.formother.class.php

Improve code style

2017-01-16 17:40:13 -03:00

html.formprojet.class.php

Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project

2017-02-06 20:45:04 +01:00

html.formpropal.class.php

…

html.formsms.class.php

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

html.formsocialcontrib.class.php

…

index.html

…

infobox.class.php

…

interfaces.class.php

Fix avoid trigger during migration

2017-02-28 20:55:14 +01:00

ldap.class.php

…

link.class.php

…

menu.class.php

…

menubase.class.php

Replace attributes var for public

2016-12-15 09:54:45 -03:00

notify.class.php

NEW Add hook "formatNotificationMessage"

2017-01-09 23:55:53 +01:00

openid.class.php

…

rssparser.class.php

…

smtps.class.php

Clean doc about changes in external libraries

2017-02-24 14:35:20 +01:00

stats.class.php

…

translate.class.php

Introduce method loadLangs to save code lines

2017-03-03 13:27:51 +01:00

utils.class.php

NEW Can set number of dump to keep with job "local database backup"

2017-02-27 02:04:25 +01:00

vcard.class.php

FIX #6479

2017-03-03 14:04:40 +01:00

workboardresponse.class.php

…