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
241a96a1
Commit
241a96a1
authored
Jun 8, 2013
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: param outputlang not provided to price function
parent
c0b849b8
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/core/lib/pdf.lib.php
+4
-4
4 additions, 4 deletions
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+1
-0
1 addition, 0 deletions
...e/modules/facture/doc/doc_generic_invoice_odt.modules.php
with
5 additions
and
4 deletions
htdocs/core/lib/pdf.lib.php
+
4
−
4
View file @
241a96a1
...
...
@@ -1083,7 +1083,7 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanage
}
else
{
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
(
$sign
*
$object
->
lines
[
$i
]
->
subprice
);
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
(
$sign
*
$object
->
lines
[
$i
]
->
subprice
,
0
,
$outputlangs
);
}
}
...
...
@@ -1109,7 +1109,7 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
}
else
{
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
((
$object
->
lines
[
$i
]
->
subprice
)
+
(
$object
->
lines
[
$i
]
->
subprice
)
*
(
$object
->
lines
[
$i
]
->
tva_tx
)
/
100
);
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
((
$object
->
lines
[
$i
]
->
subprice
)
+
(
$object
->
lines
[
$i
]
->
subprice
)
*
(
$object
->
lines
[
$i
]
->
tva_tx
)
/
100
,
0
,
$outputlangs
);
}
}
...
...
@@ -1293,7 +1293,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0,$hookman
}
else
{
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
(
$sign
*
$object
->
lines
[
$i
]
->
total_ht
);
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
(
$sign
*
$object
->
lines
[
$i
]
->
total_ht
,
0
,
$outputlangs
);
}
}
}
...
...
@@ -1327,7 +1327,7 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
else
{
if
(
empty
(
$hidedetails
)
||
$hidedetails
>
1
)
return
price
((
$object
->
lines
[
$i
]
->
total_ht
)
+
(
$object
->
lines
[
$i
]
->
total_ht
)
*
(
$object
->
lines
[
$i
]
->
tva_tx
)
/
100
);
price
((
$object
->
lines
[
$i
]
->
total_ht
)
+
(
$object
->
lines
[
$i
]
->
total_ht
)
*
(
$object
->
lines
[
$i
]
->
tva_tx
)
/
100
,
0
,
$outputlangs
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+
1
−
0
View file @
241a96a1
...
...
@@ -110,6 +110,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'object_ref_customer'
=>
$object
->
ref_client
,
'object_ref_supplier'
=>
$object
->
ref_fournisseur
,
'object_source_invoice_ref'
=>
$invoice_source
->
ref
,
'object_hour'
=>
dol_print_date
(
$object
->
date
,
'hour'
),
'object_date'
=>
dol_print_date
(
$object
->
date
,
'day'
),
'object_date_limit'
=>
dol_print_date
(
$object
->
date_lim_reglement
,
'day'
),
'object_date_creation'
=>
dol_print_date
(
$object
->
date_creation
,
'day'
),
...
...
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