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

Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
This commit is contained in:
Laurent Destailleur
2016-09-19 14:05:16 +02:00
24 changed files with 74 additions and 34 deletions

View File

@@ -23,5 +23,5 @@ CREATE TABLE llx_multicurrency_rate
date_sync datetime DEFAULT NULL,
rate double NOT NULL DEFAULT 0,
fk_multicurrency integer NOT NULL,
entity integer DEFAULT 1,
) ENGINE=innodb;
entity integer DEFAULT 1
) ENGINE=innodb;