diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 6f5dc35e3..6883b0842 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -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 + } \ No newline at end of file diff --git a/include/XMLDocument/xml_reader.class.php b/include/XMLDocument/xml_reader.class.php index 45063cbc5..30b8f8fb4 100644 --- a/include/XMLDocument/xml_reader.class.php +++ b/include/XMLDocument/xml_reader.class.php @@ -397,8 +397,6 @@ abstract class XML_Reader /** * * @return array - * @TODODNY - * Implémenter les allowances */ function get_info(): array { diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php index 2ba56b493..6dbf25fcb 100644 --- a/include/class/acc_ledger_purchase.class.php +++ b/include/class/acc_ledger_purchase.class.php @@ -1988,7 +1988,6 @@ EOF; } $r.=''; - $r.='

'; if ( $g_parameter->MY_ANALYTIC!='nu' && !$p_summary) // use of AA $r.=''; @@ -2125,6 +2124,7 @@ EOF; $file=new IFile(); $file->setAlertOnSize(true); $file->table=0; + $r.='

'._("Facture").'

'; $r.=_("Ajoutez une pièce justificative "); $r.=$file->input("pj",""); @@ -2141,11 +2141,13 @@ EOF; $r.=$doc_gen->input().'
'; } $r.='

'; + $r.='

'._("Documents supplémentaires").'

'; $r.=$this->input_supplemental_document(); $r.='

'; $obj=new IText(); + $obj->size=50; $r.=_('Numero de bon de commande : ').$obj->input('bon_comm').'
'; - $r.=_('Autre information : ').$obj->input('other_info').'
'; + $r.=_('Communication').$obj->input('other_info').'
'; $r.='

'; $r.=''; return $r; diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php index 6a6a7b265..5ba62f1c4 100644 --- a/include/class/acc_ledger_sale.class.php +++ b/include/class/acc_ledger_sale.class.php @@ -1282,14 +1282,16 @@ EOF; $r.=''.td($other_tax_label).td(hb($other_tax_amount),'class="num"'); } if ( $other_tax_amount!="") {$tot=bcadd($tot,$other_tax_amount,2);} - $r.=''.td(_('Total TVAC')).td(hb($tot),'class="num"'); + $r.=''.td(_('Total TVAC')).td(hb($tot),'class="num"').''; $r.=''; } else { + $r.=''; if ( ! empty($other_tax_label) ) { $r.=''.td($other_tax_label).td(hb($other_tax_amount),'class="num"'); } if ( $other_tax_amount!="") {$tot=bcadd($tot,$other_tax_amount,2);} - $r.='
Total '.hb($tot); + $r.=''.td(_('Total ')).td(hb($tot),'class="num"'); + $r.='
'; } $r.=''; @@ -1374,13 +1376,13 @@ EOF; */ public function extra_info() { - $r = '
'; + $r = '
'; // check for upload piece $file = new IFile(); $file->table = 0; $file->setAlertOnSize(true); - $r.='

'; + $r.='

'._("Facture").'

'; // 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() . '
'; + $r.='

'._("Documents supplémentaires").'

'; + // add a receipt $r.=$this->input_supplemental_document(); - $r.='
'; $obj = new IText(); + $obj->size=50; + $r.='

'; $r.=_('Numero de bon de commande') . $obj->input('bon_comm') . '
'; + $r.=_('Communication') . $obj->input('other_info') . '
'; $r.='

'; $r.='
';