[Noalyss-commit] [noalyss] 128/173: Merge branch 'dev7112' into entreprise

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 2a96573b3dc6e4f38dded38c739dcce1cb845f2a
Merge: aadb421 13d052a
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Fri Nov 22 23:03:03 2019 +0100

    Merge branch 'dev7112' into entreprise

 include/class/acc_ledger_purchase.class.php | 9 +++++++--
 include/class/acc_ledger_sold.class.php     | 4 ++++
 include/lib/inum.class.php                  | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --cc include/class/acc_ledger_purchase.class.php
index fab39c6,a3e74c0..9475b32
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@@ -706,7 -669,10 +706,12 @@@ class  Acc_Ledger_Purchase extends Acc_
                  }
                  // insert into quant_purchase
                  //-----
++                
+                 if (empty( ${'e_march' . $i . '_price'}  ) ) ${'e_march' . $i 
. '_price'}  = 0;
+                 if (empty( ${'e_march' . $i }  ) ) ${'e_march' . $i }  = 0;
+                 if (empty( ${'e_quant' . $i }  ) ) ${'e_quant' . $i }  = 0;
 +                $price_euro=bcdiv(${'e_march'.$i.'_price'}, $p_currency_rate);
+                 
                  if ( $g_parameter->MY_TVA_USE=='Y')
                  {
  
@@@ -1723,31 -1607,10 +1728,31 @@@
          {$tot_amount}
      </td>
      <td class="num">
 -        {$tot}
 +        {$tot} {$str_code}
      </td>
 +</tr>
  EOF;
 -        } else {
 +    if ($p_currency_code !=0) {
 +        $rate=_("Taux ");
 +$r.=<<<EOF
 +<tr class="highlight">
 +    {$decalage}            
 +     <td>
 +                
 +     </td>
 +    <td class="num">
 +        
 +    </td>
 +    <td class="num">
 +        {$rate} {$p_currency_rate}
 +    </td>
 +    <td class="num">
 +        {$tot_eur}  EUR
 +    </td>
 +</tr>
 +EOF;
-         } 
-         }else {
++        } // if ($p_currency_code !=0
++        }else { // if $g_parameter->MY_TVA_USE=='Y'
          $r.=<<<EOF
  <tr class="highlight">
      {$decalage}            
diff --cc include/class/acc_ledger_sold.class.php
index 4971468,da6991c..3d1e2ef
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@@ -412,8 -374,9 +412,12 @@@ class Acc_Ledger_Sold extends Acc_Ledge
                      $op->oa_description = sql_string($e_comm);
                      $op->save_form_plan($_POST, $i, $j_id);
                  }
+                 if (empty( ${'e_march' . $i . '_price'}  ) ) ${'e_march' . $i 
. '_price'}  = 0;
+                 if (empty( ${'e_march' . $i }  ) ) ${'e_march' . $i }  = 0;
+                 if (empty( ${'e_quant' . $i }  ) ) ${'e_quant' . $i }  = 0;
 +                
 +                $price_euro=bcdiv(${'e_march'.$i.'_price'}, $p_currency_rate);
++                
                  if ($g_parameter->MY_TVA_USE == 'Y') {
                      /* save into quant_sold */
                      $r = $this->db->exec_sql("select insert_quant_sold 
($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)", array(null, /* 1 */