diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 98d3ab2dc19..c8a214921a7 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -42,7 +42,7 @@ accessforbidden(); if ($_GET["action"] == "set") { - for ($i = 0 ; $i < 3 ; $i++) + for ($i = 0 ; $i < 2 ; $i++) { dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity); } @@ -59,6 +59,7 @@ if ($_GET["action"] == "set") dolibarr_set_const($db, "PRELEVEMENT_NUMBER_KEY", $account->cle_rib,'chaine',0,'',$conf->entity); dolibarr_set_const($db, "PRELEVEMENT_IBAN", $account->iban,'chaine',0,'',$conf->entity); dolibarr_set_const($db, "PRELEVEMENT_BIC", $account->bic,'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity); } Header("Location: prelevement.php"); @@ -98,12 +99,11 @@ print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup'); print '
'; print ''; -print ''; +print '
'; print ''; print ''; print ''; -//print ''; -print "\n"; +print ""; //User print ''; @@ -114,36 +114,25 @@ print ''; print ''; //Profid1 of Transmitter -print ''; +print ''; print ''; print ''; -/* -* Bank info -*/ -print ''; -print ''; -print ''; -print ''; - // Bank account (from Banks module) -print ''; -print ''; +print ''; +print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("CurrentValue").'
'.$langs->trans("ResponsibleUser").'
'.$langs->trans("NumeroNationalEmetter")." (".$langs->transcountry('ProfId1',$mysoc->pays_code).")";'
'.$langs->trans("NumeroNationalEmetter").' - '.$langs->transcountry('ProfId1',$mysoc->pays_code).''; print ''; print '
'.$langs->trans("BankToReceiveWithdraw").'
'.$langs->trans("BankAccountOwner").''; - -//bank account holder -print ''; -print '
'.$langs->trans("Bank").''; +print '
'.$langs->trans("BankToReceiveWithdraw").''; print $html->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1); print '
'; +print ''; print ''; - print '

'; print '
'; -print '
'; +print '
'; /* * Notifications diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 9b76481576a..f30a4d36986 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -74,7 +74,7 @@ NumeroNationalEmetter=Número Nacional del Emissor PleaseSelectCustomerBankBANToWithdraw=Introduïu la informació del compte bancari del client a domiciliar WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT -BankToReceiveWithdraw=Informació del seu compte bancari receptor de les domiciliacions +BankToReceiveWithdraw=Compte bancari receptor de les domiciliacions CreditDate=Abonada el WithdrawalFileNotCapable=No es possible generar fitxer bancari de domiciliacio per al seu pais ShowWithdraw=Veure domiciliació diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index bb640f4c5a6..31dbcc65b0d 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -74,7 +74,7 @@ NumeroNationalEmetter=National Transmitter Number PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT -BankToReceiveWithdraw=Information about you bank account to receive withdraws +BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country ShowWithdraw=Show Withdraw diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang index 9fb1e270974..c615306c1bf 100755 --- a/htdocs/langs/es_AR/withdrawals.lang +++ b/htdocs/langs/es_AR/withdrawals.lang @@ -74,7 +74,7 @@ NumeroNationalEmetter=Número Nacional del Emisor PleaseSelectCustomerBankBANToWithdraw=Introduzca la información de la cuenta bancaria del cliente a domiciliar WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT -BankToReceiveWithdraw=Información de su cuenta bancaria receptora de las domiciliaciones +BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones CreditDate=Abonada el WithdrawalFileNotCapable=No es posible generar fichero bancario de domiciliacion para su pais ShowWithdraw=Ver domiciliación diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index c55eb061121..e01d4eabcbf 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -74,7 +74,7 @@ NumeroNationalEmetter=Número Nacional del Emisor PleaseSelectCustomerBankBANToWithdraw=Introduzca la información de la cuenta bancaria del cliente a domiciliar WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT -BankToReceiveWithdraw=Información de su cuenta bancaria receptora de las domiciliaciones +BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones CreditDate=Abonada el WithdrawalFileNotCapable=No es posible generar fichero bancario de domiciliacion para su pais ShowWithdraw=Ver domiciliación diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index b434b7f6f96..57ca0baa8b5 100755 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -74,7 +74,7 @@ NumeroNationalEmetter= Numéro National Émetteur PleaseSelectCustomerBankBANToWithdraw=Saisissez les informations du compte bancaire client à prélever WithBankUsingRIB=Pour les comptes bancaires utilisant le RIB WithBankUsingBANBIC=Pour les comptes bancaires utilisant le code BAN/BIC/SWIFT -BankToReceiveWithdraw=Informations de votre compte bancaire recevant les prélèvements +BankToReceiveWithdraw=Compte bancaire recevant les prélèvements CreditDate=Crédité le WithdrawalFileNotCapable=Impossible de generer fichier de bon de prelevements pour votre pays ShowWithdraw=Voir prélèvement