From ff97a413865e0cbfaec7b3e5c66d2be2b81a0f8e Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Mon, 8 Mar 2021 09:00:52 +0100 Subject: [PATCH 1/2] FIX : num_payment on llx_salary is useless --- htdocs/salaries/card.php | 1 - htdocs/salaries/class/salary.class.php | 13 ------------- htdocs/salaries/list.php | 4 ++-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 91330cf318e..eb4a6958045 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -148,7 +148,6 @@ if ($action == 'add' && empty($cancel)) $object->dateep = $dateep; $object->note = GETPOST("note", 'none'); $object->type_payment = ($type_payment > 0 ? $type_payment : 0); - $object->num_payment = GETPOST("num_payment", 'alphanohtml'); $object->fk_user_author = $user->id; $object->fk_project = $projectid; diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php index 224b6e74c4a..979adfd18e4 100644 --- a/htdocs/salaries/class/salary.class.php +++ b/htdocs/salaries/class/salary.class.php @@ -64,7 +64,6 @@ class Salary extends CommonObject public $fk_project; public $type_payment; - public $num_payment; /** * @var string salary payments label @@ -142,7 +141,6 @@ class Salary extends CommonObject $sql .= " amount=".price2num($this->amount).","; $sql .= " fk_projet=".((int) $this->fk_project).","; $sql .= " fk_typepayment=".$this->type_payment.","; - $sql .= " num_payment='".$this->db->escape($this->num_payment)."',"; $sql .= " label='".$this->db->escape($this->label)."',"; $sql .= " datesp='".$this->db->idate($this->datesp)."',"; $sql .= " dateep='".$this->db->idate($this->dateep)."',"; @@ -215,7 +213,6 @@ class Salary extends CommonObject $sql .= " s.amount,"; $sql .= " s.fk_projet as fk_project,"; $sql .= " s.fk_typepayment,"; - $sql .= " s.num_payment,"; $sql .= " s.label,"; $sql .= " s.datesp,"; $sql .= " s.dateep,"; @@ -249,7 +246,6 @@ class Salary extends CommonObject $this->amount = $obj->amount; $this->fk_project = $obj->fk_project; $this->type_payment = $obj->fk_typepayment; - $this->num_payment = $obj->num_payment; $this->label = $obj->label; $this->datesp = $this->db->jdate($obj->datesp); $this->dateep = $this->db->jdate($obj->dateep); @@ -410,7 +406,6 @@ class Salary extends CommonObject $sql .= ", salary"; $sql .= ", fk_typepayment"; $sql .= ", fk_account"; - $sql .= ", num_payment"; if ($this->note) $sql .= ", note"; $sql .= ", label"; $sql .= ", datesp"; @@ -429,7 +424,6 @@ class Salary extends CommonObject $sql .= ", ".($this->salary > 0 ? $this->salary : "null"); $sql .= ", ".($this->type_payment > 0 ? $this->type_payment : 0); $sql .= ", ".($this->accountid > 0 ? $this->accountid : "null"); - $sql .= ", '".$this->db->escape($this->num_payment)."'"; if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'"; $sql .= ", '".$this->db->escape($this->label)."'"; $sql .= ", '".$this->db->idate($this->datesp)."'"; @@ -450,13 +444,6 @@ class Salary extends CommonObject { if (!empty($conf->banque->enabled) && !empty($this->amount)) { - // Insert into llx_bank - require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; - - $acc = new Account($this->db); - $result = $acc->fetch($this->accountid); - if ($result <= 0) dol_print_error($this->db); - // Update extrafield if (!$error) { if (!$error) diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index 89e5703ff56..33ec9a6b1ae 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -112,7 +112,7 @@ $userstatic = new User($db); $accountstatic = new Account($db); $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,"; -$sql .= " s.rowid, s.fk_account, s.paye, s.fk_user, s.amount, s.salary, s.label, s.datesp as datesp, s.dateep as dateep, s.fk_typepayment as type, s.num_payment, s.fk_bank,"; +$sql .= " s.rowid, s.fk_account, s.paye, s.fk_user, s.amount, s.salary, s.label, s.datesp as datesp, s.dateep as dateep, s.fk_typepayment as type, s.fk_bank,"; $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,"; $sql .= " pst.code as payment_code,"; $sql .= " SUM(ps.amount) as alreadypayed"; @@ -310,7 +310,7 @@ if ($result) if (!$i) $totalarray['nbfield']++; // Type - print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.''; + print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).''; if (!$i) $totalarray['nbfield']++; // Account From f9a1b5fd3e9971186bfefa4b4e5ef213ddb4fa68 Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Mon, 8 Mar 2021 09:21:03 +0100 Subject: [PATCH 2/2] FIX : quote forgotten in merge --- htdocs/salaries/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index e4946858cfd..7bc75f52793 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -570,7 +570,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { } // Type - print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).'; + print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).''; if (!$i) { $totalarray['nbfield']++; }