diff --git a/ChangeLog b/ChangeLog
index 1061c220394..d23e281c009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,7 +75,9 @@ Dolibarr better:
- The deprecated way (with 4 parameters) to declare a new tab into a module descriptor file has been
removed. You must now use the 6 parameters way. See file modMyModule.class.php for example.
- Remove the javascript function ac_delay() that is not used anymore by core code.
-- Properties "dictionaries" into module descriptor files has been renamed into "dictionaries".
+- Properties "dictionnaries" into module descriptor files has been renamed into "dictionaries".
+- Method form->select_currency() has been removed. Use instead print form->selectCurrency().
+- Method form->select_methodes_commande() has been renamed into english name selectInputMethod().
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f8a0c9ea5a1..63ca02f6a5c 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -305,7 +305,7 @@ if ($action == 'edit' || $action == 'updateedit')
$var=!$var;
print '
';
if ($action == 'editdemandreason') {
- $form->form_demand_reason($_SERVER ['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+ $form->formInputReason($_SERVER ['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
} else {
- $form->form_demand_reason($_SERVER ['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
+ $form->formInputReason($_SERVER ['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
}
// Removed because using dictionary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
// This is to avoid too heavy screens and have an uniform look and feel for all screens.
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index 2a20706fd7c..8a97e75ddf1 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -256,7 +256,7 @@ if ($action == 'create')
print '
';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6b73b7ba53a..86bc2768840 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -793,7 +793,7 @@ class Form
}
$sql.=$this->db->order("nom","ASC");
if ($limit > 0) $sql.=$this->db->plimit($limit);
-
+
dol_syslog(get_class($this)."::select_thirdparty_list sql=".$sql);
$resql=$this->db->query($sql);
if ($resql)
@@ -1341,7 +1341,7 @@ class Form
$sql.=' ,pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
$sql.=' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
}
-
+
// Multilang : we add translation
if (! empty($conf->global->MAIN_MULTILANGS))
{
@@ -1617,12 +1617,12 @@ class Form
$opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
$outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
}
-
+
//Price by customer
if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
if (!empty($objp->idprodcustprice)) {
$found = 1;
-
+
if ($objp->custprice_base_type == 'HT')
{
$opt.= price($objp->custprice,1).' '.$currencytext.' '.$langs->trans("HT");
@@ -1633,7 +1633,7 @@ class Form
$opt.= price($objp->custprice_ttc,1).' '.$currencytext.' '.$langs->trans("TTC");
$outval.= price($objp->custprice_ttc,1).' '.$currencytextnoent.' '.$langs->transnoentities("TTC");
}
-
+
$outprice_ht=price($objp->custprice);
$outprice_ttc=price($objp->custprice_ttc);
$outpricebasetype=$objp->custprice_base_type;
@@ -2124,7 +2124,7 @@ class Form
* @param int $addempty Add empty entry
* @return void
*/
- function select_availability($selected='',$htmlname='availid',$filtertype='',$addempty=0)
+ function selectAvailabilityDelay($selected='',$htmlname='availid',$filtertype='',$addempty=0)
{
global $langs,$user;
@@ -2154,7 +2154,7 @@ class Form
*
* @return int Nb of lines loaded, 0 if already loaded, <0 if ko
*/
- function load_cache_demand_reason()
+ function loadCacheInputReason()
{
global $langs;
@@ -2164,7 +2164,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
$sql.= " WHERE active=1";
$sql.= " ORDER BY rowid";
- dol_syslog(get_class($this)."::load_cache_demand_reason sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::loadCacheInputReason sql=".$sql,LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2194,19 +2194,20 @@ class Form
}
/**
- * Return list of events that triggered an object creation
+ * Return list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
+ * List found into table c_input_reason loaded by loadCacheInputReason
*
- * @param int $selected Id or code of type origin to select by default
- * @param string $htmlname Nom de la zone select
- * @param string $exclude To exclude a code value (Example: SRC_PROP)
- * @param int $addempty Add an empty entry
- * @return void
+ * @param int $selected Id or code of type origin to select by default
+ * @param string $htmlname Nom de la zone select
+ * @param string $exclude To exclude a code value (Example: SRC_PROP)
+ * @param int $addempty Add an empty entry
+ * @return void
*/
- function select_demand_reason($selected='',$htmlname='demandreasonid',$exclude='',$addempty=0)
+ function selectInputReason($selected='',$htmlname='demandreasonid',$exclude='',$addempty=0)
{
global $langs,$user;
- $this->load_cache_demand_reason();
+ $this->loadCacheInputReason();
print '