From 519d7d63b6d8e66ec9859e0b538deaba3657e6a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 30 Mar 2016 23:33:19 +0200 Subject: [PATCH] Fix missing translation --- htdocs/langs/en_US/margins.lang | 3 ++- htdocs/margin/checkMargins.php | 6 ++++-- htdocs/margin/lib/margins.lib.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index b705f25ba42..43ba02178e6 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -46,4 +46,5 @@ AgentContactType=Commercial agent contact type AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative rateMustBeNumeric=Rate must be a numeric value markRateShouldBeLesserThan100=Mark rate should be lower than 100 -ShowMarginInfos=Show margin infos \ No newline at end of file +ShowMarginInfos=Show margin infos +CheckMargins=Margins detail \ No newline at end of file diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index ac53d079298..becf7ea5890 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -109,7 +109,7 @@ $productstatic = new Product($db); $form = new Form($db); -$title = $langs->trans("CheckMargins"); +$title = $langs->trans("Margins"); llxHeader('', $title); @@ -118,7 +118,7 @@ llxHeader('', $title); // Show tabs $head = marges_prepare_head($user); $picto = 'margin'; -dol_fiche_head($head, 'checkMargins', $title, 0, $picto); +dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto); print '
'; print ''; @@ -243,6 +243,8 @@ if ($result) { dol_print_error($db); } +dol_fiche_end(); + print '
' . "\n"; print '
'; print '
'; diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php index 2a3d0775eaa..6687b9fcf59 100644 --- a/htdocs/margin/lib/margins.lib.php +++ b/htdocs/margin/lib/margins.lib.php @@ -59,7 +59,7 @@ function marges_admin_prepare_head() function marges_prepare_head() { global $langs, $conf, $user; - $langs->load("marges@marges"); + $langs->load("margins"); $h = 0; $head = array();