';
+
+// Line nb
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
print '| '.($i + 1).' | ';
$coldisplay++;
}
+
+// Product
print '';
print '';
$coldisplay++;
@@ -113,6 +117,7 @@ if (!empty($extrafields)) {
print ' | ';
+// Qty
print '';
$coldisplay++;
echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
@@ -142,7 +147,7 @@ if ($filtertype != 1) {
echo $line->efficiency;
print ' | ';
} else {
- //Unité
+ // Unit
print '';
$coldisplay++;
@@ -166,6 +171,8 @@ if ($filtertype != 1) {
print ' | ';
}
}
+
+// Cost
$total_cost = 0;
$tmpbom->calculateCosts();
print '';
@@ -312,10 +319,12 @@ if ($resql) {
print ' | '.price(price2num($sub_bom_line->total_cost, 'MT')).' | ';
$this->total_cost += $line->total_cost;
} elseif ($sub_bom_product->cost_price > 0) {
- print ''.price(price2num($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty, 'MT')).' | ';
+ print '';
+ print ''.price(price2num($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty, 'MT')).' | ';
$total_cost+= $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
} elseif ($sub_bom_product->pmp > 0) { // PMP if cost price isn't defined
- print ''.price(price2num($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty, 'MT')).' | ';
+ print '';
+ print ''.price(price2num($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty, 'MT')).' | ';
$total_cost.= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
} else { // Minimum purchase price if cost price and PMP aren't defined
$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 073fd90944e..99b767724df 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -123,7 +123,7 @@ $max = 10;
foreach ($arrayofpaymentmodetomanage as $val) {
$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";
- $sql .= " bc.statut, bc.nbcheque, bc.type,";
+ $sql .= " bc.statut as status, bc.nbcheque, bc.type,";
$sql .= " ba.ref as bref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
$sql .= " aj.code";
$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
@@ -160,7 +160,8 @@ foreach ($arrayofpaymentmodetomanage as $val) {
$checkdepositstatic->id = $objp->rowid;
$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
- $checkdepositstatic->statut = $objp->statut;
+ $checkdepositstatic->statut = $objp->status;
+ $checkdepositstatic->status = $objp->status;
$accountstatic->id = $objp->bid;
$accountstatic->ref = $objp->bref;
@@ -178,13 +179,14 @@ foreach ($arrayofpaymentmodetomanage as $val) {
print ''.$accountstatic->getNomUrl(1).' | ';
print ''.$objp->nbcheque.' | ';
print ''.price($objp->amount).' | ';
- print ''.$checkdepositstatic->LibStatut($objp->statut, 3).' | ';
+ print ''.$checkdepositstatic->LibStatut($objp->status, 3).' | ';
print '
';
}
if ($i == 0) {
print '