';
@@ -939,6 +950,7 @@ if ($resql) {
}
}
+ $morehtml = '';
/*$morehtml = '';
$morehtml .= ' "; // ' Page ';
$morehtml .= '';
@@ -1160,7 +1172,6 @@ if ($resql) {
// Loop on each record
$sign = 1;
- $totalarray = array();
while ($i < min($num, $limit)) {
$objp = $db->fetch_object($resql);
$links = $bankaccountstatic->get_url($objp->rowid);
@@ -1296,18 +1307,10 @@ if ($resql) {
$backgroundcolor = "class='oddeven'";
} else {
if ($objp->amount < 0) {
- if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
- $color = '#fca955';
- } else {
- $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
- }
+ $color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
$backgroundcolor = 'style="background: '.$color.';"';
} else {
- if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
- $color = '#7fdb86';
- } else {
- $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
- }
+ $color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
$backgroundcolor = 'style="background: '.$color.';"';
}
}
@@ -1333,7 +1336,7 @@ if ($resql) {
$titletoshow = '';
$reg = array();
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
- if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
+ if (!empty($reg[1]) && $langs->trans($reg[1]) != $reg[1]) {
$labeltoshow = $langs->trans($reg[1]);
} else {
if ($objp->label == '(payment_salary)') {
@@ -1357,6 +1360,7 @@ if ($resql) {
} elseif ($links[$key]['type'] == 'payment') {
$paymentstatic->id = $links[$key]['url_id'];
$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+ $paymentstatic->date = $db->jdate($objp->do);
print ' '.$paymentstatic->getNomUrl(2);
} elseif ($links[$key]['type'] == 'payment_supplier') {
$paymentsupplierstatic->id = $links[$key]['url_id'];
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 5567678c366..f86c50f31cc 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -63,6 +63,7 @@ $cancel = GETPOST('cancel', 'alpha');
// Security check
$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+$socid = 0;
if ($user->socid) {
$socid = $user->socid;
}
@@ -568,6 +569,12 @@ if ($result) {
// Bank line
print '
| '.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).' | ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
+ $arrayselected = array();
+ $c = new Categorie($db);
+ $cats = $c->containing($bankline->id, Categorie::TYPE_BANK_LINE);
+ foreach ($cats as $cat) {
+ $arrayselected[] = $cat->id;
+ }
print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
print " |
";
}