diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index dd45159cdf0..285fe5df739 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1822,6 +1822,8 @@ class Contrat extends CommonObject } } + // TODO Update column llx_contrat.denormalized_lower_panned_end_date + if (empty($error)) { // Call trigger $this->context['line_id'] = $rowid; @@ -2830,6 +2832,9 @@ class Contrat extends CommonObject if ($resqlupdate) { $contractlineprocessed[$obj->lid] = $object->ref; + // TODO Update column llx_contrat.denormalized_lower_panned_end_date + + $actioncode = 'RENEW_CONTRACT'; $now = dol_now(); diff --git a/htdocs/contrat/class/contratligne.class.php b/htdocs/contrat/class/contratligne.class.php index 8f6b10b85e3..e24726cc116 100644 --- a/htdocs/contrat/class/contratligne.class.php +++ b/htdocs/contrat/class/contratligne.class.php @@ -540,11 +540,6 @@ class ContratLigne extends CommonObjectLine $this->date_start_real = $this->db->jdate($obj->date_start_real); $this->date_end = $this->db->jdate($obj->date_end); $this->date_end_real = $this->db->jdate($obj->date_end_real); - // For backward compatibility - //$this->date_ouverture_prevue = $this->db->jdate($obj->date_ouverture_prevue); - //$this->date_ouverture = $this->db->jdate($obj->date_ouverture); - //$this->date_fin_validite = $this->db->jdate($obj->date_fin_validite); - //$this->date_cloture = $this->db->jdate($obj->date_cloture); $this->tva_tx = $obj->tva_tx; $this->vat_src_code = $obj->vat_src_code; @@ -939,6 +934,10 @@ class ContratLigne extends CommonObjectLine dol_syslog(get_class($this)."::active_line", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { + if ($date_end >= 0) { + // TODO Update column llx_contrat.denormalized_lower_panned_end_date + } + // Call trigger $result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user); if ($result < 0) { diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 3b79adb6b7c..cdb34cd858d 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -35,6 +35,13 @@ // Load Dolibarr environment require '../main.inc.php'; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + * @var User $user + */ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; @@ -45,14 +52,6 @@ if (isModEnabled("category")) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; } -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array('contracts', 'products', 'companies', 'compta')); @@ -324,7 +323,7 @@ $sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as $sql .= " SUM(".$db->ifsql("cd.statut=0", '1', '0').') as nb_initial,'; $sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", '1', '0').') as nb_running,'; $sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", '1', '0').') as nb_expired,'; -$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", '1', '0').') as nb_late,'; +$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contract->services->expires->warning_delay)."')", '1', '0').') as nb_late,'; $sql .= " SUM(".$db->ifsql("cd.statut=5", '1', '0').') as nb_closed'; // Add fields from extrafields if (!empty($extrafields->attributes[$object->table_element]['label'])) {