@@ -245,7 +245,7 @@ |
||
| 245 | 245 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
| 246 | 246 | if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME)) { |
| 247 | 247 | $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp; |
| 248 | - $newfiletmp = preg_replace('/__+/', '_', $newfiletmp); // Replace repeated _ into one _ (to avoid string with substitution syntax) |
|
| 248 | + $newfiletmp = preg_replace('/__+/', '_', $newfiletmp); // Replace repeated _ into one _ (to avoid string with substitution syntax) |
|
| 249 | 249 | } |
| 250 | 250 | if (!empty($conf->global->MAIN_DOC_USE_TIMING)) { |
| 251 | 251 | $format = $conf->global->MAIN_DOC_USE_TIMING; |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | /** |
| 93 | 93 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 94 | 94 | */ |
| 95 | - public $fields=array( |
|
| 95 | + public $fields = array( |
|
| 96 | 96 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,), |
| 97 | 97 | 'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,), |
| 98 | 98 | 'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>-1,), |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * View |
| 44 | 44 | */ |
| 45 | 45 | |
| 46 | -$form = new Form($db); // $form is required as global value into dol_banner_tab |
|
| 46 | +$form = new Form($db); // $form is required as global value into dol_banner_tab |
|
| 47 | 47 | |
| 48 | 48 | llxHeader('', $langs->trans("CronInfo")); |
| 49 | 49 | |
@@ -98,8 +98,8 @@ |
||
| 98 | 98 | $month_current = dol_print_date(dol_now(), '%m'); |
| 99 | 99 | $year_start = $year; |
| 100 | 100 | } |
| 101 | -$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 |
|
| 102 | -$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 |
|
| 101 | +$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 |
|
| 102 | +$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 |
|
| 103 | 103 | // Quarter |
| 104 | 104 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
| 105 | 105 | $q = GETPOST("q", "int") ?GETPOST("q", "int") : 0; |
@@ -97,8 +97,8 @@ |
||
| 97 | 97 | $month_current = dol_print_date(dol_now(), '%m'); |
| 98 | 98 | $year_start = $year; |
| 99 | 99 | } |
| 100 | -$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 |
|
| 101 | -$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 |
|
| 100 | +$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 |
|
| 101 | +$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 |
|
| 102 | 102 | // Quarter |
| 103 | 103 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
| 104 | 104 | $q = GETPOST("q", "int"); |
@@ -78,8 +78,8 @@ |
||
| 78 | 78 | $month_current = dol_print_date(dol_now(), '%m'); |
| 79 | 79 | $year_start = $year; |
| 80 | 80 | } |
| 81 | -$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 |
|
| 82 | -$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 |
|
| 81 | +$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 |
|
| 82 | +$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 |
|
| 83 | 83 | // Quarter |
| 84 | 84 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
| 85 | 85 | $q = GETPOST("q") ?GETPOST("q") : 0; |
@@ -98,8 +98,8 @@ |
||
| 98 | 98 | $month_current = dol_print_date(dol_now(), '%m'); |
| 99 | 99 | $year_start = $year; |
| 100 | 100 | } |
| 101 | -$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 |
|
| 102 | -$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 |
|
| 101 | +$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 |
|
| 102 | +$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 |
|
| 103 | 103 | // Quarter |
| 104 | 104 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
| 105 | 105 | $q = GETPOST("q", "int") ?GETPOST("q", "int") : 0; |
@@ -97,8 +97,8 @@ |
||
| 97 | 97 | $month_current = dol_print_date(dol_now(), '%m'); |
| 98 | 98 | $year_start = $year; |
| 99 | 99 | } |
| 100 | -$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 |
|
| 101 | -$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 |
|
| 100 | +$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 |
|
| 101 | +$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 |
|
| 102 | 102 | // Quarter |
| 103 | 103 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
| 104 | 104 | $q = GETPOST("q", "int"); |
@@ -241,7 +241,7 @@ |
||
| 241 | 241 | $sql .= " AND b.doc_type = 'customer_invoice'"; |
| 242 | 242 | $sql .= " AND aa.entity = ".$conf->entity; |
| 243 | 243 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
| 244 | - $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
| 244 | + $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
| 245 | 245 | } |
| 246 | 246 | $sql .= " GROUP BY dm"; |
| 247 | 247 | $sql .= " ORDER BY dm"; |