https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix

Conflicts:
	htdocs/product/card.php

Fix list of email templates must be hidden for templates of disabled
modules.

alias for each extrafield table.

deprecated doActions of canvas and doActions of triggers.

empty() only supports variables in PHP < 5.5

Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible

$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.

Fix product list page offset calculation

fix ErrorBadValueForParamNotAString shit one again...

Accountancy- Add a column in table bookkeeping to validate operations

New: Accountancy add a function to remove all zero at the right of the account

Typo

Complete information on FEC format - french law

Fix not complete output of error messages in shipment

Fix not complete output of error messages

FIX : Fatal error: Cannot access empty property

Fix the list of thirdparty must be restricted to customer for invoices

FIX option MAIN_DISABLE_FULL_SCANLIST was not working for stock movements

Update sms.php

Fix page offset calculation

Thanks to Florian

on invoice when a payment is done for several invoices, export of
payment can export both fields.