Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur
2014-06-29 23:56:23 +02:00
2 changed files with 18 additions and 6 deletions

View File

@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$langs->load('bills');
$langs->load('compta');
$langs->load('products');
// Security check
$id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));