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

Merge pull request #8831 from tiaris/dev_datepricefour

Browse Source 
NEW Adding code to show update date of supplier price shown
This commit is contained in:
Laurent Destailleur 2019-03-14 18:44:38 +01:00 committed by GitHub
commit 40bf2c21b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -634,8 +634,8 @@ class ProductFournisseur extends Product
$prodfourn->fourn_tva_npr = $record["info_bits"]; $prodfourn->fourn_tva_npr = $record["info_bits"];
$prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"]; $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
$prodfourn->supplier_reputation = $record["supplier_reputation"]; $prodfourn->supplier_reputation = $record["supplier_reputation"];
$prodfourn->date_creation = $this->db->jdate($record['datec']); $prodfourn->fourn_date_creation = $this->db->jdate($record['datec']);
$prodfourn->date_modification = $this->db->jdate($record['tms']); $prodfourn->fourn_date_modification = $this->db->jdate($record['tms']);
$prodfourn->fourn_multicurrency_price = $record["multicurrency_price"]; $prodfourn->fourn_multicurrency_price = $record["multicurrency_price"];
$prodfourn->fourn_multicurrency_unitprice = $record["multicurrency_unitprice"]; $prodfourn->fourn_multicurrency_unitprice = $record["multicurrency_unitprice"];

14
htdocs/product/fournisseurs.php
View File

@ -798,10 +798,11 @@ SCRIPT;
print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right '); print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right '); print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center '); print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
if($conf->barcode->enabled) { if ($conf->barcode->enabled) {
print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, 'align="center"', $sortfield, $sortorder);
} }
print_liste_field_titre("DateModification",$_SERVER["PHP_SELF"],"pfp.tms","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre(''); print_liste_field_titre('');
print "</tr>\n"; print "</tr>\n";
@ -893,14 +894,12 @@ SCRIPT;
} }
print'</td>'; print'</td>';
if($conf->barcode->enabled) { if ($conf->barcode->enabled) {
// Barcode // Barcode
print '<td align="right">'; print '<td align="right">';
print $productfourn->barcode; print $productfourn->barcode;
print '</td>'; print '</td>';
// Barcode type // Barcode type
print '<td align="center">'; print '<td align="center">';
@ -908,7 +907,12 @@ SCRIPT;
$productfourn->fetch_barcode(); $productfourn->fetch_barcode();
print $productfourn->barcode_type_label?$productfourn->barcode_type_label:($productfourn->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':''); print $productfourn->barcode_type_label?$productfourn->barcode_type_label:($productfourn->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
print '</td>'; print '</td>';
} }
// Date
print '<td align="right">';
print dol_print_date($productfourn->date_modification, "dayhour");
print '</td>';
if (is_object($hookmanager)) if (is_object($hookmanager))
{ {