diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 0e237af632c..7de3e878545 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2215,7 +2215,7 @@ if ($action == 'create')
// Payment mode
print '
| ' . $langs->trans('PaymentMode') . ' | ';
- $form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
+ $form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
print ' |
';
// Project
@@ -3155,10 +3155,13 @@ if ($action == 'create')
print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ' | ';
print '';
print '';
- if ($action == 'editmode') {
- $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
- } else {
- $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'none');
+ if ($action == 'editmode')
+ {
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
+ }
+ else
+ {
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
}
print ' | ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8eb7eee4220..fdd951293a6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2329,8 +2329,8 @@ class Form
dol_syslog(get_class($this)."::select_type_paiements ".$selected.", ".$htmlname.", ".$filtertype.", ".$format,LOG_DEBUG);
$filterarray=array();
- if ($filtertype == 'CRDT') $filterarray=array(0,2);
- elseif ($filtertype == 'DBIT') $filterarray=array(1,2);
+ if ($filtertype == 'CRDT') $filterarray=array(0,2,3);
+ elseif ($filtertype == 'DBIT') $filterarray=array(1,2,3);
elseif ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype);
$this->load_cache_types_paiements();
@@ -3055,12 +3055,13 @@ class Form
/**
* Affiche formulaire de selection des modes de reglement
*
- * @param string $page Page
- * @param int $selected Id mode pre-selectionne
- * @param string $htmlname Name of select html field
+ * @param string $page Page
+ * @param int $selected Id mode pre-selectionne
+ * @param string $htmlname Name of select html field
+ * @param string $filtertype To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))
* @return void
*/
- function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id')
+ function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id', $filtertype='')
{
global $langs;
if ($htmlname != "none")
@@ -3070,7 +3071,7 @@ class Form
print '';
print '';
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index d91c6ce3764..d60059cd17f 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1316,12 +1316,12 @@ if ($action == 'create')
// Payment term
print '| '.$langs->trans('PaymentConditionsShort').' | ';
- $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
+ $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id, 'cond_reglement_id');
print ' |
';
// Payment mode
print '| '.$langs->trans('PaymentMode').' | ';
- $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
+ $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id, 'mode_reglement_id', 'DBIT');
print ' |
';
// Project
@@ -1333,7 +1333,7 @@ if ($action == 'create')
$formproject->select_projects($soc->id, $projectid, 'projectid');
print '';
}
-
+
// Public note
print '| '.$langs->trans('NotePublic').' | ';
print '';
@@ -1779,11 +1779,11 @@ else
print ' | ';
if ($action == 'editmode')
{
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT');
}
else
{
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', 'DBIT');
}
print ' |
';