@@ -81,9 +81,9 @@ |
||
| 81 | 81 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
| 83 | 83 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
| 84 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php'; |
|
| 85 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php'; |
|
| 86 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 84 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
|
| 85 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
|
| 86 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 87 | 87 | |
| 88 | 88 | // Load translation files required by the page |
| 89 | 89 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |
@@ -91,8 +91,8 @@ |
||
| 91 | 91 | $label_default = getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT'); |
| 92 | 92 | $qty_default = 1; |
| 93 | 93 | |
| 94 | - print '<input type="text" id="label" name="label" class="takepospay" value="' . $label_default . '" style="width:40%;" placeholder="' . $langs->trans('Label') . '">'; |
|
| 95 | - print '<input type="text" id="qty" name="qty" class="takepospay" value="' . $qty_default . '" style="width:10%;" placeholder="' . $langs->trans('Qty') . '">'; |
|
| 94 | + print '<input type="text" id="label" name="label" class="takepospay" value="'.$label_default.'" style="width:40%;" placeholder="'.$langs->trans('Label').'">'; |
|
| 95 | + print '<input type="text" id="qty" name="qty" class="takepospay" value="'.$qty_default.'" style="width:10%;" placeholder="'.$langs->trans('Qty').'">'; |
|
| 96 | 96 | } |
| 97 | 97 | ?> |
| 98 | 98 | <input type="button" class="button takepospay clearboth" value="OK" onclick="Save();"> |
@@ -273,7 +273,7 @@ |
||
| 273 | 273 | print '<tr class="oddeven"><td>'; |
| 274 | 274 | print $langs->trans('PrintWithoutDetailsLabelDefault'); |
| 275 | 275 | print '<td colspan="2">'; |
| 276 | - print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />'; |
|
| 276 | + print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />'; |
|
| 277 | 277 | print "</td></tr>\n"; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
| 61 | 61 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
| 62 | 62 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
| 63 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 63 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 64 | 64 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
| 65 | 65 | $search_country = GETPOST('search_country', 'alpha'); |
| 66 | 66 | $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); |
@@ -216,13 +216,13 @@ discard block |
||
| 216 | 216 | $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l"; |
| 217 | 217 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product"; |
| 218 | 218 | if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) { |
| 219 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity); |
|
| 219 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity); |
|
| 220 | 220 | } |
| 221 | 221 | $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation"; |
| 222 | 222 | $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn"; |
| 223 | 223 | $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc"; |
| 224 | 224 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 225 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 225 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 226 | 226 | } |
| 227 | 227 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays "; |
| 228 | 228 | $sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 "; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
| 60 | 60 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
| 61 | 61 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
| 62 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 62 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 63 | 63 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
| 64 | 64 | $search_country = GETPOST('search_country', 'alpha'); |
| 65 | 65 | $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); |
@@ -215,13 +215,13 @@ discard block |
||
| 215 | 215 | $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd"; |
| 216 | 216 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product"; |
| 217 | 217 | if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) { |
| 218 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity); |
|
| 218 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity); |
|
| 219 | 219 | } |
| 220 | 220 | $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation"; |
| 221 | 221 | $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture"; |
| 222 | 222 | $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc"; |
| 223 | 223 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 224 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 224 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 225 | 225 | } |
| 226 | 226 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays "; |
| 227 | 227 | $sql .= " WHERE fd.fk_code_ventilation > 0"; |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | llxHeader('', $title, '', '', 0, 0, $arrayjs); |
| 78 | 78 | |
| 79 | -print load_fiche_titre($title, '', $memberstatic->picto); |
|
| 79 | +print load_fiche_titre($title, '', $memberstatic->picto); |
|
| 80 | 80 | |
| 81 | 81 | //dol_mkdir($dir); |
| 82 | 82 | |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($mode == 'memberbyregion') { //+ |
| 173 | 173 | $data[] = array( |
| 174 | 174 | 'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')), |
| 175 | - 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')), |
|
| 175 | + 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')), |
|
| 176 | 176 | 'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'), |
| 177 | 177 | 'nb'=>$obj->nb, |
| 178 | 178 | 'lastdate'=>$db->jdate($obj->lastdate), |
@@ -156,7 +156,7 @@ |
||
| 156 | 156 | $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray); |
| 157 | 157 | |
| 158 | 158 | if (is_numeric($foruserid) || $foruserlogin) { |
| 159 | - $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include |
|
| 159 | + $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include |
|
| 160 | 160 | if ($nb <= 0) { |
| 161 | 161 | $nb = 1; // Protection to avoid empty page |
| 162 | 162 | } |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | |
| 75 | 75 | // update of object |
| 76 | 76 | if ($forcelangprod == $current_lang) { |
| 77 | - $object->label = GETPOST("libelle", 'alphanohtml'); |
|
| 77 | + $object->label = GETPOST("libelle", 'alphanohtml'); |
|
| 78 | 78 | $object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml')); |
| 79 | 79 | //$object->other = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml')); |
| 80 | 80 | } else { |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $sql .= ", s.canvas, s.tms as date_modification, s.status as status"; |
| 276 | 276 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
| 277 | 277 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 278 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 278 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 279 | 279 | } |
| 280 | 280 | if (empty($user->rights->societe->client->voir) && !$socid) { |
| 281 | 281 | $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | $sql .= $db->plimit($max, 0); |
| 295 | 295 | |
| 296 | 296 | //print $sql; |
| 297 | -$lastmodified=""; |
|
| 297 | +$lastmodified = ""; |
|
| 298 | 298 | $result = $db->query($sql); |
| 299 | 299 | if ($result) { |
| 300 | 300 | $num = $db->num_rows($result); |