vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug v22

Browse source
This commit is contained in:
ldestailleur 2025-04-03 20:29:41 +02:00
parent 2af9cd5aab
commit 94703556eb
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
htdocs/accountancy/admin/closure.php
View file

@ -142,7 +142,7 @@ foreach ($list_account_main as $key) {
$keydesc = $key.'_Desc';
$htmltext = $langs->trans($keydesc);
print '<td class="fieldrequired" width="50%">';
print '<td>';
print $form->textwithpicto($label, $htmltext);
print '</td>';
// Value
@ -154,7 +154,7 @@ foreach ($list_account_main as $key) {
// Journal
print '<tr class="oddeven">';
print '<td class="fieldrequired">'.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").'</td>';
print '<td>'.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").'</td>';
print '<td>';
$defaultjournal = getDolGlobalString('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL');
print $formaccounting->select_journal($defaultjournal, "ACCOUNTING_CLOSURE_DEFAULT_JOURNAL", 9, 1, 0, 0);
@ -162,7 +162,7 @@ print '</td></tr>';
// Accounting groups used for the balance sheet account
print '<tr class="oddeven">';
print '<td class="fieldrequired">';
print '<td>';
print $form->textwithpicto($langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT"), $langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNTHelp"));
print '</td>';
print '<td>';
@ -171,7 +171,7 @@ print '</td></tr>';
// Accounting groups used for the income statement
print '<tr class="oddeven">';
print '<td class="fieldrequired">';
print '<td>';
print $form->textwithpicto($langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT"), $langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENTHelp"));
print '</td>';
print '<td>';

9
htdocs/accountancy/admin/productaccount.php
View file

@ -485,15 +485,14 @@ if ($resql) {
print '<input type="hidden" name="page_y" value="">';
print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
print '<br>';
print '<span class="opacitymedium">'.$langs->trans("InitAccountancyDesc").'</span><br>';
print '<br>';
// Select mode
// Select usage
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Options').'</td><td>'.$langs->trans('Description').'</td>';
print '<td>'.$langs->trans('ProductUsage').'</td><td></td>';
print "</tr>\n";
print '<tr class="oddeven"><td><input type="radio" id="accounting_product_mode1" name="accounting_product_mode" value="ACCOUNTANCY_SELL"'.($accounting_product_mode == 'ACCOUNTANCY_SELL' ? ' checked' : '').'> <label for="accounting_product_mode1">'.$langs->trans('OptionModeProductSell').'</label></td>';
print '<td>'.$langs->trans('OptionModeProductSellDesc');
@ -518,9 +517,11 @@ if ($resql) {
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Refresh').'" name="changetype"></div>';
print "<br>\n";
print "<br><br>\n";
$object = new Product($db);
// Filter on categories
$moreforfilter = '';
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

2
htdocs/accountancy/admin/subaccount.php
View file

@ -346,7 +346,7 @@ if ($resql) {
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 0, 0, 1);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'accounting_account', 0, '', '', $limit, 0, 0, 1);
print '<div class="info">'.$langs->trans("WarningCreateSubAccounts").'</div>';

3
htdocs/admin/compta.php
View file

@ -173,7 +173,7 @@ print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans('OtherOptions').'</td>';
print "</tr>\n";
/*
foreach ($list as $key) {
print '<tr class="oddeven value">';
@ -186,6 +186,7 @@ foreach ($list as $key) {
print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
print '</td></tr>';
}
*/
// Option to include various payment in results
print '<tr class="oddeven value">'."\n";

2
htdocs/langs/en_US/accountancy.lang
View file

@ -482,7 +482,7 @@ ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not i
ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
Error_BOOKKEEPING_ADDON_NotDefined=Error, the rule for bookkeeping numbering ref is not defined into general setup of Accountancy module
ErrorBookkeepingTryInsertNotBalancedTransactionAndCanceled=Try to insert a non balanced transaction in book for %s (Payment ID: %s). Canceled. Surely a bug.
ProductUsage=Product or service usage
## Import
ImportAccountingEntries=Accounting entries
ImportAccountingEntriesFECFormat=Accounting entries - FEC format