Fixing style errors.
This commit is contained in:
parent
5992641360
commit
61903a1079
@ -1912,9 +1912,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
|
|||||||
if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
|
if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
|
||||||
$combination = new ProductCombination($db);
|
$combination = new ProductCombination($db);
|
||||||
|
|
||||||
if (($fk_product_parent = $combination->getFkProductParentByFkProductChild($object->id)) > 0) {
|
if (($fk_product_parent = $combination->getFkProductParentByFkProductChild($object->id)) > 0) {
|
||||||
$prodstatic = new Product($db);
|
$prodstatic = new Product($db);
|
||||||
$prodstatic->fetch($fk_product_parent);
|
$prodstatic->fetch($fk_product_parent);
|
||||||
|
|
||||||
// Parent product
|
// Parent product
|
||||||
print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
|
print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
|
||||||
|
|||||||
@ -4482,7 +4482,7 @@ class Product extends CommonObject
|
|||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
$labelStatus = $labelStatusShort = '';
|
$labelStatus = $labelStatusShort = '';
|
||||||
|
|
||||||
$langs->load('products');
|
$langs->load('products');
|
||||||
if (!empty($conf->productbatch->enabled)) { $langs->load("productbatch");
|
if (!empty($conf->productbatch->enabled)) { $langs->load("productbatch");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -118,16 +118,16 @@ class ProductAttribute extends CommonObject
|
|||||||
$query = $this->db->query($sql);
|
$query = $this->db->query($sql);
|
||||||
if ($query)
|
if ($query)
|
||||||
{
|
{
|
||||||
while ($result = $this->db->fetch_object($query)) {
|
while ($result = $this->db->fetch_object($query)) {
|
||||||
$tmp = new ProductAttribute($this->db);
|
$tmp = new ProductAttribute($this->db);
|
||||||
$tmp->id = $result->rowid;
|
$tmp->id = $result->rowid;
|
||||||
$tmp->ref = $result->ref;
|
$tmp->ref = $result->ref;
|
||||||
$tmp->ref_ext = $result->ref_ext;
|
$tmp->ref_ext = $result->ref_ext;
|
||||||
$tmp->label = $result->label;
|
$tmp->label = $result->label;
|
||||||
$tmp->rang = $result->rang;
|
$tmp->rang = $result->rang;
|
||||||
|
|
||||||
$return[] = $tmp;
|
$return[] = $tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else dol_print_error($this->db);
|
else dol_print_error($this->db);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user