@@ -45,8 +45,8 @@ |
||
45 | 45 | |
46 | 46 | const STATUS_DRAFT = 0; |
47 | 47 | const STATUS_NOT_USED = 1; |
48 | - const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
49 | - const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
48 | + const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
49 | + const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
50 | 50 | const STATUS_REJECTED = 3; |
51 | 51 | |
52 | 52 |
@@ -255,7 +255,7 @@ |
||
255 | 255 | $i = 0; |
256 | 256 | |
257 | 257 | if ($limit > 0 && $limit != $conf->liste_limit) { |
258 | - $param.='&limit='.((int) $limit); |
|
258 | + $param .= '&limit='.((int) $limit); |
|
259 | 259 | } |
260 | 260 | $param = "&id=".urlencode($id); |
261 | 261 |
@@ -142,7 +142,7 @@ |
||
142 | 142 | |
143 | 143 | $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local; |
144 | 144 | // Affiche en-tete du rapport |
145 | -$description=''; |
|
145 | +$description = ''; |
|
146 | 146 | if ($calc == 0 || $calc == 1) { // Calculate on invoice for goods and services |
147 | 147 | $calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec"); |
148 | 148 | $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>'; |
@@ -169,7 +169,7 @@ |
||
169 | 169 | // Set period |
170 | 170 | $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); |
171 | 171 | $prevyear = $year_start; |
172 | -$q=0; |
|
172 | +$q = 0; |
|
173 | 173 | $prevquarter = $q; |
174 | 174 | if ($prevquarter > 1) { |
175 | 175 | $prevquarter--; |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | |
52 | 52 | // Date range |
53 | -$year = GETPOST('year', 'int'); // this is used for navigation previous/next. It is the last year to show in filter |
|
53 | +$year = GETPOST('year', 'int'); // this is used for navigation previous/next. It is the last year to show in filter |
|
54 | 54 | if (empty($year)) { |
55 | 55 | $year_current = dol_print_date(dol_now(), "%Y"); |
56 | 56 | $month_current = dol_print_date(dol_now(), "%m"); |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | |
619 | 619 | if (isModEnabled('salaries') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) { |
620 | 620 | if ($modecompta == 'CREANCES-DETTES') { |
621 | - $column = 's.dateep'; // we use the date of end of period of salary |
|
621 | + $column = 's.dateep'; // we use the date of end of period of salary |
|
622 | 622 | |
623 | 623 | $sql = "SELECT s.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(s.amount) as amount"; |
624 | 624 | $sql .= " FROM ".MAIN_DB_PREFIX."salary as s"; |
@@ -947,14 +947,14 @@ discard block |
||
947 | 947 | |
948 | 948 | if ($obj->pcg_type == 'INCOME') { |
949 | 949 | if (!isset($encaiss[$obj->dm])) { |
950 | - $encaiss[$obj->dm] = 0; // To avoid warning of var not defined |
|
950 | + $encaiss[$obj->dm] = 0; // To avoid warning of var not defined |
|
951 | 951 | } |
952 | 952 | $encaiss[$obj->dm] += $obj->credit; |
953 | 953 | $encaiss[$obj->dm] -= $obj->debit; |
954 | 954 | } |
955 | 955 | if ($obj->pcg_type == 'EXPENSE') { |
956 | 956 | if (!isset($decaiss[$obj->dm])) { |
957 | - $decaiss[$obj->dm] = 0; // To avoid warning of var not defined |
|
957 | + $decaiss[$obj->dm] = 0; // To avoid warning of var not defined |
|
958 | 958 | } |
959 | 959 | $decaiss[$obj->dm] += $obj->debit; |
960 | 960 | $decaiss[$obj->dm] -= $obj->credit; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | } |
71 | 71 | |
72 | 72 | // Date range |
73 | -$year = GETPOST('year', 'int'); // this is used for navigation previous/next. It is the last year to show in filter |
|
73 | +$year = GETPOST('year', 'int'); // this is used for navigation previous/next. It is the last year to show in filter |
|
74 | 74 | if (empty($year)) { |
75 | 75 | $year_current = dol_print_date(dol_now(), "%Y"); |
76 | 76 | $month_current = dol_print_date(dol_now(), "%m"); |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | if ($modecompta == 'CREANCES-DETTES') { |
266 | 266 | print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder); |
267 | 267 | } else { |
268 | - print_liste_field_titre(''); // Make 4 columns in total whatever $modecompta is |
|
268 | + print_liste_field_titre(''); // Make 4 columns in total whatever $modecompta is |
|
269 | 269 | } |
270 | 270 | print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder); |
271 | 271 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | } |
301 | 301 | $sql .= " GROUP BY pcg_type"; |
302 | 302 | if ($showaccountdetail == 'no') { |
303 | - $sql .= ", name, socid"; // group by "accounting group" (INCOME/EXPENSE), then "customer". |
|
303 | + $sql .= ", name, socid"; // group by "accounting group" (INCOME/EXPENSE), then "customer". |
|
304 | 304 | } |
305 | 305 | $sql .= $db->order($sortfield, $sortorder); |
306 | 306 | |
@@ -939,7 +939,7 @@ discard block |
||
939 | 939 | |
940 | 940 | if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') { |
941 | 941 | if ($modecompta == 'CREANCES-DETTES') { |
942 | - $column = 's.dateep'; // We use the date of end of period of salary |
|
942 | + $column = 's.dateep'; // We use the date of end of period of salary |
|
943 | 943 | |
944 | 944 | $sql = "SELECT u.rowid, u.firstname, u.lastname, s.fk_user as fk_user, s.label as label, date_format($column,'%Y-%m') as dm, sum(s.amount) as amount"; |
945 | 945 | $sql .= " FROM ".MAIN_DB_PREFIX."salary as s"; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | //$conf->global->SOCIETE_FISCAL_MONTH_START = 7; |
61 | 61 | |
62 | 62 | // Date range |
63 | -$year = GETPOST('year', 'int'); // year with current month, is the month of the period we must show |
|
63 | +$year = GETPOST('year', 'int'); // year with current month, is the month of the period we must show |
|
64 | 64 | if (empty($year)) { |
65 | 65 | $year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt'); |
66 | 66 | $month_current = dol_print_date(dol_now(), "%m"); |
@@ -124,8 +124,8 @@ |
||
124 | 124 | // Ref customer |
125 | 125 | //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1); |
126 | 126 | //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1); |
127 | - $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
128 | - $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
127 | + $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
128 | + $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
129 | 129 | // Thirdparty |
130 | 130 | $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer'); |
131 | 131 | // Project |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
95 | 95 | $object = new Fichinter($db); |
96 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
96 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
97 | 97 | |
98 | 98 | $extrafields = new ExtraFields($db); |
99 | 99 | |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | // Output page |
375 | 375 | // -------------------------------------------------------------------- |
376 | 376 | |
377 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
377 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
378 | 378 | |
379 | 379 | |
380 | 380 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
@@ -720,7 +720,7 @@ discard block |
||
720 | 720 | $objectstatic->id = $obj->rowid; |
721 | 721 | $objectstatic->ref = $obj->ref; |
722 | 722 | $objectstatic->ref_client = $obj->ref_client; |
723 | - $objectstatic->statut = $obj->status; // deprecated |
|
723 | + $objectstatic->statut = $obj->status; // deprecated |
|
724 | 724 | $objectstatic->status = $obj->status; |
725 | 725 | |
726 | 726 | $companystatic->name = $obj->name; |