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

Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php

2018-02-03 19:33:24 +01:00

..

address.class.php

$db attributte now be protected

2017-02-08 20:27:14 -03:00

api_contacts.class.php

Fix maxi debug of APIs (clean output fields)

2017-12-21 16:50:18 +01:00

api_thirdparties.class.php

Missing Api for standing proposal/orders/invoices

2018-02-01 02:29:41 +01:00

client.class.php

Fix for multicompany

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

companybankaccount.class.php

Scrutinizer Auto-Fixes

2017-10-13 11:28:26 +00:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

societe.class.php

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

2018-02-03 19:33:24 +01:00