Author: danydb Date: 2014-01-10 19:46:56 +0100 (Fri, 10 Jan 2014) New Revision: 5670
Modified: phpcompta/trunk/ phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_misc.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: Merged revisions 5668-5669 via svnmerge from svn+ssh://[email protected]/svn/phpcompta/tags/rel671 ........ r5668 | danydb | 2014-01-10 19:15:39 +0100 (ven., 10 janv. 2014) | 1 line Bug NON DEDUCTIBLE ........ r5669 | danydb | 2014-01-10 19:15:52 +0100 (ven., 10 janv. 2014) | 1 line improve appearance ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/tags/rel671:1-5666 + /phpcompta/tags/rel671:1-5669 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =================================================================== --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2014-01-10 18:15:52 UTC (rev 5669) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2014-01-10 18:46:56 UTC (rev 5670) @@ -275,13 +275,6 @@ $p_nd_amount->amount_nd_rate = $p_fiche->strAttribut(ATTR_DEF_DEPENSE_NON_DEDUCTIBLE); $p_nd_amount->compute_nd(); } - - if (!$p_fiche->empty_attribute(ATTR_DEF_DEP_PRIV)) - { - $p_nd_amount->amount_perso_rate = $p_fiche->strAttribut(ATTR_DEF_DEP_PRIV); - $p_nd_amount->compute_perso(); - } - if (!$p_fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIBLE) && $tva_both == 0) { $p_nd_amount->nd_vat_rate = $p_fiche->strAttribut(ATTR_DEF_TVA_NON_DEDUCTIBLE); @@ -292,6 +285,13 @@ $p_nd_amount->nd_ded_vat_rate = $p_fiche->strAttribut(ATTR_DEF_TVA_NON_DEDUCTIBLE_RECUP); $p_nd_amount->compute_ndded_vat(); } + + if (!$p_fiche->empty_attribute(ATTR_DEF_DEP_PRIV)) + { + $p_nd_amount->amount_perso_rate = $p_fiche->strAttribut(ATTR_DEF_DEP_PRIV); + $p_nd_amount->compute_perso(); + } + } /** @@ -313,7 +313,6 @@ throw new Exception(__FILE__.__LINE__.'invalid acc_operation.j_id'); } $source_j_id=$p_acc_operation->jrnx_id ; - $p_nd_amount->correct(); /* * Save all the no deductible * ATTR_DEF_ACCOUNT_ND_TVA,ATTR_DEF_ACCOUNT_ND_TVA_ND,ATTR_DEF_ACCOUNT_ND_PERSO,ATTR_DEF_ACCOUNT_ND @@ -323,9 +322,9 @@ $dna_default = new Acc_Parm_Code($this->db, 'DNA'); /* save op. */ - if (!$p_Fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND)) + if (!$p_fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND)) { - $dna = $p_Fiche->strAttribut(ATTR_DEF_ACCOUNT_ND); + $dna = $p_fiche->strAttribut(ATTR_DEF_ACCOUNT_ND); } else { $dna = $dna_default->p_value; @@ -333,12 +332,12 @@ $dna = ($dna == '') ? $dna_default->p_value : $dna; $p_acc_operation->type = 'd'; - $p_acc_operation->amount = $p_nd_amount->amount_nd_rate ; + $p_acc_operation->amount = $p_nd_amount->amount_nd; $p_acc_operation->poste = $dna; $p_acc_operation->qcode = ''; $p_acc_operation->desc=$this->find_label($dna)." ND ".$p_fiche->strAttribut(ATTR_DEF_QUICKCODE); - if ($p_nd_amount->amount_nd_rate > 0) - $p_tot_debit = bcadd($p_tot_debit, $p_nd_amount->amount_nd_rate); + if ($p_nd_amount->amount_nd > 0) + $p_tot_debit = bcadd($p_tot_debit, $p_nd_amount->amount_nd ); $j_id = $p_acc_operation->insert_jrnx(); } /* @@ -399,6 +398,9 @@ $op->oa_jrnx_id_source=$source_j_id; $op->save_form_plan_vat_nd($_POST,$idx,$j_id,$p_nd_amount->nd_vat,$p_acc_operation->jrnx_id); } + if ($p_nd_amount->nd_vat> 0) + $p_tot_debit = bcadd($p_tot_debit, $p_nd_amount->nd_vat); + } if ($p_nd_amount->nd_ded_vat != 0) { @@ -576,6 +578,7 @@ /* compute ND */ $this->compute_no_deductible($acc_amount, $fiche, $tva_both); + $acc_amount->correct(); Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =================================================================== --- phpcompta/trunk/include/template/ledger_detail_ach.php 2014-01-10 18:15:52 UTC (rev 5669) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2014-01-10 18:46:56 UTC (rev 5670) @@ -226,7 +226,8 @@ $row.=td(''); } } - echo tr($row); + $class=($e%2==0)?' class="even"':'class="odd"'; + echo tr($row,$class); } if ($owner->MY_TVA_USE == 'Y') $row = td(_('Total'), ' style="font-style:italic;text-align:right;font-weight: bolder;width:auto" colspan="6"'); @@ -309,7 +310,9 @@ $montant = td(nbm($q[$e]['j_montant']), 'class="num"'); $row.=($q[$e]['j_debit'] == 't') ? $montant : td(''); $row.=($q[$e]['j_debit'] == 'f') ? $montant : td(''); - echo tr($row); + $class=($e%2==0)?' class="even"':'class="odd"'; + + echo tr($row,$class); } ?> </table> Modified: phpcompta/trunk/include/template/ledger_detail_misc.php =================================================================== --- phpcompta/trunk/include/template/ledger_detail_misc.php 2014-01-10 18:15:52 UTC (rev 5669) +++ phpcompta/trunk/include/template/ledger_detail_misc.php 2014-01-10 18:46:56 UTC (rev 5670) @@ -163,8 +163,10 @@ $row.=td(''); } } - echo tr($row); + $class=($e%2==0)?' class="even"':'class="odd"'; + echo tr($row,$class); + } ?> </table> Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =================================================================== --- phpcompta/trunk/include/template/ledger_detail_ven.php 2014-01-10 18:15:52 UTC (rev 5669) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2014-01-10 18:46:56 UTC (rev 5670) @@ -219,7 +219,8 @@ $row.=td(''); } } - echo tr($row); + $class=($e%2==0)?' class="even"':'class="odd"'; + echo tr($row,$class); } if ($owner->MY_TVA_USE == 'Y') $row = td(_('Total'), ' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"'); @@ -302,7 +303,8 @@ $montant = td(nbm($q['j_montant']), 'class="num"'); $row.=($q['j_debit'] == 't') ? $montant : td(''); $row.=($q['j_debit'] == 'f') ? $montant : td(''); - echo tr($row); + $class=($e%2==0)?' class="even"':'class="odd"'; + echo tr($row,$class); } ?> </table> --- 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
