diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php index fe28e73fcaa..9a9d67f5ffc 100644 --- a/htdocs/variants/admin/admin.php +++ b/htdocs/variants/admin/admin.php @@ -52,22 +52,22 @@ print load_fiche_titre($title, $linkback, 'title_setup'); dol_fiche_head(array(), 'general', $tab, 0, 'product'); print '
'; -print ''; +print '
'; print ''; -print ''."\n"; -print ''."\n"; -print ''."\n"; +print ''."\n"; print ''; print ''; -if(isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { +if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR; } else { $separator = "_"; } -print ''; +print ''; print '
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
'.$langs->trans("Parameters").''."\n"; +print ''.$langs->trans("Value").''."\n"; +print ' 
'.$langs->trans('HideProductCombinations').''; print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'
'.$langs->trans('CombinationsSeparator').'
'; -print '
'; +print '
'; print '
'; // End of page diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index fa45b1ad0ef..e7444ed5fb8 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -266,7 +266,7 @@ print $form->formconfirm( id)): ?> - +     @@ -274,7 +274,7 @@ print $form->formconfirm( ref) ?> value) ?> - + diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php index e07ba6077e7..80246cbe1dd 100644 --- a/htdocs/variants/class/ProductCombination2ValuePair.class.php +++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php @@ -111,12 +111,12 @@ class ProductCombination2ValuePair public function fetchByFkCombination($fk_combination) { $sql = "SELECT - c.rowid, - c2v.fk_prod_attr_val, - c2v.fk_prod_attr, - c2v.fk_prod_combination -FROM ".MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr -WHERE c2v.fk_prod_combination = ".(int) $fk_combination; + c.rowid, + c2v.fk_prod_attr_val, + c2v.fk_prod_attr, + c2v.fk_prod_combination + FROM ".MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr + WHERE c2v.fk_prod_combination = ".(int) $fk_combination; $sql .= $this->db->order('c.rang', 'asc'); diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index 8c5b80b4cc9..5d8f0fe11ce 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -502,9 +502,9 @@ if (! empty($id) || ! empty($ref)) print ''; print ''."\n"; print ''."\n"; - if($valueid > 0) { - print ''."\n"; - } + if($valueid > 0) { + print ''."\n"; + } print dol_fiche_head(); @@ -641,7 +641,7 @@ if (! empty($id) || ! empty($ref)) } } elseif ($action === 'copy') { -print $form->formconfirm( + print $form->formconfirm( 'combinations.php?id='.$id, $langs->trans('CloneCombinationsProduct'), $langs->trans('ConfirmCloneProductCombinations'), @@ -795,8 +795,8 @@ print $form->formconfirm( variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?> isProduct()) print ''.($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight').''; ?> - getLibStatut(2, 0) ?> - getLibStatut(2, 1) ?> + getLibStatut(2, 0) ?> + getLibStatut(2, 1) ?> diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php index 4f2d53bb75f..59edd15d8c6 100644 --- a/htdocs/variants/create.php +++ b/htdocs/variants/create.php @@ -77,7 +77,7 @@ print ''; ?> - +
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index f230923be7f..481640d0daa 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -116,17 +116,17 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; - - + + $attribute): ?> - - - + + @@ -151,4 +151,4 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; // End of page llxFooter(); -$db->close(); \ No newline at end of file +$db->close();
trans('Ref') ?> trans('Label') ?>trans('NbOfDifferentValues') ?>trans('NbProducts') ?>trans('NbOfDifferentValues') ?>trans('NbProducts') ?>
ref) ?> label) ?>countChildValues() ?>countChildProducts() ?> + countChildValues() ?>countChildProducts() ?>