';
$out.=$sublink;
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
- $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone" style="cursor:move;"');
- $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
+ $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone cursormove"');
+ $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
$label=$head['text'];
if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
$out.= '';
$out.= '
';
}
- $out.= '';
+
$out.= "\n";
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 271f87ab4a0..99b27c20822 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -219,10 +219,10 @@ class Form
if (empty($notabletag)) $ret.='';
if (empty($notabletag)) $ret.='
'."\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ea92fb5a63b..6028f9bcabc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1164,7 +1164,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
$morehtmlstatus.=$tmptxt;
}
- elseif ($object->element == 'contrat')
+ elseif ($object->element == 'contrat' || $object->element == 'contract')
{
if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);
else $morehtmlstatus.=$object->getLibStatut(4);
@@ -2375,14 +2375,14 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
* Example: picto.png@mymodule if picto.png is stored into htdocs/mymodule/img
* Example: /mydir/mysubdir/picto.png if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
- * @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
+ * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @param int $pictoisfullpath If 1, image path is a full path
* @param int $srconly Return only content of the src attribute of img.
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
* @return string Return img tag
* @see #img_object, #img_picto_common
*/
-function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
+function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
{
global $conf;
@@ -2434,7 +2434,8 @@ function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $
if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB
$title=$tmparray[0];
$alt=empty($tmparray[1])?'':$tmparray[1];
- return ''; // Alt is used for accessibility, title for popup
+ if ($picto == 'refresh') var_dump($moreatt);
+ return ''; // Alt is used for accessibility, title for popup
}
}
@@ -2444,16 +2445,16 @@ function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $picto Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
* For external modules use imagename@mymodule to search into directory "img" of module.
- * @param string $morealt Add more attribute on img tag (ie: class="datecallink")
+ * @param string $moreatt Add more attribute on img tag (ie: class="datecallink")
* @param int $pictoisfullpath If 1, image path is a full path
* @param int $srconly Return only content of the src attribute of img.
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
* @return string Return img tag
* @see #img_picto, #img_picto_common
*/
-function img_object($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
+function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
{
- return img_picto($titlealt, 'object_'.$picto, $morealt, $pictoisfullpath, $srconly, $notitle);
+ return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
}
/**
@@ -2461,12 +2462,12 @@ function img_object($titlealt, $picto, $morealt = '', $pictoisfullpath = false,
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
- * @param string $morealt Add more attribute on img tag
+ * @param string $moreatt Add more attribute on img tag
* @param int $pictoisfullpath If 1, image path is a full path
* @return string Return img tag
* @see #img_object, #img_picto
*/
-function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
+function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
{
global $conf;
@@ -2474,7 +2475,7 @@ function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
- return img_picto($titlealt, $path, $morealt, 1);
+ return img_picto($titlealt, $path, $moreatt, 1);
}
/**
@@ -2482,12 +2483,12 @@ function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
- * @param string $morealt Add more attribute on img tag
+ * @param string $moreatt Add more attribute on img tag
* @param int $pictoisfullpath If 1, image path is a full path
* @return string Return img tag
* @see #img_object, #img_picto
*/
-function img_picto_common($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
+function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
{
global $conf;
@@ -2506,7 +2507,7 @@ function img_picto_common($titlealt, $picto, $morealt = '', $pictoisfullpath = 0
}
}
- return img_picto($titlealt, $path, $morealt, 1);
+ return img_picto($titlealt, $path, $moreatt, 1);
}
/**
@@ -2612,9 +2613,9 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
if ($titlealt == 'default') $titlealt = $langs->trans('View');
- $morealt = ($float ? 'style="float: right" ' : '').$other;
+ $moreatt = ($float ? 'style="float: right" ' : '').$other;
- return img_picto($titlealt, 'view.png', $morealt);
+ return img_picto($titlealt, 'view.png', $moreatt);
}
/**
@@ -2686,17 +2687,17 @@ function img_info($titlealt = 'default')
* Show warning logo
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- * @param string $morealt Add more attribute on img tag (For example 'style="float: right"'). If 1
+ * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1
* @return string Return img tag
*/
-function img_warning($titlealt = 'default', $morealt = '')
+function img_warning($titlealt = 'default', $moreatt = '')
{
global $conf, $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
- //return '
';
+ return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): ''));
}
/**
@@ -2718,16 +2719,16 @@ function img_error($titlealt = 'default')
* Show next logo
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
-* @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
+* @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag
*/
-function img_next($titlealt = 'default', $morealt='')
+function img_next($titlealt = 'default', $moreatt='')
{
global $conf, $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Next');
- //return img_picto($titlealt, 'next.png', $morealt);
+ //return img_picto($titlealt, 'next.png', $moreatt);
return '';
}
@@ -2735,16 +2736,16 @@ function img_next($titlealt = 'default', $morealt='')
* Show previous logo
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- * @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
+ * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag
*/
-function img_previous($titlealt = 'default', $morealt='')
+function img_previous($titlealt = 'default', $moreatt='')
{
global $conf, $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
- //return img_picto($titlealt, 'previous.png', $morealt);
+ //return img_picto($titlealt, 'previous.png', $moreatt);
return '';
}
@@ -2787,16 +2788,16 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass='')
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $selected Selected
- * @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
+ * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag
*/
-function img_left($titlealt = 'default', $selected = 0, $morealt='')
+function img_left($titlealt = 'default', $selected = 0, $moreatt='')
{
global $conf, $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Left');
- return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $morealt);
+ return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
}
/**
@@ -2804,16 +2805,16 @@ function img_left($titlealt = 'default', $selected = 0, $morealt='')
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $selected Selected
- * @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
+ * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag
*/
-function img_right($titlealt = 'default', $selected = 0, $morealt='')
+function img_right($titlealt = 'default', $selected = 0, $moreatt='')
{
global $conf, $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Right');
- return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $morealt);
+ return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
}
/**
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 6e6e0c7b511..d2567f30c04 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -334,8 +334,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
$thumbsbyrow=6;
print '
';
- $var=false;
-
// Title
if ($foruserprofile)
{
@@ -343,10 +341,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '
';
if ($edit)
@@ -577,8 +572,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
}
else
{
- $var=!$var;
- print '
';
+ print '
';
print '
'.$langs->trans("BackgroundTableTitleColor").'
';
print '
';
if ($edit)
@@ -604,8 +598,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
}
else
{
- $var=!$var;
- print '
';
+ print '
';
print '
'.$langs->trans("TextTitleColor").'
';
print '
';
if ($edit)
@@ -627,8 +620,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
// Text LinkColor
if ($foruserprofile)
{
- /*$var=!$var;
- print '
';
if ($edit)
@@ -670,11 +662,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
}
// Use Hover
- $var=!$var;
if ($foruserprofile)
{
/* Must first change option to choose color of highlight instead of yes or no.
- print '
';
print_r($objimport->array_import_updatekeys);
diff --git a/htdocs/install/doctemplates/mycompany/background_dolibarr.jpg b/htdocs/install/doctemplates/mycompany/background_dolibarr.jpg
new file mode 100644
index 00000000000..31177b1b5c2
Binary files /dev/null and b/htdocs/install/doctemplates/mycompany/background_dolibarr.jpg differ
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index acbf407fd62..139b3e463b8 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -117,6 +117,7 @@ ImportFromToLine=Import line numbers (from - to)
SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
## filters
SelectFilterFields=If you want to filter on some values, just input values here.
FilteredFields=Filtered fields
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index fc6e9ecb743..a886dcf475b 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -241,8 +241,10 @@ else
dol_banner_tab($act, 'element_id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref, '&element='.$element, 0, '', '');
+ print '
';
+
print '';
-
+
print '
';
// Type
@@ -312,6 +314,8 @@ else
print '
';
+ print '
';
+
dol_fiche_end();
}
}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index c9fb0de6edf..bb043076157 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1670,7 +1670,7 @@ else
// Zip / Town
print '