lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Browse Source
This commit is contained in:
Florian Henry 2013-05-28 21:51:11 +02:00
commit 8a726ab51b
5 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/mailing/cibles.php
View File

@ -113,7 +113,7 @@ if ($action == 'add')
} }
} }
if ($action == 'clear') if (GETPOST('clearlist'))
{ {
// Chargement de la classe // Chargement de la classe
$classname = "MailingTargets"; $classname = "MailingTargets";
@ -375,7 +375,7 @@ if ($object->fetch($id) >= 0)
if ($search_firstname) $param.= "&search_firstname=".urlencode($search_firstname); if ($search_firstname) $param.= "&search_firstname=".urlencode($search_firstname);
if ($search_email) $param.= "&search_email=".urlencode($search_email); 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,''); print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');

9
htdocs/core/class/html.formother.class.php
View File

@ -544,13 +544,15 @@ class FormOther
*/ */
function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='') function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
{ {
global $langs; global $langs,$conf;
$out=''; $out='';
if (! is_array($arrayofcolors) || count($arrayofcolors) < 1) if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)
{ {
$langs->load("other"); $langs->load("other");
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.= '<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" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
$out.= '<script type="text/javascript"> $out.= '<script type="text/javascript">
@ -590,9 +592,12 @@ class FormOther
} }
} ); }); } ); });
</script>'; </script>';
}
$out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />'; $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 else // In most cases, this is not used. We used instead function with no specific list of colors
{
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.= '<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 src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
@ -605,7 +610,7 @@ class FormOther
}); });
}); });
</script>'; </script>';
}
$out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">'; $out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';
//print '<option value="-1">&nbsp;</option>'; //print '<option value="-1">&nbsp;</option>';
foreach ($arrayofcolors as $val) foreach ($arrayofcolors as $val)

3
htdocs/fourn/facture/fiche.php
View File

@ -1344,7 +1344,8 @@ else
if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION)) if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
{ {
$object->date=dol_now(); $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); $numref = $object->getNextNumRef($soc);
} }

2
htdocs/langs/ca_ES/categories.lang
View File

@ -76,7 +76,7 @@ ProductsCategoryShort=Categoria productes
MembersCategoryShort=Categoria membre MembersCategoryShort=Categoria membre
SuppliersCategoriesShort=Categories proveïdors SuppliersCategoriesShort=Categories proveïdors
CustomersCategoriesShort=Categories clients CustomersCategoriesShort=Categories clients
CustomersProspectsCategoriesShort=Categories clients/potencials CustomersProspectsCategoriesShort=Categories clients
ProductsCategoriesShort=Categories productes ProductsCategoriesShort=Categories productes
MembersCategoriesShort=Categories membres MembersCategoriesShort=Categories membres
ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte. ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte.

2
htdocs/langs/es_ES/categories.lang
View File

@ -76,7 +76,7 @@ ProductsCategoryShort=Categoría productos
MembersCategoryShort=Categoría miembro MembersCategoryShort=Categoría miembro
SuppliersCategoriesShort=Categorías proveedores SuppliersCategoriesShort=Categorías proveedores
CustomersCategoriesShort=Categorías clientes CustomersCategoriesShort=Categorías clientes
CustomersProspectsCategoriesShort=Categorías clientes/potenciales CustomersProspectsCategoriesShort=Categorías clientes
ProductsCategoriesShort=Categorías productos ProductsCategoriesShort=Categorías productos
MembersCategoriesShort=Categorías miembros MembersCategoriesShort=Categorías miembros
ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto. ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto.