@@ -221,7 +221,7 @@ |
||
221 | 221 | |
222 | 222 | if (!$notrigger) { |
223 | 223 | // Call triggers |
224 | - $result=$this->call_trigger('LINERECEPTION_CREATE', $user); |
|
224 | + $result = $this->call_trigger('LINERECEPTION_CREATE', $user); |
|
225 | 225 | if ($result < 0) { |
226 | 226 | $error++; |
227 | 227 | } |
@@ -51,7 +51,9 @@ |
||
51 | 51 | $object->fetch($id); |
52 | 52 | $object->fetch_thirdparty(); |
53 | 53 | $result = $object->add_object_linked($addlink, $objecttmp->id); |
54 | - if (isset($_POST['reftolinkto'])) unset($_POST['reftolinkto']); |
|
54 | + if (isset($_POST['reftolinkto'])) { |
|
55 | + unset($_POST['reftolinkto']); |
|
56 | + } |
|
55 | 57 | } elseif ($ret < 0) { |
56 | 58 | setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); |
57 | 59 | } else { |
@@ -43,7 +43,7 @@ |
||
43 | 43 | if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) { |
44 | 44 | $element_prop = getElementProperties($addlink); |
45 | 45 | if (is_array($element_prop)) { |
46 | - dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php'); |
|
46 | + dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php'); |
|
47 | 47 | |
48 | 48 | $objecttmp = new $element_prop['classname']($db); |
49 | 49 | $ret = $objecttmp->fetch(0, $addlinkref); |
@@ -34,22 +34,22 @@ |
||
34 | 34 | $total = 0; |
35 | 35 | foreach ($linkedObjectBlock as $key => $objectlink) { |
36 | 36 | echo '<tr class="oddeven">'; |
37 | - echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>'; |
|
37 | + echo '<td>'.$langs->trans(get_class($objectlink)).'</td>'; |
|
38 | 38 | echo '<td>'.$objectlink->getNomUrl(1).'</td>'; |
39 | 39 | echo '<td class="center">'; |
40 | - if (get_class($objectlink)=='ConferenceOrBooth') { |
|
40 | + if (get_class($objectlink) == 'ConferenceOrBooth') { |
|
41 | 41 | print dol_trunc($objectlink->label, 20); |
42 | 42 | } |
43 | 43 | print '</td>'; |
44 | 44 | echo '<td class="center">'; |
45 | - if (get_class($objectlink)=='ConferenceOrBoothAttendee') { |
|
45 | + if (get_class($objectlink) == 'ConferenceOrBoothAttendee') { |
|
46 | 46 | print dol_print_date($objectlink->date_subscription); |
47 | 47 | } else { |
48 | 48 | print dol_print_date($objectlink->datep); |
49 | 49 | } |
50 | 50 | print '</td>'; |
51 | 51 | echo '<td class="right">'; |
52 | - if (get_class($objectlink)=='ConferenceOrBoothAttendee') { |
|
52 | + if (get_class($objectlink) == 'ConferenceOrBoothAttendee') { |
|
53 | 53 | print price($objectlink->amount); |
54 | 54 | } |
55 | 55 | print '</td>'; |
@@ -102,8 +102,8 @@ |
||
102 | 102 | |
103 | 103 | |
104 | 104 | // List of targets fields |
105 | -$headerlinefields = array(); // Array of fields (label to show) |
|
106 | -$contentlinevalues = array(); // Array of example values |
|
105 | +$headerlinefields = array(); // Array of fields (label to show) |
|
106 | +$contentlinevalues = array(); // Array of example values |
|
107 | 107 | $i = 0; |
108 | 108 | foreach ($fieldstarget as $code => $label) { |
109 | 109 | $withoutstar = preg_replace('/\*/', '', $fieldstarget[$code]); |
@@ -170,7 +170,7 @@ |
||
170 | 170 | $sql = array(); |
171 | 171 | |
172 | 172 | // If already used, we add an entry to show we enable module |
173 | - require_once DOL_DOCUMENT_ROOT . '/blockedlog/class/blockedlog.class.php'; |
|
173 | + require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php'; |
|
174 | 174 | |
175 | 175 | $object = new stdClass(); |
176 | 176 | $object->id = 1; |
@@ -75,7 +75,9 @@ |
||
75 | 75 | |
76 | 76 | $parameters = array(); |
77 | 77 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
78 | -if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
78 | +if ($reshook < 0) { |
|
79 | + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
80 | +} |
|
79 | 81 | |
80 | 82 | if (empty($reshook)) { |
81 | 83 | $backurlforlist = DOL_URL_ROOT.'/compta/bank/list.php'; |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation |
222 | 222 | |
223 | 223 | if (empty($noback)) { |
224 | - header("Location: " . $urltogo); |
|
224 | + header("Location: ".$urltogo); |
|
225 | 225 | exit; |
226 | 226 | } |
227 | 227 | } else { |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | |
338 | 338 | if ($result > 0) { |
339 | 339 | setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs'); |
340 | - header("Location: " . DOL_URL_ROOT . "/compta/bank/list.php"); |
|
340 | + header("Location: ".DOL_URL_ROOT."/compta/bank/list.php"); |
|
341 | 341 | exit; |
342 | 342 | } else { |
343 | 343 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | if (isModEnabled('paymentbybanktransfer')) { |
584 | 584 | if ($mysoc->isInEEC()) { |
585 | 585 | print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>'; |
586 | - print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. (empty(GETPOST('pti_in_ctti')) ? '' : ' checked ') . '>'; |
|
586 | + print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'.(empty(GETPOST('pti_in_ctti')) ? '' : ' checked ').'>'; |
|
587 | 587 | print '</td></tr>'; |
588 | 588 | } |
589 | 589 | } |
@@ -1129,14 +1129,14 @@ discard block |
||
1129 | 1129 | $tooltip = $langs->trans("Example").':<br>CH93 0076 2011 6238 5295 7<br>LT12 1000 0111 0100 1000<br>FR14 2004 1010 0505 0001 3M02 606<br>LU28 0019 4006 4475 0000<br>DE89 3704 0044 0532 0130 00'; |
1130 | 1130 | print $form->textwithpicto($langs->trans($ibankey), $tooltip, 1, 'help', '', 0, 3, 'iban'); |
1131 | 1131 | print '</td>'; |
1132 | - print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban', 'alphanohtml') : $object->iban).'"></td></tr>'; |
|
1132 | + print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban', 'alphanohtml') : $object->iban).'"></td></tr>'; |
|
1133 | 1133 | |
1134 | 1134 | // BIC |
1135 | 1135 | print '<tr><td>'; |
1136 | 1136 | $tooltip = $langs->trans("Example").': LIABLT2XXXX'; |
1137 | 1137 | print $form->textwithpicto($langs->trans($bickey), $tooltip, 1, 'help', '', 0, 3, 'bic'); |
1138 | 1138 | print '</td>'; |
1139 | - print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic', 'alphanohtml') : $object->bic).'"></td></tr>'; |
|
1139 | + print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic', 'alphanohtml') : $object->bic).'"></td></tr>'; |
|
1140 | 1140 | |
1141 | 1141 | // Show fields of bank account |
1142 | 1142 | foreach ($object->getFieldsToShow() as $val) { |
@@ -1176,7 +1176,7 @@ discard block |
||
1176 | 1176 | } |
1177 | 1177 | if ($mysoc->isInEEC()) { |
1178 | 1178 | print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>'; |
1179 | - print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. ($object->pti_in_ctti ? ' checked ' : '') . '>'; |
|
1179 | + print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'.($object->pti_in_ctti ? ' checked ' : '').'>'; |
|
1180 | 1180 | print '</td></tr>'; |
1181 | 1181 | } |
1182 | 1182 | } |
@@ -268,9 +268,9 @@ discard block |
||
268 | 268 | // Exports profiles provided by this module |
269 | 269 | $r = 1; |
270 | 270 | |
271 | - $this->export_code[$r]=$this->rights_class.'_'.$r; |
|
272 | - $this->export_label[$r]='MOs'; // Translation key (used only if key ExportDataset_xxx_z not found) |
|
273 | - $this->export_icon[$r]='mrp'; |
|
271 | + $this->export_code[$r] = $this->rights_class.'_'.$r; |
|
272 | + $this->export_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found) |
|
273 | + $this->export_icon[$r] = 'mrp'; |
|
274 | 274 | $this->export_fields_array[$r] = array( |
275 | 275 | 'm.rowid'=>"Id", |
276 | 276 | 'm.ref'=>"Ref", |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | $r++; */ |
351 | 351 | /* END MODULEBUILDER IMPORT MO */ |
352 | 352 | $r++; |
353 | - $this->import_code[$r]=$this->rights_class.'_'.$r; |
|
354 | - $this->import_label[$r]='MOs'; // Translation key (used only if key ExportDataset_xxx_z not found) |
|
355 | - $this->import_icon[$r]='mrp'; |
|
353 | + $this->import_code[$r] = $this->rights_class.'_'.$r; |
|
354 | + $this->import_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found) |
|
355 | + $this->import_icon[$r] = 'mrp'; |
|
356 | 356 | $this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon |
357 | 357 | $this->import_tables_array[$r] = array('m'=>MAIN_DB_PREFIX.'mrp_mo', 'extra'=>MAIN_DB_PREFIX.'mrp_mo_extrafields'); |
358 | 358 | $this->import_tables_creator_array[$r] = array('m'=>'fk_user_creat'); // Fields to store import user id |
@@ -1120,7 +1120,9 @@ |
||
1120 | 1120 | global $langs, $conf, $mysoc; |
1121 | 1121 | |
1122 | 1122 | $ltrdirection = 'L'; |
1123 | - if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R'; |
|
1123 | + if ($outputlangs->trans("DIRECTION") == 'rtl') { |
|
1124 | + $ltrdirection = 'R'; |
|
1125 | + } |
|
1124 | 1126 | |
1125 | 1127 | // Load translation files required by the page |
1126 | 1128 | $outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings")); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $this->db = $db; |
90 | 90 | $this->name = "vinci"; |
91 | 91 | $this->description = $langs->trans('DocumentModelStandardPDF'); |
92 | - $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
92 | + $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
93 | 93 | |
94 | 94 | // Page size for A4 format |
95 | 95 | $this->type = 'pdf'; |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
227 | 227 | // Set path to the background PDF File |
228 | 228 | if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) { |
229 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
229 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
230 | 230 | $tplidx = $pdf->importPage(1); |
231 | 231 | } |
232 | 232 | |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | if ($this->getColumnStatus('desc')) { |
519 | 519 | $pdf->startTransaction(); //description |
520 | 520 | $des = $prod -> description; |
521 | - $descr = $des;//implode("<br>", $des); |
|
521 | + $descr = $des; //implode("<br>", $des); |
|
522 | 522 | |
523 | 523 | $this->printStdColumnContent($pdf, $curY, 'desc', $descr); |
524 | 524 | |
@@ -1157,7 +1157,7 @@ discard block |
||
1157 | 1157 | $pdf->SetFont('', 'B', $default_font_size + 3); |
1158 | 1158 | $pdf->SetXY($posx, $posy); |
1159 | 1159 | $pdf->SetTextColor(0, 0, 60); |
1160 | - $pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": " .$object->qty, '', 'R'); |
|
1160 | + $pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": ".$object->qty, '', 'R'); |
|
1161 | 1161 | |
1162 | 1162 | |
1163 | 1163 | $pdf->SetTextColor(0, 0, 60); |
@@ -304,8 +304,11 @@ |
||
304 | 304 | } |
305 | 305 | } |
306 | 306 | |
307 | - if (!$error) $db->commit(); |
|
308 | - else $db->rollback(); |
|
307 | + if (!$error) { |
|
308 | + $db->commit(); |
|
309 | + } else { |
|
310 | + $db->rollback(); |
|
311 | + } |
|
309 | 312 | } |
310 | 313 | } |
311 | 314 |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $search_date_order_endday = GETPOST('search_date_order_endday', 'int'); |
65 | 65 | $search_date_order_endmonth = GETPOST('search_date_order_endmonth', 'int'); |
66 | 66 | $search_date_order_endyear = GETPOST('search_date_order_endyear', 'int'); |
67 | -$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear); // Use tzserver |
|
67 | +$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear); // Use tzserver |
|
68 | 68 | $search_date_order_end = dol_mktime(23, 59, 59, $search_date_order_endmonth, $search_date_order_endday, $search_date_order_endyear); |
69 | 69 | |
70 | 70 | $search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int'); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int'); |
74 | 74 | $search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int'); |
75 | 75 | $search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int'); |
76 | -$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
76 | +$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
77 | 77 | $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear); |
78 | 78 | |
79 | 79 | $search_date_valid_startday = GETPOST('search_date_valid_startday', 'int'); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int'); |
83 | 83 | $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int'); |
84 | 84 | $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int'); |
85 | -$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
85 | +$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
86 | 86 | $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear); |
87 | 87 | |
88 | 88 | $search_date_approve_startday = GETPOST('search_date_approve_startday', 'int'); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $search_date_approve_endday = GETPOST('search_date_approve_endday', 'int'); |
92 | 92 | $search_date_approve_endmonth = GETPOST('search_date_approve_endmonth', 'int'); |
93 | 93 | $search_date_approve_endyear = GETPOST('search_date_approve_endyear', 'int'); |
94 | -$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver |
|
94 | +$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver |
|
95 | 95 | $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear); |
96 | 96 | |
97 | 97 | $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | |
371 | 371 | $db->begin(); |
372 | 372 | |
373 | - $default_ref_supplier=dol_print_date(dol_now(), '%Y%m%d%H%M%S'); |
|
373 | + $default_ref_supplier = dol_print_date(dol_now(), '%Y%m%d%H%M%S'); |
|
374 | 374 | |
375 | 375 | foreach ($orders as $id_order) { |
376 | 376 | $cmd = new CommandeFournisseur($db); |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | $objecttmp->fk_project = $cmd->fk_project; |
390 | 390 | $objecttmp->multicurrency_code = $cmd->multicurrency_code; |
391 | 391 | $objecttmp->ref_supplier = !empty($cmd->ref_supplier) ? $cmd->ref_supplier : $default_ref_supplier; |
392 | - $default_ref_supplier+=1; |
|
392 | + $default_ref_supplier += 1; |
|
393 | 393 | |
394 | 394 | $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); |
395 | 395 | if (empty($datefacture)) { |
@@ -885,9 +885,9 @@ discard block |
||
885 | 885 | if ($search_user > 0) { |
886 | 886 | $sql .= " AND EXISTS ("; |
887 | 887 | $sql .= " SELECT ec.rowid "; |
888 | - $sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec"; |
|
889 | - $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact"; |
|
890 | - $sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = " . ((int) $search_user); |
|
888 | + $sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec"; |
|
889 | + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact"; |
|
890 | + $sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = ".((int) $search_user); |
|
891 | 891 | $sql .= " AND tc.element = 'order_supplier' AND tc.source = 'internal'"; |
892 | 892 | $sql .= ")"; |
893 | 893 | } |
@@ -931,7 +931,7 @@ discard block |
||
931 | 931 | if ($searchCategoryProductOperator == 0) { |
932 | 932 | $searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
933 | 933 | } else { |
934 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
934 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
935 | 935 | } |
936 | 936 | } |
937 | 937 | } |
@@ -1203,7 +1203,7 @@ discard block |
||
1203 | 1203 | |
1204 | 1204 | $topicmail = "SendOrderRef"; |
1205 | 1205 | $modelmail = "order_supplier_send"; |
1206 | - $objecttmp = new CommandeFournisseur($db); // in case $object is not the good object |
|
1206 | + $objecttmp = new CommandeFournisseur($db); // in case $object is not the good object |
|
1207 | 1207 | $trackid = 'sord'.$object->id; |
1208 | 1208 | include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; |
1209 | 1209 |