Skip to content

Commit

Permalink
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@FHenry
FHenry committed May 28, 2013
2 parents 3ddb410 + 485c7bc commit 8a726ab
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 59 deletions.
4 changes: 2 additions & 2 deletions htdocs/comm/mailing/cibles.php
View file
Expand Up @@ -113,7 +113,7 @@
}
}

if ($action == 'clear')
if (GETPOST('clearlist'))
{
// Chargement de la classe
$classname = "MailingTargets";
Expand Down Expand Up @@ -375,7 +375,7 @@
if ($search_firstname) $param.= "&search_firstname=".urlencode($search_firstname);
if ($search_email) $param.= "&search_email=".urlencode($search_email);

$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" class="button" value="'.$langs->trans("TargetsReset").'">';
$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';

print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');

Expand Down
113 changes: 59 additions & 54 deletions htdocs/core/class/html.formother.class.php
View file
Expand Up @@ -544,68 +544,73 @@ function select_color($set_color='', $prefix='f_color', $form_name='objForm', $s
*/
function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
{
global $langs;
global $langs,$conf;

$out='';

if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)
{
$langs->load("other");
$out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
$out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
$out.= '<script type="text/javascript">
jQuery(document).ready(function(){
$(\'#colorpicker'.$prefix.'\').jPicker( {
window: {
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
effects:
{
type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
speed:
{
show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
}
},
position:
{
x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
},
},
images: {
clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
},
localization: // alter these to change the text presented by the picker (e.g. different language)
{
text:
{
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
newColor: \''.dol_escape_js($langs->trans("New")).'\',
currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
ok: \''.dol_escape_js($langs->trans("Save")).'\',
cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
}
}
} ); });
</script>';
if (empty($conf->dol_use_jmobile))
{
$out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
$out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
$out.= '<script type="text/javascript">
jQuery(document).ready(function(){
$(\'#colorpicker'.$prefix.'\').jPicker( {
window: {
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
effects:
{
type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
speed:
{
show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
}
},
position:
{
x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
},
},
images: {
clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
},
localization: // alter these to change the text presented by the picker (e.g. different language)
{
text:
{
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
newColor: \''.dol_escape_js($langs->trans("New")).'\',
currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
ok: \''.dol_escape_js($langs->trans("Save")).'\',
cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
}
}
} ); });
</script>';
}
$out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';
}
else // In most cases, this is not used. We used instead function with no specific list of colors
{
$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
$out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
$out.= '<script type="text/javascript">
jQuery(document).ready(function(){
jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
size: 14,
label: \'\',
hide: true
});
});
</script>';

if (empty($conf->dol_use_jmobile))
{
$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
$out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
$out.= '<script type="text/javascript">
jQuery(document).ready(function(){
jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
size: 14,
label: \'\',
hide: true
});
});
</script>';
}
$out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';
//print '<option value="-1">&nbsp;</option>';
foreach ($arrayofcolors as $val)
Expand Down Expand Up @@ -1005,7 +1010,7 @@ function updateBoxOrder(closing) {
}

if (empty($conf->browser->phone))
{
{
$emptybox->box_id='A';
$emptybox->info_box_head=array();
$emptybox->info_box_contents=array();
Expand Down Expand Up @@ -1036,7 +1041,7 @@ function updateBoxOrder(closing) {
}

if (empty($conf->browser->phone))
{
{
$emptybox->box_id='B';
$emptybox->info_box_head=array();
$emptybox->info_box_contents=array();
Expand Down
3 changes: 2 additions & 1 deletion htdocs/fourn/facture/fiche.php
View file
Expand Up @@ -1344,7 +1344,8 @@
if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
{
$object->date=dol_now();
$object->date_lim_reglement=$object->calculate_date_lim_reglement();
//TODO: Possibly will have to control payment information into suppliers
//$object->date_lim_reglement=$object->calculate_date_lim_reglement();
}
$numref = $object->getNextNumRef($soc);
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/langs/ca_ES/categories.lang
View file
Expand Up @@ -76,7 +76,7 @@ ProductsCategoryShort=Categoria productes
MembersCategoryShort=Categoria membre
SuppliersCategoriesShort=Categories proveïdors
CustomersCategoriesShort=Categories clients
CustomersProspectsCategoriesShort=Categories clients/potencials
CustomersProspectsCategoriesShort=Categories clients
ProductsCategoriesShort=Categories productes
MembersCategoriesShort=Categories membres
ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte.
Expand Down
2 changes: 1 addition & 1 deletion htdocs/langs/es_ES/categories.lang
View file
Expand Up @@ -76,7 +76,7 @@ ProductsCategoryShort=Categoría productos
MembersCategoryShort=Categoría miembro
SuppliersCategoriesShort=Categorías proveedores
CustomersCategoriesShort=Categorías clientes
CustomersProspectsCategoriesShort=Categorías clientes/potenciales
CustomersProspectsCategoriesShort=Categorías clientes
ProductsCategoriesShort=Categorías productos
MembersCategoriesShort=Categorías miembros
ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto.
Expand Down

0 comments on commit 8a726ab

Please sign in to comment.