diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 31ccfaaae9d..ea85bb3fd01 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1217,11 +1217,15 @@ else
{
$langs->load('projects');
print '
';
+
print '';
+
print ' | ';
if ($_GET['action'] == 'classer')
{
@@ -1653,7 +1657,7 @@ else
$html->show_documents('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed);
/*
- * Propales
+ * Propales rattachées
*/
$sql = 'SELECT '.$db->pdate('p.datep').' as dp, p.price, p.ref, p.rowid as propalid';
$sql .= ' FROM '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'fa_pr as fp WHERE fp.fk_propal = p.rowid AND fp.fk_facture = '.$fac->id;
@@ -1695,7 +1699,6 @@ else
{
dolibarr_print_error($db);
}
- print ' | ';
/*
* Commandes rattachées
@@ -1743,6 +1746,7 @@ else
dolibarr_print_error($db);
}
}
+
print ' | ';
/*
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index acd76de0b43..8e6db6bb2d5 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -267,6 +267,12 @@ elseif (file_exists($fileimagebis))
print '';
+
+// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+print ' ';
+print ' ';
+
+
$db->close();
llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 45506a5b5d3..dc25988d225 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -74,6 +74,7 @@ $head[$h][1] = $langs->trans("Info");
$hselected = $h;
$h++;
+
dolibarr_fiche_head($head, $hselected, $langs->trans("Bill")." : $fac->ref");
@@ -83,6 +84,10 @@ print ' | ';
print '';
+// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+print '';
+print '
';
+
$db->close();
llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/html.formmail.class.php b/htdocs/html.formmail.class.php
index 7dfe1975e11..0e4fc346709 100644
--- a/htdocs/html.formmail.class.php
+++ b/htdocs/html.formmail.class.php
@@ -202,7 +202,7 @@ class FormMail
print "";
print "| ".$langs->trans("MailFile")." | ";
print "";
- print "trans("Upload")."\"/>";
+ print "trans("Upload")."\"/>";
print " |
\n";
}
@@ -236,7 +236,7 @@ class FormMail
print "\n";
}
- print "| trans("SendMail")."\"> |
\n";
+ print "| trans("SendMail")."\"> |
\n";
print "\n";
print "\n";
diff --git a/htdocs/includes/menus/barre_left/default.php b/htdocs/includes/menus/barre_left/default.php
index f8745035081..91d7591ae28 100644
--- a/htdocs/includes/menus/barre_left/default.php
+++ b/htdocs/includes/menus/barre_left/default.php
@@ -89,7 +89,7 @@ class MenuLeft {
}
if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {
- print '';
+ print "\n";
}
}
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index 62da20f2fce..d1da8053089 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -272,12 +272,12 @@ class MenuLeft {
if ($conf->facture->enabled)
{
$langs->load("bills");
- $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),1,$user->rights->facture->lire);
+ $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),1,$user->rights->fournisseur->facture->lire);
if ($user->societe_id == 0)
{
- if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"),2,$user->rights->facture->creer);
+ if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"),2,$user->rights->fournisseur->facture->creer);
}
- if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"),2,$user->rights->facture->lire);
+ if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"),2,$user->rights->fournisseur->facture->lire);
}
}
@@ -492,14 +492,14 @@ class MenuLeft {
if ($conf->facture->enabled)
{
$langs->load("bills");
- $newmenu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"), 0, $user->rights->facture->lire);
+ $newmenu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"), 0, $user->rights->fournisseur->facture->lire);
if ($user->societe_id == 0)
{
- $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->facture->creer);
+ $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer);
}
- $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"), 1, $user->rights->facture->lire);
+ $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire);
}
if ($conf->commande->enabled)
@@ -661,7 +661,7 @@ class MenuLeft {
}
if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {
- print '';
+ print "\n";
}
}
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index ebb7995e6f2..68455effcb3 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -675,7 +675,7 @@ class MenuLeft {
}
if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {
- print '';
+ print "\n";
}
}
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 5cdc18f3c3f..87b8f33cda8 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -64,7 +64,8 @@ DraftBills=Draft invoices
Unpayed=Unpayed
ConfirmDeleteBill=Are you sure you want to delete this invoice ?
ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ?
-ConfirmCancelBill=Are you sure you want to cancel this invoice ?
+ConfirmClassifyPayedBill=Are you sure you want to change invoice %s to status payed ?
+ConfirmCancelBill=Are you sure you want to cancel invoice %s ?
ValidateBill=Validate invoice
GlobalDiscount=Global discount
NumberOfBills=Nb of invoices
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index dddce54edf1..103e65a55a7 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -64,7 +64,8 @@ DraftBills=Factures brouillons
Unpayed=Impayées
ConfirmDeleteBill=Êtes-vous sûr de vouloir supprimer cette facture ?
ConfirmValidateBill=Êtes-vous sûr de vouloir valider cette facture sous la référence %s ?
-ConfirmCancelBill=Êtes-vous sûr de vouloir annuler cette facture ?
+ConfirmClassifyPayedBill=Êtes-vous sûr de vouloir classer la facture %s à payer ?
+ConfirmCancelBill=Êtes-vous sûr de vouloir annuler la facture %s ?
ValidateBill=Valider facture
GlobalDiscount=Remise globale
NumberOfBills=Nb de factures
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 61a8eec0641..44ac944a583 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -177,7 +177,7 @@ function dolibarr_syslog($message, $level=LOG_ERR)
*/
function dolibarr_fiche_head($links, $active=0, $title='')
{
- print "\n";
+ print '
'."\n";
if (strlen($title))
{
@@ -206,7 +206,7 @@ function dolibarr_fiche_head($links, $active=0, $title='')
}
print "
\n";
- print "
\n\n";
+ print '
'."\n\n";
}
/**
@@ -626,7 +626,8 @@ function img_edit($alt = "default")
{
global $conf,$langs;
if ($alt=="default") $alt=$langs->trans("Modify");
- return '

';
+// return '

';
+ return '

';
}
/**
@@ -819,61 +820,66 @@ function img_allow($allow)
*/
function loginfunction()
{
- global $langs,$conf;
- $langs->load("main");
-
- print '';
- print "\n
Dolibarr Authentification\n";
- print '
';
-
-
-
- print '';
- print '';
- print '';
- print '';
-
- print '
';
+ print '';
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a9e6dd51f03..4bf9754869f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -328,9 +328,10 @@ function left_menu($menu_array, $help_url='', $form_search='')
global $user, $conf, $langs, $db;
print '\n";
print "\n";
+ print "\n";
+ print '
'."\n";
print '';
- print "\n".'
'."\n";
+ print "\n
\n".''."\n";
+ print "\n\n".'';
+ print "\n\n".''."\n";
print "\n\n";
}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index dc66d8105b1..7c6e87ea0c1 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -222,7 +222,7 @@ if ($_GET["id"])
* Contenu des stocks
*
*/
- print '
';
+ print '
';
print '| '.$langs->trans("Warehouse").' | Valeur du stock |
';
$sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps";
$sql .= " WHERE ps.fk_entrepot = e.rowid AND ps.fk_product = ".$product->id;
@@ -241,7 +241,7 @@ if ($_GET["id"])
$i++;
}
}
- print '| '.$langs->trans("Total").': | '.$total." |
";
+ print '| '.$langs->trans("Total").': | '.$total." |
";
}
print '';
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 7916e28e4b9..bea736ddc6e 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -27,7 +27,7 @@ require("../../conf/conf.php");
/***** Style du fond *****/
body {
- background-color: #F1F1F1;
+ background-color: #F4F4F4;
font: 12px helvetica, verdana, arial, sans-serif;
margin-top: 0;
margin-bottom: 0;
@@ -35,7 +35,7 @@ body {
margin-left: 0;
}
.body {
- background-color: #F1F1F1;
+ background-color: #F4F4F4;
color: #101010;
font: 12px helvetica, verdana, arial, sans-serif;
}
@@ -55,9 +55,9 @@ input
}
input.flat
{
- font: helvetica, verdana, arial, sans-serif;
+ font: 12px helvetica, verdana, arial, sans-serif;
background: #FDFDFD;
- border: 1px solid #8C9C9B;
+ border: 1px solid #9CACAB;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
}
@@ -77,7 +77,7 @@ textarea.flat
.button {
font: 12px helvetica, verdana, arial, sans-serif;
font-size: 100%;
- border: 1px solid #ccd7e0;
+ border: 0px;
background-image : url();
background-position : bottom;
padding: 0px 0px 0px 0px;
@@ -117,13 +117,13 @@ div.tmenu
div.vmenuplusfiche
{
- float: left;
+ float: left;
margin-right: 6px;
}
div.vmenu
{
- display:block;
+ display: block;
float: left;
margin-right: 2px;
padding: 0px;
@@ -314,7 +314,7 @@ td.barre_select {
}
td.photo {
- background: #FCFCFC;
+ background: #F4F4F4;
color: #000000;
border: 1px solid #b3c5cc;
}
@@ -345,23 +345,22 @@ div.formsearch
/*
* Barre onglets
*/
+div.tabs {
+ top: 20px;
+ margin: 1px 0px 0px 0px;
+ padding: 0px 6px 0px 0px;
+ text-align: left;
+}
+
div.tabBar {
color: #234046;
background: #dee7ec;
- padding-top: 14px;
- padding-left: 14px;
- padding-right: 14px;
- padding-bottom: 14px;
+ padding-top: 12px;
+ padding-left: 12px;
+ padding-right: 12px;
+ padding-bottom: 12px;
margin: 0px 0px 10px 0px;
border: 1px solid #8CACBB;
- border-top: 1px solid #8CACBB;
-}
-
-div.tabs {
- top: 20px;
- margin: 1px 0em 0em 0em;
- padding: 0em 0.5em;
- text-align: left;
}
div.tabsAction {
@@ -370,6 +369,7 @@ div.tabsAction {
text-align: right;
}
+
a.tabTitle {
background: #436976;
border: 1px solid #8CACBB;
@@ -402,10 +402,16 @@ a.tab:visited {
a.tab#active {
background: #dee7ec;
border-bottom: #dee7ec 1px solid;
+ color: #436976;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
text-decoration: none;
}
a.tab:hover {
background: #dee7ec;
+ color: #436976;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
text-decoration: none;
}
@@ -532,16 +538,16 @@ margin: 0px 0px;
}
table.border {
-border: 1px solid #6C7C8B;
-border-color: #6C7C8B;
+border: 1px solid #8C9CAB;
+border-color: #8C9CAB;
border-width: 1px;
border-collapse: collapse;
}
table.border td {
padding: 1px 2px;
-border: 1px solid #6C7C8B;
-border-color: #6C7C8B;
+border: 1px solid #8C9CAB;
+border-color: #8C9CAB;
border-width: 1px;
border-collapse: collapse;
}
@@ -576,43 +582,43 @@ width: 100%;
* Tableaux
*/
-input.liste_titre {
-background: #7699A9;
-}
-
tr.liste_titre {
background: #7699A9;
+background-image : url();
color: #334444;
font: helvetica, verdana, arial, sans-serif;
font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
}
td.liste_titre {
background: #7699A9;
+background-image : url();
color: #334444;
font: helvetica, verdana, arial, sans-serif;
font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
}
-
-.liste_titre_sel
+td.liste_titre_sel
{
background: #7699A9;
-color: #f0f0ff;
+background-image : url();
+color: #F5FFFF;
font: helvetica, verdana, arial, sans-serif;
font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
}
+input.liste_titre {
+background: #7699A9;
+background-image : url();
+border: 0px;
+}
tr.liste_total td {
border-top: 1px solid #888888;
-background: #F0F0F0;
+background: #F4F4F4;
font-weight: bold;
white-space: nowrap;
}
@@ -662,11 +668,11 @@ background: #c0c4c7;
*/
tr.box_titre {
background: #7699A9;
+background-image : url();
color: #334444;
font: 12px helvetica, verdana, arial, sans-serif;
font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
}
@@ -706,7 +712,7 @@ div.error {
color: #550000; font-weight: bold;
padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0.5em 0em 0.5em 0em;
- border: 1px solid #6C7C8B;
+ border: 1px solid #8C9CAB;
}
diff --git a/htdocs/theme/eldy/img/liste_titre.png b/htdocs/theme/eldy/img/liste_titre.png
new file mode 100644
index 00000000000..a575ee4b9b0
Binary files /dev/null and b/htdocs/theme/eldy/img/liste_titre.png differ