diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index f9bb8f39641..8a46ef00bfb 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -257,6 +257,18 @@ else print "
\n"; +// Options +echo ''; +echo ''; +echo ''; +echo ''; +echo ''; + +$key = 'CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT'; +echo ''; + +echo ''; +echo '
' . $langs->trans('Parameter') . '' . $langs->trans('Value') . '
', $langs->trans($key), '', ajax_constantonoff($key), '
'; print '
'; print ''; diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index c5cd4d7f0e2..87d36c5faf3 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -43,7 +43,11 @@ $id = GETPOST("id", 'int'); $action = GETPOST("action", "alpha"); $confirm = GETPOST('confirm'); $refund = GETPOST("refund", "int"); -$auto_create_payment = GETPOST("auto_create_paiement", "int"); +if (GETPOSTISSET('auto_create_paiement')) { + $auto_create_payment = GETPOST("auto_create_paiement", "int"); +} else { + $auto_create_payment = empty($conf->global->CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT); +} if (empty($refund)) $refund = 0; @@ -384,17 +388,10 @@ if ($action == 'create') if (!empty($conf->use_javascript_ajax)) { print "\n".''."\n"; } @@ -482,7 +479,7 @@ if ($action == 'create') // Auto create payment print ''.$langs->trans('AutomaticCreationPayment').''; - print ''."\n"; + print ''."\n"; // Number print ''.$langs->trans('Numero'); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 431ef75ac63..4736c655344 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1683,6 +1683,7 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se AccountancyCode=Accounting Code AccountancyCodeSell=Sale account. code AccountancyCodeBuy=Purchase account. code +CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=By default, leave the checkbox “Automatically create a total payment” empty when creating a new tax object ##### Agenda ##### AgendaSetup=Events and agenda module setup PasswordTogetVCalExport=Key to authorize export link