diff --git a/dev/examples/create_product.php b/dev/examples/create_product.php
index cdb6cdae9e2592a6c54ea416fea93b5cf3b7ebbb..6ecce081d454862267cda9455a925da74487e015 100755
--- a/dev/examples/create_product.php
+++ b/dev/examples/create_product.php
@@ -66,7 +66,7 @@ $myproduct=new Product($db);
// Definition of product instance properties
$myproduct->ref = '1234';
-$myproduct->libelle = 'libelle';
+$myproduct->label = 'label';
$myproduct->price = '10';
$myproduct->price_base_type = 'HT';
$myproduct->tva_tx = '19.6';
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
index 38ea93f131bebbf0860efceb6ed8b8bcb5be4089..6e7ea6dd05f0f4149b05a2c234e1d5a5658cb00d 100755
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -88,7 +88,7 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
$produit->type = rand(0,1);
$produit->status = 1;
$produit->ref = ($produit->type?'S':'P').time().$s;
- $produit->libelle = 'Label '.time().$s;
+ $produit->label = 'Label '.time().$s;
$produit->description = 'Description '.time().$s;
$produit->price = rand(1,1000);
$produit->tva_tx = "19.6";
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 1cd605ea9ca203be9fe8299c1f259f9572778604..0dc404ac3d187f599add0f0a550a098b1a6576b7 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -357,7 +357,7 @@ else if ($id || $ref)
print '</tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 32bc33938f5569124e9165c58d05a27b6c85e8d7..c3acb807e01a7ae9df5fa7d29d5f1669f1f3f411 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -37,7 +37,7 @@ $action=GETPOST('action');
$confirm=GETPOST('confirm');
$socid=GETPOST('socid','int');
-$nom=GETPOST('nom');
+$label=GETPOST('label');
$description=GETPOST('description');
$visible=GETPOST('visible');
$parent=GETPOST('parent');
@@ -66,7 +66,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
$categorie = new Categorie($db);
$result=$categorie->fetch($id);
- $categorie->label = $nom;
+ $categorie->label = $label;
$categorie->description = dol_htmlcleanlastbr($description);
$categorie->socid = ($socid ? $socid : 'null');
$categorie->visible = $visible;
@@ -138,13 +138,13 @@ print '<table class="border" width="100%">';
// Ref
print '<tr><td class="fieldrequired">';
print $langs->trans("Ref").'</td>';
-print '<td><input type="text" size="25" id="nom" name ="nom" value="'.$object->label.'" />';
+print '<td><input type="text" size="25" id="label" name ="label" value="'.$object->label.'" />';
print '</tr>';
// Description
print '<tr>';
-print '<td width="25%">'.$langs->trans("Description").'</td>';
-print '<td>';
+print '<td class="fieldrequired" width="25%">'.$langs->trans("Description").'</td>';
+print '<td >';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50);
$doleditor->Create();
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 31580e28be86e61a24525eaa10ce6aa3da6013df..a1c544f338ba351fc71c166ca2eb0bbaccfb0570 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -327,7 +327,7 @@ if ($object->type == 0)
print '<td class="nowrap" valign="top">';
print $prod->getNomUrl(1,'category');
print "</td>\n";
- print '<td valign="top">'.$prod->libelle."</td>\n";
+ print '<td valign="top">'.$prod->label."</td>\n";
// Link to delete from category
print '<td align="right">';
$typeid=$object->type;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index ad26b0c409d6001f4996a5e93909ebd67adb4822..bb0f8353709997438a2f0b307c8554dddebc3c54 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1402,7 +1402,7 @@ class Commande extends CommonOrder
$line->localtax1_tx=$localtax1_tx;
$line->localtax2_tx=$localtax2_tx;
$line->ref=$prod->ref;
- $line->libelle=$prod->libelle;
+ $line->libelle=$prod->label;
$line->product_desc=$prod->description;
$line->fk_unit=$prod->fk_unit;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 77877a37cb2a9eb7bd23879d4d7b9044e74b910a..567505db15a78c63d79ae817f728f8f164429b4f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -91,11 +91,10 @@ abstract class CommonObject
*/
public $canvas;
-
- public $name;
- public $lastname;
- public $firstname;
- public $civility_id;
+ /**
+ *
+ * @var object Thirdparty associated with object
+ */
public $thirdparty;
// No constructor as it is an abstract class
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index 4d020526e448a85dfb5c4778f4e969b15a074bc2..f03a313ce2a795973065ec72109a0800a49eb662 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -34,6 +34,7 @@ function categories_prepare_head($object,$type)
global $langs, $conf, $user;
$langs->load("categories");
+ $langs->load("products");
$h = 0;
$head = array();
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 725cd35a6cb734d6589612595bd968ff6fbc7f2e..4567076678822239af6ca13536612aac6947177f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -317,7 +317,7 @@ if (empty($reshook))
{
$res=$productsupplier->fetch($idprod);
- $label = $productsupplier->libelle;
+ $label = $productsupplier->label;
$desc = $productsupplier->description;
if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 01574caa2b2181f0d3d39c35bff59cb2e704ab9a..1794c34a48dbdf5c997576dfd9fd0e101302e11b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -690,7 +690,7 @@ if (empty($reshook))
{
$result=$productsupplier->fetch($idprod);
- $label = $productsupplier->libelle;
+ $label = $productsupplier->label;
$desc = $productsupplier->description;
if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php
index 448cf19e61e97a8416a8d375bc0efe110a75169b..ef07b730a97d46dacb91fc0c44c8113e56d87e4e 100644
--- a/htdocs/fourn/product/categorie.php
+++ b/htdocs/fourn/product/categorie.php
@@ -115,7 +115,7 @@ if ($_GET["id"])
print "<tr>";
print '<td>'.$langs->trans("Ref").'</td><td>'.$product->ref.'</td>';
- print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->label.'</td>';
print "</table><br>\n";
$c = new Categorie($db);
diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php
index f20c360de6c4df45cfda197a361a40857dec8bb7..ba5c396c42017de39f606f1965491d0fd0fc3cf5 100644
--- a/htdocs/fourn/product/photos.php
+++ b/htdocs/fourn/product/photos.php
@@ -102,7 +102,7 @@ if ($id)
print '<td colspan="2">';
print $object->getLibStatut(2);
print '</td></tr>';
- print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td>';
print '<td>'.$langs->trans("SellingPrice").'</td><td>'.price($object->price).'</td></tr>';
print "</table><br>\n";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index b359287d24fd0261340e72f91de00846193a72c2..b9bd6e5099d3cb29c1eb0ff9f099541d216f7f9a 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -263,7 +263,7 @@ if ($result)
$product_static->type=$objp->fk_product_type;
$product_static->id=$objp->rowid;
$product_static->ref=$objp->ref;
- $product_static->libelle=$objp->label;
+ $product_static->label=$objp->label;
$text=$product_static->getNomUrl(1);
print $text.= ' - '.$objp->label;
print "</td>\n";
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index eb3ac32c424bbff90890043921454b9be487d4fa..d3c53eb9e2e3646463a51694da9ab056bce70794 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Libelle
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f94525385770ea0cab6e1ebd9a186a1229d4f67e..4a6af7b855ee3fccebb5d2f1e3e16feeef5b0d1e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -169,7 +169,7 @@ if (empty($reshook))
{
$error=0;
- if (! GETPOST('libelle'))
+ if (! GETPOST('label'))
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), 'errors');
$action = "create";
@@ -187,7 +187,7 @@ if (empty($reshook))
$units = GETPOST('units', 'int');
$object->ref = $ref;
- $object->libelle = GETPOST('libelle');
+ $object->label = GETPOST('label');
$object->price_base_type = GETPOST('price_base_type');
if ($object->price_base_type == 'TTC')
@@ -315,7 +315,7 @@ if (empty($reshook))
$object->oldcopy=dol_clone($object);
$object->ref = $ref;
- $object->libelle = GETPOST('libelle');
+ $object->label = GETPOST('label');
$object->description = dol_htmlcleanlastbr(GETPOST('desc'));
$object->url = GETPOST('url');
$object->note = dol_htmlcleanlastbr(GETPOST('note'));
@@ -822,7 +822,7 @@ else
print '</td></tr>';
// Label
- print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag(GETPOST('libelle')).'"></td></tr>';
+ print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" size="40" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>';
// On sell
print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
@@ -1085,7 +1085,7 @@ else
print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
// Label
- print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
+ print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
// Status To sell
print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
@@ -1341,7 +1341,7 @@ else
print '</tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->label.'</td>';
$nblignes=7;
if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++;
@@ -1586,7 +1586,7 @@ else
// Categories
print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
- print $form->showCategories($object->id,'product');
+ print $form->showCategories($object->id,'product',1);
print "</td></tr>";
print "</table>\n";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c1046af1216e29429b8052022036e45dcccbcbd1..fc46435a32aeb0d1ef31b133e67317d4ef9c2e76 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -59,8 +59,21 @@ class Product extends CommonObject
var $id ;
//! Ref
var $ref;
- var $libelle; // TODO deprecated
+ /**
+ * Product label
+ * @var string
+ * @deprecated use $label
+ */
+ var $libelle;
+ /**
+ * Product label
+ * @var string
+ */
var $label;
+ /**
+ * Product descripion
+ * @var string
+ */
var $description;
/**
@@ -232,7 +245,7 @@ class Product extends CommonObject
if (dol_strlen(trim($this->ref)) == 0)
$err++;
- if (dol_strlen(trim($this->libelle)) == 0)
+ if (dol_strlen(trim($this->label)) == 0)
$err++;
if ($err > 0)
@@ -260,7 +273,7 @@ class Product extends CommonObject
// Clean parameters
$this->ref = dol_string_nospecial(trim($this->ref));
- $this->libelle = trim($this->libelle);
+ $this->label = trim($this->label);
$this->price_ttc=price2num($this->price_ttc);
$this->price=price2num($this->price);
$this->price_min_ttc=price2num($this->price_min_ttc);
@@ -312,7 +325,7 @@ class Product extends CommonObject
$this->barcode=trim($this->barcode);
// Check parameters
- if (empty($this->libelle))
+ if (empty($this->label))
{
$this->error='ErrorMandatoryParametersNotProvided';
return -1;
@@ -397,7 +410,7 @@ class Product extends CommonObject
$sql.= ", ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null");
$sql.= ", ".price2num($price_min_ht);
$sql.= ", ".price2num($price_min_ttc);
- $sql.= ", ".(! empty($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null");
+ $sql.= ", ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
$sql.= ", ".$user->id;
$sql.= ", ".$this->type;
$sql.= ", ".price2num($price_ht);
@@ -588,11 +601,11 @@ class Product extends CommonObject
$error=0;
// Check parameters
- if (! $this->libelle) $this->libelle = 'MISSING LABEL';
+ if (! $this->label) $this->label = 'MISSING LABEL';
// Clean parameters
$this->ref = dol_string_nospecial(trim($this->ref));
- $this->libelle = trim($this->libelle);
+ $this->label = trim($this->label);
$this->description = trim($this->description);
$this->note = (isset($this->note) ? trim($this->note) : null);
$this->weight = price2num($this->weight);
@@ -667,7 +680,7 @@ class Product extends CommonObject
if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code);
$sql = "UPDATE ".MAIN_DB_PREFIX."product";
- $sql.= " SET label = '" . $this->db->escape($this->libelle) ."'";
+ $sql.= " SET label = '" . $this->db->escape($this->label) ."'";
$sql.= ", ref = '" . $this->ref ."'";
$sql.= ", ref_ext = ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null");
$sql.= ", tva_tx = " . $this->tva_tx;
@@ -958,7 +971,7 @@ class Product extends CommonObject
if ($this->db->num_rows($result)) // if there is already a description line for this language
{
$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
- $sql2.= " SET label='".$this->db->escape($this->libelle)."',";
+ $sql2.= " SET label='".$this->db->escape($this->label)."',";
$sql2.= " description='".$this->db->escape($this->description)."',";
$sql2.= " note='".$this->db->escape($this->note)."'";
$sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'";
@@ -966,7 +979,7 @@ class Product extends CommonObject
else
{
$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description, note)";
- $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->libelle);
+ $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label);
$sql2.= "','".$this->db->escape($this->description);
$sql2.= "','".$this->db->escape($this->note)."')";
}
@@ -1535,7 +1548,6 @@ class Product extends CommonObject
$this->id = $obj->rowid;
$this->ref = $obj->ref;
$this->ref_ext = $obj->ref_ext;
- $this->libelle = $obj->label; // TODO deprecated
$this->label = $obj->label;
$this->description = $obj->description;
$this->url = $obj->url;
@@ -3808,7 +3820,7 @@ class Product extends CommonObject
// Initialize parameters
$this->id=0;
$this->ref = 'PRODUCT_SPEC';
- $this->libelle = 'PRODUCT SPECIMEN';
+ $this->label = 'PRODUCT SPECIMEN';
$this->description = 'PRODUCT SPECIMEN '.dol_print_date($now,'dayhourlog');
$this->specimen=1;
$this->country_id=1;
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 0a4277419199dccbcd748ef02dda21ac9838c51d..fd6bdc2de0fb7e2b43140bd3d7ec00ec2c83b623 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -524,7 +524,7 @@ if ($id > 0 || ! empty($ref))
print "\n<tr ".$bc[$var].">";
$productstatic->id=$objp->rowid;
$productstatic->ref=$objp->ref;
- $productstatic->libelle=$objp->label;
+ $productstatic->label=$objp->label;
$productstatic->type=$objp->type;
print '<td>'.$productstatic->getNomUrl(1,'',24).'</td>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 615f4accf705d911bd8dfdc58a3d3bea7be225d8..8f05cb926977ba9db5adc88190898fac61fb5800 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -191,7 +191,7 @@ if ($object->id)
print '</tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->libelle.'</td></tr>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
// Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index abeb8fdf995aaff3bd8fd7a214eede2dc739f724..750158d4e8d292eab7cde5f4c4ecdf7d426ac0f7 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -280,7 +280,7 @@ if ($id || $ref)
print '</tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->libelle.'</td></tr>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->label.'</td></tr>';
// Minimum Price
print '<tr><td>'.$langs->trans("BuyingPriceMin").'</td>';
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index c6245cf203cb80bd2ab5e308a7fea9bbde730f2e..f1fd687890d84056a7a3af11cea4ff4ca5a576a3 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -126,7 +126,7 @@ if ($object->id)
print '</tr>';
// Libelle
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 2c9ab9a7794e2058d1fa84fe15ed161587a95e5b..ce8ad104a1f014a30aed4ac8597046db9c559d8b 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -368,7 +368,7 @@ print '</td>';
print '</tr>';
// Label
-print '<tr><td>' . $langs->trans("Label") . '</td><td>' . $object->libelle . '</td>';
+print '<tr><td>' . $langs->trans("Label") . '</td><td>' . $object->label . '</td>';
$isphoto = $object->is_photo_available($conf->product->multidir_output [$object->entity]);
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index ce161a1af609b86dcf6105e947ab143710427d48..60e3cba31e321728f97304e3b7e7ec45ebaba5d0 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -83,7 +83,7 @@ if (! empty($id) || ! empty($ref))
print '</tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->libelle.'</td></tr>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
// Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 7dcf61395347070c12ff8bad63e6a665ce3c7430..2dd349d3a347e18cddd02ee604f1f06098246f09 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Libelle
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index e6ced5ad90511a63386710bad69e322d4ad5edef..e7a803c299c5e02c14ff044b0271c3eec4297efd 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -115,7 +115,7 @@ if ($id > 0 || ! empty($ref)) {
print '</tr>';
// Libelle
- print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->libelle . '</td>';
+ print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->label . '</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index d098ca3399b3858b07874b7a2e8d8d47c296bbf1..3e897888893a1be3544a8e2a7b9098262763d735 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Libelle
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 1f4e9b985e58251c2e1b3051682952baae45d4b5..22f28cd2303ffc47a06f4536241373412135afff 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -108,7 +108,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Libelle
- print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index debb0698c4472b9f8bbf7d7b2d82d381dc8e4b20..de9c4cee29a9125182a603e94e0ba1e23db568de 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -109,7 +109,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Libelle
- print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->libelle . '</td>';
+ print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->label . '</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 1776ba571e0d679165f9ab807a5cd9a8b5cbfe13..3bb44436d438900afdd46a88802d7fe14d10ea66 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Libelle
- print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->libelle . '</td>';
+ print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->label . '</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 2a08eb6a7df74f981725f20caf0b92386e5fbf74..82c8ded066f4c80e3bffb4f3a8132b60a0aaf1f3 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -514,7 +514,7 @@ if ($resql)
print '</td>';
// Product label
print '<td class="liste_titre" align="left">';
- print '<input class="flat" type="text" size="10" name="search_product" value="'.($idproduct?$product->libelle:$search_product).'">';
+ print '<input class="flat" type="text" size="10" name="search_product" value="'.($idproduct?$product->label:$search_product).'">';
print '</td>';
// Batch
if (! empty($conf->productbatch->enabled))
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 2a4acf54ff775662bbded115e277490b4cdb7a61..dfa94910625cd33d0c96265a8d0ac4c6b4ddc18b 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -403,7 +403,7 @@ if ($id > 0 || $ref)
print '</tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
+ print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->label.'</td>';
print '</tr>';
// Status (to sell)
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 0213ee7f6fa2381f86d596e6528f5789bd9c8716..e7a0b258986e294929f25b3580678e7a2cd42810 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -558,7 +558,7 @@ if (GETPOST("source") == 'contractline' && $valid)
$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
if ($contractline->fk_product)
{
- $text.='<br>'.$product->ref.($product->libelle?' - '.$product->libelle:'');
+ $text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
}
if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
//if ($contractline->date_fin_validite) {
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 8c66f6157ba56b0e442eaab0ffe83e264251eb6d..d1ed853eb5dcd0d2ceea97dbeb49c19f0503e4ad 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -695,7 +695,7 @@ if (GETPOST("source") == 'contractline' && $valid)
$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
if ($contractline->fk_product)
{
- $text.='<br>'.$product->ref.($product->libelle?' - '.$product->libelle:'');
+ $text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
}
if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
//if ($contractline->date_fin_validite) {
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index e74a0d815d34d0b4c07b3b7b466860fe856ed78b..b7af224ff52546e74f7e3c2d13e353d279c6cf33 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -505,7 +505,7 @@ function createProductOrService($authentication,$product)
$newobject->ref=$product['ref'];
$newobject->ref_ext=$product['ref_ext'];
$newobject->type=$product['type'];
- $newobject->libelle=$product['label']; // TODO deprecated
+ $newobject->libelle=$product['label']; // @deprecated
$newobject->label=$product['label'];
$newobject->description=$product['description'];
$newobject->note=$product['note'];
@@ -675,7 +675,7 @@ function updateProductOrService($authentication,$product)
if (isset($product['ref'])) $newobject->ref=$product['ref'];
if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext'];
$newobject->type=$product['type'];
- $newobject->libelle=$product['label']; // TODO deprecated
+ $newobject->libelle=$product['label']; // @deprecated
$newobject->label=$product['label'];
$newobject->description=$product['description'];
$newobject->note=$product['note'];