@@ -172,10 +172,10 @@ |
||
172 | 172 | $dispachedLines = $object->getDispachedLines(1); |
173 | 173 | $nbDispachedLines = count($dispachedLines); |
174 | 174 | |
175 | - for ($line = 0 ; $line < $nbDispachedLines; $line++) { |
|
175 | + for ($line = 0; $line < $nbDispachedLines; $line++) { |
|
176 | 176 | $sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty']; |
177 | 177 | } |
178 | - for ($line = 0 ; $line < $nbLinesOrdered; $line++) { |
|
178 | + for ($line = 0; $line < $nbLinesOrdered; $line++) { |
|
179 | 179 | $sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty; |
180 | 180 | } |
181 | 181 | $head[$h][1] .= '<span class="badge marginleftonlyshort">'.price2num($sumQtyAllreadyDispatched, 'MS').' / '.price2num($sumQtyOrdered, 'MS').'</span>'; |
@@ -124,8 +124,8 @@ |
||
124 | 124 | $htmlname = 'activesynchro'; |
125 | 125 | } |
126 | 126 | |
127 | - $dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP") . (($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : ""); |
|
128 | - $ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr") . (($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : ""); |
|
127 | + $dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP").(($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : ""); |
|
128 | + $ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr").(($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : ""); |
|
129 | 129 | |
130 | 130 | $arraylist = array( |
131 | 131 | Ldap::SYNCHRO_NONE => $langs->trans("No"), |
@@ -175,10 +175,10 @@ |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | $i = 1; |
178 | - $filepath = $path . $filename . '.' . $ext; |
|
178 | + $filepath = $path.$filename.'.'.$ext; |
|
179 | 179 | |
180 | 180 | while (file_exists($filepath)) { |
181 | - $filepath = $path . $filename . '(' . $i . ').' . $ext; |
|
181 | + $filepath = $path.$filename.'('.$i.').'.$ext; |
|
182 | 182 | $i++; |
183 | 183 | } |
184 | 184 | file_put_contents($filepath, $data); |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public $picto = 'inventory'; |
61 | 61 | |
62 | - const STATUS_DRAFT = 0; // Draft |
|
63 | - const STATUS_VALIDATED = 1; // Inventory is in process |
|
64 | - const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
65 | - const STATUS_CANCELED = 9; // Canceled |
|
62 | + const STATUS_DRAFT = 0; // Draft |
|
63 | + const STATUS_VALIDATED = 1; // Inventory is in process |
|
64 | + const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
65 | + const STATUS_CANCELED = 9; // Canceled |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * 'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password') |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | 'title' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax200'), |
102 | 102 | 'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'), |
103 | 103 | 'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'), |
104 | - 'date_inventory' => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35), // This date is not used so disabled by default. |
|
104 | + 'date_inventory' => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35), // This date is not used so disabled by default. |
|
105 | 105 | 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500), |
106 | 106 | 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501), |
107 | 107 | 'date_validation' => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502), |
@@ -1283,7 +1283,7 @@ |
||
1283 | 1283 | |
1284 | 1284 | // List of bank accounts |
1285 | 1285 | if ($permissiontoaddupdatepaymentinformation) { |
1286 | - $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&action=create'); |
|
1286 | + $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=create'); |
|
1287 | 1287 | } |
1288 | 1288 | |
1289 | 1289 | print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank'); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | public $liste_limit; |
95 | 95 | |
96 | - public $tzuserinputkey = 'tzserver'; // Use 'tzuserrel' to always store date in GMT and show date in time zone of user. |
|
96 | + public $tzuserinputkey = 'tzserver'; // Use 'tzuserrel' to always store date in GMT and show date in time zone of user. |
|
97 | 97 | |
98 | 98 | |
99 | 99 | /** |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $this->facture = new stdClass(); |
156 | 156 | $this->contrat = new stdClass(); |
157 | 157 | $this->user = new stdClass(); |
158 | - $this->adherent = new stdClass(); |
|
158 | + $this->adherent = new stdClass(); |
|
159 | 159 | $this->bank = new stdClass(); |
160 | 160 | $this->notification = new stdClass(); |
161 | 161 | $this->mailing = new stdClass(); |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $this->facture = new stdClass(); |
225 | 225 | $this->contrat = new stdClass(); |
226 | 226 | $this->user = new stdClass(); |
227 | - $this->adherent = new stdClass(); |
|
227 | + $this->adherent = new stdClass(); |
|
228 | 228 | $this->bank = new stdClass(); |
229 | 229 | $this->notification = new stdClass(); |
230 | 230 | $this->mailing = new stdClass(); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | |
234 | 234 | // Common arrays |
235 | 235 | $this->cache = array(); |
236 | - $this->modules = array();; |
|
236 | + $this->modules = array(); ; |
|
237 | 237 | $this->modules_parts = array( |
238 | 238 | 'css' => array(), |
239 | 239 | 'js' => array(), |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | } |
945 | 945 | |
946 | 946 | if (!empty($this->global->MAIN_TZUSERINPUTKEY)) { |
947 | - $this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY; // 'tzserver' or 'tzuserrel' |
|
947 | + $this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY; // 'tzserver' or 'tzuserrel' |
|
948 | 948 | } |
949 | 949 | |
950 | 950 | if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) { |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | } |
249 | 249 | } |
250 | 250 | if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) { |
251 | - $substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>'; |
|
251 | + $substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm').'</a>'; |
|
252 | 252 | } |
253 | 253 | /* For backward compatibility, deprecated */ |
254 | 254 | if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) { |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | } |
416 | 416 | |
417 | 417 | // Action send test emailing |
418 | - if ($action == 'send' && ! $cancel) { |
|
418 | + if ($action == 'send' && !$cancel) { |
|
419 | 419 | $error = 0; |
420 | 420 | |
421 | 421 | $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing'); |
@@ -320,12 +320,12 @@ |
||
320 | 320 | //output template |
321 | 321 | $html .= '<tr class="app oddeven '.dol_escape_htmltag($compatible).'">'; |
322 | 322 | $html .= '<td class="center" width="210"><div class="newAppParent">'; |
323 | - $html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html |
|
323 | + $html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html |
|
324 | 324 | $html .= '</div></td>'; |
325 | 325 | $html .= '<td class="margeCote"><h2 class="appTitle">'; |
326 | 326 | $html .= dol_escape_htmltag($product->name->language[$this->lang - 1]); |
327 | 327 | $html .= '<br><small>'; |
328 | - $html .= $version; // No dol_escape_htmltag, it is already escape html |
|
328 | + $html .= $version; // No dol_escape_htmltag, it is already escape html |
|
329 | 329 | $html .= '</small></h2>'; |
330 | 330 | $html .= '<small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.dol_escape_htmltag($product->reference).' - '.dol_escape_htmltag($langs->trans('Id')).': '.((int) $product->id).'</small><br><br>'.dol_escape_htmltag($product->description_short->language[$this->lang - 1]).'</td>'; |
331 | 331 | // do not load if display none |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup'); |
479 | 479 | |
480 | 480 | // Start to show page |
481 | -$deschelp = ''; |
|
481 | +$deschelp = ''; |
|
482 | 482 | if ($mode == 'common' || $mode == 'commonkanban') { |
483 | 483 | $desc = $langs->trans("ModulesDesc", '{picto}'); |
484 | 484 | $desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}'); |
@@ -1061,14 +1061,14 @@ discard block |
||
1061 | 1061 | <div id="category-tree-left"> |
1062 | 1062 | <ul class="tree"> |
1063 | 1063 | <?php |
1064 | - echo $dolistore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content |
|
1064 | + echo $dolistore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content |
|
1065 | 1065 | ?> |
1066 | 1066 | </ul> |
1067 | 1067 | </div> |
1068 | 1068 | <div id="listing-content"> |
1069 | 1069 | <table summary="list_of_modules" id="list_of_modules" class="productlist centpercent"> |
1070 | 1070 | <tbody id="listOfModules"> |
1071 | - <?php echo $dolistore->get_products(!empty($categorie) ? $categorie: ''); ?> |
|
1071 | + <?php echo $dolistore->get_products(!empty($categorie) ? $categorie : ''); ?> |
|
1072 | 1072 | </tbody> |
1073 | 1073 | </table> |
1074 | 1074 | </div> |