diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 78d2821bf90..af2a8841643 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -183,6 +183,10 @@ if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! emp
if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['bankviainvoice']=$langs->trans("MoreActionBankViaInvoice");
print '';
print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
+if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice')
+{
+ print '
'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").' ';
+}
print ' | ';
print "\n";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e811eaff261..993af489989 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -44,7 +44,12 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'setbarcodeproducton')
{
- $res=dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", GETPOST('value'), 'chaine', 0, '', $conf->entity);
+ $barcodenumberingmodule = GETPOST('value', 'alpha');
+ $res=dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity);
+ if ($barcodenumberingmodule == 'mod_barcode_product_standard' && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
+ {
+ $res=dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
+ }
}
elseif ($action == 'setbarcodeproductoff')
{
@@ -406,13 +411,13 @@ if ($conf->produit->enabled)
if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
{
- print '';
+ print ' | ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' | ';
}
else
{
- print '';
+ print ' | ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' | ';
}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8c83c342ab4..f083ef59a2d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -913,6 +913,7 @@ class Contrat extends CommonObject
$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
$sql.= ")";
$resql=$this->db->query($sql);
+
if ($resql)
{
$error=0;
@@ -930,8 +931,8 @@ class Contrat extends CommonObject
{
$modCodeContract = new $module();
- if (!empty($modCodeContract->code_auto)) {
- // Update ref
+ if (! empty($modCodeContract->code_auto)) {
+ // Force the ref to a draft value if numbering module is an automatic numbering
$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
if ($this->db->query($sql))
{
@@ -940,9 +941,6 @@ class Contrat extends CommonObject
$this->ref="(PROV".$this->id.")";
}
}
- } else {
- $error++;
- $this->error='Failed to get PROV number';
}
}
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 936e7b87be4..f71a1c19b96 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -95,8 +95,11 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
$tooltip=$langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
$tooltip.=$langs->trans("GenericMaskCodes3");
- $tooltip.=$langs->trans("GenericMaskCodes4c");
- $tooltip.=$langs->trans("GenericMaskCodes5");
+ $tooltip.=''.$langs->trans("Example").':
';
+ $tooltip.='020{000000000} (for internal use)
';
+ $tooltip.='9771234{00000} (example of ISSN code with prefix 1234)
';
+ $tooltip.='9791234{00000} (example of ISMN code with prefix 1234)
';
+ //$tooltip.=$langs->trans("GenericMaskCodes5");
// Mask parameter
//$texte.= '| '.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'): | ';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 477f611bf39..6b3568bea31 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1857,4 +1857,5 @@ DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (
MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
\ No newline at end of file
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 9b393f8a1bf..8ffb6b38831 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -436,7 +436,7 @@ $listofreferent=array(
'table'=>'projet_task',
'datefieldname'=>'task_date',
'disableamount'=>0,
- 'urlnew'=>DOL_URL_ROOT.'/projet/tasks.php?id='.$id,
+ 'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?id='.$id,
'buttonnew'=>'AddTimeSpent',
'testnew'=>$user->rights->projet->creer,
'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),