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
bab54f82
Commit
bab54f82
authored
11 years ago
by
aspangaro
Browse files
Options
Downloads
Patches
Plain Diff
Type bank & tva
parent
73eec6b8
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/compta/bank/account.php
+7
-6
7 additions, 6 deletions
htdocs/compta/bank/account.php
htdocs/compta/bank/search.php
+1
-1
1 addition, 1 deletion
htdocs/compta/bank/search.php
htdocs/compta/tva/class/tva.class.php
+2
-2
2 additions, 2 deletions
htdocs/compta/tva/class/tva.class.php
with
10 additions
and
9 deletions
htdocs/compta/bank/account.php
+
7
−
6
View file @
bab54f82
...
@@ -467,6 +467,7 @@ if ($id > 0 || ! empty($ref))
...
@@ -467,6 +467,7 @@ if ($id > 0 || ! empty($ref))
// VAT
// VAT
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='payment_vat'"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='payment_vat'"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"tva as t ON bu2.url_id = t.rowid"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"tva as t ON bu2.url_id = t.rowid"
;
// Salary payment
// Salary payment
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment_salary'"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment_salary'"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"payment_salary as sal ON bu3.url_id = sal.rowid"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"payment_salary as sal ON bu3.url_id = sal.rowid"
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/bank/search.php
+
1
−
1
View file @
bab54f82
...
@@ -252,7 +252,7 @@ if ($resql)
...
@@ -252,7 +252,7 @@ if ($resql)
print
'<td align="center" class="nowrap">'
.
dol_print_date
(
$db
->
jdate
(
$objp
->
dv
),
"day"
)
.
"</td>
\n
"
;
print
'<td align="center" class="nowrap">'
.
dol_print_date
(
$db
->
jdate
(
$objp
->
dv
),
"day"
)
.
"</td>
\n
"
;
// Payment type
// Payment type
print
"
<td
align=
\"
center
\
"
>
"
;
print
'
<td
class="nowrap
">
'
;
$labeltype
=
(
$langs
->
trans
(
"PaymentTypeShort"
.
$objp
->
fk_type
)
!=
"PaymentTypeShort"
.
$objp
->
fk_type
)
?
$langs
->
trans
(
"PaymentTypeShort"
.
$objp
->
fk_type
)
:
$langs
->
getLabelFromKey
(
$db
,
$objp
->
fk_type
,
'c_paiement'
,
'code'
,
'libelle'
);
$labeltype
=
(
$langs
->
trans
(
"PaymentTypeShort"
.
$objp
->
fk_type
)
!=
"PaymentTypeShort"
.
$objp
->
fk_type
)
?
$langs
->
trans
(
"PaymentTypeShort"
.
$objp
->
fk_type
)
:
$langs
->
getLabelFromKey
(
$db
,
$objp
->
fk_type
,
'c_paiement'
,
'code'
,
'libelle'
);
if
(
$labeltype
==
'SOLD'
)
print
' '
;
//$langs->trans("InitialBankBalance");
if
(
$labeltype
==
'SOLD'
)
print
' '
;
//$langs->trans("InitialBankBalance");
else
print
$labeltype
;
else
print
$labeltype
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/tva/class/tva.class.php
+
2
−
2
View file @
bab54f82
...
@@ -323,7 +323,7 @@ class Tva extends CommonObject
...
@@ -323,7 +323,7 @@ class Tva extends CommonObject
/**
/**
* Hum la fonction s'appelle 'Solde' elle doit a mon avis calc
l
uer le solde de TVA, non ?
* Hum la fonction s'appelle 'Solde' elle doit a mon avis calcu
l
er le solde de TVA, non ?
*
*
* @param int $year Year
* @param int $year Year
* @return double Amount
* @return double Amount
...
@@ -589,7 +589,7 @@ class Tva extends CommonObject
...
@@ -589,7 +589,7 @@ class Tva extends CommonObject
}
}
/**
/**
* Mise a jour du lien entre le paiement tva et la ligne g
�n�r�
e dans llx_bank
* Mise a jour du lien entre le paiement tva et la ligne g
enere
e dans llx_bank
*
*
* @param int $id_bank Id compte bancaire
* @param int $id_bank Id compte bancaire
* @return int <0 if KO, >0 if OK
* @return int <0 if KO, >0 if OK
...
...
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