@@ -322,7 +322,7 @@ |
||
322 | 322 | |
323 | 323 | // Add font-awesome (if $val2['level'] == 0, we are on level2 |
324 | 324 | if ($val2['level'] == 0 && !empty($val2['prefix'])) { |
325 | - print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright" |
|
325 | + print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright" |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | print $val2['titre']; |
@@ -176,7 +176,7 @@ |
||
176 | 176 | // $this->menu->liste is top menu |
177 | 177 | //var_dump($this->menu->liste);exit; |
178 | 178 | $lastlevel = array(); |
179 | - $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
179 | + $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
180 | 180 | print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n"; |
181 | 181 | foreach ($this->menu->liste as $key => $val) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' |
182 | 182 | print '<ul class="ulmenu" data-inset="true">'; |
@@ -1766,7 +1766,7 @@ discard block |
||
1766 | 1766 | $nature = "expensereports"; |
1767 | 1767 | } |
1768 | 1768 | if ($objp->nature == 1 && isModEnabled('asset')) { |
1769 | - $nature = "various"; // Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists. |
|
1769 | + $nature = "various"; // Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists. |
|
1770 | 1770 | } |
1771 | 1771 | if ($objp->nature == 8) { |
1772 | 1772 | $nature = "inventory"; |
@@ -1790,7 +1790,7 @@ discard block |
||
1790 | 1790 | $journallabel = '<span class="opacitymedium">(' . $langs->trans($objp->label) . ')</span>'; // Label of bank account in llx_accounting_journal |
1791 | 1791 | } |
1792 | 1792 | |
1793 | - $key = $langs->trans("AccountingJournalType" . $objp->nature); // $objp->nature is 1, 2, 3 ... |
|
1793 | + $key = $langs->trans("AccountingJournalType" . $objp->nature); // $objp->nature is 1, 2, 3 ... |
|
1794 | 1794 | $transferlabel = (($objp->nature && $key != "AccountingJournalType" . $objp->nature) ? $key . ($journallabelwithoutspan != $key ? ' ' . $journallabel : '') : $journallabel); |
1795 | 1795 | |
1796 | 1796 | $newmenu->add('/accountancy/journal/' . $nature . 'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=' . $objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire')); |
@@ -176,7 +176,7 @@ |
||
176 | 176 | // $this->menu->liste is top menu |
177 | 177 | //var_dump($this->menu->liste);exit; |
178 | 178 | $lastlevel = array(); |
179 | - $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
179 | + $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
180 | 180 | print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n"; |
181 | 181 | foreach ($this->menu->liste as $key => $val) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' |
182 | 182 | print '<ul class="ulmenu" data-inset="true">'; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $mode_search = 2; // Search on a foreign key int |
58 | 58 | } |
59 | 59 | if (in_array($typ, array('sellist')) && !is_numeric($crit)) { |
60 | - $mode_search = 0;// Search on a foreign key string |
|
60 | + $mode_search = 0; // Search on a foreign key string |
|
61 | 61 | } |
62 | 62 | if (in_array($typ, array('chkbxlst', 'checkbox', 'select'))) { |
63 | 63 | $mode_search = 4; // Search on a multiselect field with sql type = text |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $module = $object->element; |
42 | 42 | |
43 | 43 | // Special cases |
44 | -if (isset($permissiontoadd) && ! isset($permission)) { |
|
44 | +if (isset($permissiontoadd) && !isset($permission)) { |
|
45 | 45 | $permission = $permissiontoadd; |
46 | 46 | } |
47 | 47 | // TODO Remove this section. We already got $permissiontoadd. |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | <div class="tagtd nowrap noborderbottom"> |
166 | 166 | <?php |
167 | 167 | $selectedCompany = GETPOSTISSET("newcompany") ? GETPOSTINT("newcompany") : (empty($object->socid) ? 0 : $object->socid); |
168 | - $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp maxwidth400 widthcentpercentminusx'); // This also print the select component?> |
|
168 | + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp maxwidth400 widthcentpercentminusx'); // This also print the select component?> |
|
169 | 169 | </div> |
170 | 170 | <div class="tagtd noborderbottom minwidth500imp"> |
171 | 171 | <?php |
@@ -198,7 +198,7 @@ |
||
198 | 198 | // we need to fetch product associated to line for some test |
199 | 199 | if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') { |
200 | 200 | $res = $line->fetch_product(); |
201 | - if ($res > 0) { |
|
201 | + if ($res > 0) { |
|
202 | 202 | if ($line->product->isService() && $line->product->isMandatoryPeriod()) { |
203 | 203 | print '<div><span class="clearboth nowraponall warning">' . $langs->trans("mandatoryPeriodNeedTobeSet") . '</span></div>'; |
204 | 204 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | |
420 | 420 | $res = 1; |
421 | 421 | if (!is_object($line->product)) { |
422 | - $res = $line->fetch_product(); // fetch product to know its type and allow isMandatoryperiod() |
|
422 | + $res = $line->fetch_product(); // fetch product to know its type and allow isMandatoryperiod() |
|
423 | 423 | } |
424 | 424 | if ($res > 0) { |
425 | 425 | if ($line->product->isMandatoryPeriod() && $line->product->isService()) { |
@@ -437,11 +437,11 @@ discard block |
||
437 | 437 | |
438 | 438 | $res = 1; |
439 | 439 | if (!is_object($line->product)) { |
440 | - $res = $line->fetch_product(); // fetch product to know its type and allow isMandatoryperiod() |
|
440 | + $res = $line->fetch_product(); // fetch product to know its type and allow isMandatoryperiod() |
|
441 | 441 | } |
442 | - if ($res > 0) { |
|
442 | + if ($res > 0) { |
|
443 | 443 | if ($line->product->isMandatoryperiod() && $line->product->isService()) { |
444 | - print 'jQuery("#date_end").addClass("inputmandatory");'; // Do not add tag "required", this block the cancel action when value not set |
|
444 | + print 'jQuery("#date_end").addClass("inputmandatory");'; // Do not add tag "required", this block the cancel action when value not set |
|
445 | 445 | } |
446 | 446 | } |
447 | 447 | } |
@@ -34,11 +34,10 @@ discard block |
||
34 | 34 | } |
35 | 35 | $value = $datenotinstring; |
36 | 36 | } elseif (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('int'))) { |
37 | - $value = (!empty($obj->$tmpkey) || $obj->$tmpkey === '0' ? $obj->$tmpkey : ''); |
|
37 | + $value = (!empty($obj->$tmpkey) || $obj->$tmpkey === '0' ? $obj->$tmpkey : ''); |
|
38 | 38 | } else { |
39 | 39 | // The key may be in $obj->array_options if not in $obj |
40 | - $value = (isset($obj->$tmpkey) ? $obj->$tmpkey : |
|
41 | - (isset($obj->array_options[$tmpkey]) ? $obj->array_options[$tmpkey] : '') ); |
|
40 | + $value = (isset($obj->$tmpkey) ? $obj->$tmpkey : (isset($obj->array_options[$tmpkey]) ? $obj->array_options[$tmpkey] : '')); |
|
42 | 41 | } |
43 | 42 | // If field is a computed field, we make computation to get value |
44 | 43 | if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) { |
@@ -52,7 +51,7 @@ discard block |
||
52 | 51 | $valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey); |
53 | 52 | $title = dol_string_nohtmltag($valuetoshow); |
54 | 53 | |
55 | - print '<td' . ($cssclass ? ' class="' . $cssclass . '"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist' |
|
54 | + print '<td' . ($cssclass ? ' class="' . $cssclass . '"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist' |
|
56 | 55 | print ' data-key="' . $extrafieldsobjectkey . '.' . $key . '"'; |
57 | 56 | print($title ? ' title="' . dol_escape_htmltag($title) . '"' : ''); |
58 | 57 | print '>'; |