[Phpcompta-dev] r5648 - phpcompta/tags/rel671/include

[phpcompta-dev]

Author: danydb
Date: 2014-01-07 18:44:04 +0100 (Tue, 07 Jan 2014)
New Revision: 5648

Modified:
   phpcompta/tags/rel671/include/class_acc_ledger.php
   phpcompta/tags/rel671/include/class_acc_ledger_purchase.php
Log:
Task #960 - TVA ND & comptabilit?\195?\169 analytique
Move function find_label

Modified: phpcompta/tags/rel671/include/class_acc_ledger.php
===================================================================
--- phpcompta/tags/rel671/include/class_acc_ledger.php  2014-01-07 17:16:00 UTC 
(rev 5647)
+++ phpcompta/tags/rel671/include/class_acc_ledger.php  2014-01-07 17:44:04 UTC 
(rev 5648)
@@ -3717,6 +3717,16 @@
             return $array;
                        
         }
+        /**
+         * Retrieve the label of an accounting
+         * @param $p_value tmp_pcmn.pcm_val
+         * @return string
+         */
+        protected function find_label($p_value)
+        {
+            $lib=$this->db->get_value('select pcm_lib from tmp_pcmn where 
pcm_val=$1',array($p_value));
+            return $lib;
+        }
 
 }
 ?>
\ No newline at end of file

Modified: phpcompta/tags/rel671/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/tags/rel671/include/class_acc_ledger_purchase.php 2014-01-07 
17:16:00 UTC (rev 5647)
+++ phpcompta/tags/rel671/include/class_acc_ledger_purchase.php 2014-01-07 
17:44:04 UTC (rev 5648)
@@ -293,6 +293,7 @@
             $p_nd_amount->compute_ndded_vat();
         }
     }
+
     /**
      * Insert into JRNX the No Deductible amount
      * @param Acc_Compute $p_nd_amount content ND amount
@@ -325,7 +326,7 @@
             $p_acc_operation->amount = $p_nd_amount->amount_nd_rate ;
             $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);
             $j_id = $p_acc_operation->insert_jrnx();
@@ -351,6 +352,7 @@
             $p_acc_operation->amount = $p_nd_amount->amount_perso ;
             $p_acc_operation->poste = $dna;
             $p_acc_operation->qcode = '';
+            $p_acc_operation->desc=$this->find_label($dna)." ND_PRIV 
".$p_fiche->strAttribut(ATTR_DEF_QUICKCODE);
             if ($p_nd_amount->amount_perso> 0)
                 $p_tot_debit = bcadd($p_tot_debit, $p_nd_amount->amount_perso);
             $j_id = $p_acc_operation->insert_jrnx();
@@ -373,7 +375,7 @@
 
             $p_acc_operation->amount = $p_nd_amount->nd_vat;
             $p_acc_operation->poste = $dna;
-            
+            $p_acc_operation->desc=$this->find_label($dna)." ND_TVA 
".$p_fiche->strAttribut(ATTR_DEF_QUICKCODE);
             $j_id = $p_acc_operation->insert_jrnx();
         }
         if ($p_nd_amount->nd_ded_vat != 0)
@@ -395,6 +397,7 @@
             $p_acc_operation->qcode = '';
             $p_acc_operation->amount = $p_nd_amount->nd_ded_vat;
             $p_acc_operation->poste = $dna;
+            $p_acc_operation->desc=$this->find_label($dna)." DED_TVA 
".$p_fiche->strAttribut(ATTR_DEF_QUICKCODE);
             if ($p_nd_amount->nd_ded_vat > 0)
                 $p_tot_debit = bcadd($p_tot_debit, $p_nd_amount->nd_ded_vat);
             $j_id = $p_acc_operation->insert_jrnx();



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