From 560150fd1c6c6204f274417b3455bfd42a5e7984 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 22 Apr 2015 07:15:17 +0200 Subject: [PATCH 1/2] Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default) --- htdocs/compta/bank/account.php | 1 + htdocs/compta/bank/ligne.php | 1 + htdocs/compta/salaries/class/paymentsalary.class.php | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index ce2bbc5381e..3fc72e25e3a 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -46,6 +46,7 @@ $langs->load("banks"); $langs->load("categories"); $langs->load("bills"); $langs->load("companies"); +$langs->load("salaries"); $langs->load("loan"); $langs->load("donations"); diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 8bba13039a9..2093d62802c 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -37,6 +37,7 @@ $langs->load("bills"); if (! empty($conf->adherent->enabled)) $langs->load("members"); if (! empty($conf->don->enabled)) $langs->load("donations"); if (! empty($conf->loan->enabled)) $langs->load("loan"); +if (! empty($conf->salaries->enabled)) $langs->load("salaries"); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index f7da679196b..f44a1c05608 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -424,7 +424,8 @@ class PaymentSalary extends CommonObject $bank_line_id, $this->fk_user, DOL_URL_ROOT.'/user/card.php?id=', - $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), + $fuser->getFullName($langs), + // $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), 'user' ); From 768fdde2d15b223f7ce02f4c33d491a576b9f6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 22 Apr 2015 10:39:32 +0200 Subject: [PATCH 2/2] Update product.class.php --- htdocs/product/class/product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1f32e0a328f..e4f2a9d02c0 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1514,7 +1514,7 @@ class Product extends CommonObject $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,"; $sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,"; $sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit"; - $sql.= " ,ref_ext, fk_price_expression"; + $sql.= " , fk_price_expression"; $sql.= " FROM ".MAIN_DB_PREFIX."product"; if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id); else