Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
e1773249
Commit
e1773249
authored
8 years ago
by
aspangaro
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Traduction on index accountancy page & improvements
parent
0eded9a8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/accountancy/admin/defaultaccounts.php
+5
-2
5 additions, 2 deletions
htdocs/accountancy/admin/defaultaccounts.php
htdocs/accountancy/index.php
+21
-16
21 additions, 16 deletions
htdocs/accountancy/index.php
with
26 additions
and
18 deletions
htdocs/accountancy/admin/defaultaccounts.php
+
5
−
2
View file @
e1773249
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2016 Alexandre Spangaro <aspangaro
.dolibarr@gmail
.com>
* Copyright (C) 2013-2016 Alexandre Spangaro <aspangaro
@zendsi
.com>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
...
...
@@ -62,7 +62,10 @@ $list_account = array (
'ACCOUNTING_VAT_PAY_ACCOUNT'
,
'ACCOUNTING_ACCOUNT_SUSPENSE'
,
'ACCOUNTING_ACCOUNT_TRANSFER_CASH'
,
'DONATION_ACCOUNTINGACCOUNT'
'DONATION_ACCOUNTINGACCOUNT'
,
'LOAN_ACCOUNTING_ACCOUNT_CAPITAL'
,
'LOAN_ACCOUNTING_ACCOUNT_INTEREST'
,
'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/accountancy/index.php
+
21
−
16
View file @
e1773249
<?php
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@zendsi.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -36,9 +37,6 @@ $langs->load("accountancy");
if
(
$user
->
societe_id
>
0
)
accessforbidden
();
// Validate History
$action
=
GETPOST
(
'action'
);
$langs
->
load
(
"admin"
);
$langs
->
load
(
"dict"
);
$langs
->
load
(
"bills"
);
...
...
@@ -73,11 +71,11 @@ print "<br>\n";
// STEPS
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescChartModel"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"Pcg_version"
)
.
'</strong>'
);
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescChartModel"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"Pcg_version"
)
.
'</strong>'
);
print
"<br>
\n
"
;
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescChart"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"Chartofaccounts"
)
.
'</strong>'
);
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescChart"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"Chartofaccounts"
)
.
'</strong>'
);
print
"<br>
\n
"
;
print
"<br>
\n
"
;
...
...
@@ -86,16 +84,16 @@ print "<br>\n";
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescMisc"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"MenuDefaultAccounts"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescMisc"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"MenuDefaultAccounts"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
$step
++
;
$textlink
=
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"MenuVatAccounts"
)
.
'</strong>'
;
$textlink
=
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"MenuVatAccounts"
)
.
'</strong>'
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescVat"
,
$step
,
$textlink
);
print
"<br>
\n
"
;
print
"<br>
\n
"
;
if
(
!
empty
(
$conf
->
tax
->
enabled
))
{
$textlink
=
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"MenuTaxAccounts"
)
.
'</strong>'
;
$textlink
=
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"MenuTaxAccounts"
)
.
'</strong>'
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescContrib"
,
$step
,
$textlink
);
print
"<br>
\n
"
;
...
...
@@ -104,7 +102,7 @@ if (! empty($conf->tax->enabled))
/*if (! empty($conf->salaries->enabled))
{
$step++;
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("Financial").'-'.$langs->transnoentitiesnoconv("Accountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("
Menu
Financial").'-'.$langs->transnoentitiesnoconv("
Menu
Accountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
// htdocs/admin/salaries.php
print "<br>\n";
print "<br>\n";
...
...
@@ -112,14 +110,14 @@ if (! empty($conf->tax->enabled))
if
(
!
empty
(
$conf
->
expensereport
->
enabled
))
// TODO Move this in the default account page because this is only one accounting account per purpose, not several.
{
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescExpenseReport"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"MenuExpenseReportAccounts"
)
.
'</strong>'
);
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescExpenseReport"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"MenuExpenseReportAccounts"
)
.
'</strong>'
);
print
"<br>
\n
"
;
print
"<br>
\n
"
;
}
if
(
!
empty
(
$conf
->
loan
->
enabled
))
// TODO Move this in the default account page because this is only one accounting account per purpose, not several.
{
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescLoan"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"Menu
Loan
Accounts"
)
.
'</strong>'
);
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescLoan"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
MenuSpecialExpenses"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Loans"
)
.
'</strong> '
.
$langs
->
transnoentitiesnoconv
(
"or"
)
.
' <strong>'
.
$langs
->
transnoentitiesnoconv
(
"MenuFinancial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"Menu
Default
Accounts"
)
.
'</strong>'
);
print
"<br>
\n
"
;
print
"<br>
\n
"
;
}
...
...
@@ -127,7 +125,7 @@ if (! empty($conf->loan->enabled)) // TODO Move this in the default account pag
if (! empty($conf->don->enabled))
{
$step++;
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("Financial").'-'.$langs->transnoentitiesnoconv("Accountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("
Menu
Financial").'-'.$langs->transnoentitiesnoconv("
Menu
Accountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
print "<br>\n";
print "<br>\n";
}*/
...
...
@@ -138,7 +136,7 @@ print "<br>\n";
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescProd"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"ProductsBinding"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescProd"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Setup"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"ProductsBinding"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
print
"<br>
\n
"
;
...
...
@@ -148,14 +146,21 @@ print "<br>\n";
$step
=
0
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescCustomer"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"CustomersVentilation"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescCustomer"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"CustomersVentilation"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescSupplier"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"SuppliersVentilation"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescSupplier"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"SuppliersVentilation"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDesc
Writ
eRe
c
or
ds
"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"Accountancy"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"
Supplier
sVentilation"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDesc
Expens
eRe
p
or
t
"
,
$step
,
'<strong>'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Financial"
)
.
'-'
.
$langs
->
transnoentitiesnoconv
(
"
Menu
Accountancy"
)
.
"-"
.
$langs
->
transnoentitiesnoconv
(
"
ExpenseReport
sVentilation"
)
.
'</strong>'
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescWriteRecords"
,
$step
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
$step
++
;
print
img_picto
(
''
,
'puce'
)
.
' '
.
$langs
->
trans
(
"AccountancyAreaDescAnalyze"
,
$step
)
.
"<br>
\n
"
;
print
"<br>
\n
"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment