[Phpcompta-dev] r477 - trunk/import_account/include

[phpcompta-dev]

Author: danydb
Date: 2013-03-30 21:31:51 +0100 (Sat, 30 Mar 2013)
New Revision: 477

Modified:
   trunk/import_account/include/class_impacc_operation.php
Log:
Negative VAT rate

Modified: trunk/import_account/include/class_impacc_operation.php
===================================================================
--- trunk/import_account/include/class_impacc_operation.php     2013-03-30 
19:57:59 UTC (rev 476)
+++ trunk/import_account/include/class_impacc_operation.php     2013-03-30 
20:31:51 UTC (rev 477)
@@ -383,13 +383,14 @@
                                                        break;
                                        }
                                        /* save VAT into an array */
-                                       if (isset($tva[$tva_id]))
+                                       $side=($amount_tva > 0)?1:0
+                                       if (isset($tva[$tva_id][$side]))
                                        {
-                                               $tva[$tva_id] = 
bcadd($tva[$tva_id], $amount_tva);
+                                               $tva[$tva_id][$side] = 
bcadd($tva[$tva_id][$side], $amount_tva);
                                        }
                                        else
                                        {
-                                               $tva[$tva_id] = $amount_tva;
+                                               $tva[$tva_id][$side] = 
$amount_tva;
                                        }
                                        $sum = bcadd($sum, $amount_tvac);
                                }  // loop e
@@ -409,23 +410,26 @@
                                $jtiers->insert_jrnx();
 
                                /* Record the vat 1 */
-                               foreach ($tva as $key => $value)
+                               foreach ($tva as $key => $atva)
                                {
-                                       $tva = new Acc_TVA($cn, $key);
-                                       $tva->load();
-                                       $poste = $tva->get_side($oth_side);
-                                       $op_tva = new Acc_Operation($cn);
-                                       $op_tva->date = $date;
-                                       $op_tva->amount = $value;
-                                       $op_tva->poste = $poste;
-                                       $op_tva->grpt = $grpt;
-                                       $op_tva->type = $oth_side;
-                                       $op_tva->jrn = $jrn;
-                                       $op_tva->user = $_SESSION['g_user'];
-                                       $op_tva->periode = 0;
-                                       $op_tva->qcode = null;
-                                       $op_tva->desc = $tva->tva_label;
-                                       $op_tva->insert_jrnx();
+                                       foreach ($atva as $tvaid=>$tva_value )
+                                       {
+                                               $tva = new Acc_TVA($cn, $key);
+                                               $tva->load();
+                                               $poste = 
$tva->get_side($oth_side);
+                                               $op_tva = new 
Acc_Operation($cn);
+                                               $op_tva->date = $date;
+                                               $op_tva->amount = $tva_value;
+                                               $op_tva->poste = $poste;
+                                               $op_tva->grpt = $grpt;
+                                               $op_tva->type = $oth_side;
+                                               $op_tva->jrn = $jrn;
+                                               $op_tva->user = 
$_SESSION['g_user'];
+                                               $op_tva->periode = 0;
+                                               $op_tva->qcode = null;
+                                               $op_tva->desc = $tva->tva_label;
+                                               $op_tva->insert_jrnx();
+                                       }
                                }
 
                                /* record into jrn */



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu