diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index cf059f1cdf1..444927ea27d 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -961,6 +961,7 @@ if ($resql)
$balancebefore = 0; // For balance
$balancecalculated = false;
$posconciliatecol = 0;
+ $cachebankaccount = array();
// Loop on each record
$sign = 1;
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 5a7ac205fe5..0c9df2c8b63 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -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
*/
- public $picto = 'bill';
+ public $picto = 'payment';
/**
* @var int ID
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index a1c1d8ae349..6990fb34106 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -395,7 +395,7 @@ if ($id)
{
$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='
';
// Project
@@ -479,7 +479,7 @@ if ($id)
print '
';
print $object->subledger_account;
print ' | ';
-
+
if (! empty($conf->banque->enabled))
{
if ($object->fk_account > 0)
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 02c3b331544..3d37b7e7de6 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -82,7 +82,7 @@ if ($object->id)
{
$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='
';
// Project
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 9afae281f78..33fd53b602b 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -50,7 +50,7 @@ $object->info($id);
$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='
';
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 12acff2ee4d..3ac50a65e9a 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -602,6 +602,8 @@ if ($id > 0)
$num = $db->num_rows($resql);
$i = 0; $total = 0;
+
+ print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
';
print '';
print '| '.$langs->trans("RefPayment").' | ';
@@ -668,6 +670,8 @@ if ($id > 0)
print ''.price($resteapayer)." |
\n";
print "
";
+ print '
';
+
$db->free($resql);
}
else
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index bb2b69f63f2..e826e86ea57 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -302,7 +302,7 @@ if ($action == 'create')
// Rate
print '
| '.$langs->trans("Rate").' | % |
';
- // insurance amount
+ // Insurance amount
print '
| '.$langs->trans("Insurance").' | |
';
// Project
@@ -707,7 +707,9 @@ if ($id > 0)
$total_insurance = 0;
$total_interest = 0;
$total_capital = 0;
- print '
';
+
+ print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ print '
';
print '';
print '| '.$langs->trans("RefPayment").' | ';
print ''.$langs->trans("Date").' | ';
@@ -748,6 +750,8 @@ if ($id > 0)
print '
';
}
print "
";
+ print '
';
+
$db->free($resql);
}
else
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index b536b264952..1f693282e5f 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -141,7 +141,7 @@ if ($object->id > 0)
$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
// ------------------------------------------------------------
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 3543722670d..1fc376dfe17 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -248,7 +248,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$res = $object->fetch_optionals();
$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 = '';
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 55fcdc6f9eb..6c956826e4c 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -110,7 +110,7 @@ if ($object->id)
*/
$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
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 0cbf4c40d8b..6ebe37b674a 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -95,7 +95,7 @@ if ($id > 0 || ! empty($ref))
$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
// ------------------------------------------------------------