@@ -429,7 +429,7 @@ |
||
429 | 429 | if ($mode == 'short_label') { |
430 | 430 | return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'"); |
431 | 431 | } elseif ($mode == 'code') { |
432 | - return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '". $this->db->escape($unit_type) ."'"); |
|
432 | + return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'"); |
|
433 | 433 | } |
434 | 434 | |
435 | 435 | return $code; |
@@ -295,11 +295,11 @@ |
||
295 | 295 | } |
296 | 296 | |
297 | 297 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
298 | - $sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe_perentity"; |
|
299 | - $sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'"; |
|
298 | + $sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe_perentity"; |
|
299 | + $sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'"; |
|
300 | 300 | } else { |
301 | - $sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe"; |
|
302 | - $sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'"; |
|
301 | + $sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe"; |
|
302 | + $sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'"; |
|
303 | 303 | } |
304 | 304 | $sql .= " AND entity IN (".getEntity('societe').")"; |
305 | 305 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | * \ingroup workstation |
24 | 24 | * \brief File of class to manage Workstation numbering rules standard |
25 | 25 | */ |
26 | -require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php'; |
|
26 | +require_once DOL_DOCUMENT_ROOT.'/core/modules/workstation/modules_workstation.php'; |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Class to manage the Standard numbering rule for Workstation |
@@ -154,7 +154,7 @@ |
||
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | - if (!$mask) { |
|
157 | + if (!$mask) { |
|
158 | 158 | $this->error = 'NotConfigured'; |
159 | 159 | return 0; |
160 | 160 | } |
@@ -135,8 +135,8 @@ |
||
135 | 135 | 'lastname' => $obj->name, // For thirdparties, lastname must be name |
136 | 136 | 'firstname' => '', // For thirdparties, firstname is '' |
137 | 137 | 'other' => |
138 | - ('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'. // date start real |
|
139 | - ('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'. // date end planned |
|
138 | + ('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.// date start real |
|
139 | + ('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.// date end planned |
|
140 | 140 | ('Contract='.$obj->fk_contrat).';'. |
141 | 141 | ('ContactLine='.$obj->cdid), |
142 | 142 | 'source_url' => $this->url($obj->id), |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | $title = $object->ref; |
227 | 227 | if (!empty($withproject)) { |
228 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
228 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
229 | 229 | } |
230 | 230 | $help_url = ''; |
231 | 231 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | // Title |
267 | 267 | $morehtmlref .= $projectstatic->title; |
268 | 268 | // Thirdparty |
269 | - if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) { |
|
269 | + if (!empty($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) { |
|
270 | 270 | $morehtmlref .= '<br>'.$projectstatic->thirdparty->getNomUrl(1, 'project'); |
271 | 271 | } |
272 | 272 | $morehtmlref .= '</div>'; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search |
45 | 45 | $backtopage = GETPOST('backtopage', 'alpha'); |
46 | 46 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
47 | -$lineid = GETPOST('lineid', 'int'); |
|
47 | +$lineid = GETPOST('lineid', 'int'); |
|
48 | 48 | |
49 | 49 | // Initialize technical objects |
50 | 50 | $object = new KnowledgeRecord($db); |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | print '<table class="border centpercent tableforfield">'."\n"; |
426 | 426 | |
427 | 427 | // Common attributes |
428 | - $keyforbreak='fk_c_ticket_category'; // We change column just before this field |
|
428 | + $keyforbreak = 'fk_c_ticket_category'; // We change column just before this field |
|
429 | 429 | //unset($object->fields['fk_project']); // Hide field already shown in banner |
430 | 430 | //unset($object->fields['fk_soc']); // Hide field already shown in banner |
431 | 431 | $object->fields['answer']['enabled'] = 0; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object); |
86 | 86 | if (!empty($hookmanager->resPrint)) { |
87 | 87 | print $hookmanager->resPrint; |
88 | - return; // Receipt page can be called by the takepos/send.php page that use ob_start/end so we must use return and not exit to stop page |
|
88 | + return; // Receipt page can be called by the takepos/send.php page that use ob_start/end so we must use return and not exit to stop page |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | // IMPORTANT: This file is sended to 'Takepos Printing' application. Keep basic file. No external files as css, js... If you need images use absolute path. |
@@ -173,13 +173,13 @@ discard block |
||
173 | 173 | if ($action == 'without_details') { |
174 | 174 | $qty = GETPOST('qty', 'int') > 0 ? GETPOST('qty', 'int') : 1; |
175 | 175 | print '<tr>'; |
176 | - print '<td>' . GETPOST('label', 'alphanohtml') . '</td>'; |
|
177 | - print '<td class="right">' . $qty . '</td>'; |
|
178 | - print '<td class="right">' . price(price2num($object->total_ttc / $qty, 'MU'), 1) . '</td>'; |
|
176 | + print '<td>'.GETPOST('label', 'alphanohtml').'</td>'; |
|
177 | + print '<td class="right">'.$qty.'</td>'; |
|
178 | + print '<td class="right">'.price(price2num($object->total_ttc / $qty, 'MU'), 1).'</td>'; |
|
179 | 179 | if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { |
180 | - print '<td class="right">' . price($object->total_ht, 1) . '</td>'; |
|
180 | + print '<td class="right">'.price($object->total_ht, 1).'</td>'; |
|
181 | 181 | } |
182 | - print '<td class="right">' . price($object->total_ttc, 1) . '</td>'; |
|
182 | + print '<td class="right">'.price($object->total_ttc, 1).'</td>'; |
|
183 | 183 | print '</tr>'; |
184 | 184 | } else { |
185 | 185 | foreach ($object->lines as $line) { |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | * Actions |
57 | 57 | */ |
58 | 58 | |
59 | -if ($action=="split") { |
|
59 | +if ($action == "split") { |
|
60 | 60 | $line = GETPOST('line', 'int'); |
61 | 61 | $split = GETPOST('split', 'int'); |
62 | - if ($split==1) { // Split line |
|
62 | + if ($split == 1) { // Split line |
|
63 | 63 | $invoice = new Facture($db); |
64 | 64 | $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-SPLIT)'); |
65 | 65 | if ($ret > 0) { |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | } |
86 | 86 | $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set fk_facture=".$placeid." where rowid=".$line; |
87 | 87 | $db->query($sql); |
88 | - } elseif ($split==0) { // Unsplit line |
|
88 | + } elseif ($split == 0) { // Unsplit line |
|
89 | 89 | $invoice = new Facture($db); |
90 | - if ($place=="SPLIT") $place="0"; // Avoid move line to the same place (from SPLIT to SPLIT place) |
|
90 | + if ($place == "SPLIT") $place = "0"; // Avoid move line to the same place (from SPLIT to SPLIT place) |
|
91 | 91 | $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')'); |
92 | 92 | if ($ret > 0) { |
93 | 93 | $placeid = $invoice->id; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | <script> |
165 | 165 | function Split(selectedline, split) { |
166 | 166 | $.ajax({ |
167 | - url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place;?>", |
|
167 | + url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place; ?>", |
|
168 | 168 | context: document.body |
169 | 169 | }).done(function() { |
170 | 170 | $("#currentplace").load("invoice.php?place="+parent.place+"&invoiceid="+parent.invoiceid, function() { |
@@ -201,8 +201,8 @@ discard block |
||
201 | 201 | |
202 | 202 | |
203 | 203 | |
204 | - $("#headersplit1").html("<?php echo $langs->trans("Place");?> "+parent.place); |
|
205 | - $("#headersplit2").html("<?php echo $langs->trans("SplitSale");?>"); |
|
204 | + $("#headersplit1").html("<?php echo $langs->trans("Place"); ?> "+parent.place); |
|
205 | + $("#headersplit2").html("<?php echo $langs->trans("SplitSale"); ?>"); |
|
206 | 206 | |
207 | 207 | }); |
208 | 208 | </script> |