@@ -198,7 +198,7 @@ |
||
| 198 | 198 | $maxfilesizearray = getMaxFileSizeArray(); |
| 199 | 199 | $maxmin = $maxfilesizearray['maxmin']; |
| 200 | 200 | if ($maxmin > 0) { |
| 201 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 201 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 202 | 202 | } |
| 203 | 203 | print '<input type="file" class="flat" name="photo" id="photoinput">'; |
| 204 | 204 | print '</td></tr>'; |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | /** |
| 216 | 216 | * @var int Thirdparty ID |
| 217 | 217 | */ |
| 218 | - public $socid; // both socid and fk_soc are used |
|
| 219 | - public $fk_soc; // both socid and fk_soc are used |
|
| 218 | + public $socid; // both socid and fk_soc are used |
|
| 219 | + public $fk_soc; // both socid and fk_soc are used |
|
| 220 | 220 | |
| 221 | 221 | /** |
| 222 | 222 | * @var string Thirdparty name |
@@ -1067,8 +1067,8 @@ discard block |
||
| 1067 | 1067 | $this->country_code = $obj->country_id ? $obj->country_code : ''; |
| 1068 | 1068 | $this->country = $obj->country_id ? ($langs->trans('Country' . $obj->country_code) != 'Country' . $obj->country_code ? $langs->transnoentities('Country' . $obj->country_code) : $obj->country) : ''; |
| 1069 | 1069 | |
| 1070 | - $this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used |
|
| 1071 | - $this->socid = $obj->fk_soc; // Both fk_soc and socid are used |
|
| 1070 | + $this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used |
|
| 1071 | + $this->socid = $obj->fk_soc; // Both fk_soc and socid are used |
|
| 1072 | 1072 | $this->socname = $obj->socname; |
| 1073 | 1073 | $this->poste = $obj->poste; |
| 1074 | 1074 | $this->statut = $obj->statut; |
@@ -1876,7 +1876,7 @@ discard block |
||
| 1876 | 1876 | $error = 0; |
| 1877 | 1877 | |
| 1878 | 1878 | if (!isset($this->roles)) { |
| 1879 | - return 0; // Avoid to loose roles when property not set |
|
| 1879 | + return 0; // Avoid to loose roles when property not set |
|
| 1880 | 1880 | } |
| 1881 | 1881 | |
| 1882 | 1882 | $this->db->begin(); |
@@ -671,7 +671,7 @@ |
||
| 671 | 671 | print '<td class="center tdlastresultcode" title="' . dol_escape_htmltag($obj->lastresult) . '">'; |
| 672 | 672 | if ($obj->lastresult != '') { |
| 673 | 673 | if (empty($obj->lastresult)) { |
| 674 | - print $obj->lastresult; // Print '0' |
|
| 674 | + print $obj->lastresult; // Print '0' |
|
| 675 | 675 | } else { |
| 676 | 676 | print '<span class="error">' . dol_escape_htmltag(dol_trunc($obj->lastresult)) . '</div>'; |
| 677 | 677 | } |
@@ -574,7 +574,7 @@ |
||
| 574 | 574 | $langs->load($reg[1]); |
| 575 | 575 | } |
| 576 | 576 | |
| 577 | - $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
| 577 | + $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
| 578 | 578 | |
| 579 | 579 | $morehtmlref = '<div class="refidno">'; |
| 580 | 580 | $morehtmlref .= $langs->trans($labeltoshow); |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | * View |
| 46 | 46 | */ |
| 47 | 47 | |
| 48 | -$form = new Form($db); // $form is required as global value into dol_banner_tab |
|
| 48 | +$form = new Form($db); // $form is required as global value into dol_banner_tab |
|
| 49 | 49 | |
| 50 | 50 | llxHeader('', $langs->trans("CronInfo")); |
| 51 | 51 | |
@@ -1015,7 +1015,7 @@ discard block |
||
| 1015 | 1015 | $datas['ref'] = '<br><b>' . $langs->trans('Ref') . ':</b> ' . dol_escape_htmltag($this->ref); |
| 1016 | 1016 | $datas['label'] = '<br><b>' . $langs->trans('Title') . ':</b> ' . $langs->trans($this->label); |
| 1017 | 1017 | if ($this->label != $langs->trans($this->label)) { |
| 1018 | - $datas['label'] .= ' <span class="opacitymedium">(' . $this->label . ')</span>'; |
|
| 1018 | + $datas['label'] .= ' <span class="opacitymedium">(' . $this->label . ')</span>'; |
|
| 1019 | 1019 | } |
| 1020 | 1020 | if (!empty($this->params)) { |
| 1021 | 1021 | $datas['params'] = '<br><b>' . $langs->trans('Parameters') . ':</b> ' . dol_escape_htmltag($this->params); |
@@ -1435,7 +1435,7 @@ discard block |
||
| 1435 | 1435 | $msg = $langs->trans("ErrorInBatch", $this->label); |
| 1436 | 1436 | $from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM'); |
| 1437 | 1437 | $cmailfile = new CMailFile($subject, $this->email_alert, $from, $msg); |
| 1438 | - $result = $cmailfile->sendfile(); // Do not test result |
|
| 1438 | + $result = $cmailfile->sendfile(); // Do not test result |
|
| 1439 | 1439 | } |
| 1440 | 1440 | |
| 1441 | 1441 | return $error ? -1 : 1; |
@@ -57,45 +57,45 @@ |
||
| 57 | 57 | $search_mvt_num = GETPOSTINT('search_mvt_num'); |
| 58 | 58 | $search_doc_type = GETPOST("search_doc_type", 'alpha'); |
| 59 | 59 | $search_doc_ref = GETPOST("search_doc_ref", 'alpha'); |
| 60 | -$search_date_startyear = GETPOSTINT('search_date_startyear'); |
|
| 61 | -$search_date_startmonth = GETPOSTINT('search_date_startmonth'); |
|
| 62 | -$search_date_startday = GETPOSTINT('search_date_startday'); |
|
| 63 | -$search_date_endyear = GETPOSTINT('search_date_endyear'); |
|
| 64 | -$search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
|
| 65 | -$search_date_endday = GETPOSTINT('search_date_endday'); |
|
| 60 | +$search_date_startyear = GETPOSTINT('search_date_startyear'); |
|
| 61 | +$search_date_startmonth = GETPOSTINT('search_date_startmonth'); |
|
| 62 | +$search_date_startday = GETPOSTINT('search_date_startday'); |
|
| 63 | +$search_date_endyear = GETPOSTINT('search_date_endyear'); |
|
| 64 | +$search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
|
| 65 | +$search_date_endday = GETPOSTINT('search_date_endday'); |
|
| 66 | 66 | $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); |
| 67 | 67 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
| 68 | 68 | $search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear')); |
| 69 | -$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
|
| 70 | -$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
|
| 71 | -$search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
|
| 72 | -$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
|
| 73 | -$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
|
| 74 | -$search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
|
| 69 | +$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
|
| 70 | +$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
|
| 71 | +$search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
|
| 72 | +$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
|
| 73 | +$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
|
| 74 | +$search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
|
| 75 | 75 | $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); |
| 76 | 76 | $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); |
| 77 | -$search_date_modification_startyear = GETPOSTINT('search_date_modification_startyear'); |
|
| 78 | -$search_date_modification_startmonth = GETPOSTINT('search_date_modification_startmonth'); |
|
| 79 | -$search_date_modification_startday = GETPOSTINT('search_date_modification_startday'); |
|
| 80 | -$search_date_modification_endyear = GETPOSTINT('search_date_modification_endyear'); |
|
| 81 | -$search_date_modification_endmonth = GETPOSTINT('search_date_modification_endmonth'); |
|
| 82 | -$search_date_modification_endday = GETPOSTINT('search_date_modification_endday'); |
|
| 77 | +$search_date_modification_startyear = GETPOSTINT('search_date_modification_startyear'); |
|
| 78 | +$search_date_modification_startmonth = GETPOSTINT('search_date_modification_startmonth'); |
|
| 79 | +$search_date_modification_startday = GETPOSTINT('search_date_modification_startday'); |
|
| 80 | +$search_date_modification_endyear = GETPOSTINT('search_date_modification_endyear'); |
|
| 81 | +$search_date_modification_endmonth = GETPOSTINT('search_date_modification_endmonth'); |
|
| 82 | +$search_date_modification_endday = GETPOSTINT('search_date_modification_endday'); |
|
| 83 | 83 | $search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear); |
| 84 | 84 | $search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear); |
| 85 | -$search_date_export_startyear = GETPOSTINT('search_date_export_startyear'); |
|
| 86 | -$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth'); |
|
| 87 | -$search_date_export_startday = GETPOSTINT('search_date_export_startday'); |
|
| 88 | -$search_date_export_endyear = GETPOSTINT('search_date_export_endyear'); |
|
| 89 | -$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth'); |
|
| 90 | -$search_date_export_endday = GETPOSTINT('search_date_export_endday'); |
|
| 85 | +$search_date_export_startyear = GETPOSTINT('search_date_export_startyear'); |
|
| 86 | +$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth'); |
|
| 87 | +$search_date_export_startday = GETPOSTINT('search_date_export_startday'); |
|
| 88 | +$search_date_export_endyear = GETPOSTINT('search_date_export_endyear'); |
|
| 89 | +$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth'); |
|
| 90 | +$search_date_export_endday = GETPOSTINT('search_date_export_endday'); |
|
| 91 | 91 | $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear); |
| 92 | 92 | $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear); |
| 93 | -$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear'); |
|
| 94 | -$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth'); |
|
| 95 | -$search_date_validation_startday = GETPOSTINT('search_date_validation_startday'); |
|
| 96 | -$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear'); |
|
| 97 | -$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth'); |
|
| 98 | -$search_date_validation_endday = GETPOSTINT('search_date_validation_endday'); |
|
| 93 | +$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear'); |
|
| 94 | +$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth'); |
|
| 95 | +$search_date_validation_startday = GETPOSTINT('search_date_validation_startday'); |
|
| 96 | +$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear'); |
|
| 97 | +$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth'); |
|
| 98 | +$search_date_validation_endday = GETPOSTINT('search_date_validation_endday'); |
|
| 99 | 99 | $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear); |
| 100 | 100 | $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear); |
| 101 | 101 | $search_import_key = GETPOST("search_import_key", 'alpha'); |
@@ -54,45 +54,45 @@ discard block |
||
| 54 | 54 | $search_mvt_num = GETPOSTINT('search_mvt_num'); |
| 55 | 55 | $search_doc_type = GETPOST("search_doc_type", 'alpha'); |
| 56 | 56 | $search_doc_ref = GETPOST("search_doc_ref", 'alpha'); |
| 57 | -$search_date_startyear = GETPOSTINT('search_date_startyear'); |
|
| 58 | -$search_date_startmonth = GETPOSTINT('search_date_startmonth'); |
|
| 59 | -$search_date_startday = GETPOSTINT('search_date_startday'); |
|
| 60 | -$search_date_endyear = GETPOSTINT('search_date_endyear'); |
|
| 61 | -$search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
|
| 62 | -$search_date_endday = GETPOSTINT('search_date_endday'); |
|
| 57 | +$search_date_startyear = GETPOSTINT('search_date_startyear'); |
|
| 58 | +$search_date_startmonth = GETPOSTINT('search_date_startmonth'); |
|
| 59 | +$search_date_startday = GETPOSTINT('search_date_startday'); |
|
| 60 | +$search_date_endyear = GETPOSTINT('search_date_endyear'); |
|
| 61 | +$search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
|
| 62 | +$search_date_endday = GETPOSTINT('search_date_endday'); |
|
| 63 | 63 | $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); |
| 64 | 64 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
| 65 | 65 | $search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear')); |
| 66 | -$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
|
| 67 | -$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
|
| 68 | -$search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
|
| 69 | -$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
|
| 70 | -$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
|
| 71 | -$search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
|
| 66 | +$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
|
| 67 | +$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
|
| 68 | +$search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
|
| 69 | +$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
|
| 70 | +$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
|
| 71 | +$search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
|
| 72 | 72 | $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); |
| 73 | 73 | $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); |
| 74 | -$search_date_modification_startyear = GETPOSTINT('search_date_modification_startyear'); |
|
| 75 | -$search_date_modification_startmonth = GETPOSTINT('search_date_modification_startmonth'); |
|
| 76 | -$search_date_modification_startday = GETPOSTINT('search_date_modification_startday'); |
|
| 77 | -$search_date_modification_endyear = GETPOSTINT('search_date_modification_endyear'); |
|
| 78 | -$search_date_modification_endmonth = GETPOSTINT('search_date_modification_endmonth'); |
|
| 79 | -$search_date_modification_endday = GETPOSTINT('search_date_modification_endday'); |
|
| 74 | +$search_date_modification_startyear = GETPOSTINT('search_date_modification_startyear'); |
|
| 75 | +$search_date_modification_startmonth = GETPOSTINT('search_date_modification_startmonth'); |
|
| 76 | +$search_date_modification_startday = GETPOSTINT('search_date_modification_startday'); |
|
| 77 | +$search_date_modification_endyear = GETPOSTINT('search_date_modification_endyear'); |
|
| 78 | +$search_date_modification_endmonth = GETPOSTINT('search_date_modification_endmonth'); |
|
| 79 | +$search_date_modification_endday = GETPOSTINT('search_date_modification_endday'); |
|
| 80 | 80 | $search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear); |
| 81 | 81 | $search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear); |
| 82 | -$search_date_export_startyear = GETPOSTINT('search_date_export_startyear'); |
|
| 83 | -$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth'); |
|
| 84 | -$search_date_export_startday = GETPOSTINT('search_date_export_startday'); |
|
| 85 | -$search_date_export_endyear = GETPOSTINT('search_date_export_endyear'); |
|
| 86 | -$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth'); |
|
| 87 | -$search_date_export_endday = GETPOSTINT('search_date_export_endday'); |
|
| 82 | +$search_date_export_startyear = GETPOSTINT('search_date_export_startyear'); |
|
| 83 | +$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth'); |
|
| 84 | +$search_date_export_startday = GETPOSTINT('search_date_export_startday'); |
|
| 85 | +$search_date_export_endyear = GETPOSTINT('search_date_export_endyear'); |
|
| 86 | +$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth'); |
|
| 87 | +$search_date_export_endday = GETPOSTINT('search_date_export_endday'); |
|
| 88 | 88 | $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear); |
| 89 | 89 | $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear); |
| 90 | -$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear'); |
|
| 91 | -$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth'); |
|
| 92 | -$search_date_validation_startday = GETPOSTINT('search_date_validation_startday'); |
|
| 93 | -$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear'); |
|
| 94 | -$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth'); |
|
| 95 | -$search_date_validation_endday = GETPOSTINT('search_date_validation_endday'); |
|
| 90 | +$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear'); |
|
| 91 | +$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth'); |
|
| 92 | +$search_date_validation_startday = GETPOSTINT('search_date_validation_startday'); |
|
| 93 | +$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear'); |
|
| 94 | +$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth'); |
|
| 95 | +$search_date_validation_endday = GETPOSTINT('search_date_validation_endday'); |
|
| 96 | 96 | $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear); |
| 97 | 97 | $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear); |
| 98 | 98 | $search_import_key = GETPOST("search_import_key", 'alpha'); |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | $form_question['formatexport'] = array( |
| 792 | 792 | 'name' => 'formatexport', |
| 793 | 793 | 'type' => 'select', |
| 794 | - 'label' => $langs->trans('Modelcsv'), // TODO Use Selectmodelcsv and show a select combo |
|
| 794 | + 'label' => $langs->trans('Modelcsv'), // TODO Use Selectmodelcsv and show a select combo |
|
| 795 | 795 | 'values' => $listofformat, |
| 796 | 796 | 'default' => $formatexportset, |
| 797 | 797 | 'morecss' => 'minwidth200 maxwidth200' |
@@ -617,7 +617,7 @@ |
||
| 617 | 617 | |
| 618 | 618 | print '<br>'; |
| 619 | 619 | |
| 620 | - $result = $object->fetchAllPerMvt($piece_num, $mode); // This load $object->linesmvt |
|
| 620 | + $result = $object->fetchAllPerMvt($piece_num, $mode); // This load $object->linesmvt |
|
| 621 | 621 | |
| 622 | 622 | if ($result < 0) { |
| 623 | 623 | setEventMessages($object->error, $object->errors, 'errors'); |