diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 6102c9fd734..dd320ebbeec 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -61,6 +61,9 @@ $arrayfields=array(
//...
);
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('supplierbalencelist','globalcard'));
+
/*
* Actions
*/
@@ -100,7 +103,7 @@ if ($id > 0)
// Invoice list
print load_fiche_titre($langs->trans("CustomerPreview"));
- print '
';
+ print '';
print '';
if (! empty($arrayfields['f.datef']['checked'])) print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
print '| '.$langs->trans("Element").' | ';
@@ -253,13 +256,18 @@ if ($id > 0)
if (!empty($data['fk_facture'])) print dol_print_date($data['date'],'day');
elseif (!empty($data['fk_paiement'])) print dol_print_date($data['date'],'dayhour');
print "\n";
+
print ''.$data['link']." | \n";
print ''.$data['status'].' | ';
+
print ''.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." | \n";
+
$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
+
print ''.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." | \n";
$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
+
// Balance
print ''.price($data['balance'])." | \n";
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 252868cf56e..ebe8e727bd4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1478,15 +1478,12 @@ class CommandeFournisseur extends CommonOrder
// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
$result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
- if ($result > 0)
+ if ($result > 0 && $origin == 'commande') // If supplier order created from customer order, we take best supplier price
{
- $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
- $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
- // is remise percent not keyed but present for the product we add it
- if ($remise_percent == 0 && $prod->remise_percent !=0)
- $remise_percent =$prod->remise_percent;
-
-
+ $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+ $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
+ // is remise percent not keyed but present for the product we add it
+ if ($remise_percent == 0 && $prod->remise_percent !=0) $remise_percent =$prod->remise_percent;
}
if ($result == 0) // If result == 0, we failed to found the supplier reference price
{
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 470e6c64cc4..fc5821b96f8 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -38,6 +38,8 @@ if ($user->societe_id > 0)
}
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('supplierbalencelist','globalcard'));
/*
* View
@@ -67,7 +69,7 @@ if ($socid > 0)
// Invoice list
print load_fiche_titre($langs->trans("SupplierPreview"));
- print '';
+ print '';
$sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.amount, f.datef as df,";
$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
@@ -114,7 +116,7 @@ if ($socid > 0)
}
$totalpaye = $fac->getSommePaiement();
-
+
print '';
print "| ".dol_print_date($fac->date)." | \n";
@@ -182,7 +184,7 @@ if ($socid > 0)
{
dol_print_error($db);
}
-
+
print "
";
}
}