[Noalyss-commit] [noalyss] 14/20: Round value , due to the 4 dec in Sale and Expense

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit f938c9073e6dd5682a8f1accc0438455688ce274
Author: Dany De Bontridder <address@hidden>
Date:   Sat Oct 24 21:51:16 2015 +0200

    Round value , due to the 4 dec in Sale and Expense
---
 include/class/class_acc_ledger_purchase.php |    2 +-
 include/class/class_acc_ledger_sold.php     |    2 +-
 include/class/class_anc_operation.php       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/class/class_acc_ledger_purchase.php 
b/include/class/class_acc_ledger_purchase.php
index e59ebf7..8bac0ab 100644
--- a/include/class/class_acc_ledger_purchase.php
+++ b/include/class/class_acc_ledger_purchase.php
@@ -1526,7 +1526,7 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
                 $p_array['pa_id']=$a_anc;
                 /* op is the operation it contains either a sequence or a 
jrnx.j_id */
                 $r.=HtmlInput::hidden('op[]=',$i);
-                
$r.=$anc_op->display_form_plan($p_array,$null,$p_mode,$i,$amount);
+                
$r.=$anc_op->display_form_plan($p_array,$null,$p_mode,$i,round($amount,2));
                 $r.='</td>';
             }
 
diff --git a/include/class/class_acc_ledger_sold.php 
b/include/class/class_acc_ledger_sold.php
index 22c6990..803a877 100644
--- a/include/class/class_acc_ledger_sold.php
+++ b/include/class/class_acc_ledger_sold.php
@@ -797,7 +797,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
                 $p_array['pa_id'] = $a_anc;
                 /* op is the operation it contains either a sequence or a 
jrnx.j_id */
                 $r.=HtmlInput::hidden('op[]=', $i);
-                $r.=$anc_op->display_form_plan($p_array, $null, $p_mode, $i, 
$amount);
+                $r.=$anc_op->display_form_plan($p_array, $null, $p_mode, $i,  
round($amount,2));
                 $r.='</td>';
             }
 
diff --git a/include/class/class_anc_operation.php 
b/include/class/class_anc_operation.php
index 8e907d5..5efc069 100644
--- a/include/class/class_anc_operation.php
+++ b/include/class/class_anc_operation.php
@@ -617,7 +617,7 @@ class Anc_Operation
         if ($p_add_button && $p_mode == 1)
         {
             $style_remain=($remain==0)?'style="color:green"':' 
style="color:red"';
-            $result.=" Reste à imputer =  ".
+            $result.=" "._("Reste")." =  ".
                      '<span class="remain" '.$style_remain.' 
id="'.$ctrl_remain.'">'.
                             $remain.'</span>';
             // add a button to add a row