admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Appearance: add invoice or a file, additional document

Browse source
This commit is contained in:
sparkyx 2026-01-18 16:57:23 +01:00
parent 6f0c69c0bc
commit 677eacafd3
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
html/css/style-classic7.css
View file

@ -2501,6 +2501,8 @@ ul.aligned-block li {
padding: 2rem;
border:1px solid navy;
margin-right:1rem;
width: 20rem;
}
/***************************************************************************
* column in the dashboard
@ -4259,6 +4261,8 @@ span.nb-round {
.bt-center {
margin-bottom: 2rem;
float:inherit;
clear:both;
}
@ -4288,4 +4292,10 @@ span.nb-round {
#module_setting .selectedcell {
background-color:beige;
}
#facturation_div_id{
height:auto;
float:left
}

2
include/XMLDocument/xml_reader.class.php
View file

@ -397,8 +397,6 @@ abstract class XML_Reader
/**
*
* @return array
* @TODODNY
* Implémenter les allowances
*/
function get_info(): array
{

6
include/class/acc_ledger_purchase.class.php
View file

@ -1988,7 +1988,6 @@ EOF;
}
$r.='</table>';
$r.='</p>';
if ( $g_parameter->MY_ANALYTIC!='nu' && !$p_summary) // use of AA
$r.='<input type="button" class="button" value="'._('Vérifiez imputation analytique').'" onClick="verify_ca(\'\');">';
@ -2125,6 +2124,7 @@ EOF;
$file=new IFile();
$file->setAlertOnSize(true);
$file->table=0;
$r.='<h3 class="title">'._("Facture").'</h3>';
$r.=_("Ajoutez une pièce justificative ");
$r.=$file->input("pj","");
@ -2141,11 +2141,13 @@ EOF;
$r.=$doc_gen->input().'<br>';
}
$r.='</p>';
$r.='<h3 class="title">'._("Documents supplémentaires").'</h3>';
$r.=$this->input_supplemental_document();
$r.='<p>';
$obj=new IText();
$obj->size=50;
$r.=_('Numero de bon de commande : ').$obj->input('bon_comm').'<br>';
$r.=_('Autre information : ').$obj->input('other_info').'<br>';
$r.=_('Communication').$obj->input('other_info').'<br>';
$r.='</p>';
$r.='</div>';
return $r;

16
include/class/acc_ledger_sale.class.php
View file

@ -1282,14 +1282,16 @@ EOF;
$r.='<tr>'.td($other_tax_label).td(hb($other_tax_amount),'class="num"');
}
if ( $other_tax_amount!="") {$tot=bcadd($tot,$other_tax_amount,2);}
$r.='<tr>'.td(_('Total TVAC')).td(hb($tot),'class="num"');
$r.='<tr>'.td(_('Total TVAC')).td(hb($tot),'class="num"').'</tr>';
$r.='</table>';
} else {
$r.='<table>';
if ( ! empty($other_tax_label) ) {
$r.='<tr>'.td($other_tax_label).td(hb($other_tax_amount),'class="num"');
}
if ( $other_tax_amount!="") {$tot=bcadd($tot,$other_tax_amount,2);}
$r.='<br>Total '.hb($tot);
$r.='<tr>'.td(_('Total ')).td(hb($tot),'class="num"');
$r.='</table>';
}
$r.='</div>';
@ -1374,13 +1376,13 @@ EOF;
*/
public function extra_info() {
$r = '<div id="facturation_div_id" style="display:flex;height:185px;height:10rem">';
$r = '<div id="facturation_div_id" style="">';
// check for upload piece
$file = new IFile();
$file->table = 0;
$file->setAlertOnSize(true);
$r.='<p class="decale">';
$r.='<h3 class="title">'._("Facture").'</h3>';
// add a receipt
$r.=_("Ajoutez une pièce justificative ");
$r.=$file->input("pj", "");
@ -1398,11 +1400,15 @@ EOF;
" union select -2,'"._("Z - Facture PDF Standard")."' ".
" order by 2");
$r.=$doc_gen->input() . '<br>';
$r.='<h3 class="title">'._("Documents supplémentaires").'</h3>';
// add a receipt
$r.=$this->input_supplemental_document();
$r.='<br>';
$obj = new IText();
$obj->size=50;
$r.='<p>';
$r.=_('Numero de bon de commande') . $obj->input('bon_comm') . '<br>';
$r.=_('Communication') . $obj->input('other_info') . '<br>';
$r.='</p>';
$r.='</div>';