Improve look for ANC + Add payment method + card name
This commit is contained in:
parent
0a804a81a8
commit
b35d73fe08
3 changed files with 21 additions and 12 deletions
|
|
@ -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.='<br>';
|
||||
}
|
||||
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.='<div style="float:left"><h2 class="info">' . "Payé par " . ${'e_mp_qcode_' . $e_mp} .
|
||||
" ".$fname->getName() . '</h2></div>';
|
||||
$r.='<br>';
|
||||
}
|
||||
// check for upload piece
|
||||
if ( ! $p_summary ) $r.=$this->extra_info();
|
||||
|
||||
|
||||
return $r;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.='<div style="float:left"><h2 class="info">'."Payé par ".${'e_mp_qcode_'.$e_mp}.
|
||||
" ".$fname->getName().'</h2></div>';
|
||||
$r.='<br>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ endif;?>
|
|||
<H2 class="dossier"> Dossier : <?=h(dossier::name())?></h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="module">
|
||||
<table>
|
||||
<tr>
|
||||
|
|
@ -85,4 +86,5 @@ endif;?>
|
|||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="clear:both;"></div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue