diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php index 53a2078bb65..7ff86142a75 100644 --- a/htdocs/accountancy/admin/closure.php +++ b/htdocs/accountancy/admin/closure.php @@ -142,7 +142,7 @@ foreach ($list_account_main as $key) { $keydesc = $key.'_Desc'; $htmltext = $langs->trans($keydesc); - print ''; + print ''; print $form->textwithpicto($label, $htmltext); print ''; // Value @@ -154,7 +154,7 @@ foreach ($list_account_main as $key) { // Journal print ''; -print ''.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").''; +print ''.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").''; print ''; $defaultjournal = getDolGlobalString('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL'); print $formaccounting->select_journal($defaultjournal, "ACCOUNTING_CLOSURE_DEFAULT_JOURNAL", 9, 1, 0, 0); @@ -162,7 +162,7 @@ print ''; // Accounting groups used for the balance sheet account print ''; -print ''; +print ''; 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 ''; print ''; @@ -171,7 +171,7 @@ print ''; // Accounting groups used for the income statement print ''; -print ''; +print ''; print $form->textwithpicto($langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT"), $langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENTHelp")); print ''; print ''; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index e5a934872c3..ecef0d2a796 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -485,15 +485,14 @@ if ($resql) { print ''; print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy'); - print '
'; print ''.$langs->trans("InitAccountancyDesc").'
'; print '
'; - // Select mode + // Select usage print ''; print ''; - print ''; + print ''; print "\n"; print ''; print ''; print ''; print "\n"; - +/* foreach ($list as $key) { print ''; @@ -186,6 +186,7 @@ foreach ($list as $key) { print ''; print ''; } +*/ // Option to include various payment in results print ''."\n"; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 41a26e98649..6ecedb136ec 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -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
'.$langs->trans('Options').''.$langs->trans('Description').''.$langs->trans('ProductUsage').'
'.$langs->trans('OptionModeProductSellDesc'); @@ -518,9 +517,11 @@ if ($resql) { print '
'; - print "
\n"; + print "

\n"; + $object = new Product($db); + // Filter on categories $moreforfilter = ''; $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php index 03bb7c7da66..d5dd0f6ac3d 100644 --- a/htdocs/accountancy/admin/subaccount.php +++ b/htdocs/accountancy/admin/subaccount.php @@ -346,7 +346,7 @@ if ($resql) { print ''; print ''; - 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 '
'.$langs->trans("WarningCreateSubAccounts").'
'; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 45d548e9556..4af5a763877 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -173,7 +173,7 @@ print '
'.$langs->trans('OtherOptions').'