From 5df0f4c2fdbfaafbf029521708da2f0842d1e4b1 Mon Sep 17 00:00:00 2001 From: AXeL-dev Date: Sun, 1 Oct 2017 18:33:22 +0100 Subject: [PATCH 1/3] FIX: in payment form, label does not fill with GET method --- htdocs/compta/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 2b8b6a6fe5b..bf9e62e157f 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -253,7 +253,7 @@ if ($action == 'create') // Label print ''; print fieldLabel('Label','label',1).''; - print 'trans("SalaryPayment")).'">'; + print 'trans("SalaryPayment")).'">'; print ''; // Date start period From f7dcf1ca45430d4083f4c68fdbcc2baba8f49876 Mon Sep 17 00:00:00 2001 From: AXeL-dev Date: Sun, 1 Oct 2017 18:35:06 +0100 Subject: [PATCH 2/3] FIX: wrong user first name/last name position in user tooltip --- htdocs/user/class/user.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 40124109961..21815185cb5 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2058,7 +2058,7 @@ class User extends CommonObject $label.= '
'; $label.= '' . $langs->trans("User") . '
'; - $label.= '' . $langs->trans('Name') . ': ' . $this->getFullName($langs,'',''); + $label.= '' . $langs->trans('Name') . ': ' . $this->getFullName($langs,''); if (! empty($this->login)) $label.= '
' . $langs->trans('Login') . ': ' . $this->login; $label.= '
' . $langs->trans("EMail").': '.$this->email; From 46800afac97f83cbf03300d3052ee633fc1c14e7 Mon Sep 17 00:00:00 2001 From: AXeL-dev Date: Sun, 1 Oct 2017 18:38:08 +0100 Subject: [PATCH 3/3] FIX: missing variables in payment form --- htdocs/compta/salaries/card.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index bf9e62e157f..47d4c027185 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -214,6 +214,12 @@ if ($action == 'create') $pastmonthyear--; } + $datespmonth = GETPOST('datespmonth', 'int'); + $datespday = GETPOST('datespday', 'int'); + $datespyear = GETPOST('datespyear', 'int'); + $dateepmonth = GETPOST('dateepmonth', 'int'); + $dateepday = GETPOST('dateepday', 'int'); + $dateepyear = GETPOST('dateepyear', 'int'); $datesp=dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear); $dateep=dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);