Look and feel v6

This commit is contained in:
Laurent Destailleur 2017-10-13 20:04:11 +02:00
parent 1f2555d7c6
commit 5092c41d94
3 changed files with 16 additions and 13 deletions

View File

@ -179,7 +179,6 @@ class FormActions
if ($typeelement == 'invoice') $title=$langs->trans('ActionsOnBill'); if ($typeelement == 'invoice') $title=$langs->trans('ActionsOnBill');
elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill'); elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
elseif ($typeelement == 'propal') $title=$langs->trans('ActionsOnPropal'); elseif ($typeelement == 'propal') $title=$langs->trans('ActionsOnPropal');
elseif ($typeelement == 'supplier_payment') $title=$langs->trans('ActionsOnSupplierPayment');
elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal'); elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
elseif ($typeelement == 'order') $title=$langs->trans('ActionsOnOrder'); elseif ($typeelement == 'order') $title=$langs->trans('ActionsOnOrder');
elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') $title=$langs->trans('ActionsOnOrder'); elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') $title=$langs->trans('ActionsOnOrder');

View File

@ -367,11 +367,10 @@ if ($result > 0)
} }
print '</div>'; print '</div>';
/*
print '<div class="fichecenter"><div class="fichehalfleft">'; print '<div class="fichecenter"><div class="fichehalfleft">';
/* // Documents generes
* Documents generes
*/
$ref=dol_sanitizeFileName($object->ref); $ref=dol_sanitizeFileName($object->ref);
$filedir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref); $filedir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id; $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
@ -393,7 +392,7 @@ if ($result > 0)
print '</div></div></div>'; print '</div></div></div>';
//print '</td></tr></table>'; //print '</td></tr></table>';
*/
} }
else else
{ {

View File

@ -32,9 +32,12 @@ $langs->load("bills");
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("companies"); $langs->load("companies");
$paiement = new PaiementFourn($db); $id = GETPOST('id','int');
$paiement->fetch($_GET["id"], $user);
$paiement->info($_GET["id"]); $object = new PaiementFourn($db);
$object->fetch($id);
$object->info($id);
/* /*
* View * View
@ -42,15 +45,17 @@ $paiement->info($_GET["id"]);
llxHeader(); llxHeader();
$head = payment_supplier_prepare_head($paiement); $head = payment_supplier_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'payment'); dol_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'payment');
print '<table width="100%"><tr><td>'; dol_banner_tab($object, 'id', $linkback, -1, 'rowid', 'ref');
dol_print_object_info($paiement);
print '</td></tr></table>';
print '</div>'; dol_fiche_end();
print '<table width="100%"><tr><td>';
dol_print_object_info($object);
print '</td></tr></table>';
llxFooter(); llxFooter();