lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into FIX_salaries2

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-03-08 09:16:00 +01:00
commit e7c030f576
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/salaries/card.php
View File

@ -156,7 +156,6 @@ if ($action == 'add' && empty($cancel)) {
$object->dateep = $dateep; $object->dateep = $dateep;
$object->note = GETPOST("note", 'restricthtml'); $object->note = GETPOST("note", 'restricthtml');
$object->type_payment = ($type_payment > 0 ? $type_payment : 0); $object->type_payment = ($type_payment > 0 ? $type_payment : 0);
$object->num_payment = GETPOST("num_payment", 'alphanohtml');
$object->fk_user_author = $user->id; $object->fk_user_author = $user->id;
$object->fk_project = $projectid; $object->fk_project = $projectid;

6
htdocs/salaries/class/salary.class.php
View File

@ -64,7 +64,6 @@ class Salary extends CommonObject
public $fk_project; public $fk_project;
public $type_payment; public $type_payment;
public $num_payment;
/** /**
* @var string salary payments label * @var string salary payments label
@ -141,7 +140,6 @@ class Salary extends CommonObject
$sql .= " amount=".price2num($this->amount).","; $sql .= " amount=".price2num($this->amount).",";
$sql .= " fk_projet=".((int) $this->fk_project).","; $sql .= " fk_projet=".((int) $this->fk_project).",";
$sql .= " fk_typepayment=".$this->type_payment.","; $sql .= " fk_typepayment=".$this->type_payment.",";
$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
$sql .= " label='".$this->db->escape($this->label)."',"; $sql .= " label='".$this->db->escape($this->label)."',";
$sql .= " datesp='".$this->db->idate($this->datesp)."',"; $sql .= " datesp='".$this->db->idate($this->datesp)."',";
$sql .= " dateep='".$this->db->idate($this->dateep)."',"; $sql .= " dateep='".$this->db->idate($this->dateep)."',";
@ -206,7 +204,6 @@ class Salary extends CommonObject
$sql .= " s.amount,"; $sql .= " s.amount,";
$sql .= " s.fk_projet as fk_project,"; $sql .= " s.fk_projet as fk_project,";
$sql .= " s.fk_typepayment,"; $sql .= " s.fk_typepayment,";
$sql .= " s.num_payment,";
$sql .= " s.label,"; $sql .= " s.label,";
$sql .= " s.datesp,"; $sql .= " s.datesp,";
$sql .= " s.dateep,"; $sql .= " s.dateep,";
@ -238,7 +235,6 @@ class Salary extends CommonObject
$this->amount = $obj->amount; $this->amount = $obj->amount;
$this->fk_project = $obj->fk_project; $this->fk_project = $obj->fk_project;
$this->type_payment = $obj->fk_typepayment; $this->type_payment = $obj->fk_typepayment;
$this->num_payment = $obj->num_payment;
$this->label = $obj->label; $this->label = $obj->label;
$this->datesp = $this->db->jdate($obj->datesp); $this->datesp = $this->db->jdate($obj->datesp);
$this->dateep = $this->db->jdate($obj->dateep); $this->dateep = $this->db->jdate($obj->dateep);
@ -393,7 +389,6 @@ class Salary extends CommonObject
$sql .= ", salary"; $sql .= ", salary";
$sql .= ", fk_typepayment"; $sql .= ", fk_typepayment";
$sql .= ", fk_account"; $sql .= ", fk_account";
$sql .= ", num_payment";
if ($this->note) $sql .= ", note"; if ($this->note) $sql .= ", note";
$sql .= ", label"; $sql .= ", label";
$sql .= ", datesp"; $sql .= ", datesp";
@ -412,7 +407,6 @@ class Salary extends CommonObject
$sql .= ", ".($this->salary > 0 ? $this->salary : "null"); $sql .= ", ".($this->salary > 0 ? $this->salary : "null");
$sql .= ", ".($this->type_payment > 0 ? $this->type_payment : 0); $sql .= ", ".($this->type_payment > 0 ? $this->type_payment : 0);
$sql .= ", ".($this->accountid > 0 ? $this->accountid : "null"); $sql .= ", ".($this->accountid > 0 ? $this->accountid : "null");
$sql .= ", '".$this->db->escape($this->num_payment)."'";
if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'"; if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
$sql .= ", '".$this->db->escape($this->label)."'"; $sql .= ", '".$this->db->escape($this->label)."'";
$sql .= ", '".$this->db->idate($this->datesp)."'"; $sql .= ", '".$this->db->idate($this->datesp)."'";

2
htdocs/salaries/list.php
View File

@ -570,7 +570,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
} }
// Type // Type
print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>'; print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }