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/agentMargins.php b/htdocs/margin/agentMargins.php index f9189ed7e97..fe429f7c145 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -108,7 +108,7 @@ print ''; $form->select_date($enddate,'enddate','','',1,"sel",1,1); print ''; print ''; -print ''; +print ''; print ''; print ""; print ''; diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index ac53d079298..79d4ceb3794 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 ''; @@ -133,7 +133,7 @@ print ''; print ''; print "
'; $form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1); print ''; -print ''; +print ''; print '
"; @@ -243,6 +243,8 @@ if ($result) { dol_print_error($db); } +dol_fiche_end(); + print '
' . "\n"; print '
'; print '
'; diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 93f3220d12c..9977354e67a 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -129,7 +129,7 @@ print ''; $form->select_date($enddate,'enddate','','',1,"sel",1,1); print ''; print ''; -print ''; +print ''; 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(); diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index e8483c90a34..2e550a74720 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -131,7 +131,7 @@ print ''; $form->select_date($enddate,'enddate','','',1,"sel",1,1); print ''; print ''; -print ''; +print ''; print ''; print "";