Skip to content

Commit

Permalink
Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid
Browse files Browse the repository at this point in the history
FIX set due date in object in create invoice and set default paid in …
  • Loading branch information
eldy committed Sep 3, 2019
2 parents a9bb891 + 877867a commit 33cb9f7
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions htdocs/compta/facture/class/facture.class.php
Expand Up @@ -459,7 +459,16 @@ public function create(User $user, $notrigger = 0, $forceduedate = 0)
}

// Define due date if not already defined
$datelim=(empty($forceduedate)?$this->calculate_date_lim_reglement():$forceduedate);
if (empty($forceduedate)) {
$duedate = $this->calculate_date_lim_reglement();
if ($duedate < 0) {
dol_syslog(__METHOD__ . ' ' . $this->error, LOG_ERR);
return -1;
}
$this->date_lim_reglement = $duedate;
} else {
$this->date_lim_reglement = $forceduedate;
}

// Insert into database
$socid = $this->socid;
Expand Down Expand Up @@ -514,7 +523,7 @@ public function create(User $user, $notrigger = 0, $forceduedate = 0)
$sql.= ", ".($this->fk_project?$this->fk_project:"null");
$sql.= ", ".$this->cond_reglement_id;
$sql.= ", ".$this->mode_reglement_id;
$sql.= ", '".$this->db->idate($datelim)."', '".$this->db->escape($this->modelpdf)."'";
$sql.= ", '".$this->db->idate($this->date_lim_reglement)."', '".$this->db->escape($this->modelpdf)."'";
$sql.= ", ".($this->situation_cycle_ref?"'".$this->db->escape($this->situation_cycle_ref)."'":"null");
$sql.= ", ".($this->situation_counter?"'".$this->db->escape($this->situation_counter)."'":"null");
$sql.= ", ".($this->situation_final?$this->situation_final:0);
Expand Down Expand Up @@ -1695,7 +1704,7 @@ public function update(User $user, $notrigger = 0)
$sql.= " datef=".(strval($this->date)!='' ? "'".$this->db->idate($this->date)."'" : 'null').",";
$sql.= " date_pointoftax=".(strval($this->date_pointoftax)!='' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null').",";
$sql.= " date_valid=".(strval($this->date_validation)!='' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
$sql.= " paye=".(isset($this->paye)?$this->db->escape($this->paye):"null").",";
$sql.= " paye=".(isset($this->paye)?$this->db->escape($this->paye):0).",";
$sql.= " remise_percent=".(isset($this->remise_percent)?$this->db->escape($this->remise_percent):"null").",";
$sql.= " remise_absolue=".(isset($this->remise_absolue)?$this->db->escape($this->remise_absolue):"null").",";
$sql.= " close_code=".(isset($this->close_code)?"'".$this->db->escape($this->close_code)."'":"null").",";
Expand Down

0 comments on commit 33cb9f7

Please sign in to comment.