@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | $month_current = dol_print_date(dol_now(), '%m'); |
80 | 80 | $year_start = $year; |
81 | 81 | } |
82 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
83 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
82 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
83 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
84 | 84 | // Quarter |
85 | 85 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
86 | 86 | $q = GETPOST("q") ?GETPOST("q") : 0; |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $headerparams = array_merge($commonparams, $headerparams); |
166 | 166 | $tableparams = array_merge($commonparams, $tableparams); |
167 | 167 | |
168 | -$paramslink=""; |
|
168 | +$paramslink = ""; |
|
169 | 169 | foreach ($allparams as $key => $value) { |
170 | 170 | $paramslink .= '&'.$key.'='.$value; |
171 | 171 | } |
@@ -186,8 +186,8 @@ discard block |
||
186 | 186 | $modecompta = "RECETTES-DEPENSES"; |
187 | 187 | } |
188 | 188 | |
189 | -$exportlink=""; |
|
190 | -$namelink=""; |
|
189 | +$exportlink = ""; |
|
190 | +$namelink = ""; |
|
191 | 191 | |
192 | 192 | // Show report header |
193 | 193 | if ($modecompta == "CREANCES-DETTES") { |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) { |
99 | 99 | // get pmp for subproducts if any |
100 | 100 | $producttmp->get_sousproduits_arbo(); |
101 | - $prods_arbo=$producttmp->get_arbo_each_prod(); |
|
101 | + $prods_arbo = $producttmp->get_arbo_each_prod(); |
|
102 | 102 | if (!empty($prods_arbo)) { |
103 | 103 | $price = 0; |
104 | 104 | foreach ($prods_arbo as $child) { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | } |
110 | 110 | } |
111 | 111 | |
112 | - $prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price() |
|
112 | + $prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price() |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | // Add price for costprice (at end) |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) { |
118 | 118 | // get costprice for subproducts if any |
119 | 119 | $producttmp->get_sousproduits_arbo(); |
120 | - $prods_arbo=$producttmp->get_arbo_each_prod(); |
|
120 | + $prods_arbo = $producttmp->get_arbo_each_prod(); |
|
121 | 121 | if (!empty($prods_arbo)) { |
122 | 122 | $price = 0; |
123 | 123 | foreach ($prods_arbo as $child) { |
@@ -493,7 +493,7 @@ |
||
493 | 493 | |
494 | 494 | dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread); |
495 | 495 | |
496 | - $result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect |
|
496 | + $result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect |
|
497 | 497 | $result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread); |
498 | 498 | $result3 = imap_timeout(IMAP_WRITETIMEOUT, 5); |
499 | 499 | $result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5); |
@@ -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); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | $this->rights[$r][0] = 130; |
203 | 203 | $this->rights[$r][1] = 'Modify thirdparty information payment'; |
204 | 204 | $this->rights[$r][3] = 0; |
205 | - $this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on |
|
205 | + $this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on |
|
206 | 206 | $this->rights[$r][5] = 'write'; |
207 | 207 | |
208 | 208 | // 262 : Restrict access to sales representative |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | } |
705 | 705 | // Add profids as criteria to search duplicates |
706 | 706 | $langs->load("companies"); |
707 | - $i=1; |
|
707 | + $i = 1; |
|
708 | 708 | while ($i <= 6) { |
709 | 709 | if ($i == 1) { |
710 | 710 | $this->import_updatekeys_array[$r]['s.siren'] = 'ProfId1'.(empty($mysoc->country_code) ? '' : $mysoc->country_code); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $form = new Form($db); |
29 | 29 | } |
30 | 30 | |
31 | -$qtytoconsumeforline = $this->tpl['qty'] / ( !empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 ); |
|
31 | +$qtytoconsumeforline = $this->tpl['qty'] / (!empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1); |
|
32 | 32 | /*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) { |
33 | 33 | $qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom']; |
34 | 34 | }*/ |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | if ($res) { |
50 | 50 | print $tmpproduct->getNomUrl(1); |
51 | 51 | if ($tmpbom->id) { |
52 | - print ' ' . $langs->trans("or") . ' '; |
|
52 | + print ' '.$langs->trans("or").' '; |
|
53 | 53 | print $tmpbom->getNomUrl(1); |
54 | - print ' <a class="collapse_bom" id="collapse-' . $line->id . '" href="#">'; |
|
54 | + print ' <a class="collapse_bom" id="collapse-'.$line->id.'" href="#">'; |
|
55 | 55 | print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open')); |
56 | 56 | } |
57 | 57 | print '</a>'; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | if ($tmpbom->id > 0) { |
84 | 84 | print '<td class="center">'; |
85 | - print '<input type="checkbox" name="bomlineid[]" value="' . $line->id . '">'; |
|
85 | + print '<input type="checkbox" name="bomlineid[]" value="'.$line->id.'">'; |
|
86 | 86 | print '</td>'; |
87 | 87 | } else { |
88 | 88 | print '<td class="center"></td>'; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | // Select of all the sub-BOM lines |
98 | 98 | $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl'; |
99 | -$sql.= ' WHERE fk_bom ='. (int) $tmpbom->id; |
|
99 | +$sql .= ' WHERE fk_bom ='.(int) $tmpbom->id; |
|
100 | 100 | $resql = $db->query($sql); |
101 | 101 | |
102 | 102 | if ($resql) { |
@@ -177,7 +177,7 @@ |
||
177 | 177 | $facavoir->fetch($facid); |
178 | 178 | $invoicecredits[] = $facavoir->getNomUrl(1); |
179 | 179 | } |
180 | - print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')'; |
|
180 | + print ' ('.$langs->transnoentities("InvoiceHasAvoir").implode(',', $invoicecredits).')'; |
|
181 | 181 | } |
182 | 182 | /* |
183 | 183 | if ($facidnext > 0) { |
@@ -29,9 +29,9 @@ |
||
29 | 29 | |
30 | 30 | // Load Dolibarr environment |
31 | 31 | require '../../main.inc.php'; |
32 | -require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; |
|
33 | -require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php'; |
|
34 | -require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.class.php'; |
|
32 | +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; |
|
33 | +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; |
|
34 | +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; |
|
35 | 35 | |
36 | 36 | |
37 | 37 | // Load translation files required by the page |
@@ -65,7 +65,7 @@ |
||
65 | 65 | |
66 | 66 | $startdate = $enddate = ''; |
67 | 67 | if (GETPOST('startdatemonth')) { |
68 | - $startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int')); |
|
68 | + $startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int')); |
|
69 | 69 | } |
70 | 70 | if (GETPOST('enddatemonth')) { |
71 | 71 | $enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear')); |