Debug v22 - Fix bad trans and setup for Cash acocunting.
This commit is contained in:
parent
31a66e2ce2
commit
ca995180a3
3 changed files with 9 additions and 8 deletions
|
|
@ -433,7 +433,7 @@ print '<br>';
|
|||
|
||||
// Case of the parameter ACCOUNTING_MODE
|
||||
|
||||
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
|
||||
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
|
||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="action" value="updatemode">';
|
||||
|
|
@ -446,7 +446,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
|
|||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_1" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode != 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_1"> '.$langs->trans('OptionModeVirtual').'</label> ('.$langs->trans('Default').')</td>';
|
||||
print '<td><span class="opacitymedium">'.nl2br($langs->trans('ACCOUNTING_USE_NON_TREASURY_Desc')).'</span>';
|
||||
print "</td></tr>\n";
|
||||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_2" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'><label for="accounting_mode_2"> '.$langs->trans('OptionModeTrue').'</label></td>';
|
||||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_2" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode == 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_2"> '.$langs->trans('OptionModeTrue').'</label></td>';
|
||||
print '<td><span class="opacitymedium">'.nl2br($langs->trans('ACCOUNTING_USE_TREASURY_Desc'))."</span>";
|
||||
print "</td></tr>\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ if ($action == 'update') {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
|
@ -158,11 +159,11 @@ print '<table class="noborder centpercent">';
|
|||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="2">'.$langs->trans('OptionMode').'</td>';
|
||||
print "</tr>\n";
|
||||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_1" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'><label for="accounting_mode_1"> '.$langs->trans('OptionModeTrue').'</label></td>';
|
||||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_2" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode != 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_2"> '.$langs->trans('OptionModeVirtual').'</label></td>';
|
||||
print '<td class="opacitymedium">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
|
||||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_1" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode == 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_1"> '.$langs->trans('OptionModeTrue').'</label></td>';
|
||||
print '<td class="opacitymedium">'.nl2br($langs->trans('OptionModeTrueDesc'));
|
||||
print "</td></tr>\n";
|
||||
print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_2" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'><label for="accounting_mode_2"> '.$langs->trans('OptionModeVirtual').'</label></td>';
|
||||
print '<td class="opacitymedium">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
|
||||
|
||||
print "</table>\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ MenuFinancial=Billing | Payment
|
|||
TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
|
||||
TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> 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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue