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
b714347b
Commit
b714347b
authored
Feb 8, 2014
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Substition of extra field was ko for order.
parent
fb789b81
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/class/extrafields.class.php
+4
-4
4 additions, 4 deletions
htdocs/core/class/extrafields.class.php
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+10
-0
10 additions, 0 deletions
...re/modules/commande/doc/doc_generic_order_odt.modules.php
with
14 additions
and
4 deletions
htdocs/core/class/extrafields.class.php
+
4
−
4
View file @
b714347b
...
@@ -516,7 +516,7 @@ class ExtraFields
...
@@ -516,7 +516,7 @@ class ExtraFields
/**
/**
* Load array this->attribute_label
* Load array this->attribute_label
*
*
* @param string $elementtype Type of element
* @param string $elementtype Type of element
('adherent', 'commande', societe', 'facture', 'propal', 'product', ...)
* @param boolean $forceload Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED
* @param boolean $forceload Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED
* @return array Array of attributes for all extra fields
* @return array Array of attributes for all extra fields
*/
*/
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+
10
−
0
View file @
b714347b
...
@@ -140,6 +140,16 @@ class doc_generic_order_odt extends ModelePDFCommandes
...
@@ -140,6 +140,16 @@ class doc_generic_order_odt extends ModelePDFCommandes
$resarray
[
'object_total_vat_'
.
$line
->
tva_tx
]
+=
$line
->
total_tva
;
$resarray
[
'object_total_vat_'
.
$line
->
tva_tx
]
+=
$line
->
total_tva
;
}
}
// Retrieve extrafields
if
(
is_array
(
$object
->
array_options
)
&&
count
(
$object
->
array_options
))
{
require_once
DOL_DOCUMENT_ROOT
.
'/core/class/extrafields.class.php'
;
$extrafields
=
new
ExtraFields
(
$this
->
db
);
$extralabels
=
$extrafields
->
fetch_name_optionals_label
(
'commande'
,
true
);
$object
->
fetch_optionals
(
$object
->
id
,
$extralabels
);
$resarray
=
$this
->
fill_substitutionarray_with_extrafields
(
$object
,
$resarray
,
$extrafields
,
$array_key
=
'object'
,
$outputlangs
);
}
return
$resarray
;
return
$resarray
;
}
}
...
...
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