';
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->propal->creer, 'string', '', 0, 1);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 35ab14454ef..12d6fa10769 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3004,6 +3004,9 @@ class Facture extends CommonInvoice
$line->total_ttc = $tabprice[2];
$line->total_localtax1 = $tabprice[9];
$line->total_localtax2 = $tabprice[10];
+ $line->multicurrency_total_ht = $tabprice[16];
+ $line->multicurrency_total_tva = $tabprice[17];
+ $line->multicurrency_total_ttc = $tabprice[18];
$line->update($user);
$this->update_price(1);
$this->db->commit();
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 61728562d2e..2d75584cbda 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -156,6 +156,7 @@ class ChargeSociales extends CommonObject
function create($user)
{
global $conf;
+ $error=0;
$now=dol_now();
@@ -191,8 +192,17 @@ class ChargeSociales extends CommonObject
$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
//dol_syslog("ChargesSociales::create this->id=".$this->id);
- $this->db->commit();
- return $this->id;
+ $result=$this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
+ if ($result < 0) $error++;
+
+ if(empty($error)) {
+ $this->db->commit();
+ return $this->id;
+ }
+ else {
+ $this->db->rollback();
+ return -1*$error;
+ }
}
else
{
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index d575d1a97b9..c9db79e6202 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -670,6 +670,9 @@ class Tva extends CommonObject
$linkclose='';
if (empty($notooltip))
{
+
+
+
if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
$label=$langs->trans("ShowMyObject");
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 92290ee0656..c2b6e03ee5b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1561,7 +1561,7 @@ else
if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
{
- print '
';
+ print ' ';
// Label
if ($objp->fk_product > 0)
{
@@ -1571,12 +1571,10 @@ else
$productstatic->ref=$objp->pref;
$productstatic->entity=$objp->pentity;
$productstatic->label=$objp->plabel;
- $text = $productstatic->getNomUrl(1,'',20);
+ $text = $productstatic->getNomUrl(1,'',32);
if ($objp->plabel)
{
$text .= ' - ';
- //$productstatic->ref=$objp->label;
- //$text .= $productstatic->getNomUrl(0,'',16);
$text .= $objp->plabel;
}
$description = $objp->description;
@@ -1713,8 +1711,8 @@ else
$productstatic->type=$objp->ptype;
$productstatic->ref=$objp->pref;
$productstatic->entity=$objp->pentity;
- print $productstatic->getNomUrl(1,'',20);
- print $objp->label?' - '.dol_trunc($objp->label,16):'';
+ print $productstatic->getNomUrl(1,'',32);
+ print $objp->label?' - '.dol_trunc($objp->label,32):'';
print '
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -50,10 +51,22 @@ foreach($linkedObjectBlock as $key => $objectlink)
getNomUrl(1); ?>
date_contrat,'day'); ?>
- total_ttc); ?>
+ rights->contrat->lire && empty($conf->global->CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE))
+ {
+ $totalcontrat = 0;
+ foreach ($objectlink->lines as $linecontrat) {
+ $totalcontrat = $totalcontrat + $linecontrat->total_ht;
+ $total = $total + $linecontrat->total_ht;
+ }
+ echo price($totalcontrat);
+ } ?>
getLibStatut(7); ?>
">transnoentitiesnoconv("RemoveLink")); ?>
-
\ No newline at end of file
+
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 0e0c444af33..7f938ba9b6c 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -182,37 +182,70 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave','alpha'))
$filenamefrom=dol_sanitizeFileName(GETPOST('renamefilefrom','alpha'), '_', 0); // Do not remove accents
$filenameto=dol_sanitizeFileName(GETPOST('renamefileto','alpha'), '_', 0); // Do not remove accents
- // Security:
- // Disallow file with some extensions. We rename them.
- // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
- if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+ if ($filenamefrom != $filenameto)
{
- $filenameto.= '.noexe';
- }
+ // Security:
+ // Disallow file with some extensions. We rename them.
+ // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+ if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+ {
+ $filenameto.= '.noexe';
+ }
- if ($filenamefrom && $filenameto)
- {
- $srcpath = $upload_dir.'/'.$filenamefrom;
- $destpath = $upload_dir.'/'.$filenameto;
+ if ($filenamefrom && $filenameto)
+ {
+ $srcpath = $upload_dir.'/'.$filenamefrom;
+ $destpath = $upload_dir.'/'.$filenameto;
- $result = dol_move($srcpath, $destpath);
- if ($result)
- {
- if ($object->id)
- {
- $object->addThumbs($destpath);
- }
+ $result = dol_move($srcpath, $destpath);
+ if ($result)
+ {
+ if ($object->id)
+ {
+ $object->addThumbs($destpath);
+ }
- // TODO Add revert function of addThumbs to remove for old name
- //$object->delThumbs($srcpath);
+ // TODO Add revert function of addThumbs to remove for old name
+ //$object->delThumbs($srcpath);
- setEventMessages($langs->trans("FileRenamed"), null);
- }
- else
- {
- $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
- setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
- }
+ setEventMessages($langs->trans("FileRenamed"), null);
+ }
+ else
+ {
+ $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+ setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
+ }
+ }
}
}
+
+ // Update properties in ECM table
+ if (GETPOST('ecmfileid', 'int') > 0)
+ {
+ $shareenabled = GETPOST('shareenabled', 'alpha');
+
+ include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+ $ecmfile=new EcmFiles($db);
+ $result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
+ if ($result > 0)
+ {
+ if ($shareenabled)
+ {
+ if (empty($ecmfile->share))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+ $ecmfile->share = getRandomPassword(true);
+ }
+ }
+ else
+ {
+ $ecmfile->share = '';
+ }
+ $result = $ecmfile->update($user);
+ if ($result < 0)
+ {
+ setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+ }
+ }
+ }
}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 015173f1f05..aeca3d5a102 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -425,7 +425,7 @@ abstract class CommonDocGenerator
{
$object->fetch_projet();
}
-
+
$resarray[$array_key.'_project_ref'] = $object->project->ref;
$resarray[$array_key.'_project_title'] = $object->project->title;
$resarray[$array_key.'_project_description'] = $object->project->description;
@@ -510,7 +510,7 @@ abstract class CommonDocGenerator
'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
);
-
+
// Units
if ($conf->global->PRODUCT_USE_UNITS)
{
@@ -527,16 +527,16 @@ abstract class CommonDocGenerator
$line->fetch_optionals($line->rowid,$extralabels);
$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
-
+
// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
- if (isset($line->product_ref))
+ if (isset($line->fk_product) && $line->fk_product > 0)
{
- $product = new Product($this->db);
- $result = $product->fetch(null, $line->product_ref);
- foreach($product->array_options as $key=>$label)
+ $tmpproduct = new Product($this->db);
+ $result = $tmpproduct->fetch($line->fk_product);
+ foreach($tmpproduct->array_options as $key=>$label)
$resarray["line_".$key] = $label;
- }
-
+ }
+
return $resarray;
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 69002d9ae93..0dd9a245136 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3496,7 +3496,7 @@ abstract class CommonObject
/**
* Return if a country is inside the EEC (European Economic Community)
- * @deprecated
+ * @deprecated Use function isInEEC function instead
*
* @return boolean true = country inside EEC, false = country outside EEC
*/
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cbd2eb5c3b3..4e8f67d6552 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -646,9 +646,10 @@ class Form
* @param integer $maxlength Max length for labels (0=no limit)
* @param string $morecss More css class
* @param string $usecodeaskey 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+ * @param int $showempty Show empty choice
* @return string HTML string with select
*/
- function select_country($selected='',$htmlname='country_id',$htmloption='',$maxlength=0,$morecss='minwidth300',$usecodeaskey='')
+ function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1)
{
global $conf,$langs;
@@ -693,20 +694,22 @@ class Form
foreach ($countryArray as $row)
{
+ if (empty($showempty) && empty($row['rowid'])) continue;
+
if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
if (empty($row['favorite']) && $atleastonefavorite)
{
$atleastonefavorite=0;
- $out.= '
---------------------- ';
+ $out.= '
---------------------- ';
}
if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) )
{
$foundselected=true;
- $out.= '
';
+ $out.= ' ';
}
else
{
- $out.= ' ';
+ $out.= ' ';
}
if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
else $out.= ' ';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 4bff96700d5..3d560c9644e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -938,7 +938,7 @@ class FormFile
* @param string $url Full url to use for click links ('' = autodetect)
* @param int $showrelpart 0=Show only filename (default), 1=Show first level 1 dir
* @param int $permtoeditline Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
- * @param string $upload_dir Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
+ * @param string $upload_dir Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
* @param string $sortfield Sort field ('name', 'size', 'position', ...)
* @param string $sortorder Sort order ('ASC' or 'DESC')
* @param int $disablemove 1=Disable move button, 0=Position move is possible.
@@ -951,6 +951,7 @@ class FormFile
global $user, $conf, $langs, $hookmanager;
global $bc,$bcdd;
global $sortfield, $sortorder, $maxheightmini;
+ global $dolibarr_main_url_root;
// Define relative path used to store the file
if (empty($relativepath))
@@ -1038,6 +1039,7 @@ class FormFile
print '';
+ if ($relativedir && $filearray[$key]['rowid'] > 0)
+ {
+ if ($editline)
+ {
+ print $langs->trans("FileSharedViaALink").' ';
+ print ''.$langs->trans("Hash").' : '.$file['share'].' ';
+ $forcedownload=0;
+ $paramlink='';
+ if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share']; // Hash for public share
+ if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+
+ $fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+ //if (! empty($object->ref)) $fulllink.='&hashn='.$object->ref; // Hash of file path
+ //elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label; // Hash of file content
+
+ print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+ print ''.$langs->trans("Download").' '; // No target here
+ }
+ else
+ {
+ //print ''.$langs->trans("FileNotShared").' ';
+ }
+ }
+ }
+ print ' ';
+
+ // Actions buttons
if (! $editline)
{
// Delete or view link
@@ -1215,6 +1259,7 @@ class FormFile
else
{
print '';
+ print ' ';
@@ -1227,9 +1272,9 @@ class FormFile
}
if ($nboffiles == 0)
{
- $colspan=(empty($useinecm)?'5':'5');
- if (empty($disablemove)) $colspan++;
- print '';
+ $colspan=(empty($useinecm)?'6':'6');
+ if (empty($disablemove)) $colspan++; // 6 columns or 7
+ print ' ';
if (empty($textifempty)) print $langs->trans("NoFileFound");
else print $textifempty;
print ' ';
- print ''.$langs->trans("Link").' ';
- return $out;
-}
-
/**
* Convert a html select field into an ajax combobox.
* Use ajax_combobox() only for small combo list! If not, use instead ajax_autocompleter().
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d3b242840ae..3f7c45dda52 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -573,7 +573,7 @@ function getFormeJuridiqueLabel($code)
}
/**
- * Return if a country is inside the EEC (European Economic Community)
+ * Return if a country of an object is inside the EEC (European Economic Community)
* TODO Add a field into country dictionary.
*
* @param Object $object Object
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 206d1bb8099..b53e588c275 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -225,7 +225,8 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
{
global $conf, $db;
- $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+ $sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+ $sql.=" acl, position, share";
if ($mode) $sql.=", description";
$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
$sql.=" WHERE filepath = '".$db->escape($path)."'";
@@ -258,7 +259,8 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
"keywords" => $obj->keywords,
"cover" => $obj->cover,
"position" => (int) $obj->position,
- "acl" => $obj->acl
+ "acl" => $obj->acl,
+ "share" => $obj->share
);
}
$i++;
@@ -318,6 +320,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
+ $filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
$found=1;
break;
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a736f3c139a..89e31d00703 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2223,13 +2223,263 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
}
}
- if (strtoupper($countrycode) == "CA")
+ elseif (strtoupper($countrycode) == "CA")
{
if (dol_strlen($phone) == 10) {
$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
}
}
-
+ elseif (strtoupper($parameters['countrycode']) == "PT" )
+ {//Portugal
+ if (dol_strlen($object) == 13)
+ {//ex: +351_ABC_DEF_GHI
+ $newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "SR" )
+ {//Suriname
+ if (dol_strlen($object) == 10)
+ {//ex: +597_ABC_DEF
+ $newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
+ }
+ elseif (dol_strlen($object) == 11)
+ {//ex: +597_ABC_DEFG
+ $newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "DE" )
+ {//Allemagne
+ if (dol_strlen($object) == 14)
+ {//ex: +49_ABCD_EFGH_IJK
+ $newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
+ }
+ elseif (dol_strlen($object) == 13)
+ {//ex: +49_ABC_DEFG_HIJ
+ $newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "ES")
+ {//Espagne
+ if (dol_strlen($object) == 12)
+ {//ex: +34_ABC_DEF_GHI
+ $newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "BF")
+ {// Burkina Faso
+ if (dol_strlen($newphone) == 12)
+ {//ex : +22 A BC_DE_FG_HI
+ $newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "RO")
+ {// Roumanie
+ if (dol_strlen($newphone) == 12)
+ {//ex : +40 AB_CDE_FG_HI
+ $newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "TR")
+ {//Turquie
+ if (dol_strlen($object) == 13)
+ {//ex : +90 ABC_DEF_GHIJ
+ $newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "US")
+ {//Etat-Unis
+ if (dol_strlen($newphone) == 12)
+ {//ex: +1 ABC_DEF_GHIJ
+ $newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "MX")
+ {//Mexique
+ if (dol_strlen($newphone) == 12)
+ {//ex: +52 ABCD_EFG_HI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+ }
+ elseif (dol_strlen($newphone) == 11)
+ {//ex: +52 AB_CD_EF_GH
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+ }
+ elseif (dol_strlen($newphone) == 13)
+ {//ex: +52 ABC_DEF_GHIJ
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "ML")
+ {//Mali
+ if(dol_strlen($newphone) == 12)
+ {//ex: +223 AB_CD_EF_GH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "TH")
+ {//Thaïlande
+ if(dol_strlen($newphone) == 11)
+ {//ex: +66_ABC_DE_FGH
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+ }
+ elseif(dol_strlen($newphone) == 12)
+ {//ex: +66_A_BCD_EF_GHI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "MU")
+ {//Maurice
+ if(dol_strlen($newphone) == 11)
+ {//ex: +230_ABC_DE_FG
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+ }
+ elseif(dol_strlen($newphone) == 12)
+ {//ex: +230_ABCD_EF_GH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "ZA")
+ {//Afrique du sud
+ if(dol_strlen($newphone) == 12)
+ {//ex: +27_AB_CDE_FG_HI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "SY")
+ {//Syrie
+ if(dol_strlen($newphone) == 12)
+ {//ex: +963_AB_CD_EF_GH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ elseif(dol_strlen($newphone) == 13)
+ {//ex: +963_AB_CD_EF_GHI
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "AE")
+ {//Emirats Arabes Unis
+ if(dol_strlen($newphone) == 12)
+ {//ex: +971_ABC_DEF_GH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+ }
+ elseif(dol_strlen($newphone) == 13)
+ {//ex: +971_ABC_DEF_GHI
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+ }
+ elseif(dol_strlen($newphone) == 14)
+ {//ex: +971_ABC_DEF_GHIK
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "DZ")
+ {//Algérie
+ if(dol_strlen($newphone) == 13)
+ {//ex: +213_ABC_DEF_GHI
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "BE")
+ {//Belgique
+ if(dol_strlen($newphone) == 11)
+ {//ex: +32_ABC_DE_FGH
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+ }
+ elseif(dol_strlen($newphone) == 12)
+ {//ex: +32_ABC_DEF_GHI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "PF")
+ {//Polynésie française
+ if(dol_strlen($newphone) == 12)
+ {//ex: +689_AB_CD_EF_GH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "CO")
+ {//Colombie
+ if(dol_strlen($newphone) == 13)
+ {//ex: +57_ABC_DEF_GH_IJ
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "JO")
+ {//Jordanie
+ if(dol_strlen($newphone) == 12)
+ {//ex: +962_A_BCD_EF_GH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "MG")
+ {//Madagascar
+ if(dol_strlen($newphone) == 13)
+ {//ex: +261_AB_CD_EF_GHI
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "GB")
+ {//Royaume uni
+ if(dol_strlen($newphone) == 13)
+ {//ex: +44_ABCD_EFG_HIJ
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "CH")
+ {//Suisse
+ if(dol_strlen($newphone) == 12)
+ {//ex: +41_AB_CDE_FG_HI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+ }
+ elseif(dol_strlen($newphone) == 15)
+ {// +41_AB_CDE_FGH_IJKL
+ $newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "TN")
+ {//Tunisie
+ if(dol_strlen($newphone) == 12)
+ {//ex: +216_AB_CDE_FGH
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "GF")
+ {//Guyane francaise
+ if(dol_strlen($newphone) == 13)
+ {//ex: +594_ABC_DE_FG_HI (ABC=594 de nouveau)
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "GP")
+ {//Guadeloupe
+ if(dol_strlen($newphone) == 13)
+ {//ex: +590_ABC_DE_FG_HI (ABC=590 de nouveau)
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "MQ")
+ {//Martinique
+ if(dol_strlen($newphone) == 13)
+ {//ex: +596_ABC_DE_FG_HI (ABC=596 de nouveau)
+ $newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+ }
+ }
+ elseif (strtoupper($parameters['countrycode']) == "IT")
+ {//Italie
+ if(dol_strlen($newphone) == 12)
+ {//ex: +39_ABC_DEF_GHI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+ }
+ elseif(dol_strlen($newphone) == 13)
+ {//ex: +39_ABC_DEF_GH_IJ
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+ }
+ }
+ elseif(strtoupper($parameters['countrycode']) == "AU")
+ {//Australie
+ if(dol_strlen($newphone) == 12)
+ {//ex: +61_A_BCDE_FGHI
+ $newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
+ }
+ }
if (! empty($addlink)) // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
{
if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) // If phone or option for, we use link of phone
@@ -6844,7 +7094,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
if (empty($conf->use_javascript_ajax)) return '';
- $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css');
+ $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
//$mime_preview[]='vnd.oasis.opendocument.presentation';
//$mime_preview[]='archive';
$num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
@@ -6861,6 +7111,25 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
}
+/**
+ * Make content of an input box selected when we click into input field.
+ *
+ * @param string $htmlname Id of html object
+ * @param string $addlink Add a 'link to' after
+ */
+function ajax_autoselect($htmlname, $addlink='')
+{
+ global $langs;
+ $out = '';
+ if ($addlink) $out.=' '.$langs->trans("Link").' ';
+ return $out;
+}
+
+
/**
* Return mime type of a file
*
@@ -6931,6 +7200,7 @@ function dol_mimetype($file, $default='application/octet-stream', $mode=0)
if (preg_match('/\.gif$/i',$tmpfile)) { $mime='image/gif'; $imgmime='image.png'; $famime='file-image-o'; }
if (preg_match('/\.bmp$/i',$tmpfile)) { $mime='image/bmp'; $imgmime='image.png'; $famime='file-image-o'; }
if (preg_match('/\.(tif|tiff)$/i',$tmpfile)) { $mime='image/tiff'; $imgmime='image.png'; $famime='file-image-o'; }
+ if (preg_match('/\.svg$/i',$tmpfile)) { $mime='image/svg+xml';$imgmime='image.png'; $famime='file-image-o'; }
// Calendar
if (preg_match('/\.vcs$/i',$tmpfile)) { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
if (preg_match('/\.ics$/i',$tmpfile)) { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index e6f69da1d93..f0a666b03e9 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -37,7 +37,7 @@ $quality = 80;
*/
function image_format_supported($file)
{
- $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into product.class.php
+ $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg'; // See also into product.class.php
// Case filename is not a format image
if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 59a2d82ffc7..7c24e49e89b 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1320,7 +1320,17 @@ class pdf_einstein extends ModelePDFCommandes
if ($showaddress)
{
// Sender properties
- $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+ $carac_emetteur='';
+ // Add internal contact of proposal if defined
+ $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+ if (count($arrayidcontact) > 0)
+ {
+ $object->fetch_user($arrayidcontact[0]);
+ $labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
+ $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+ }
+
+ $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
// Show sender
$posy=42+$top_shift;
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 9b3f4e16e9b..b18f8bebf62 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -172,7 +172,7 @@ class modBlockedLog extends DolibarrModules
// If already used, we add an entry to show we enable module
require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
- $object=new stdClass;
+ $object=new stdClass();
$object->id = 1;
$object->element = 'module';
$object->ref = 'systemevent';
@@ -215,7 +215,7 @@ class modBlockedLog extends DolibarrModules
// If already used, we add an entry to show we enable module
require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
- $object=new stdClass;
+ $object=new stdClass();
$object->id = 1;
$object->element = 'module';
$object->ref = 'systemevent';
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 47d44d66164..d62576c5063 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -80,7 +80,7 @@ class modWebsite extends DolibarrModules
// New pages on tabs
// -----------------
- //$this->tabs[] = array('data'=>'thirdparty:+website:WebSites:website:($conf->societe->enabled && $user->rights->societe->lire):/societe/website.php?mainmenu=home&id=__ID__'); // To add a new tab identified by code tabname1
+ //$this->tabs[] = array(); // To add a new tab identified by code tabname1
// Boxes
//------
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index a75ed1846ff..e4a63b23b3d 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -71,7 +71,8 @@ $(document).ready(function(){
function() {
console.log("tableDND end of ajax call");
if (reloadpage == 1) {
- location.href = '';
+ //console.log('');
+ location.href = '';
} else {
$("# .drag").each(
function( intIndex ) {
diff --git a/htdocs/document.php b/htdocs/document.php
index 1c722e4cb55..50f4a61186d 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -25,9 +25,9 @@
* \file htdocs/document.php
* \brief Wrapper to download data files
* \remarks Call of this wrapper is made with URL:
- * document.php?modulepart=repfichierconcerne&file=relativepathoffile
- * document.php?modulepart=logs&file=dolibarr.log
- * document.php?modulepart=logs&hashp=sharekey
+ * DOL_URL_ROOT.'/document.php?modulepart=repfichierconcerne&file=relativepathoffile'
+ * DOL_URL_ROOT.'/document.php?modulepart=logs&file=dolibarr.log'
+ * DOL_URL_ROOT.'/document.php?hashp=sharekey'
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -36,9 +36,9 @@
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1');
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
//if (! defined('NOREQUIREHOOK')) define('NOREQUIREHOOK','1'); // Disable "main.inc.php" hooks
// For bittorent link, we don't need to load/check we are into a login session
if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent' && ! defined("NOLOGIN"))
@@ -58,9 +58,6 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined
define("NOLOGIN",1);
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
}
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
/**
* Header empty
@@ -75,7 +72,6 @@ function llxHeader() { }
*/
function llxFooter() { }
-
require 'main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -103,21 +99,17 @@ if (in_array($modulepart, array('facture_paiement','unpaid')))
/*
- * Action
+ * Actions
*/
// None
+
/*
* View
*/
-// Define mime type
-$type = 'application/octet-stream';
-if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
-else $type=dol_mimetype($original_file);
-
// Define attachment (attachment=true to force choice popup 'open'/'save as')
$attachment = true;
if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
@@ -160,6 +152,10 @@ if (! empty($hashp))
}
}
+// Define mime type
+$type = 'application/octet-stream';
+if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
+else $type=dol_mimetype($original_file);
// Security: Delete string ../ into $original_file
$original_file = str_replace("../","/", $original_file);
@@ -252,9 +248,6 @@ header('Content-Length: ' . dol_filesize($fullpath_original_file));
header('Cache-Control: Public, must-revalidate');
header('Pragma: public');
-//ob_clean();
-//flush();
-
readfile($fullpath_original_file_osencoded);
if (is_object($db)) $db->close();
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 8c62cbe18f2..e0926e0f777 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -341,13 +341,9 @@ if (! empty($object->share))
{
if ($action != 'edit')
{
- $modulepart='ecm';
$forcedownload=0;
$paramlink='';
- //if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart; // For sharing with hash (so public files), modulepart is not required.
- //if (! empty($object->entity)) $paramlink.='&entity='.$object->entity; // For sharing with hash (so public files), entity is not required.
- //$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath); // No need of name of file for public link, we will use the hash
if (! empty($object->share)) $paramlink.=($paramlink?'&':'').'hashp='.$object->share; // Hash for public share
if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 453cb6068ad..588c13ca849 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -117,7 +117,7 @@ if (empty($reshook))
// Fill array 'array_options' with data from update form
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-
+
if ($ret < 0) $error++;
if (! $error)
{
@@ -476,7 +476,7 @@ if ($object->id > 0)
/*
- * Last supplier proposal
+ * Latest supplier proposal
*/
$proposalstatic = new SupplierProposal($db);
@@ -485,7 +485,7 @@ if ($object->id > 0)
$sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
$sql.= " WHERE p.fk_soc =".$object->id;
- $sql.= " AND p.entity =".$conf->entity;
+ $sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
$sql.= " ORDER BY p.date_valid DESC";
$sql.= " ".$db->plimit($MAXLIST);
@@ -548,7 +548,7 @@ if ($object->id > 0)
}
/*
- * Last supplier orders
+ * Latest supplier orders
*/
$orderstatic = new CommandeFournisseur($db);
@@ -561,6 +561,7 @@ if ($object->id > 0)
$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
$sql2.= ' WHERE c.fk_soc = s.rowid';
+ $sql2.= " AND c.entity IN (".getEntity('commande_fournisseur').")";
$sql2.= ' AND s.rowid = '.$object->id;
// Show orders with status validated, shipping started and delivered (well any order we can bill)
$sql2.= " AND c.fk_statut IN (5)";
@@ -578,9 +579,9 @@ if ($object->id > 0)
// TODO move to DAO class
$sql = "SELECT count(p.rowid) as total";
- $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
$sql.= " WHERE p.fk_soc =".$object->id;
- $sql.= " AND p.entity =".$conf->entity;
+ $sql.= " AND p.entity IN (".getEntity('commande_fournisseur').")";
$resql=$db->query($sql);
if ($resql)
{
@@ -589,9 +590,9 @@ if ($object->id > 0)
}
$sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
$sql.= " WHERE p.fk_soc =".$object->id;
- $sql.= " AND p.entity =".$conf->entity;
+ $sql.= " AND p.entity IN (".getEntity('commande_fournisseur').")";
$sql.= " ORDER BY p.date_commande DESC";
$sql.= " ".$db->plimit($MAXLIST);
$resql=$db->query($sql);
@@ -652,7 +653,7 @@ if ($object->id > 0)
}
/*
- * Last supplier invoices
+ * Latest supplier invoices
*/
$langs->load('bills');
@@ -666,7 +667,7 @@ if ($object->id > 0)
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn';
$sql.= ' WHERE f.fk_soc = '.$object->id;
- $sql.= " AND f.entity =".$conf->entity;
+ $sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
$sql.= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ht,f.total_tva,f.total_ttc,f.paye';
$sql.= ' ORDER BY f.datef DESC';
$resql=$db->query($sql);
@@ -694,15 +695,15 @@ if ($object->id > 0)
print '';
print '';
$facturestatic->id=$obj->rowid;
- $facturestatic->ref=($obj->ref?$obj->ref:$obj->rowid).($obj->ref_supplier?' - '.$obj->ref_supplier:'');
- $facturestatic->ref_supplier = $obj->ref_supplier;
- $facturestatic->total_ht = $obj->total_ht;
+ $facturestatic->ref=($obj->ref?$obj->ref:$obj->rowid);
+ $facturestatic->ref_supplier = $obj->ref_supplier;
+ $facturestatic->libelle = $obj->libelle;
+ $facturestatic->total_ht = $obj->total_ht;
$facturestatic->total_tva = $obj->total_tva;
$facturestatic->total_ttc = $obj->total_ttc;
- //$facturestatic->ref_supplier=$obj->ref_supplier;
print $facturestatic->getNomUrl(1);
- //print img_object($langs->trans('ShowBill'),'bill').' '.($obj->ref?$obj->ref:$obj->rowid).' - '.$obj->ref_supplier.' ';
- print ' '.dol_trunc($obj->libelle,14);
+ print $obj->ref_supplier?' - '.$obj->ref_supplier:'';
+ print ($obj->libelle?' - ':'').dol_trunc($obj->libelle,14);
print ' ';
print ''.dol_print_date($db->jdate($obj->df),'day').' ';
print ''.price($obj->amount).' ';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 444eb5d200a..292466ea0d8 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1929,6 +1929,8 @@ class FactureFournisseur extends CommonInvoice
$label .= '' . $langs->trans('Ref') . ': ' . $this->ref;
if (! empty($this->ref_supplier))
$label.= '' . $langs->trans('RefSupplier') . ': ' . $this->ref_supplier;
+ if (! empty($this->libelle))
+ $label.= '' . $langs->trans('Label') . ': ' . $this->libelle;
if (! empty($this->total_ht))
$label.= '' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
if (! empty($this->total_tva))
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 8262a5f05df..7e64b6ae951 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -35,7 +35,7 @@ $allowinstall = 0;
$allowupgrade = false;
$checksok = 1;
-$setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):$langs->getDefaultLang();
+$setuplang=GETPOST("selectlang",'az09',3)?GETPOST("selectlang",'az09',3):$langs->getDefaultLang();
$langs->setDefaultLang($setuplang);
$langs->load("install");
@@ -345,6 +345,10 @@ else
$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
$conf->setValues($db);
+ // Reset forced setup after the setValues
+ if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE');
+ $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
+
// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
// Version to install is DOL_VERSION
$dolibarrlastupgradeversionarray=preg_split('/[\.-]/',isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL)?$conf->global->MAIN_VERSION_LAST_INSTALL:''));
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 5db07cd1412..229ae0a3c3e 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -42,10 +42,8 @@ error_reporting(0);
@set_time_limit(120);
error_reporting($err);
-$setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto';
+$setuplang=GETPOST("selectlang",'az09',3)?GETPOST("selectlang",'az09',3):'auto';
$langs->setDefaultLang($setuplang);
-$versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]);
-$versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]);
$langs->loadLangs(array("admin","install","other"));
@@ -78,6 +76,7 @@ print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(G
print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount','alpha')?GETPOST('set_empty_time_spent_amount','alpha'):'0').' Found line with id '.$obj->id.', label "'.$obj->libelle.'" of module "'.$obj->module.'" to delete';
+ if (GETPOST('clean_perm_table','alpha') == 'confirmed')
+ {
+ $sqldelete = 'DELETE FROM '.MAIN_DB_PREFIX.'rights_def WHERE id = '.$obj->id;
+ $resqldelete = $db->query($sqldelete);
+ if (! $resqldelete)
+ {
+ dol_print_error($db);
+ }
+ print ' - deleted';
+ }
+ print ' No lines of a disabled external module (with id > 100000) found into table rights_def ';
+
+ print ''.$langs->trans('MigrationUserRightsEntity')." ';
+
+ print ''.$langs->trans('MigrationUserGroupRightsEntity')." ';
+ print ' ';
print $product_static->getNomUrl(1);
print " \n";
if (! $i) $totalarray['nbfield']++;
@@ -724,7 +724,7 @@ else
// Ref supplier
if (! empty($arrayfields['pfp.ref_fourn']['checked']))
{
- print '';
+ print ' ';
print $product_static->getNomUrl(1);
print " \n";
if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index fa3fdc6b18e..b304f65f986 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1230,7 +1230,7 @@ else
print '';
$s = ' ';
$s ='';
- if ($website && $pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
+ if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
{
- $websitepage = new WebSitePage($db);
- $websitepage->fetch($pageid);
-
$realpage=$urlwithroot.'/public/website/index.php?website='.$website.'&pageref='.$websitepage->pageurl;
$pagealias = $websitepage->pageurl;
@@ -1894,8 +1905,9 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print '
';
print $langs->trans("URL");
print ' ';
- print '