From 8a74c928f3f596f7a88aa9fe69697233137d384c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 28 Aug 2012 23:01:04 +0200 Subject: [PATCH] Fix: regression --- htdocs/product/class/product.class.php | 16 ++++++++++++++-- htdocs/product/traduction.php | 7 ++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 578f9bc54ed..39d514defa1 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -698,7 +698,13 @@ class Product extends CommonObject $sql2.= "','".$this->db->escape($this->description); $sql2.= "','".$this->db->escape($this->note)."')"; } - if (!$this->db->query($sql2)) return -1; + dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2); + if (! $this->db->query($sql2)) + { + $this->error=$this->db->lasterror(); + dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR); + return -1; + } } else if (isset($this->multilangs["$key"])) { @@ -720,7 +726,13 @@ class Product extends CommonObject // on ne sauvegarde pas des champs vides if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] ) - if (!$this->db->query($sql2)) return -1; + dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2); + if (! $this->db->query($sql2)) + { + $this->error=$this->db->lasterror(); + dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR); + return -1; + } } } return 1; diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index b856a057a91..945a70c012c 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -55,6 +55,7 @@ if ($cancel == $langs->trans("Cancel")) $action = ''; } + // Validation de l'ajout if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && @@ -103,7 +104,7 @@ $cancel != $langs->trans("Cancel") && { if ( $key == $current_lang ) { - $product->lable = $_POST["libelle-".$key]; + $product->label = $_POST["libelle-".$key]; $product->description = dol_htmlcleanlastbr($_POST["desc-".$key]); $product->note = dol_htmlcleanlastbr($_POST["note-".$key]); } @@ -163,7 +164,7 @@ if ($action == 'edit') //WYSIWYG Editor require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - print '
'; + print ''; print ''; print ''; print ''; @@ -250,7 +251,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print '
'; - print ''; + print ''; print ''; print ''; print '';