@@ -158,11 +158,11 @@ |
||
158 | 158 | unset($object->barcode_type_code); |
159 | 159 | unset($object->barcode_type_label); |
160 | 160 | |
161 | - unset($object->mode_reglement); // We use mode_reglement_id now |
|
162 | - unset($object->cond_reglement); // We use cond_reglement_id now |
|
163 | - unset($object->note); // We use note_public or note_private now |
|
164 | - unset($object->contact); // We use contact_id now |
|
165 | - unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
161 | + unset($object->mode_reglement); // We use mode_reglement_id now |
|
162 | + unset($object->cond_reglement); // We use cond_reglement_id now |
|
163 | + unset($object->note); // We use note_public or note_private now |
|
164 | + unset($object->contact); // We use contact_id now |
|
165 | + unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
166 | 166 | |
167 | 167 | unset($object->projet); // Should be fk_project |
168 | 168 | unset($object->project); // Should be fk_project |
@@ -60,12 +60,12 @@ discard block |
||
60 | 60 | return $this->$newProperty; |
61 | 61 | } |
62 | 62 | if ($this->isDynamicPropertiesEnabled()) { |
63 | - return null; // If the property is set, then __get is not called. |
|
63 | + return null; // If the property is set, then __get is not called. |
|
64 | 64 | } |
65 | 65 | $msg = "DolDeprecationHandler: Undefined property '" . $name . "'" . self::getCallerInfoString(); |
66 | 66 | dol_syslog($msg); |
67 | 67 | trigger_error($msg, E_USER_NOTICE); |
68 | - return $this->$name; // Returning value anyway (graceful degradation) |
|
68 | + return $this->$name; // Returning value anyway (graceful degradation) |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | if (!$this->isDynamicPropertiesEnabled()) { |
96 | 96 | $msg = "DolDeprecationHandler: Undefined property '" . $name . "'" . self::getCallerInfoString(); |
97 | 97 | trigger_error($msg, E_USER_NOTICE); |
98 | - $this->$name = $value; // Setting anyway for graceful degradation |
|
98 | + $this->$name = $value; // Setting anyway for graceful degradation |
|
99 | 99 | } else { |
100 | 100 | $this->$name = $value; |
101 | 101 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | if (property_exists($this, 'enableDeprecatedReporting')) { |
194 | 194 | // If the property exists, then we use it. |
195 | - return (bool)$this->enableDeprecatedReporting; |
|
195 | + return (bool) $this->enableDeprecatedReporting; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | return (error_reporting() & E_DEPRECATED) === E_DEPRECATED; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | if (property_exists($this, 'enableDynamicProperties')) { |
211 | 211 | // If the property exists, then we use it. |
212 | - return (bool)$this->enableDynamicProperties; |
|
212 | + return (bool) $this->enableDynamicProperties; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | // Otherwise it depends on a choice |
@@ -789,7 +789,7 @@ |
||
789 | 789 | $sql .= ", login = " . ($this->login ? "'" . $this->db->escape($this->login) . "'" : "null"); |
790 | 790 | $sql .= ", societe = " . ($this->company ? "'" . $this->db->escape($this->company) . "'" : ($this->societe ? "'" . $this->db->escape($this->societe) . "'" : "null")); |
791 | 791 | if ($this->socid) { |
792 | - $sql .= ", fk_soc = " . ($this->socid > 0 ? (int) $this->socid : "null"); // Must be modified only when creating from a third-party |
|
792 | + $sql .= ", fk_soc = " . ($this->socid > 0 ? (int) $this->socid : "null"); // Must be modified only when creating from a third-party |
|
793 | 793 | } |
794 | 794 | $sql .= ", address = " . ($this->address ? "'" . $this->db->escape($this->address) . "'" : "null"); |
795 | 795 | $sql .= ", zip = " . ($this->zip ? "'" . $this->db->escape($this->zip) . "'" : "null"); |
@@ -512,7 +512,7 @@ |
||
512 | 512 | $this->amount = $obj->amount; |
513 | 513 | $this->caneditamount = $obj->caneditamount; |
514 | 514 | $this->mail_valid = $obj->mail_valid; |
515 | - $this->note = $obj->note_public; // deprecated |
|
515 | + $this->note = $obj->note_public; // deprecated |
|
516 | 516 | $this->note_public = $obj->note_public; |
517 | 517 | $this->vote = $obj->vote; |
518 | 518 |
@@ -241,7 +241,7 @@ |
||
241 | 241 | $this->dateh = $this->db->jdate($obj->dateh); |
242 | 242 | $this->datef = $this->db->jdate($obj->datef); |
243 | 243 | $this->amount = $obj->subscription; |
244 | - $this->note = $obj->note_public; // deprecated |
|
244 | + $this->note = $obj->note_public; // deprecated |
|
245 | 245 | $this->note_public = $obj->note_public; |
246 | 246 | $this->fk_bank = $obj->fk_bank; |
247 | 247 | return 1; |
@@ -118,7 +118,7 @@ |
||
118 | 118 | if ($this->apiService == 'groq') { |
119 | 119 | $this->apiEndpoint = 'https://api.groq.com/openai/v1/chat/completions'; |
120 | 120 | if ($model == 'auto') { |
121 | - $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
121 | + $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
122 | 122 | } |
123 | 123 | } elseif ($this->apiService == 'chatgpt') { |
124 | 124 | $this->apiEndpoint = 'https://api.openai.com/v1/chat/completions'; |
@@ -1430,7 +1430,7 @@ discard block |
||
1430 | 1430 | foreach ($this->lines as &$line) { |
1431 | 1431 | $tmpproduct->cost_price = 0; |
1432 | 1432 | $tmpproduct->pmp = 0; |
1433 | - $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading |
|
1433 | + $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading |
|
1434 | 1434 | |
1435 | 1435 | if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) { |
1436 | 1436 | if (empty($line->fk_bom_child)) { |
@@ -1625,7 +1625,7 @@ discard block |
||
1625 | 1625 | */ |
1626 | 1626 | public function getKanbanView($option = '', $arraydata = null) |
1627 | 1627 | { |
1628 | - global $db,$langs; |
|
1628 | + global $db, $langs; |
|
1629 | 1629 | |
1630 | 1630 | $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); |
1631 | 1631 |
@@ -48,7 +48,7 @@ |
||
48 | 48 | 'receivable_on_assignment' => array('label' => 'AssetAccountancyCodeReceivableOnAssignment'), |
49 | 49 | 'proceeds_from_sales' => array('label' => 'AssetAccountancyCodeProceedsFromSales'), |
50 | 50 | 'vat_collected' => array('label' => 'AssetAccountancyCodeVatCollected'), |
51 | - 'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible','column_break' => true), |
|
51 | + 'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible', 'column_break' => true), |
|
52 | 52 | ), |
53 | 53 | ), |
54 | 54 | 'accelerated_depreciation' => array( |
@@ -63,8 +63,8 @@ |
||
63 | 63 | */ |
64 | 64 | public $picto = 'asset'; |
65 | 65 | |
66 | - const STATUS_DRAFT = 0; // In progress |
|
67 | - const STATUS_DISPOSED = 9; // Disposed |
|
66 | + const STATUS_DRAFT = 0; // In progress |
|
67 | + const STATUS_DISPOSED = 9; // Disposed |
|
68 | 68 | |
69 | 69 | /** |
70 | 70 | * 'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password') |