From 58b07515992126fdfafef17dcc6970094f95b10a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Apr 2012 10:55:03 +0200 Subject: [PATCH 1/4] Fix: translation --- htdocs/langs/en_US/bills.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 3b758e008ce..aced8c2c897 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -235,7 +235,7 @@ Discount=Discount Discounts=Discounts AddDiscount=Create discount AddRelativeDiscount=Create relative discount -EditRelativelDiscount=Edit relatvie discount +EditRelativeDiscount=Edit relative discount AddGlobalDiscount=Create absolute discount EditGlobalDiscounts=Edit absolute discounts AddCreditNote=Create credit note From 49bb9d774d9dceffbbf8b0bc54593d35fbf17253 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Apr 2012 11:00:56 +0200 Subject: [PATCH 2/4] Fix: W3C --- htdocs/core/boxes/box_produits.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index a45900672b6..10d85f10cda 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -130,7 +130,7 @@ class box_produits extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => $price); - $this->info_box_contents[$i][3] = array('td' => 'align="center" width="20" nowrap="nowrap"', + $this->info_box_contents[$i][3] = array('td' => 'align="left" nowrap="nowrap"', 'text' => $price_base_type); $this->info_box_contents[$i][4] = array('td' => 'align="right"', From 1104387b72a6748ed59a0368478fa661974cdb61 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Apr 2012 11:13:15 +0200 Subject: [PATCH 3/4] Fix: Bad link --- htdocs/admin/ihm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 920433691dc..965aba9d009 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -366,7 +366,7 @@ else // Show // Link to wiki help $var=!$var; - print ''.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1)).''; + print ''.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).''; print yn($conf->global->MAIN_HELP_DISABLELINK,1); print ''; From d4cc4b4288c8011426ed7e56a8909f13d1350275 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Apr 2012 11:16:47 +0200 Subject: [PATCH 4/4] Fix: bad link --- htdocs/admin/ihm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 965aba9d009..647a4453084 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -218,7 +218,7 @@ if ($action == 'edit') // Edit // Hide wiki link on login page $var=!$var; - print ''.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1)).''; + print ''.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).''; print $form->selectyesno('MAIN_HELP_DISABLELINK',isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1); print ''; print ' ';