lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-05 21:59:06 +02:00
commit 0410f29e81
33 changed files with 70 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/examples/create_product.php
View File

@ -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';

2
dev/initdata/generate-produit.php
View File

@ -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";

2
htdocs/categories/categorie.php
View File

@ -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)

10
htdocs/categories/edit.php
View File

@ -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();

2
htdocs/categories/viewcat.php
View File

@ -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;

2
htdocs/commande/class/commande.class.php
View File

@ -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;

9
htdocs/core/class/commonobject.class.php
View File

@ -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

1
htdocs/core/lib/categories.lib.php
View File

@ -34,6 +34,7 @@ function categories_prepare_head($object,$type)
global $langs, $conf, $user;
$langs->load("categories");
$langs->load("products");
$h = 0;
$head = array();

2
htdocs/fourn/commande/card.php
View File

@ -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);

2
htdocs/fourn/facture/card.php
View File

@ -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);

2
htdocs/fourn/product/categorie.php
View File

@ -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);

2
htdocs/fourn/product/photos.php
View File

@ -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";

2
htdocs/margin/productMargins.php
View File

@ -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";

2
htdocs/margin/tabs/productMargins.php
View File

@ -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)

14
htdocs/product/card.php
View File

@ -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";

36
htdocs/product/class/product.class.php
View File

@ -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;

2
htdocs/product/composition/card.php
View File

@ -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>';

2
htdocs/product/document.php
View File

@ -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>';

2
htdocs/product/fournisseurs.php
View File

@ -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>';

2
htdocs/product/photos.php
View File

@ -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)

2
htdocs/product/price.php
View File

@ -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]);

2
htdocs/product/stats/card.php
View File

@ -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>';

2
htdocs/product/stats/commande.php
View File

@ -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)

2
htdocs/product/stats/commande_fournisseur.php
View File

@ -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)

2
htdocs/product/stats/contrat.php
View File

@ -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)

2
htdocs/product/stats/facture.php
View File

@ -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)

2
htdocs/product/stats/facture_fournisseur.php
View File

@ -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)

2
htdocs/product/stats/propal.php
View File

@ -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)

2
htdocs/product/stock/mouvement.php
View File

@ -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))

2
htdocs/product/stock/product.php
View File

@ -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)

2
htdocs/public/paybox/newpayment.php
View File

@ -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) {

2
htdocs/public/paypal/newpayment.php
View File

@ -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) {

4
htdocs/webservices/server_productorservice.php
View File

@ -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'];