From d86b42b024cdf8ffb5d793ff935ffa28663dc70b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 May 2017 14:45:08 +0200 Subject: [PATCH] Missing title, bad css --- htdocs/langs/en_US/suppliers.lang | 1 + htdocs/product/fournisseurs.php | 8 +++++--- htdocs/product/price.php | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index b890919ace5..d84925d0676 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -14,6 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Add buying price ChangeSupplierPrice=Change buying price +SupplierPrices=Supplier prices ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s NoRecordedSuppliers=No suppliers recorded SupplierPayment=Supplier payment diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 6ff8d9deca0..1d54495b605 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -584,6 +584,11 @@ if ($id > 0 || $ref) if ($user->rights->fournisseur->lire) { + $product_fourn = new ProductFournisseur($db); + $product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder); + $nbtotalofrecords = count($product_fourn_list); + print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($product_fourn_list), $nbtotalofrecords, 'title_accountancy.png'); + // Suppliers list title print '
'; print ''; @@ -611,9 +616,6 @@ if ($id > 0 || $ref) print_liste_field_titre(''); print "\n"; - $product_fourn = new ProductFournisseur($db); - $product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder); - if (is_array($product_fourn_list)) { $var=true; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 1e9bcec3d52..607d6e07097 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1755,7 +1755,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) else if ($action != 'showlog_default_price' && $action != 'edit_price') { // List of all prices by customers - + print ''."\n"; + // Count total nb of records $nbtotalofrecords = ''; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { @@ -1792,8 +1793,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) if (count($prodcustprice->lines) > 0 || $search_soc) { print ''; - print ''; - print ''; + print ''; + print ''; // Print the search button print '
  '; $searchpitco=$form->showFilterAndCheckAddButtons(0);