From 1ab5eece6b7e79ab5b03c7c214b4dfb715693a5b Mon Sep 17 00:00:00 2001 From: jean Date: Tue, 22 May 2018 09:40:49 +0200 Subject: [PATCH 1/6] Adding code to show update date of supplier price shown --- htdocs/fourn/class/fournisseur.product.class.php | 4 ++-- htdocs/langs/en_US/suppliers.lang | 1 + htdocs/langs/fr_FR/suppliers.lang | 1 + htdocs/product/fournisseurs.php | 6 ++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index b9a2f72b9bd..dc04139232c 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -526,7 +526,7 @@ class ProductFournisseur extends Product $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,"; $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,"; - $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation"; + $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation, pfp.tms as date_modification "; $sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -568,7 +568,7 @@ class ProductFournisseur extends Product $prodfourn->fourn_tva_npr = $record["info_bits"]; $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"]; $prodfourn->supplier_reputation = $record["supplier_reputation"]; - + $prodfourn->date_modification = $this->db->jdate($record["date_modification"]); $prodfourn->fourn_multicurrency_price = $record["multicurrency_price"]; $prodfourn->fourn_multicurrency_unitprice = $record["multicurrency_unitprice"]; $prodfourn->fourn_multicurrency_tx = $record["multicurrency_tx"]; diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index d0cf540d3eb..0e6ffe8a6cd 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -45,3 +45,4 @@ BuyerName=Buyer name AllProductServicePrices=All product / service prices AllProductReferencesOfSupplier=All product / service references of supplier BuyingPriceNumShort=Vendor prices +PriceUpdate=Updated on \ No newline at end of file diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index 2f9b93ff323..0aad31d294c 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -45,3 +45,4 @@ BuyerName=Nom de l'acheteur AllProductServicePrices=Tous les prix du produits / service AllProductReferencesOfSupplier=Toutes les références des produits/services du fournisseur BuyingPriceNumShort=Prix fournisseurs +PriceUpdate=Mis à jour le \ No newline at end of file diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 21439a1ac8a..70776a989df 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -754,6 +754,7 @@ SCRIPT; print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder); } print_liste_field_titre("DiscountQtyMin",$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre("PriceUpdate",$_SERVER["PHP_SELF"],"pfp.date_modification","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre("NbDaysToDelivery",$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre("ReputationForThisProduct",$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre(''); @@ -828,6 +829,11 @@ SCRIPT; print price2num($productfourn->fourn_remise_percent).'%'; print ''; + // Date + print ''; + print dol_print_date($productfourn->date_modification, "%d/%m/%Y %H:%M"); + print ''; + // Delivery delay print ''; print $productfourn->delivery_time_days; From fb96857b734148d9f75c6348bc82a6319c1f9ec3 Mon Sep 17 00:00:00 2001 From: jean Date: Fri, 25 May 2018 15:33:27 +0200 Subject: [PATCH 2/6] use dayhour instead of % format --- htdocs/product/fournisseurs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 70776a989df..b63c22482b4 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -831,7 +831,7 @@ SCRIPT; // Date print ''; - print dol_print_date($productfourn->date_modification, "%d/%m/%Y %H:%M"); + print dol_print_date($productfourn->date_modification, "dayhour"); print ''; // Delivery delay From 5aee322b30f25b792e2102dc18a10fa4bb0faa34 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 Mar 2019 18:36:05 +0100 Subject: [PATCH 3/6] Update fournisseurs.php --- htdocs/product/fournisseurs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index b63c22482b4..21163f0b54e 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -754,7 +754,7 @@ SCRIPT; print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder); } print_liste_field_titre("DiscountQtyMin",$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre("PriceUpdate",$_SERVER["PHP_SELF"],"pfp.date_modification","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre("PriceUpdate",$_SERVER["PHP_SELF"],"pfp.tms","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre("NbDaysToDelivery",$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre("ReputationForThisProduct",$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre(''); From 463c83efec449dca40d654a9e7466cb27375527e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 Mar 2019 18:37:03 +0100 Subject: [PATCH 4/6] Update fournisseur.product.class.php --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index dc04139232c..fc16a3e6922 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -568,7 +568,7 @@ class ProductFournisseur extends Product $prodfourn->fourn_tva_npr = $record["info_bits"]; $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"]; $prodfourn->supplier_reputation = $record["supplier_reputation"]; - $prodfourn->date_modification = $this->db->jdate($record["date_modification"]); + $prodfourn->fourn_date_modification = $this->db->jdate($record["date_modification"]); $prodfourn->fourn_multicurrency_price = $record["multicurrency_price"]; $prodfourn->fourn_multicurrency_unitprice = $record["multicurrency_unitprice"]; $prodfourn->fourn_multicurrency_tx = $record["multicurrency_tx"]; From 911962ec120fef9d623cd31fbf8cf2abd3223b29 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 Mar 2019 18:43:51 +0100 Subject: [PATCH 5/6] Update suppliers.lang --- htdocs/langs/en_US/suppliers.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index e541971e160..b69b11272b4 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -45,4 +45,3 @@ BuyerName=Buyer name AllProductServicePrices=All product / service prices AllProductReferencesOfSupplier=All product / service references of vendor BuyingPriceNumShort=Vendor prices -PriceUpdate=Updated on \ No newline at end of file From 2e270d95e9d11cd3ac5adb18cb77c23e354a2d30 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 Mar 2019 18:44:03 +0100 Subject: [PATCH 6/6] Update suppliers.lang --- htdocs/langs/fr_FR/suppliers.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index 0aad31d294c..2f9b93ff323 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -45,4 +45,3 @@ BuyerName=Nom de l'acheteur AllProductServicePrices=Tous les prix du produits / service AllProductReferencesOfSupplier=Toutes les références des produits/services du fournisseur BuyingPriceNumShort=Prix fournisseurs -PriceUpdate=Mis à jour le \ No newline at end of file