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

Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php

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

..

admin

Removed duplicated code

2017-06-01 12:11:45 +02:00

ajax

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

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

canvas

FIX The vat rate line used when adding a predefined product was wrong if

2017-03-04 22:27:44 +01:00

checkvat

Standardize code

2017-05-13 17:04:46 +02:00

class

Fix: better check and security

2017-06-15 21:51:31 +02:00

notify

Fix code comment

2017-06-10 12:56:28 +02:00

tpl

Work on 6.0 look and feel

2017-03-31 17:41:20 +02:00

agenda.php

Fix code comment

2017-06-10 12:56:28 +02:00

ajaxcompanies.php

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

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

ajaxcountries.php

Escape hml tags

2017-06-18 19:42:59 +02:00

card.php

Fix do not show localtax info if not used.

2017-06-16 01:02:53 +02:00

commerciaux.php

FIX #6985

2017-06-11 10:37:58 +02:00

consumption.php

Fix alignement

2017-06-16 01:07:44 +02:00

document.php

FIX #6945

2017-06-06 10:53:53 +02:00

index.php

New: getEntity function use true $shared value by default

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

list.php

Fix code comment

2017-06-10 12:56:28 +02:00

note.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

price.php

Fix code comment

2017-06-10 12:56:28 +02:00

project.php

Fix code comment

2017-06-10 12:56:28 +02:00

rib.php

Fix code comment

2017-06-10 12:56:28 +02:00

societecontact.php

Clean code

2017-04-30 03:23:06 +02:00