@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | echo " Display this help message.\n"; |
125 | 125 | } |
126 | 126 | |
127 | -if (php_sapi_name() === "cli" && (float)PHP_VERSION > 7.0) { |
|
127 | +if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) { |
|
128 | 128 | $rest_index = 0; |
129 | 129 | $opts = getopt($short_options, $long_options, $rest_index); |
130 | 130 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @param string $arg |
150 | 150 | * @return bool |
151 | 151 | */ |
152 | - static function ($arg) { |
|
152 | + static function($arg) { |
|
153 | 153 | return strlen($arg) >= 2 && $arg[0] == '-'; |
154 | 154 | } |
155 | 155 | ); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @param string $arg |
160 | 160 | * @return string |
161 | 161 | */ |
162 | - static function ($arg) { |
|
162 | + static function($arg) { |
|
163 | 163 | if (strlen($arg) > 1) { |
164 | 164 | return "--" . $arg; |
165 | 165 | } |
@@ -294,10 +294,10 @@ discard block |
||
294 | 294 | |
295 | 295 | // Check install.lock (for both install and upgrade) |
296 | 296 | |
297 | -$lockfile = DOL_DATA_ROOT . '/install.lock'; // To lock all /install pages |
|
298 | -$lockfile2 = DOL_DOCUMENT_ROOT . '/install.lock'; // To lock all /install pages (recommended) |
|
299 | -$upgradeunlockfile = DOL_DATA_ROOT . '/upgrade.unlock'; // To unlock upgrade process |
|
300 | -$upgradeunlockfile2 = DOL_DOCUMENT_ROOT . '/upgrade.unlock'; // To unlock upgrade process |
|
297 | +$lockfile = DOL_DATA_ROOT . '/install.lock'; // To lock all /install pages |
|
298 | +$lockfile2 = DOL_DOCUMENT_ROOT . '/install.lock'; // To lock all /install pages (recommended) |
|
299 | +$upgradeunlockfile = DOL_DATA_ROOT . '/upgrade.unlock'; // To unlock upgrade process |
|
300 | +$upgradeunlockfile2 = DOL_DOCUMENT_ROOT . '/upgrade.unlock'; // To unlock upgrade process |
|
301 | 301 | if (constant('DOL_DATA_ROOT') === null) { |
302 | 302 | // We don't have a configuration file yet |
303 | 303 | // Try to detect any lockfile in the default documents path |
@@ -135,7 +135,7 @@ |
||
135 | 135 | |
136 | 136 | <table class="nobordernopadding<?php if ($force_install_noedit) { |
137 | 137 | print ' hidewhennoedit'; |
138 | - } ?>"> |
|
138 | + } ?>"> |
|
139 | 139 | |
140 | 140 | <tr> |
141 | 141 | <td colspan="3" class="label"> |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | // Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode. |
43 | 43 | |
44 | 44 | $err = error_reporting(); |
45 | -error_reporting(0); // Disable all errors |
|
45 | +error_reporting(0); // Disable all errors |
|
46 | 46 | //error_reporting(E_ALL); |
47 | -@set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64 |
|
47 | +@set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64 |
|
48 | 48 | error_reporting($err); |
49 | 49 | |
50 | 50 | $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | dolibarr_install_syslog("--- step2: entering step2.php page"); |
95 | 95 | |
96 | -'@phan-var-force string $dolibarr_main_db_prefix'; // From configuraiotn file or install/inc.php |
|
96 | +'@phan-var-force string $dolibarr_main_db_prefix'; // From configuraiotn file or install/inc.php |
|
97 | 97 | |
98 | 98 | /* |
99 | 99 | * View |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">'; |
115 | 115 | $error = 0; |
116 | 116 | |
117 | - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port); |
|
117 | + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); |
|
118 | 118 | |
119 | 119 | if ($db->connected) { |
120 | 120 | print "<tr><td>"; |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | |
600 | 600 | $conf->file->instance_unique_id = (empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id); // Unique id of instance |
601 | 601 | |
602 | -$hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only. |
|
602 | +$hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only. |
|
603 | 603 | |
604 | 604 | $out = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"' . ((getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked" checked="true"') . '> '; |
605 | 605 | $out .= '<label for="dolibarrpingno">' . $langs->trans("MakeAnonymousPing") . '</label>'; |
@@ -99,8 +99,9 @@ |
||
99 | 99 | $main_data_dir = $argv[4]; // override when executing the script in command line |
100 | 100 | } |
101 | 101 | // In mode 3 the main_url is custom |
102 | - if ($force_install_noedit != 3) |
|
103 | - $main_url = detect_dolibarr_main_url_root(); |
|
102 | + if ($force_install_noedit != 3) { |
|
103 | + $main_url = detect_dolibarr_main_url_root(); |
|
104 | + } |
|
104 | 105 | if (!empty($argv[5])) { |
105 | 106 | $main_url = $argv[5]; // override when executing the script in command line |
106 | 107 | } |
@@ -97,7 +97,7 @@ |
||
97 | 97 | |
98 | 98 | $form = new Form($db); |
99 | 99 | |
100 | -if (! ($socid > 0)) { |
|
100 | +if (!($socid > 0)) { |
|
101 | 101 | accessforbidden('Record not found'); |
102 | 102 | } |
103 | 103 |
@@ -1159,8 +1159,8 @@ discard block |
||
1159 | 1159 | if (count($prodcustprice->lines) > 0) { |
1160 | 1160 | $pu_ht = price($prodcustprice->lines[0]->price); |
1161 | 1161 | $pu_ttc = price($prodcustprice->lines[0]->price_ttc); |
1162 | - $price_min = price($prodcustprice->lines[0]->price_min); |
|
1163 | - $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc); |
|
1162 | + $price_min = price($prodcustprice->lines[0]->price_min); |
|
1163 | + $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc); |
|
1164 | 1164 | $price_base_type = $prodcustprice->lines[0]->price_base_type; |
1165 | 1165 | /*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx); |
1166 | 1166 | if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) { |
@@ -1904,7 +1904,7 @@ discard block |
||
1904 | 1904 | print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">'; |
1905 | 1905 | print '<input type="hidden" name="token" value="' . newToken() . '">'; |
1906 | 1906 | print '<input type="hidden" name="action" value="add">'; |
1907 | - print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change |
|
1907 | + print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change |
|
1908 | 1908 | print '<input type="hidden" name="backtopage" value="' . $backtopage . '">'; |
1909 | 1909 | if ($origin != 'project' && $originid) { |
1910 | 1910 | print '<input type="hidden" name="origin" value="' . $origin . '">'; |
@@ -2295,7 +2295,7 @@ discard block |
||
2295 | 2295 | if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) { |
2296 | 2296 | $formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">' . $langs->trans("CloseAs") . '</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED))); |
2297 | 2297 | } |
2298 | - $formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => ''); // Field to complete private note (not replace) |
|
2298 | + $formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => ''); // Field to complete private note (not replace) |
|
2299 | 2299 | |
2300 | 2300 | if (getDolGlobalInt('PROPOSAL_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) { |
2301 | 2301 | // This is a hidden option: |
@@ -2479,7 +2479,7 @@ discard block |
||
2479 | 2479 | $nbMandated = 0; |
2480 | 2480 | foreach ($object->lines as $line) { |
2481 | 2481 | $res = $line->fetch_product(); |
2482 | - if ($res > 0) { |
|
2482 | + if ($res > 0) { |
|
2483 | 2483 | if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) { |
2484 | 2484 | $nbMandated++; |
2485 | 2485 | break; |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | // Search Fields |
80 | 80 | $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); |
81 | -$search_user = GETPOSTINT('search_user'); |
|
81 | +$search_user = GETPOSTINT('search_user'); |
|
82 | 82 | if ($search_user == -1) { |
83 | 83 | $search_user = 0; |
84 | 84 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $search_date_endday = GETPOSTINT('search_date_endday'); |
112 | 112 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
113 | 113 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
114 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
114 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
115 | 115 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
116 | 116 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
117 | 117 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
120 | 120 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
121 | 121 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
122 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
122 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
123 | 123 | $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); |
124 | 124 | $search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday'); |
125 | 125 | $search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth'); |
@@ -961,7 +961,7 @@ discard block |
||
961 | 961 | } |
962 | 962 | |
963 | 963 | |
964 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
964 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
965 | 965 | /** |
966 | 966 | * Clean sensible object datas |
967 | 967 | * |
@@ -970,7 +970,7 @@ discard block |
||
970 | 970 | */ |
971 | 971 | protected function _cleanObjectDatas($object) |
972 | 972 | { |
973 | - // phpcs:enable |
|
973 | + // phpcs:enable |
|
974 | 974 | $object = parent::_cleanObjectDatas($object); |
975 | 975 | |
976 | 976 | unset($object->note); |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | } |
405 | 405 | |
406 | 406 | |
407 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
407 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
408 | 408 | /** |
409 | 409 | * Add line into array ->lines |
410 | 410 | * $this->thirdparty should be loaded |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | */ |
419 | 419 | public function add_product($idproduct, $qty, $remise_percent = 0) |
420 | 420 | { |
421 | - // phpcs:enable |
|
421 | + // phpcs:enable |
|
422 | 422 | global $conf, $mysoc; |
423 | 423 | |
424 | 424 | if (!$qty) { |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | return 1; |
470 | 470 | } |
471 | 471 | |
472 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
472 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
473 | 473 | /** |
474 | 474 | * Adding line of fixed discount in the proposal in DB |
475 | 475 | * |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | */ |
479 | 479 | public function insert_discount($idremise) |
480 | 480 | { |
481 | - // phpcs:enable |
|
481 | + // phpcs:enable |
|
482 | 482 | global $langs; |
483 | 483 | |
484 | 484 | include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; |
@@ -1820,7 +1820,7 @@ discard block |
||
1820 | 1820 | } |
1821 | 1821 | |
1822 | 1822 | |
1823 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1823 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1824 | 1824 | /** |
1825 | 1825 | * Load array lines |
1826 | 1826 | * |
@@ -1831,7 +1831,7 @@ discard block |
||
1831 | 1831 | */ |
1832 | 1832 | public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $sqlforgedfilters = '') |
1833 | 1833 | { |
1834 | - // phpcs:enable |
|
1834 | + // phpcs:enable |
|
1835 | 1835 | $this->lines = array(); |
1836 | 1836 | |
1837 | 1837 | $sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,'; |
@@ -2080,7 +2080,7 @@ discard block |
||
2080 | 2080 | } |
2081 | 2081 | |
2082 | 2082 | |
2083 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2083 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2084 | 2084 | /** |
2085 | 2085 | * Define proposal date |
2086 | 2086 | * |
@@ -2091,7 +2091,7 @@ discard block |
||
2091 | 2091 | */ |
2092 | 2092 | public function set_date($user, $date, $notrigger = 0) |
2093 | 2093 | { |
2094 | - // phpcs:enable |
|
2094 | + // phpcs:enable |
|
2095 | 2095 | if (empty($date)) { |
2096 | 2096 | $this->error = 'ErrorBadParameter'; |
2097 | 2097 | dol_syslog(get_class($this) . "::set_date " . $this->error, LOG_ERR); |
@@ -2144,7 +2144,7 @@ discard block |
||
2144 | 2144 | return -1; |
2145 | 2145 | } |
2146 | 2146 | |
2147 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2147 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2148 | 2148 | /** |
2149 | 2149 | * Define end validity date |
2150 | 2150 | * |
@@ -2155,7 +2155,7 @@ discard block |
||
2155 | 2155 | */ |
2156 | 2156 | public function set_echeance($user, $date_end_validity, $notrigger = 0) |
2157 | 2157 | { |
2158 | - // phpcs:enable |
|
2158 | + // phpcs:enable |
|
2159 | 2159 | if ($user->hasRight('propal', 'creer')) { |
2160 | 2160 | $error = 0; |
2161 | 2161 | |
@@ -2203,7 +2203,7 @@ discard block |
||
2203 | 2203 | return -1; |
2204 | 2204 | } |
2205 | 2205 | |
2206 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2206 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2207 | 2207 | /** |
2208 | 2208 | * Set delivery date |
2209 | 2209 | * |
@@ -2215,7 +2215,7 @@ discard block |
||
2215 | 2215 | */ |
2216 | 2216 | public function set_date_livraison($user, $delivery_date, $notrigger = 0) |
2217 | 2217 | { |
2218 | - // phpcs:enable |
|
2218 | + // phpcs:enable |
|
2219 | 2219 | return $this->setDeliveryDate($user, $delivery_date, $notrigger); |
2220 | 2220 | } |
2221 | 2221 | |
@@ -2275,7 +2275,7 @@ discard block |
||
2275 | 2275 | return -1; |
2276 | 2276 | } |
2277 | 2277 | |
2278 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2278 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2279 | 2279 | /** |
2280 | 2280 | * Set delivery |
2281 | 2281 | * |
@@ -2286,7 +2286,7 @@ discard block |
||
2286 | 2286 | */ |
2287 | 2287 | public function set_availability($user, $id, $notrigger = 0) |
2288 | 2288 | { |
2289 | - // phpcs:enable |
|
2289 | + // phpcs:enable |
|
2290 | 2290 | if ($user->hasRight('propal', 'creer') && $this->statut >= self::STATUS_DRAFT) { |
2291 | 2291 | $error = 0; |
2292 | 2292 | |
@@ -2338,7 +2338,7 @@ discard block |
||
2338 | 2338 | } |
2339 | 2339 | } |
2340 | 2340 | |
2341 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2341 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2342 | 2342 | /** |
2343 | 2343 | * Set source of demand |
2344 | 2344 | * |
@@ -2349,7 +2349,7 @@ discard block |
||
2349 | 2349 | */ |
2350 | 2350 | public function set_demand_reason($user, $id, $notrigger = 0) |
2351 | 2351 | { |
2352 | - // phpcs:enable |
|
2352 | + // phpcs:enable |
|
2353 | 2353 | if ($user->hasRight('propal', 'creer') && $this->statut >= self::STATUS_DRAFT) { |
2354 | 2354 | $error = 0; |
2355 | 2355 | |
@@ -2403,7 +2403,7 @@ discard block |
||
2403 | 2403 | } |
2404 | 2404 | } |
2405 | 2405 | |
2406 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2406 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2407 | 2407 | /** |
2408 | 2408 | * Set customer reference number |
2409 | 2409 | * |
@@ -2414,7 +2414,7 @@ discard block |
||
2414 | 2414 | */ |
2415 | 2415 | public function set_ref_client($user, $ref_client, $notrigger = 0) |
2416 | 2416 | { |
2417 | - // phpcs:enable |
|
2417 | + // phpcs:enable |
|
2418 | 2418 | if ($user->hasRight('propal', 'creer')) { |
2419 | 2419 | $error = 0; |
2420 | 2420 | |
@@ -2766,7 +2766,7 @@ discard block |
||
2766 | 2766 | } |
2767 | 2767 | } |
2768 | 2768 | |
2769 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2769 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2770 | 2770 | /** |
2771 | 2771 | * Set draft status |
2772 | 2772 | * |
@@ -2776,7 +2776,7 @@ discard block |
||
2776 | 2776 | */ |
2777 | 2777 | public function setDraft($user, $notrigger = 0) |
2778 | 2778 | { |
2779 | - // phpcs:enable |
|
2779 | + // phpcs:enable |
|
2780 | 2780 | $error = 0; |
2781 | 2781 | |
2782 | 2782 | // Protection |
@@ -2829,7 +2829,7 @@ discard block |
||
2829 | 2829 | } |
2830 | 2830 | |
2831 | 2831 | |
2832 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2832 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2833 | 2833 | /** |
2834 | 2834 | * Return list of proposal (eventually filtered on user) into an array |
2835 | 2835 | * |
@@ -2845,7 +2845,7 @@ discard block |
||
2845 | 2845 | */ |
2846 | 2846 | public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC') |
2847 | 2847 | { |
2848 | - // phpcs:enable |
|
2848 | + // phpcs:enable |
|
2849 | 2849 | global $user; |
2850 | 2850 | |
2851 | 2851 | $ga = array(); |
@@ -2922,7 +2922,7 @@ discard block |
||
2922 | 2922 | return $this->InvoiceArrayList($this->id); |
2923 | 2923 | } |
2924 | 2924 | |
2925 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2925 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2926 | 2926 | /** |
2927 | 2927 | * Returns an array with id and ref of related invoices |
2928 | 2928 | * |
@@ -2931,7 +2931,7 @@ discard block |
||
2931 | 2931 | */ |
2932 | 2932 | public function InvoiceArrayList($id) |
2933 | 2933 | { |
2934 | - // phpcs:enable |
|
2934 | + // phpcs:enable |
|
2935 | 2935 | $ga = array(); |
2936 | 2936 | $linkedInvoices = array(); |
2937 | 2937 | |
@@ -3179,7 +3179,7 @@ discard block |
||
3179 | 3179 | } |
3180 | 3180 | } |
3181 | 3181 | |
3182 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3182 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3183 | 3183 | /** |
3184 | 3184 | * Change source demand |
3185 | 3185 | * |
@@ -3190,7 +3190,7 @@ discard block |
||
3190 | 3190 | */ |
3191 | 3191 | public function demand_reason($demand_reason_id, $notrigger = 0) |
3192 | 3192 | { |
3193 | - // phpcs:enable |
|
3193 | + // phpcs:enable |
|
3194 | 3194 | global $user; |
3195 | 3195 | |
3196 | 3196 | if ($this->status >= self::STATUS_DRAFT) { |
@@ -3300,7 +3300,7 @@ discard block |
||
3300 | 3300 | return $this->LibStatut($this->statut, $mode); |
3301 | 3301 | } |
3302 | 3302 | |
3303 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3303 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3304 | 3304 | /** |
3305 | 3305 | * Return label of a status (draft, validated, ...) |
3306 | 3306 | * |
@@ -3310,7 +3310,7 @@ discard block |
||
3310 | 3310 | */ |
3311 | 3311 | public function LibStatut($status, $mode = 1) |
3312 | 3312 | { |
3313 | - // phpcs:enable |
|
3313 | + // phpcs:enable |
|
3314 | 3314 | global $hookmanager; |
3315 | 3315 | |
3316 | 3316 | // Init/load array of translation of status |
@@ -3357,7 +3357,7 @@ discard block |
||
3357 | 3357 | } |
3358 | 3358 | |
3359 | 3359 | |
3360 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3360 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3361 | 3361 | /** |
3362 | 3362 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
3363 | 3363 | * |
@@ -3367,7 +3367,7 @@ discard block |
||
3367 | 3367 | */ |
3368 | 3368 | public function load_board($user, $mode) |
3369 | 3369 | { |
3370 | - // phpcs:enable |
|
3370 | + // phpcs:enable |
|
3371 | 3371 | global $conf, $langs; |
3372 | 3372 | |
3373 | 3373 | $clause = " WHERE"; |
@@ -4593,7 +4593,7 @@ discard block |
||
4593 | 4593 | } |
4594 | 4594 | } |
4595 | 4595 | |
4596 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
4596 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
4597 | 4597 | /** |
4598 | 4598 | * Update DB line fields total_xxx |
4599 | 4599 | * Used by migration |
@@ -4602,7 +4602,7 @@ discard block |
||
4602 | 4602 | */ |
4603 | 4603 | public function update_total() |
4604 | 4604 | { |
4605 | - // phpcs:enable |
|
4605 | + // phpcs:enable |
|
4606 | 4606 | $this->db->begin(); |
4607 | 4607 | |
4608 | 4608 | // Mise a jour ligne en base |
@@ -219,12 +219,12 @@ discard block |
||
219 | 219 | */ |
220 | 220 | public $total; |
221 | 221 | |
222 | - public $cond_reglement_code; // code |
|
223 | - public $cond_reglement; // label |
|
224 | - public $cond_reglement_doc; // label doc |
|
222 | + public $cond_reglement_code; // code |
|
223 | + public $cond_reglement; // label |
|
224 | + public $cond_reglement_doc; // label doc |
|
225 | 225 | |
226 | - public $mode_reglement_code; // code |
|
227 | - public $mode_reglement; // label |
|
226 | + public $mode_reglement_code; // code |
|
227 | + public $mode_reglement; // label |
|
228 | 228 | |
229 | 229 | public $deposit_percent; |
230 | 230 | |
@@ -261,9 +261,9 @@ discard block |
||
261 | 261 | |
262 | 262 | public $duree_validite; |
263 | 263 | |
264 | - public $demand_reason_id; // id |
|
265 | - public $demand_reason_code; // code |
|
266 | - public $demand_reason; // label |
|
264 | + public $demand_reason_id; // id |
|
265 | + public $demand_reason_code; // code |
|
266 | + public $demand_reason; // label |
|
267 | 267 | |
268 | 268 | public $warehouse_id; |
269 | 269 | |
@@ -1619,7 +1619,7 @@ discard block |
||
1619 | 1619 | $this->ref_customer = $obj->ref_client; |
1620 | 1620 | $this->ref_ext = $obj->ref_ext; |
1621 | 1621 | |
1622 | - $this->total = $obj->total_ttc; // TODO deprecated |
|
1622 | + $this->total = $obj->total_ttc; // TODO deprecated |
|
1623 | 1623 | $this->total_ttc = $obj->total_ttc; |
1624 | 1624 | $this->total_ht = $obj->total_ht; |
1625 | 1625 | $this->total_tva = $obj->total_tva; |
@@ -2535,7 +2535,7 @@ discard block |
||
2535 | 2535 | */ |
2536 | 2536 | public function closeProposal($user, $status, $note = '', $notrigger = 0) |
2537 | 2537 | { |
2538 | - global $langs,$conf; |
|
2538 | + global $langs, $conf; |
|
2539 | 2539 | |
2540 | 2540 | $error = 0; |
2541 | 2541 | $now = dol_now(); |
@@ -2566,10 +2566,10 @@ discard block |
||
2566 | 2566 | if ($resql) { |
2567 | 2567 | // Status self::STATUS_REFUSED by default |
2568 | 2568 | $modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED', $this->model_pdf); |
2569 | - $trigger_name = 'PROPAL_CLOSE_REFUSED'; // used later in call_trigger() |
|
2569 | + $trigger_name = 'PROPAL_CLOSE_REFUSED'; // used later in call_trigger() |
|
2570 | 2570 | |
2571 | 2571 | if ($status == self::STATUS_SIGNED) { // Status self::STATUS_SIGNED |
2572 | - $trigger_name = 'PROPAL_CLOSE_SIGNED'; // used later in call_trigger() |
|
2572 | + $trigger_name = 'PROPAL_CLOSE_SIGNED'; // used later in call_trigger() |
|
2573 | 2573 | $modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_TOBILL') ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf; |
2574 | 2574 | |
2575 | 2575 | // The connected company is classified as a client |
@@ -3100,7 +3100,7 @@ discard block |
||
3100 | 3100 | } |
3101 | 3101 | } |
3102 | 3102 | if (file_exists($dir)) { |
3103 | - $res = @dol_delete_dir_recursive($dir); // delete files physically + into ecm tables |
|
3103 | + $res = @dol_delete_dir_recursive($dir); // delete files physically + into ecm tables |
|
3104 | 3104 | if (!$res) { |
3105 | 3105 | $this->error = 'ErrorFailToDeleteDir'; |
3106 | 3106 | $this->errors[] = $this->error; |