@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | public $total; |
164 | 164 | |
165 | 165 | public $cond_reglement_code; |
166 | - public $cond_reglement_doc; // label doc |
|
166 | + public $cond_reglement_doc; // label doc |
|
167 | 167 | |
168 | 168 | public $mode_reglement_code; |
169 | 169 | /** |
@@ -1135,7 +1135,7 @@ discard block |
||
1135 | 1135 | $this->id = 0; |
1136 | 1136 | $this->statut = 0; |
1137 | 1137 | |
1138 | - if (!getDolGlobalString('SUPPLIER_PROPOSAL_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/" . getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').".php")) { |
|
1138 | + if (!getDolGlobalString('SUPPLIER_PROPOSAL_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').".php")) { |
|
1139 | 1139 | $this->error = 'ErrorSetupNotComplete'; |
1140 | 1140 | return -1; |
1141 | 1141 | } |
@@ -1146,7 +1146,7 @@ discard block |
||
1146 | 1146 | $this->date = $now; |
1147 | 1147 | |
1148 | 1148 | // Set ref |
1149 | - require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/" . getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').'.php'; |
|
1149 | + require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').'.php'; |
|
1150 | 1150 | $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON; |
1151 | 1151 | $modSupplierProposal = new $obj; |
1152 | 1152 | $this->ref = $modSupplierProposal->getNextValue($objsoc, $this); |
@@ -1247,7 +1247,7 @@ discard block |
||
1247 | 1247 | $this->status = (int) $obj->fk_statut; |
1248 | 1248 | $this->datec = $this->db->jdate($obj->datec); // TODO deprecated |
1249 | 1249 | $this->datev = $this->db->jdate($obj->datev); // TODO deprecated |
1250 | - $this->date_creation = $this->db->jdate($obj->datec); // Creation date |
|
1250 | + $this->date_creation = $this->db->jdate($obj->datec); // Creation date |
|
1251 | 1251 | $this->date = $this->date_creation; |
1252 | 1252 | $this->date_validation = $this->db->jdate($obj->datev); // Validation date |
1253 | 1253 | $this->delivery_date = $this->db->jdate($obj->delivery_date); |
@@ -1906,7 +1906,7 @@ discard block |
||
1906 | 1906 | |
1907 | 1907 | if (!$error) { |
1908 | 1908 | $this->status = self::STATUS_DRAFT; |
1909 | - $this->statut = self::STATUS_DRAFT; // dperecated |
|
1909 | + $this->statut = self::STATUS_DRAFT; // dperecated |
|
1910 | 1910 | $this->db->commit(); |
1911 | 1911 | return 1; |
1912 | 1912 | } else { |
@@ -2413,7 +2413,7 @@ discard block |
||
2413 | 2413 | if (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON')) { |
2414 | 2414 | $mybool = false; |
2415 | 2415 | |
2416 | - $file = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON') . ".php"; |
|
2416 | + $file = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').".php"; |
|
2417 | 2417 | $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON; |
2418 | 2418 | |
2419 | 2419 | // Include file with class |
@@ -2550,7 +2550,7 @@ discard block |
||
2550 | 2550 | $label = $langs->trans("ShowSupplierProposal"); |
2551 | 2551 | $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"'; |
2552 | 2552 | } |
2553 | - $linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"'); |
|
2553 | + $linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"'); |
|
2554 | 2554 | $linkclose .= $dataparams.' class="'.$classfortooltip.'"'; |
2555 | 2555 | } |
2556 | 2556 | |
@@ -2581,7 +2581,7 @@ discard block |
||
2581 | 2581 | } |
2582 | 2582 | } |
2583 | 2583 | global $action; |
2584 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
2584 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
2585 | 2585 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
2586 | 2586 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
2587 | 2587 | if ($reshook > 0) { |
@@ -2775,7 +2775,7 @@ discard block |
||
2775 | 2775 | $return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($this->delivery_date).'</span>'; |
2776 | 2776 | } |
2777 | 2777 | if (property_exists($this, 'total_ttc')) { |
2778 | - $return .='<br><span class="opacitymedium" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ttc).'</span>'; |
|
2778 | + $return .= '<br><span class="opacitymedium" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ttc).'</span>'; |
|
2779 | 2779 | } |
2780 | 2780 | if (method_exists($this, 'getLibStatut')) { |
2781 | 2781 | $return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>'; |
@@ -3149,7 +3149,7 @@ discard block |
||
3149 | 3149 | $sql .= " ".price2num($this->localtax2_tx).","; |
3150 | 3150 | $sql .= " '".$this->db->escape($this->localtax1_type)."',"; |
3151 | 3151 | $sql .= " '".$this->db->escape($this->localtax2_type)."',"; |
3152 | - $sql .= " ".price2num($this->subprice, 'MU') .","; |
|
3152 | + $sql .= " ".price2num($this->subprice, 'MU').","; |
|
3153 | 3153 | $sql .= " ".((float) $this->remise_percent).","; |
3154 | 3154 | $sql .= " ".(isset($this->info_bits) ? ((int) $this->info_bits) : "null").","; |
3155 | 3155 | $sql .= " ".price2num($this->total_ht, 'MT').","; |