\n"; print "
\n"; - -$selectedvalue = $conf->global->AGENDA_DISABLE_EXT; -if ($selectedvalue == 1) { - $selectedvalue = 0; -} else { - $selectedvalue = 1; -} - print "
| '.$langs->trans("AgendaExtNb", $key)." | "; // Name - print ''; + print ' | '; // URL - print ' | '; + print ' | '; // Offset TZ - print ' | '; + print ' | '; // Color (Possible colors are limited by Google) print ' | '; //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); - print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : $conf->global->$color), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset'); + print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset'); print ' | '; print "'.($key + 1).' | '; - print ''; + print ' | '; print ($hasnext ? ''.img_down().' ' : ''); print ($hasprevious ? ''.img_up().'' : ''); print ' | '; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 0c6da346285..804ed9934bf 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -418,7 +418,7 @@ print ''; print img_picto('', 'globe-americas', 'class="paddingrightonly"'); -print $form->select_country($mysoc->country_id, 'country_id'); +print $form->select_country($mysoc->country_id, 'country_id', '', 0); if ($user->admin) { print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); } @@ -441,25 +441,25 @@ print ' | '."\n"; // Phone print '
| '; print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright'); -print ' | |||||||
| '; print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright'); -print ' | |||||||
| '; print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright'); -print ' | |||||||
| '; print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright'); -print ' | |||||||
| '; print ' | '; print ''; - print ' | ||||||
| ';
-print ' ';
-print '';
+print ' ';
+print '';
print ' ';
if (!empty($mysoc->logo_small)) {
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
print '';
- print ' ';
} elseif (!empty($mysoc->logo)) {
if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
@@ -487,10 +487,12 @@ if (!empty($mysoc->logo_small)) {
}
$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_small', $quality);
print '';
- print ' ';
}
- print '';
+ print '';
+ print ''.img_delete($langs->trans("Delete"), '', 'marginleftonly').'';
+ print ' ';
} elseif (!empty($mysoc->logo)) {
if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
print '';
@@ -508,8 +510,8 @@ print ' | |||||||
| ';
-print ' ';
-print '';
+print ' ';
+print '';
print ' ';
if (!empty($mysoc->logo_squarred_small)) {
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
@@ -551,20 +553,21 @@ print ' |
'; // IDs of the company (country-specific) +print '
';
print '';
-print '
';
print '
';
@@ -2474,11 +2500,15 @@ if ($action == 'create') {
print '';
print dol_get_fiche_end();
- }
- } else {
- dol_print_error($db);
}
+ } else {
+ dol_print_error($db);
}
+} else {
+ print 'Record not found';
+
+ llxFooter();
+ exit(1);
}
/*
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 640f4c17b5d..42be03263a8 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -18,6 +18,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
$modulepart = 'expensereport'; $maxheightmini = 48;
$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
$filei = 0;
+ // Loop on each attached file
foreach ($arrayoffiles as $file) {
$urlforhref = array();
$filei++;
@@ -77,7 +78,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
}
if (empty($urlforhref) || empty($thumbshown)) {
- print '';
+ print '';
} else {
print '';
}
@@ -85,7 +86,12 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
print $thumbshown ? $thumbshown : img_mime($minifile);
- print '';
+ print '';
+ if (empty($urlforhref) || empty($thumbshown)) {
+ print '';
+ } else {
+ print '';
+ }
}
print '| '.$langs->trans("CompanyIds").' | '.$langs->trans("Value").' | |||||||||||||||||||||
| '.$langs->trans("CompanyIds").' | '.$langs->trans("Value").' | |||||||||||||||||||||
| '; -print ' | ||||||||||||||||||||||
| '; print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc")); print ' | '; -print 'global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"> | |||||||||||||||||||||
| '; @@ -656,6 +659,7 @@ print ''; - print ' | '; - - // VAT - print ''; - print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $line->vatrate), $mysoc, '', 0, 0, '', false, 1); - print ' | '; - - // Unit price - print ''; - print ''; - print ' | '; - - // Unit price with tax - print ''; - print ''; - print ' | '; - - // Quantity - print ''; - print ''; - print ' | '; - - //print ''.$langs->trans('AmountHT').' | '; - //print ''.$langs->trans('AmountTTC').' | '; - - // Picture - print ''; - //print $line->fk_ecm_files; - print ' | '; - - print '';
- print '';
- print '';
- print ' '; - print ' | ';
-
- print '||||||||||||||
| '; + + // Select date + print ' | '; + print $form->selectDate($line->date, 'date'); + print ' | '; + + // Select project + if (!empty($conf->projet->enabled)) { + print ''; + $formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300'); + print ' | '; + } + + // Select type + print ''; + print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees'); + print ' | '; + + if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) { + print ''; + $params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates); + print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params); + print ' | '; + } + + // Add comments + print ''; + print ''; + print ' | '; + + // VAT + print ''; + print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $line->vatrate), $mysoc, '', 0, 0, '', false, 1); + print ' | '; + + // Unit price + print ''; + print ''; + print ' | '; + + // Unit price with tax + print ''; + print ''; + print ' | '; + + // Quantity + print ''; + print ''; + print ' | '; + + //print ''.$langs->trans('AmountHT').' | '; + //print ''.$langs->trans('AmountTTC').' | '; + + // Picture + print ''; + //print $line->fk_ecm_files; + print ' | '; + + print '';
+ print '';
+ print '';
+ print ' '; + print ' | ';
+
+ print '|||||||||
| '; print ' | '.$langs->trans('Date').' | '; - if (!empty($conf->projet->enabled)) { - print ''.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).' | '; - } + if (!empty($conf->projet->enabled)) { + print ''.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).' | '; + } print ''.$langs->trans('Type').' | '; - if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) { - print ''.$langs->trans('CarCategory').' | '; - } + if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) { + print ''.$langs->trans('CarCategory').' | '; + } print ''.$langs->trans('Description').' | '; print ''.$langs->trans('VAT').' | '; print ''.$langs->trans('PriceUHT').' | '; @@ -2388,23 +2414,23 @@ if ($action == 'create') { print ''; // Select project - if (!empty($conf->projet->enabled)) { - print ''; - $formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300'); - print ' | '; - } + if (!empty($conf->projet->enabled)) { + print ''; + $formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300'); + print ' | '; + } // Select type print ''; print $formexpensereport->selectTypeExpenseReport($fk_c_type_fees, 'fk_c_type_fees', 1); print ' | '; - if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) { - print ''; - $params = array('fk_expense' => $object->id); - print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0); - print ' | '; - } + if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) { + print ''; + $params = array('fk_expense' => $object->id); + print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0); + print ' | '; + } // Add comments print ''; @@ -2414,9 +2440,9 @@ if ($action == 'create') { // Select VAT print ' | '; $defaultvat = -1; - if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) { - $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none'; - } + if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) { + $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none'; + } print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1); print ' | '; @@ -2438,15 +2464,15 @@ if ($action == 'create') { // Picture print ''; - if ($action != 'editline') { - print ' | '; - print ' | '; - } + if ($action != 'editline') { + print ' | '; + print ' | '; + } print ' | '; print ' |
'; $checked = ''; @@ -106,7 +112,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) { if (!empty($filenamelinked) && $filenamelinked == $file['relativename']) { $checked = ' checked'; } - print '
';
+ print '';
print '
';
print '';
print '
';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 8c1bf9642b1..b8960572255 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -54,11 +54,12 @@ class Export
public $array_export_examplevalues = array(); // array with examples for fields
public $array_export_help = array(); // array with tooltip help for fields
- // To store export modules
+ // To store export templates
public $hexa; // List of fields in the export profile
public $hexafiltervalue; // List of search criteria in the export profile
public $datatoexport;
public $model_name; // Name of export profile
+ public $fk_user;
public $sqlusedforexport;
@@ -720,8 +721,6 @@ class Export
$this->db->begin();
- $filter = '';
-
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
$sql .= 'label,';
$sql .= 'type,';
@@ -732,11 +731,10 @@ class Export
$sql .= "'".$this->db->escape($this->model_name)."',";
$sql .= " '".$this->db->escape($this->datatoexport)."',";
$sql .= " '".$this->db->escape($this->hexa)."',";
- $sql .= ' '.($user->id > 0 ? $user->id : 'null').",";
+ $sql .= ' '.(isset($this->fk_user) ? (int) $this->fk_user : 'null').",";
$sql .= " '".$this->db->escape($this->hexafiltervalue)."'";
$sql .= ")";
- dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
$this->db->commit();
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index b3d0cf49a32..1dd3400ff80 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -335,6 +335,7 @@ if ($action == 'add_export_model') {
$objexport->datatoexport = $datatoexport;
$objexport->hexa = $hexa;
$objexport->hexafiltervalue = $hexafiltervalue;
+ $objexport->fk_user = (GETPOST('visibility', 'aZ09') == 'all' ? 0 : $user->id);
$result = $objexport->create($user);
if ($result >= 0) {
@@ -516,11 +517,7 @@ if ($step == 2 && $datatoexport) {
print '';
print '';
print ''.$langs->trans("SelectExportFields").' ';
- if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
- $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
- } else {
- $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
- }
+ $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
print ' ';
print '';
print '
';
@@ -1007,20 +1004,28 @@ if ($step == 4 && $datatoexport) {
print '| '.$langs->trans("ExportModelName").' | '; - print ''; + print ' | '.$langs->trans("Visibility").' | '; + print ''; print ' | |
| '; + print ' | '; + print ' | '; + $arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody")); + print $form->selectarray('visibility', $arrayvisibility, 'private'); + print ' | '; + print ''; print ''; print ' | |
| '; print $obj->label; - print ' | '; + print ' | '; + print ''; + if (empty($obj->fk_user)) { + print $langs->trans("Everybody"); + } else { + $tmpuser->fetch($obj->fk_user); + print $tmpuser->getNomUrl(1); + } + print ' | '; + print ''; print 'rowid.'">'; print img_delete(); print ''; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 0c825672f65..3c6151ef349 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3594,7 +3594,7 @@ class SupplierInvoiceLine extends CommonObjectLine $sql .= ' '.(!empty($this->fk_code_ventilation) ? $this->fk_code_ventilation : 0).','; $sql .= ' '.((int) $this->rang).','; $sql .= ' '.((int) $this->special_code).','; - $sql .= " ".((int) $this->info_bits)."',"; + $sql .= " ".((int) $this->info_bits).","; $sql .= " ".price2num($this->total_ht).","; $sql .= " ".price2num($this->total_tva).","; $sql .= " ".price2num($this->total_ttc).","; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 44a712969c1..6e89abbf953 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -66,6 +66,11 @@ $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'purchaseordercard'; // To manage different context of search + +$backtopage = GETPOST('backtopage', 'alpha'); +$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); + $socid = GETPOST('socid', 'int'); $projectid = GETPOST('projectid', 'int'); $cancel = GETPOST('cancel', 'alpha'); @@ -151,12 +156,16 @@ if ($reshook < 0) { } if (empty($reshook)) { - if ($cancel) { - if (!empty($backtopage)) { - header("Location: ".$backtopage); - exit; + $backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '&socid='.((int) $socid) : ''); + + if (empty($backtopage) || ($cancel && empty($id))) { + if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { + if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) { + $backtopage = $backurlforlist; + } else { + $backtopage = DOL_URL_ROOT.'/fourn/commande/card.php?id='.($id > 0 ? $id : '__ID__'); + } } - $action = ''; } include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once @@ -1573,10 +1582,16 @@ if ($action == 'create') { print ' |