diff --git a/include/bank.inc.php b/include/bank.inc.php
index 51723ee9a..0e4fd8986 100644
--- a/include/bank.inc.php
+++ b/include/bank.inc.php
@@ -289,7 +289,7 @@ if ( isset($_POST['save']))
echo $form;
echo '
';
echo '';
- echo '
+ echo '
';
exit();
}
diff --git a/include/jrn.php b/include/jrn.php
index 5174eb6f7..c5019ba39 100644
--- a/include/jrn.php
+++ b/include/jrn.php
@@ -281,6 +281,7 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1)
/* the qp_internal == jr_internal */
$r.='';
$r.='| Nom | ';
+ $r.='PU | ';
$r.='Quantité | ';
$r.='tva | ';
$r.='code tva | ';
@@ -312,8 +313,10 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1)
// $hid_jid=new widget("hidden","","p_jid_".$row->j_id,$row->j_id);
$r.=($i%2==0)?"
":'
'; $i++;
-
+ $pu=0.0;
+ if ( $row->qp_price != 0.0 && $row->qp_price != 0 ) $pu=round($row->qp_price/$row->qp_quantite,2);
$r.='| '.$fiche->strAttribut(ATTR_DEF_NAME).' | ';
+ $r.=''.$pu.' | ';
$r.=''.$row->qp_quantite.' | ';
$r.=''.$row->qp_vat.' | ';
$r.=''.$row->qp_vat_code.' | ';
@@ -379,6 +382,7 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1)
/* the qs_internal == jr_internal */
$r.='
';
$r.='| Nom | ';
+ $r.='PU | ';
$r.='Quantité | ';
$r.='tva | ';
$r.='code tva | ';
@@ -399,12 +403,14 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1)
$tot_tva+=$row->qs_vat;
$tot_amount+=$row->qs_price;
$r.=($i%2==0)?"
":'
'; $i++;
-
+ $pu=0.0;
+ if ( $row->qs_price != 0.0 && $row->qs_price != 0 ) $pu=round($row->qs_price/$row->qs_quantite,2);
$r.=($i%2==0)?"
":'
'; $i++;
$r.='| '.$fiche->strAttribut(ATTR_DEF_NAME).' | ';
+ $r.=''.$pu.' | ';
$r.=''.$row->qs_quantite.' | ';
$r.=''.$row->qs_vat.' | ';
- $r.=''.$row->qs_vat_code.' | ';
+ $r.=''.$row->qs_vat_code.' | ';
$r.=''.$row->qs_price.' | ';
//-- add ca
//