[Phpcompta-dev] r4877 - phpcompta/trunk/include

[phpcompta-dev]

Author: danydb
Date: 2012-06-09 18:22:59 +0200 (Sat, 09 Jun 2012)
New Revision: 4877

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_payment.php
Log:
0000600: Dans moyen de paiement, ajouter acompte

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php       2012-06-09 
16:15:18 UTC (rev 4876)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php       2012-06-09 
16:22:59 UTC (rev 4877)
@@ -254,7 +254,7 @@
              }
            $nb++;
         }
-      
+
         if ( $nb == 0 )
             throw new Exception(_('Il n\'y a aucune marchandise'),12);
 
@@ -767,7 +767,7 @@
                 {
                     $poste_val=$sposte;
                 }
-                
+
                 $famount=bcsub($cust_amount,$acompte);
                 $acc_pay->poste=$poste_val;
                 $acc_pay->qcode=$fqcode;
@@ -1510,13 +1510,13 @@
                if ( $e_mp!=0 && strlen (trim (${'e_mp_qcode_'.$e_mp})) != 0 )
         {
             $r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp});
-            $r.=HtmlInput::hidden('acompte');
+            $r.=HtmlInput::hidden('acompte',$acompte);
             /* needed for generating a invoice */
             $r.=HtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_mp});
                        $fname = new Fiche($this->db);
                        $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
                        $r.='<div style="float:left"><h2 class="info">' . "Payé 
par " . ${'e_mp_qcode_' . $e_mp} .
-                                       " ".$fname->getName() ." ". 
_('Déduction de ').h($acompte).'</h2></div>';
+                                       " ".$fname->getName() ." ". 
_('Déduction acompte ').h($acompte).'</h2></div>';
             $r.='<br>';
         }
         // check for upload piece

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php   2012-06-09 16:15:18 UTC 
(rev 4876)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php   2012-06-09 16:22:59 UTC 
(rev 4877)
@@ -216,7 +216,7 @@
         //------------------------------------------------------
         // The "Paid By"  check
         //------------------------------------------------------
-     
+
         if ($e_mp != 0 ) {
             $this->check_payment($e_mp,${"e_mp_qcode_".$e_mp});
         }
@@ -889,14 +889,14 @@
         if ( $e_mp!=0 && strlen (trim (${'e_mp_qcode_'.$e_mp})) != 0 )
         {
             $r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp});
-            $r.=HtmlInput::hidden('acompte');
+            $r.=HtmlInput::hidden('acompte',$acompte);
             /* needed for generating a invoice */
             $r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp});
 
                        $fname=new Fiche($this->db);
                        $fname->get_by_qcode(${'e_mp_qcode_'.$e_mp});
                        $r.='<div style="float:left"><h2 class="info">'."Payé 
par ".${'e_mp_qcode_'.$e_mp}.
-                                  " ".$fname->getName().' '._('Déduction de 
').h($acompte).'</h2></div>';
+                                  " ".$fname->getName().' '._('Déduction 
acompte ').h($acompte).'</h2></div>';
             $r.='<br>';
         }
 

Modified: phpcompta/trunk/include/class_acc_payment.php
===================================================================
--- phpcompta/trunk/include/class_acc_payment.php       2012-06-09 16:15:18 UTC 
(rev 4876)
+++ phpcompta/trunk/include/class_acc_payment.php       2012-06-09 16:22:59 UTC 
(rev 4877)
@@ -227,7 +227,7 @@
     }
     /**
      address@hidden
-     * @return string 
+     * @return string
      */
     public function row_deprecated()
     {
@@ -329,14 +329,14 @@
         $r='';
         $array=$this->get_valide();
         $r.=HtmlInput::hidden('gDossier',dossier::id());
-       
+
         if ( empty($array)==false ) {
             $acompte=new INum('acompte');
             $acompte->value=0;
-            $r.=_(" Montant à déduire");
+            $r.=_(" Acompte à déduire");
             $r.=$acompte->input();
         }
-        
+
         $r.='<ol>';
         $r.='<li ><input type="radio" name="e_mp" value="0" 
checked>'._('Paiement encodé plus tard');
         if ( empty($array ) == false )



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