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

htdocs/install/mysql/tables/llx_don.sql

@@ -29,7 +29,7 @@ create table llx_don
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
   amount          double(24,8) DEFAULT 0,
-  fk_payment      integer,
+  fk_payment      integer,						-- Id of payment mode
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
   lastname        varchar(50),

htdocs/install/mysql/tables/llx_expensereport_rules.sql

@@ -31,4 +31,4 @@ CREATE TABLE llx_expensereport_rules (
   code_expense_rules_type	varchar(50) NOT NULL,
   is_for_all				tinyint DEFAULT '0',
   entity					integer DEFAULT 1
-) ENGINE=InnoDB
+) ENGINE=InnoDB;