Author: danydb Date: 2013-10-05 19:47:08 +0200 (Sat, 05 Oct 2013) New Revision: 527
Modified: trunk/ trunk/rapport_avance/include/class_rapav_declaration.php Log: Merged revisions 525 via svnmerge from svn+ssh://[email protected]/svn_extension/tag/rel660 ........ r525 | danydb | 2013-07-23 17:46:56 +0200 (mar., 23 juil. 2013) | 1 line Bug in RAPAV_DD_ACCOUNT, the code for ledger of purchase was wrong ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /tag/rel660:1-523 + /tag/rel660:1-526 Modified: trunk/rapport_avance/include/class_rapav_declaration.php =================================================================== --- trunk/rapport_avance/include/class_rapav_declaration.php 2013-10-05 17:46:43 UTC (rev 526) +++ trunk/rapport_avance/include/class_rapav_declaration.php 2013-10-05 17:47:08 UTC (rev 527) @@ -405,7 +405,7 @@ { static $s_start = ""; static $s_count = 0; - + if ($s_start == "") { $s_start = $p_start; @@ -766,9 +766,9 @@ { if ($this->form->jrn_def_type == 'ACH') { - $sql = "select coalesce(sum(qs_vat),0) as amount - from quant_sold join jrnx using (j_id) - where qs_vat_code=$1 + $sql = "select coalesce(sum(qp_vat),0) as amount + from quant_purchase join jrnx using (j_id) + where qp_vat_code=$1 and (j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date($3,'DD.MM.YYYY')) and j_poste::text like ($4)"; $amount = $this->cn->get_value($sql, array($this->form->tva_id, --- PhpCompta est un logiciel de comptabilité libre en ligne (full web) Projet opensource http://www.phpcompta.eu _______________________________________________ Phpcompta est un logiciel libre de comptabilité en ligne (http://www.phpcompta.eu) Phpcompta-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/phpcompta-dev
