Merge pull request #1679 from defrance69/patch-1

Update entrepot.class.php
This commit is contained in:
Laurent Destailleur 2014-06-23 20:28:53 +02:00
commit a94b78958f
3 changed files with 3 additions and 3 deletions

View File

@ -1825,7 +1825,7 @@ if (! function_exists("llxFooter"))
* @param string $zone 'private' (for private pages) or 'public' (for public pages) * @param string $zone 'private' (for private pages) or 'public' (for public pages)
* @return void * @return void
*/ */
function llxFooter($comment='',$zone='pivate') function llxFooter($comment='',$zone='private')
{ {
global $conf, $langs; global $conf, $langs;

View File

@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/ */
class Entrepot extends CommonObject class Entrepot extends CommonObject
{ {
public $element='label'; public $element='stock';
public $table_element='entrepot'; public $table_element='entrepot';
var $id; var $id;

View File

@ -265,7 +265,7 @@ class MouvementStock
if (! $error) if (! $error)
{ {
$this->db->commit(); $this->db->commit();
return 1; return $mvid;
} }
else else
{ {