diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index b2bf4b25bca..72e764322b4 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -112,6 +112,7 @@ if ($nolinesbefore) {
print '| | ';
print '';
}
+
print '';
$coldisplay = 0;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index f44b36eb9d8..32aa4f67516 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -192,6 +192,16 @@ if ($filtertype == 1 && isModEnabled('workstation')) {
print '| ';
$coldisplay++;
if ($res > 0) {
+ $unit = new CUnits($object->db);
+ $fk_defaultUnit = $unit->getUnitFromCode('h', 'short_label', 'time');
+ $nbPlannedHour = $unit->unitConverter($line->qty, $line->fk_unit, $fk_defaultUnit);
+ $line->total_cost = 0;
+ if ($workstation->thm_machine_estimated) {
+ $line->total_cost += $nbPlannedHour * $workstation->thm_machine_estimated;
+ }
+ if ($workstation->thm_operator_estimated) {
+ $line->total_cost += $nbPlannedHour * $workstation->thm_operator_estimated;
+ }
echo $workstation->getNomUrl(1);
}
print ' | ';
@@ -199,6 +209,7 @@ if ($filtertype == 1 && isModEnabled('workstation')) {
// Cost
$total_cost = 0;
+
$tmpbom->calculateCosts();
print '';
$coldisplay++;
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index fa2eaf30e2c..382e60d34c5 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -98,7 +98,7 @@ class box_actions extends ModeleBoxes
$sql .= " AND s.rowid = ".((int) $user->socid);
}
if (!$user->hasRight('agenda', 'allactions', 'read')) {
- $sql .= " AND (a.fk_user_author = ".((int) $user->id)." OR a.fk_user_action = ".((int) $user->id)." OR a.fk_user_done = ".((int) $user->id).")";
+ $sql .= " AND (a.fk_user_author = ".((int) $user->id)." OR a.fk_user_action = ".((int) $user->id).")";
}
$sql .= " ORDER BY a.datep ASC";
$sql .= $this->db->plimit($max, 0);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6fd9bd75908..56885dfe6c8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10381,6 +10381,7 @@ abstract class CommonObject
if ($resql) {
$num_rows = $this->db->num_rows($resql);
$i = 0;
+ $this->lines = array();
while ($i < $num_rows) {
$obj = $this->db->fetch_object($resql);
if ($obj) {
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 463427a131e..a809f438419 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -454,7 +454,7 @@ function show_stats_for_company($product, $socid)
print ' | ';
print $product->stats_propale['nb'];
print ' | ';
- print $product->stats_propale['qty'];
+ print price($product->stats_propale['qty'], 1, $langs, 0, 0);
print ' | ';
print '
';
}
@@ -473,7 +473,7 @@ function show_stats_for_company($product, $socid)
print '';
print $product->stats_proposal_supplier['nb'];
print ' | ';
- print $product->stats_proposal_supplier['qty'];
+ print price($product->stats_proposal_supplier['qty'], 1, $langs, 0, 0);
print ' | ';
print '';
}
@@ -492,7 +492,7 @@ function show_stats_for_company($product, $socid)
print '';
print $product->stats_commande['nb'];
print ' | ';
- print $product->stats_commande['qty'];
+ print price($product->stats_commande['qty'], 1, $langs, 0, 0);
print ' | ';
print '';
}
@@ -511,7 +511,7 @@ function show_stats_for_company($product, $socid)
print '';
print $product->stats_commande_fournisseur['nb'];
print ' | ';
- print $product->stats_commande_fournisseur['qty'];
+ print price($product->stats_commande_fournisseur['qty'], 1, $langs, 0, 0);
print ' | ';
print '';
}
@@ -530,7 +530,7 @@ function show_stats_for_company($product, $socid)
print '';
print $product->stats_facture['nb'];
print ' | ';
- print $product->stats_facture['qty'];
+ print price($product->stats_facture['qty'], 1, $langs, 0, 0);
print ' | ';
print '';
}
@@ -568,7 +568,7 @@ function show_stats_for_company($product, $socid)
print '';
print $product->stats_facture_fournisseur['nb'];
print ' | ';
- print $product->stats_facture_fournisseur['qty'];
+ print price($product->stats_facture_fournisseur['qty'], 1, $langs, 0, 0);
print ' | ';
print '';
}
@@ -628,7 +628,7 @@ function show_stats_for_company($product, $socid)
print '';
print $product->stats_contrat['nb'];
print ' | ';
- print $product->stats_contrat['qty'];
+ print price($product->stats_contrat['qty'], 1, $langs, 0, 0);
print ' | ';
print '';
}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index a881793cf03..460c7e10e64 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1355,7 +1355,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$pdf->SetTextColor(0, 0, 0);
}
- $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index);
+ $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index, 'posy' => $posy);
$reshook = $hookmanager->executeHooks('afterPDFTotalTable', $parameters, $this); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
index f92bac05c60..a541bcf73aa 100644
--- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
@@ -1909,7 +1909,7 @@ class pdf_octopus extends ModelePDFFactures
$pdf->SetTextColor(0, 0, 0);
}
- $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index);
+ $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index, 'posy' => $posy);
$reshook = $hookmanager->executeHooks('afterPDFTotalTable', $parameters, $this); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 336156f01a5..509af957ae0 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1998,7 +1998,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetTextColor(0, 0, 0);
}
- $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index);
+ $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index, 'posy' => $posy);
$reshook = $hookmanager->executeHooks('afterPDFTotalTable', $parameters, $this); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index b7831b52696..23f342eb182 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1432,7 +1432,7 @@ class pdf_cyan extends ModelePDFPropales
$pdf->SetTextColor(0, 0, 0);
}
- $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index);
+ $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index, 'posy' => $posy);
$reshook = $hookmanager->executeHooks('afterPDFTotalTable', $parameters, $this); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 3a43bb1d124..1b5692b656b 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -817,7 +817,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetTextColor(0, 0, 0);
}
- $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index);
+ $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index, 'posy' => $posy);
$reshook = $hookmanager->executeHooks('afterPDFTotalTable', $parameters, $this); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 4c366ebb212..df27a7a1831 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1106,7 +1106,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$pdf->SetTextColor(0, 0, 0);
}
- $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index);
+ $parameters = array('pdf' => &$pdf, 'object' => &$object, 'outputlangs' => $outputlangs, 'index' => &$index, 'posy' => $posy);
$reshook = $hookmanager->executeHooks('afterPDFTotalTable', $parameters, $this); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {