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.='';
$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.='
';
$r.=_('Numero de bon de commande') . $obj->input('bon_comm') . '
';
+
$r.=_('Communication') . $obj->input('other_info') . '
';
$r.='