[Phpcompta-dev] r463 - in tag/rel652/import_doli: doc include

[phpcompta-dev]

Author: danydb
Date: 2013-02-06 23:00:52 +0100 (Wed, 06 Feb 2013)
New Revision: 463

Modified:
   tag/rel652/import_doli/doc/import-donnee-dolibarr test.csv
   tag/rel652/import_doli/include/class_impdol_operation.php
Log:
0000784: Montant n?\195?\169gatif pour achat & vente

Modified: tag/rel652/import_doli/doc/import-donnee-dolibarr test.csv
===================================================================
--- tag/rel652/import_doli/doc/import-donnee-dolibarr test.csv  2013-02-06 
18:59:05 UTC (rev 462)
+++ tag/rel652/import_doli/doc/import-donnee-dolibarr test.csv  2013-02-06 
22:00:52 UTC (rev 463)
@@ -1,5 +1,5 @@
-3;"13.03.2012";"T";"CLIENT1";"achat de marchandises";"A1";;;;;
-3;"13.03.2012";"S";"M1";"Marchandise 1";"A1";3;1,62;9;0,06;28,62
-3;"13.03.2012";"S";"M2";"Marchandise 2";"A1";12;0,72;1;0,06;12,72
-2;"14.03.2012";"T";"FOURNISSEUR1";"Facture n°121212121 : Electricté";"B1";;;;;
-2;"14.03.2012";"S";"FID1070";"Électricté";"B1";125;7,5;1;0,06;132,5
+7;"13.03.2012";"T";"CLIENT1";"achat de marchandises";"A2";;;;;
+7;"13.03.2012";"S";"M1";"Marchandise 1";"A2";3;1,62;9;0,06;28,62
+7;"13.03.2012";"S";"M2";"Marchandise 2";"A2";12;0,72;1;0,06;12,72
+8;"14.03.2012";"T";"FOURNISSEUR1";"Facture n°121212121 : Electricté";"B2";;;;;
+8;"14.03.2012";"S";"FID1070";"Électricté";"B2";-125;-7,5;1;0,06;-132,5

Modified: tag/rel652/import_doli/include/class_impdol_operation.php
===================================================================
--- tag/rel652/import_doli/include/class_impdol_operation.php   2013-02-06 
18:59:05 UTC (rev 462)
+++ tag/rel652/import_doli/include/class_impdol_operation.php   2013-02-06 
22:00:52 UTC (rev 463)
@@ -334,6 +334,7 @@
                                        $amount_tva = $oper->getp("amount_vat");
                                        $amount_tvac = 
$oper->getp("amount_total");
                                        $jrnx->amount = bcsub($amount_tvac, 
$amount_tva);
+                                       $save_amount=$jrnx->amount;
                                        $jrnx->poste = $oper->getp('poste');
                                        $jrnx->grpt = $grpt;
                                        $jrnx->type = $oth_side;
@@ -359,7 +360,7 @@
                                                case 'ACH':
                                                        $sql = "insert into 
quant_purchase(qp_internal,j_id,qp_fiche,qp_quantite,qp_price,qp_vat,qp_vat_code,qp_supplier)
                                                        
values($1,$2,$3,$4,$5,$6,$7,$8)";
-                                                       $cn->exec_sql($sql, 
array(null, $id, $oper->getp("fiche"), $oper->getp("number_unit"), 
$jrnx->amount, $amount_tva, $tva_id, $oper_tiers->getp("fiche")));
+                                                       $cn->exec_sql($sql, 
array(null, $id, $oper->getp("fiche"), $oper->getp("number_unit"), 
$save_amount, $amount_tva, $tva_id, $oper_tiers->getp("fiche")));
                                                        break;
                                                case 'VEN':
                                                        $cn->exec_sql("insert 
into quant_sold
@@ -428,7 +429,7 @@
                                /* record into jrn */
                                $acc_jrn = new Acc_Operation($cn);
                                $acc_jrn->jrn = $jrn;
-                               $acc_jrn->amount = $sum;
+                               $acc_jrn->amount =abs ($sum);
                                $acc_jrn->desc = 
mb_substr($oper_tiers->getp("desc"),0,80,'UTF8');
                                $acc_jrn->date = $date;
                                $acc_jrn->grpt = $grpt;



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