@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | $month_current = dol_print_date(dol_now(), "%m"); |
| 53 | 53 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
| 54 | 54 | } |
| 55 | -$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 56 | -$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 55 | +$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 56 | +$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 57 | 57 | |
| 58 | 58 | // We define date_start and date_end |
| 59 | 59 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | $sql .= " AND b.doc_type = 'customer_invoice'"; |
| 256 | 256 | $sql .= " AND aa.entity = ".$conf->entity; |
| 257 | 257 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
| 258 | - $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
| 258 | + $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
| 259 | 259 | } |
| 260 | 260 | $sql .= " GROUP BY dm"; |
| 261 | 261 | $sql .= " ORDER BY dm"; |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | $month_current = dol_print_date(dol_now(), "%m"); |
| 49 | 49 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
| 50 | 50 | } |
| 51 | -$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 52 | -$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 51 | +$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 52 | +$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
| 53 | 53 | |
| 54 | 54 | // We define date_start and date_end |
| 55 | 55 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $sql .= " AND b.numero_compte = aa.account_number"; |
| 241 | 241 | $sql .= " AND aa.entity = ".$conf->entity; |
| 242 | 242 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
| 243 | - $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
| 243 | + $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
| 244 | 244 | } |
| 245 | 245 | //print $sql; |
| 246 | 246 | |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | $this->type_payment = $obj->fk_typepayment; |
| 307 | 307 | $this->num_payment = $obj->num_payment; |
| 308 | 308 | $this->label = $obj->label; |
| 309 | - $this->note = $obj->note_private; // For backward compatibility |
|
| 309 | + $this->note = $obj->note_private; // For backward compatibility |
|
| 310 | 310 | $this->note_private = $obj->note_private; |
| 311 | 311 | $this->subledger_account = $obj->subledger_account; |
| 312 | 312 | $this->accountancy_code = $obj->accountancy_code; |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | $sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0); |
| 487 | 487 | $sql .= ", ".((int) $user->id); |
| 488 | 488 | $sql .= ", '".$this->db->idate($now)."'"; |
| 489 | - $sql .= ", NULL"; // Filled later |
|
| 489 | + $sql .= ", NULL"; // Filled later |
|
| 490 | 490 | $sql .= ", ".((int) $conf->entity); |
| 491 | 491 | $sql .= ")"; |
| 492 | 492 | |
@@ -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 | |
@@ -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>'; |
@@ -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 |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | unset($_SESSION["dol_login"]); |
| 51 | 51 | unset($_SESSION['dol_entity']); |
| 52 | 52 | unset($_SESSION['urlfrom']); |
| 53 | - die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?! |
|
| 53 | + die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?! |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | //global $conf, $langs, $user; |
@@ -142,12 +142,12 @@ |
||
| 142 | 142 | $messagewarning .= '</div>'; |
| 143 | 143 | |
| 144 | 144 | if ($result <= 0 && $edituser->error == 'USERNOTFOUND') { |
| 145 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 145 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 146 | 146 | $message .= $messagewarning; |
| 147 | 147 | $username = ''; |
| 148 | 148 | } else { |
| 149 | 149 | if (empty($edituser->email)) { |
| 150 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 150 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 151 | 151 | $message .= $messagewarning; |
| 152 | 152 | } else { |
| 153 | 153 | $newpassword = $edituser->setPassword($user, '', 1); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | |
| 43 | 43 | $type = GETPOST('type', 'alpha'); |
| 44 | 44 | $value = GETPOST('value', 'alpha'); |
| 45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 46 | 46 | |
| 47 | 47 | $label = GETPOST('label', 'alpha'); |
| 48 | 48 | $scandir = GETPOST('scan_dir', 'alpha'); |