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

2012-12-18 10:10:19 +01:00 · 2012-12-18 10:10:19 +01:00 · 7cbd938c9c
commit 7cbd938c9c
parent e4b4f459da d1e883de9b
1 changed files with 1 additions and 0 deletions
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@ -38,6 +38,7 @@ class Expedition extends CommonObject
 	public $element="shipping";
 	public $fk_element="fk_expedition";
 	public $table_element="expedition";
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

 	var $id;
 	var $socid;