diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 6351ff0e050..aba0ae018dc 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -433,7 +433,7 @@ print '
'; // Case of the parameter ACCOUNTING_MODE -if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { +if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) { print '
'; print ''; print ''; @@ -446,7 +446,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { print ' ('.$langs->trans('Default').')'; print ''.nl2br($langs->trans('ACCOUNTING_USE_NON_TREASURY_Desc')).''; print "\n"; - print ''; + print ''; print ''.nl2br($langs->trans('ACCOUNTING_USE_TREASURY_Desc')).""; print "\n"; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 365ff634e5d..a2cce93ce4a 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -134,6 +134,7 @@ if ($action == 'update') { } } + /* * View */ @@ -158,11 +159,11 @@ print ''; print ''; print ''; print "\n"; -print ''; +print ''; +print '\n"; +print ''; print '\n"; -print ''; -print '\n"; print "
'.$langs->trans('OptionMode').'
'.nl2br($langs->trans('OptionModeVirtualDesc'))."
'.nl2br($langs->trans('OptionModeTrueDesc')); print "
'.nl2br($langs->trans('OptionModeVirtualDesc'))."
\n"; diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 6810b0dde3d..acaae9d05dd 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -3,10 +3,10 @@ MenuFinancial=Billing | Payment TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation OptionMode=Option for accountancy -OptionModeTrue=Accrual accounting -OptionModeVirtual=Cash accounting -OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on payments. +OptionModeVirtual=Accrual accounting +OptionModeTrue=Cash accounting OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. +OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on payments. FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup. LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.