[Phpcompta-dev] r4586 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2011-12-09 14:36:23 +0100 (Fri, 09 Dec 2011)
New Revision: 4586

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
signe pour op?\195?\169ration extourn?\195?\169e

Modified: phpcompta/trunk/include/class_acc_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger.php        2011-12-08 12:50:22 UTC 
(rev 4585)
+++ phpcompta/trunk/include/class_acc_ledger.php        2011-12-09 13:36:23 UTC 
(rev 4586)
@@ -218,7 +218,7 @@
             throw (new Exception(__FILE__.__LINE__."sql a echoue [ $sql ]"));
 
         //////////////////////////////////////////////////
-        // Reverse in QUANT_* tables
+        // Reverse in jrnx* tables
         //////////////////////////////////////////////////
         $a_jid=$this->db->get_array("select j_id,j_debit from jrnx where 
j_grpt=$1",array($this->jr_grpt_id));
         for ($l=0;$l<count($a_jid);$l++)
@@ -249,7 +249,7 @@
             $Res=$this->db->exec_sql("INSERT INTO quant_sold(
                                      qs_internal, qs_fiche, qs_quantite, 
qs_price, qs_vat,
                                      qs_vat_code, qs_client, qs_valid, j_id)
-                                     SELECT $1, qs_fiche, qs_quantite*(-1), 
qs_price, qs_vat,
+                                     SELECT $1, qs_fiche, qs_quantite*(-1), 
qs_price*(-1), qs_vat*(-1),
                                      qs_vat_code, qs_client, qs_valid, $2
                                      FROM quant_sold where j_id=$3",
                                      array($p_internal,$j_id,$row));
@@ -260,8 +260,8 @@
                                      qp_internal, j_id, qp_fiche, qp_quantite, 
qp_price, qp_vat,
                                      qp_vat_code, qp_nd_amount, qp_nd_tva, 
qp_nd_tva_recup, qp_supplier,
                                      qp_valid, qp_dep_priv)
-                                     SELECT  $1, $2, qp_fiche, 
qp_quantite*(-1), qp_price, qp_vat,
-                                     qp_vat_code, qp_nd_amount, qp_nd_tva, 
qp_nd_tva_recup, qp_supplier,
+                                     SELECT  $1, $2, qp_fiche, 
qp_quantite*(-1), qp_price*(-1), qp_vat*(-1),
+                                     qp_vat_code, qp_nd_amount*(-1), 
qp_nd_tva*(-1), qp_nd_tva_recup*(-1), qp_supplier,
                                      qp_valid, qp_dep_priv
                                      FROM quant_purchase where j_id=$3",
                                      array($p_internal,$j_id,$row));

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-08 
12:50:22 UTC (rev 4585)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-09 
13:36:23 UTC (rev 4586)
@@ -156,7 +156,7 @@
    $row.=td($sym_tva,'style="text-align:center"');
    
     $htva=$q['qs_price'];
-    if ($q['qs_quantity']<0) { 
$htva=bcmult($htva,-1);$q['qs_vat']=bcmult($q['qs_vat'],-1);}
+  
     $row.=td(nbm($htva),'class="num"');
     $tvac=bcadd($htva,$q['qs_vat']);
     if ($owner->MY_TVA_USE=='Y')