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

This commit is contained in:
Laurent Destailleur 2017-12-02 14:15:59 +01:00
commit f51c96a7c6

View File

@ -30,9 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
$langs->load("sendings");
$langs->load("deliveries");
$langs->load('companies');
$langs->loadLangs(array("sendings","deliveries",'companies','bills'));
$socid=GETPOST('socid','int');
// Security check