';
print '';
$paymentstatic->id=$objp->rowid;
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 88414e45566..a6d99cbdaad 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -85,7 +85,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
* View
*/
-llxHeader();
+llxHeader('', $langs->trans("Salaries"));
$form = new Form($db);
$salstatic = new PaymentSalary($db);
@@ -155,18 +155,7 @@ if ($result)
print '';
print ' '."\n";
- print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
- if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
- print " \n";
-
- print '';
+ print ' ';
// Ref
print '| ';
print '';
@@ -198,6 +187,17 @@ if ($result)
print $searchpitco;
print ' | ';
+ print ' ';
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+ if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+ print " \n";
+
print "\n";
while ($i < min($num,$limit))
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 66d6a65dd56..706c75fab07 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -177,18 +177,7 @@ if ($resql)
print '';
print ' '."\n";
- print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"periode","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
- print " \n";
-
- print '';
+ print ' ';
// Ref
print '| ';
print '';
@@ -218,14 +207,24 @@ if ($resql)
print ' | ';
print " \n";
+ print '';
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"periode","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+ print " \n";
+
$i=0;
$totalarray=array();
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($resql);
- $var = !$var;
- print "";
+ print ' ';
// Ref
print '';
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 1a45b8a91c7..15a6df0a717 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -157,19 +157,10 @@ if ($result)
print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
+ print '';
print ' ';
- print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DateValue"),$_SERVER["PHP_SELF"],"dv","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
- if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
- print " \n";
- print '';
+ print ' ';
print ' | ';
print ' | ';
print ' | ';
@@ -196,10 +187,20 @@ if ($result)
print '';
print " \n";
+ print '';
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DateValue"),$_SERVER["PHP_SELF"],"dv","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+ if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+ print " \n";
+
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($result);
- $var=!$var;
if ($obj->payment_code <> '')
{
@@ -210,7 +211,7 @@ if ($result)
$type = ' | ';
}
- print "";
+ print ' ';
$tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid;
@@ -254,7 +255,8 @@ if ($result)
print "| | ";
print " ";
-
+ print ' ';
+
print '';
$db->free($result);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 99b27c20822..a01d54f0bef 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1634,7 +1634,7 @@ class Form
{
if ($value['id'] == $ownerid) continue;
$userstatic->fetch($value['id']);
- $out.=$userstatic->getNomUrl(1);
+ $out.=$userstatic->getNomUrl(-1);
if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; }
if ($nbassignetouser > 1 && $action != 'view') $out.=' ';
//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index d8a7cb1b34c..fd80124e7df 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -93,11 +93,15 @@ print '
padding: 1em 15px 1em 40px;
}
li.lilevel1 {
- padding: 1em 15px 0.5em 20px;
- border-top: 1px solid #ccc;
+ padding: 1em 15px 0.5em 40px;
+ border-top: 1px solid #aaa;
margin-right: 20px;
border-right: 0px ! important;
}
+ li.lilevel1:first-child {
+ margin-right: 0px;
+ margin-left: 0px;
+ }
li.lilevel1 a {
padding-bottom: 5px;
}
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index bbe9febd481..e6e154220b8 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -763,7 +763,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
while ($i < $num)
{
$obj = $db->fetch_object($result);
- $var = !$var;
$contactstatic->id = $obj->rowid;
$contactstatic->ref = $obj->ref;
@@ -789,7 +788,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
$contactstatic->setGenderFromCivility();
- print " | ";
+ print " ";
// Photo - Name
print '';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6028f9bcabc..e51541272bd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2038,12 +2038,12 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint=0, $charfornl
if ($showgmap)
{
$url=dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id,1);
- $out.=' ';
+ $out.=' ';
}
if ($showomap)
{
$url=dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id,1);
- $out.=' ';
+ $out.=' ';
}
}
}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3874afb5198..7207f8f2189 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1005,18 +1005,25 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$i = 0;
if ($numr > 0)
- while ($i < $numr)
{
- $objp = $db->fetch_object($resql);
-
- if ($objp->nature == 1) $nature="sells";
- if ($objp->nature == 2) $nature="purchases";
- if ($objp->nature == 3) $nature="bank";
- if ($objp->nature == 4) $nature="various";
- if ($objp->nature == 9) $nature="hasnew";
-
- if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
- $i++;
+ while ($i < $numr)
+ {
+ $objp = $db->fetch_object($resql);
+
+ if ($objp->nature == 1) $nature="sells";
+ if ($objp->nature == 2) $nature="purchases";
+ if ($objp->nature == 3) $nature="bank";
+ if ($objp->nature == 4) $nature="various";
+ if ($objp->nature == 9) $nature="hasnew";
+
+ if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+ $i++;
+ }
+ }
+ else
+ {
+ // Should not happend. Entries are added
+ $newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
}
}
else dol_print_error($db);
@@ -1075,7 +1082,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// Fiscal year
if ($conf->global->MAIN_FEATURES_LEVEL > 0) // Not yet used. In a future will lock some periods.
{
- if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+ if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_periods", $langs->trans("FiscalPeriod"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
}
}
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index d925573b859..1e08cbae121 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -160,23 +160,8 @@ if ($resql)
print '';
print ' '."\n";
- print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","", $param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","", $param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","", $param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","", $param,'align="center"',$sortfield,$sortorder);
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_projet","", $param,"",$sortfield,$sortorder);
- }
- print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre('');
- print " \n";
-
// Filters lines
- print '';
+ print ' ';
print '| ';
print '';
print ' | ';
@@ -203,12 +188,26 @@ if ($resql)
print '';
print " \n";
- $var=True;
+ print '';
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","", $param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","", $param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","", $param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","", $param,'align="center"',$sortfield,$sortorder);
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_projet","", $param,"",$sortfield,$sortorder);
+ }
+ print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre('');
+ print " \n";
+
while ($i < min($num,$limit))
{
$objp = $db->fetch_object($resql);
- $var=!$var;
- print "";
+
+ print ' ';
$donationstatic->id=$objp->rowid;
$donationstatic->ref=$objp->rowid;
$donationstatic->lastname=$objp->lastname;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 8d55404659e..952d1e13dbd 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -700,20 +700,8 @@ if (empty($action))
print '';
print ' '."\n";
- print '';
- print_liste_field_titre($langs->trans('RefPayment'),$_SERVER["PHP_SELF"],'p.rowid','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$param,'align="right"',$sortfield,$sortorder);
- //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre('');
- print " \n";
-
// Lines for filters fields
- print '';
+ print ' ';
print '| ';
print '';
print ' | ';
@@ -739,11 +727,23 @@ if (empty($action))
print '';
print " \n";
+ print '';
+ print_liste_field_titre($langs->trans('RefPayment'),$_SERVER["PHP_SELF"],'p.rowid','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$param,'align="right"',$sortfield,$sortorder);
+ //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre('');
+ print " \n";
+
while ($i < min($num,$limit))
{
$objp = $db->fetch_object($resql);
$var=!$var;
- print '';
+ print ' ';
// Ref payment
print '| '.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.' | ';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 4b1384aeedb..e063734cc51 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -98,13 +98,30 @@ if (empty($reshook))
$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
$dateend = dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
$capital = price2num(GETPOST('capital'));
-
+ $rate = GETPOST('rate');
+
if (! $capital)
{
+ $error++; $action = 'create';
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
- $action = 'create';
}
- else
+ if (! $datestart)
+ {
+ $error++; $action = 'create';
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateStart")), null, 'errors');
+ }
+ if (! $dateend)
+ {
+ $error++; $action = 'create';
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateEnd")), null, 'errors');
+ }
+ if ($rate == '')
+ {
+ $error++; $action = 'create';
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Rate")), null, 'errors');
+ }
+
+ if (! $error)
{
$object->label = GETPOST('label');
$object->fk_bank = GETPOST('accountid');
@@ -112,7 +129,7 @@ if (empty($reshook))
$object->datestart = $datestart;
$object->dateend = $dateend;
$object->nbterm = GETPOST('nbterm');
- $object->rate = GETPOST('rate');
+ $object->rate = $rate;
$object->note_private = GETPOST('note_private');
$object->note_public = GETPOST('note_public');
$object->fk_project = GETPOST('fk_project');
@@ -128,7 +145,9 @@ if (empty($reshook))
$id=$object->create($user);
if ($id <= 0)
{
+ $error++;
setEventMessages($object->error, $object->errors, 'errors');
+ $action = 'create';
}
}
}
@@ -263,21 +282,21 @@ if ($action == 'create')
// Date Start
print " ";
- print '| '.$langs->trans("DateStart").' | ';
+ print ' | '.$langs->trans("DateStart").' | ';
print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1,1);
print ' | ';
// Date End
print "";
- print '| '.$langs->trans("DateEnd").' | ';
+ print ' | '.$langs->trans("DateEnd").' | ';
print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1,1);
print ' | ';
// Number of terms
- print '| '.$langs->trans("Nbterms").' | | ';
+ print '| '.$langs->trans("Nbterms").' | | ';
// Rate
- print '| '.$langs->trans("Rate").' | % | ';
+ print '| '.$langs->trans("Rate").' | % | ';
// Project
if (! empty($conf->projet->enabled))
@@ -296,8 +315,8 @@ if ($action == 'create')
// Note Private
print '';
- print '| '.$langs->trans('NotePrivate').' | ';
- print '';
+ print ' | '.$langs->trans('NotePrivate').' | ';
+ print '';
$doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
print $doleditor->Create(1);
@@ -306,8 +325,8 @@ if ($action == 'create')
// Note Public
print ' | ';
- print '| '.$langs->trans('NotePublic').' | ';
- print '';
+ print ' | '.$langs->trans('NotePublic').' | ';
+ print '';
$doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
print $doleditor->Create(1);
print ' | ';
@@ -463,7 +482,7 @@ if ($id > 0)
}
// Date start
- print "| ".$langs->trans("DateStart")." | ";
+ print ' | '.$langs->trans("DateStart")." | ";
print "";
if ($action == 'edit')
{
@@ -476,7 +495,7 @@ if ($id > 0)
print " | ";
// Date end
- print "| ".$langs->trans("DateEnd")." | ";
+ print ' | '.$langs->trans("DateEnd")." | ";
print "";
if ($action == 'edit')
{
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index bb51cf3b8f1..d9d4da6fb20 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -129,7 +129,7 @@ class Loan extends CommonObject
*/
function create($user)
{
- global $conf;
+ global $conf, $langs;
$error=0;
@@ -155,7 +155,7 @@ class Loan extends CommonObject
}
if (($conf->accounting->enabled) && empty($this->account_capital) && empty($this->account_insurance) && empty($this->account_interest))
{
- $this->error="ErrorAccountingParameter";
+ $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Accounting"));
return -2;
}
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 575be293de0..3e0654ace3f 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -85,7 +85,7 @@ if ($object->id)
$head = loan_prepare_head($object);
- dol_fiche_head($head, 'documents', $langs->trans("Loan"), 0, 'bill');
+ dol_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill');
$morehtmlref='';
// Ref loan
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index d2a60973a7f..fdc8cf67073 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -124,17 +124,8 @@ if ($resql)
print ' ';
print ' '."\n";
- print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("LoanCapital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre('');
- print " \n";
-
// Filters lines
- print '';
+ print ' ';
print ' | ';
print ' | ';
print ' | ';
@@ -146,6 +137,15 @@ if ($resql)
print '';
print ' ';
+ print '';
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("LoanCapital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre('');
+ print " \n";
+
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($resql);
@@ -154,7 +154,7 @@ if ($resql)
$loan_static->label = $obj->label;
$var = !$var;
- print "";
+ print ' ';
// Ref
print '| '.$loan_static->getNomUrl(1, 42).' | ';
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 87bd25fbe3b..f61b9312432 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -53,7 +53,7 @@ $object->info($id);
$head = loan_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("Loan"), 0, 'bill');
+dol_fiche_head($head, 'info', $langs->trans("Loan"), -1, 'bill');
$morehtmlref='';
// Ref loan
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index b03880a832e..e28320470a2 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -70,7 +70,7 @@ if ($id > 0)
$head = loan_prepare_head($object);
- dol_fiche_head($head, 'note', $langs->trans("Loan"), 0, 'bill');
+ dol_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
$morehtmlref=' ';
// Ref loan
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 913bcac5f30..e270cc3b030 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -590,7 +590,8 @@ div.myavailability {
.checkallactions {
vertical-align: text-bottom;
margin-top: 6px;
- margin-left: 4px;
+ margin-left: 4px; /* left must be same than right to keep checkbox centered */
+ margin-right: 4px; /* left must be same than right to keep checkbox centered */
}
.selectlimit, .marginrightonly {
margin-right: 10px !important;
@@ -1736,7 +1737,7 @@ div.vmenu, td.vmenu {
}
#menu_contenu_logo { padding-top: 0; }
.companylogo { }
-.searchform { padding-top: 4px; }
+.searchform { padding-top: 10px; }
a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { white-space: nowrap; font-size:px; font-family: ; text-align: ; font-weight: bold; }
font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #aaa; margin-left: 4px; }
@@ -2434,18 +2435,7 @@ div.pagination li span:focus {
-moz-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
-webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
- /*
- color: #000;
- background-color: #eee;
- border-color: #ccc;
-
- background-image: -moz-linear-gradient(top, #eee, #ddd);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), to(#ddd));
- background-image: -webkit-linear-gradient(top, #eee, #ddd);
- background-image: -o-linear-gradient(top, #eee, #ddd);
- background-image: linear-gradient(to bottom, #eee, #ddd);
- background-repeat: repeat-x;
-*/
+ padding-top: 8px;
}
div.pagination li .active a,
div.pagination li .active span,
@@ -2622,7 +2612,7 @@ tr.liste_titre_topborder td {
.liste_titre td a.notasortlink:hover {
background: transparent;
}
-tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
+tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
border-bottom: 1px solid #ddd;
}
@@ -4316,6 +4306,7 @@ ul.ulmenu {
}
.alilevel0 {
color: rgb() !important;
+ background: #f8f8f8
}
.ulmenu {
box-shadow: none !important;
@@ -4339,24 +4330,9 @@ ul.ulmenu {
color: # !important;
text-shadow: none !important;
}
-/*
-.ui-btn-up-c {
- background: transparent;
-}
-*/
div.tabsElem a.tab {
background: transparent;
}
-
-/*.ui-controlgroup-horizontal .ui-btn.ui-first-child {
--webkit-border-top-left-radius: 6px;
-border-top-left-radius: 6px;
-}
-.ui-controlgroup-horizontal .ui-btn.ui-last-child {
--webkit-border-top-right-radius: 6px;
-border-top-right-radius: 6px;
-}*/
-
.alilevel1 {
color: rgb() !important;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 947b8a57168..6885bfad144 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1768,7 +1768,7 @@ div.vmenu, td.vmenu {
}
#menu_contenu_logo { padding-right: 4px; }
.companylogo { padding-top: 4px; }
-.searchform { padding-top: 8px; }
+.searchform { padding-top: 10px; }
a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { white-space: nowrap; font-size:px; font-family: ; text-align: ; font-weight: bold; }
font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #aaa; margin-left: 4px; }
@@ -2447,6 +2447,7 @@ div.pagination li {
div.pagination li.pagination a,
div.pagination li.pagination span {
padding: 6px 12px;
+ padding-top: 8px;
line-height: 1.42857143;
color: #000;
text-decoration: none;
@@ -2486,9 +2487,10 @@ div.pagination li a:hover,
div.pagination li span:hover,
div.pagination li a:focus,
div.pagination li span:focus {
- color: #000;
- background-color: #eee;
- border-color: #ddd;
+ color: #000;
+ background-color: #eee;
+ border-color: #ddd;
+ padding-top: 8px;
}
div.pagination li .active a,
div.pagination li .active span,
@@ -2700,7 +2702,7 @@ tr.liste_titre_topborder td {
.liste_titre td a.notasortlink:hover {
background: transparent;
}
-tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
+tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
border-bottom: 1px solid rgb();
}
| | |