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

Missing title, bad css

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-17 14:45:08 +02:00
parent 8fc285c8b3
commit d86b42b024
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/suppliers.lang
View File

@ -14,6 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
SomeSubProductHaveNoPrices=Some sub-products have no price defined SomeSubProductHaveNoPrices=Some sub-products have no price defined
AddSupplierPrice=Add buying price AddSupplierPrice=Add buying price
ChangeSupplierPrice=Change buying price ChangeSupplierPrice=Change buying price
SupplierPrices=Supplier prices
ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
NoRecordedSuppliers=No suppliers recorded NoRecordedSuppliers=No suppliers recorded
SupplierPayment=Supplier payment SupplierPayment=Supplier payment

8
htdocs/product/fournisseurs.php
View File

@ -584,6 +584,11 @@ if ($id > 0 || $ref)
if ($user->rights->fournisseur->lire) 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 // Suppliers list title
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -611,9 +616,6 @@ if ($id > 0 || $ref)
print_liste_field_titre(''); print_liste_field_titre('');
print "</tr>\n"; print "</tr>\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)) if (is_array($product_fourn_list))
{ {
$var=true; $var=true;

7
htdocs/product/price.php
View File

@ -1755,7 +1755,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
else if ($action != 'showlog_default_price' && $action != 'edit_price') else if ($action != 'showlog_default_price' && $action != 'edit_price')
{ {
// List of all prices by customers // List of all prices by customers
print '<!-- list of prices per customer -->'."\n";
// Count total nb of records // Count total nb of records
$nbtotalofrecords = ''; $nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { 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) if (count($prodcustprice->lines) > 0 || $search_soc)
{ {
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>'; print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
print '<td colspan="8">&nbsp;</td>'; print '<td class="liste_titre" colspan="8">&nbsp;</td>';
// Print the search button // Print the search button
print '<td class="liste_titre" align="right">'; print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0); $searchpitco=$form->showFilterAndCheckAddButtons(0);