@@ -205,12 +205,12 @@ |
||
205 | 205 | |
206 | 206 | $numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now); |
207 | 207 | //Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last character (* or ?) used in the mask by the key |
208 | - if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
208 | + if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
209 | 209 | $literaltype = ''; |
210 | - $literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type |
|
210 | + $literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type |
|
211 | 211 | switch ($literaltype) { |
212 | 212 | case 'EAN13': //EAN13 rowid = 2 |
213 | - if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13 |
|
213 | + if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13 |
|
214 | 214 | $ean = substr($numFinal, 0, 12); //take first 12 digits |
215 | 215 | $eansum = barcode_gen_ean_sum($ean); |
216 | 216 | $ean .= $eansum; //substitute the las character by the key |
@@ -1718,7 +1718,7 @@ |
||
1718 | 1718 | |
1719 | 1719 | $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs); |
1720 | 1720 | |
1721 | - $mode = 'target'; |
|
1721 | + $mode = 'target'; |
|
1722 | 1722 | $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object); |
1723 | 1723 | |
1724 | 1724 | // Show recipient |
@@ -1718,7 +1718,7 @@ |
||
1718 | 1718 | |
1719 | 1719 | $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs); |
1720 | 1720 | |
1721 | - $mode = 'target'; |
|
1721 | + $mode = 'target'; |
|
1722 | 1722 | $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object); |
1723 | 1723 | |
1724 | 1724 | // Show recipient |
@@ -1718,7 +1718,7 @@ |
||
1718 | 1718 | |
1719 | 1719 | $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs); |
1720 | 1720 | |
1721 | - $mode = 'target'; |
|
1721 | + $mode = 'target'; |
|
1722 | 1722 | $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object); |
1723 | 1723 | |
1724 | 1724 | // Show recipient |
@@ -263,7 +263,7 @@ |
||
263 | 263 | echo '<div>'; |
264 | 264 | echo '<table class="noborder centpercent">'; |
265 | 265 | echo '<thead>'; |
266 | -echo '<tr class="liste_titre"><th>' . $langs->trans('Parameter') . '</th><th>' . $langs->trans('Value') . '</th></tr>'; |
|
266 | +echo '<tr class="liste_titre"><th>'.$langs->trans('Parameter').'</th><th>'.$langs->trans('Value').'</th></tr>'; |
|
267 | 267 | echo '</thead>'; |
268 | 268 | echo '<tbody>'; |
269 | 269 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * \brief Module to show box of members |
25 | 25 | */ |
26 | 26 | |
27 | -include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php'; |
|
27 | +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; |
|
28 | 28 | |
29 | 29 | |
30 | 30 | /** |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | |
84 | 84 | $this->max = $max; |
85 | 85 | |
86 | - include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php'; |
|
87 | - require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php'; |
|
86 | + include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; |
|
87 | + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; |
|
88 | 88 | $memberstatic = new Adherent($this->db); |
89 | 89 | $statictype = new AdherentType($this->db); |
90 | 90 | |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | $numb = 0; |
101 | 101 | |
102 | 102 | $sql = "SELECT c.subscription, c.dateadh as dateh"; |
103 | - $sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "subscription as c"; |
|
104 | - $sql .= " WHERE d.entity IN (" . getEntity('adherent') . ")"; |
|
103 | + $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c"; |
|
104 | + $sql .= " WHERE d.entity IN (".getEntity('adherent').")"; |
|
105 | 105 | $sql .= " AND d.rowid = c.fk_adherent"; |
106 | 106 | |
107 | 107 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $this->info_box_contents[0][0] = array( |
217 | 217 | 'td' => '', |
218 | 218 | 'maxlength' => 500, |
219 | - 'text' => ($this->db->error() . ' sql=' . $sql), |
|
219 | + 'text' => ($this->db->error().' sql='.$sql), |
|
220 | 220 | ); |
221 | 221 | } |
222 | 222 | } else { |
@@ -100,7 +100,7 @@ |
||
100 | 100 | while ($line < $num) { |
101 | 101 | $objp = $this->db->fetch_object($result); |
102 | 102 | $date = $this->db->jdate($objp->date_movement); |
103 | - $journal = $objp->code_journal; |
|
103 | + $journal = $objp->code_journal; |
|
104 | 104 | $label = $objp->label_operation; |
105 | 105 | $amount = $objp->amount; |
106 | 106 |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | $object->date_ech = $dateech; |
167 | 167 | $object->periode = $dateperiod; |
168 | 168 | $object->amount = $amount; |
169 | - $object->fk_user = $fk_user; |
|
169 | + $object->fk_user = $fk_user; |
|
170 | 170 | $object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int'); |
171 | 171 | $object->fk_account = (int) GETPOST('fk_account', 'int'); |
172 | 172 | $object->fk_project = (int) GETPOST('fk_project', 'int'); |
@@ -449,10 +449,10 @@ discard block |
||
449 | 449 | $userstatic = new User($db); |
450 | 450 | $result = $userstatic->fetch($object->fk_user); |
451 | 451 | if ($result > 0) { |
452 | - $morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1); |
|
452 | + $morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(1); |
|
453 | 453 | } |
454 | 454 | } else { |
455 | - $morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); |
|
455 | + $morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); |
|
456 | 456 | if (!empty($object->fk_user)) { |
457 | 457 | $userstatic = new User($db); |
458 | 458 | $result = $userstatic->fetch($object->fk_user); |
@@ -84,7 +84,7 @@ |
||
84 | 84 | $object->town = GETPOST('town', 'alpha'); |
85 | 85 | $object->country_id = GETPOST("country_id", 'int'); |
86 | 86 | $object->status = GETPOST('status', 'int'); |
87 | - $object->fk_user_author = $user->id; |
|
87 | + $object->fk_user_author = $user->id; |
|
88 | 88 | $object->datec = dol_now(); |
89 | 89 | $object->entity = GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity; |
90 | 90 |