diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index 30654561f..540b252ac 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -1471,16 +1471,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $r.=HtmlInput::hidden('e_mp',$e_mp); /* Paid by */ /* if the paymethod is not 0 and if a quick code is given */ - 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}); - /* needed for generating a invoice */ - $r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}); - - $r.="Payé par ".${'e_mp_qcode_'.$e_mp}; - $r.='
'; - } for ($i=0;$i < $nb_item;$i++) { $r.=HtmlInput::hidden("e_march".$i,${"e_march".$i}); @@ -1492,9 +1483,22 @@ class Acc_Ledger_Purchase extends Acc_Ledger } $r.=HtmlInput::hidden("e_quant".$i,${"e_quant".$i}); + } + if ( ! $p_summary ) $r.=$this->extra_info(); + 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}); + + /* 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.='

' . "Payé par " . ${'e_mp_qcode_' . $e_mp} . + " ".$fname->getName() . '

'; + $r.='
'; } // check for upload piece - if ( ! $p_summary ) $r.=$this->extra_info(); + return $r; } diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 4b34ea44a..88b84b992 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -865,7 +865,10 @@ class Acc_Ledger_Sold extends Acc_Ledger /* needed for generating a invoice */ $r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}); - $r.=_("Payé par ").${'e_mp_qcode_'.$e_mp}; + $fname=new Fiche($this->db); + $fname->get_by_qcode(${'e_mp_qcode_'.$e_mp}); + $r.='

'."Payé par ".${'e_mp_qcode_'.$e_mp}. + " ".$fname->getName().'

'; $r.='
'; } diff --git a/include/template/module.php b/include/template/module.php index 0ae97f0b1..36865dba3 100644 --- a/include/template/module.php +++ b/include/template/module.php @@ -47,6 +47,7 @@ endif;?>

Dossier :

+
@@ -85,4 +86,5 @@ endif;?>
- \ No newline at end of file + +
\ No newline at end of file