Fix look and feel v10
This commit is contained in:
parent
05063016e8
commit
cafb3840b7
@ -961,6 +961,7 @@ if ($resql)
|
|||||||
$balancebefore = 0; // For balance
|
$balancebefore = 0; // For balance
|
||||||
$balancecalculated = false;
|
$balancecalculated = false;
|
||||||
$posconciliatecol = 0;
|
$posconciliatecol = 0;
|
||||||
|
$cachebankaccount = array();
|
||||||
|
|
||||||
// Loop on each record
|
// Loop on each record
|
||||||
$sign = 1;
|
$sign = 1;
|
||||||
|
|||||||
@ -44,7 +44,7 @@ class PaymentVarious extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
|
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
|
||||||
*/
|
*/
|
||||||
public $picto = 'bill';
|
public $picto = 'payment';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int ID
|
* @var int ID
|
||||||
|
|||||||
@ -395,7 +395,7 @@ if ($id)
|
|||||||
{
|
{
|
||||||
$head=various_payment_prepare_head($object);
|
$head=various_payment_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, 'payment');
|
dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
|
||||||
|
|
||||||
$morehtmlref='<div class="refidno">';
|
$morehtmlref='<div class="refidno">';
|
||||||
// Project
|
// Project
|
||||||
|
|||||||
@ -82,7 +82,7 @@ if ($object->id)
|
|||||||
{
|
{
|
||||||
$head=various_payment_prepare_head($object);
|
$head=various_payment_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'documents', $langs->trans("VariousPayment"), -1, 'payment');
|
dol_fiche_head($head, 'documents', $langs->trans("VariousPayment"), -1, $object->picto);
|
||||||
|
|
||||||
$morehtmlref='<div class="refidno">';
|
$morehtmlref='<div class="refidno">';
|
||||||
// Project
|
// Project
|
||||||
|
|||||||
@ -50,7 +50,7 @@ $object->info($id);
|
|||||||
|
|
||||||
$head = various_payment_prepare_head($object);
|
$head = various_payment_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, 'payment');
|
dol_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, $object->picto);
|
||||||
|
|
||||||
|
|
||||||
$morehtmlref='<div class="refidno">';
|
$morehtmlref='<div class="refidno">';
|
||||||
|
|||||||
@ -602,6 +602,8 @@ if ($id > 0)
|
|||||||
|
|
||||||
$num = $db->num_rows($resql);
|
$num = $db->num_rows($resql);
|
||||||
$i = 0; $total = 0;
|
$i = 0; $total = 0;
|
||||||
|
|
||||||
|
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||||
print '<table class="noborder paymenttable">';
|
print '<table class="noborder paymenttable">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("RefPayment").'</td>';
|
print '<td>'.$langs->trans("RefPayment").'</td>';
|
||||||
@ -668,6 +670,8 @@ if ($id > 0)
|
|||||||
print '<td class="right'.($resteapayer?' amountremaintopay':(' '.$cssforamountpaymentcomplete)).'">'.price($resteapayer)."</td></tr>\n";
|
print '<td class="right'.($resteapayer?' amountremaintopay':(' '.$cssforamountpaymentcomplete)).'">'.price($resteapayer)."</td></tr>\n";
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
|
print '</div>';
|
||||||
|
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -302,7 +302,7 @@ if ($action == 'create')
|
|||||||
// Rate
|
// Rate
|
||||||
print '<tr><td class="fieldrequired">'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . dol_escape_htmltag(GETPOST("rate")) . '"> %</td></tr>';
|
print '<tr><td class="fieldrequired">'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . dol_escape_htmltag(GETPOST("rate")) . '"> %</td></tr>';
|
||||||
|
|
||||||
// insurance amount
|
// Insurance amount
|
||||||
print '<tr><td>'.$langs->trans("Insurance").'</td><td><input name="insurance_amount" size="10" value="' . dol_escape_htmltag(GETPOST("insurance_amount")) . '" placeholder="'.$langs->trans('Amount').'"></td></tr>';
|
print '<tr><td>'.$langs->trans("Insurance").'</td><td><input name="insurance_amount" size="10" value="' . dol_escape_htmltag(GETPOST("insurance_amount")) . '" placeholder="'.$langs->trans('Amount').'"></td></tr>';
|
||||||
|
|
||||||
// Project
|
// Project
|
||||||
@ -707,7 +707,9 @@ if ($id > 0)
|
|||||||
$total_insurance = 0;
|
$total_insurance = 0;
|
||||||
$total_interest = 0;
|
$total_interest = 0;
|
||||||
$total_capital = 0;
|
$total_capital = 0;
|
||||||
print '<table class="noborder">';
|
|
||||||
|
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||||
|
print '<table class="noborder paymenttable">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("RefPayment").'</td>';
|
print '<td>'.$langs->trans("RefPayment").'</td>';
|
||||||
print '<td>'.$langs->trans("Date").'</td>';
|
print '<td>'.$langs->trans("Date").'</td>';
|
||||||
@ -748,6 +750,8 @@ if ($id > 0)
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
print "</table>";
|
print "</table>";
|
||||||
|
print '</div>';
|
||||||
|
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -141,7 +141,7 @@ if ($object->id > 0)
|
|||||||
$head = myobjectPrepareHead($object);
|
$head = myobjectPrepareHead($object);
|
||||||
|
|
||||||
|
|
||||||
dol_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'myobject@mymodule');
|
dol_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, $object->picto);
|
||||||
|
|
||||||
// Object card
|
// Object card
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
|
|||||||
@ -248,7 +248,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
$res = $object->fetch_optionals();
|
$res = $object->fetch_optionals();
|
||||||
|
|
||||||
$head = myobjectPrepareHead($object);
|
$head = myobjectPrepareHead($object);
|
||||||
dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
|
dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto);
|
||||||
|
|
||||||
$formconfirm = '';
|
$formconfirm = '';
|
||||||
|
|
||||||
|
|||||||
@ -110,7 +110,7 @@ if ($object->id)
|
|||||||
*/
|
*/
|
||||||
$head = myobjectPrepareHead($object);
|
$head = myobjectPrepareHead($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule');
|
dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
|
||||||
|
|
||||||
|
|
||||||
// Build file list
|
// Build file list
|
||||||
|
|||||||
@ -95,7 +95,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
|
|
||||||
$head = myobjectPrepareHead($object);
|
$head = myobjectPrepareHead($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'note', $langs->trans("MyObject"), -1, 'myobject@mymodule');
|
dol_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto);
|
||||||
|
|
||||||
// Object card
|
// Object card
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user