Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Coopdevs OCB mirror
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coopdevs
Odoo
Coopdevs OCB mirror
Commits
cfa44ec1
Commit
cfa44ec1
authored
14 years ago
by
Bhumika Shrimali
Browse files
Options
Downloads
Patches
Plain Diff
[Fix] stock: Fix picking report
bzr revid: sbh@tinyerp.com-20100722131051-lnxu6etyp5r4zzpy
parent
55547da7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
addons/stock/report/picking.rml
+8
-7
8 additions, 7 deletions
addons/stock/report/picking.rml
with
8 additions
and
7 deletions
addons/stock/report/picking.rml
+
8
−
7
View file @
cfa44ec1
...
...
@@ -150,10 +150,10 @@
<
/
para
>
<
/
td
>
<
td
>
<
para
style
=
"
terp_tblheader_Details
"
>
[[
picking
.
sale_id
and
picking
.
sale_id
.
partner_shipping
_id
and
'
Shipping
Address
:'
or
removeParentNode
(
'para'
)
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
sale_id
and
picking
.
sale_id
.
partner_shipping_id
and
picking
.
sale_id
.
partner_shipping_id
.
title
)
or
''
]]
[[
(
picking
.
sale_id
and
picking
.
sale_id
.
partner_shipping_id
and
picking
.
sale_id
.
partner_shipping
_id
.
name
)
or
''
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
sale_id
and
picking
.
sale_id
.
partner_shipping_id
and
picking
.
sale_id
.
partner_shipping
_id
.
street
)
or
''
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
sale_id
and
picking
.
sale_id
.
partner_shipping_id
and
picking
.
sale_id
.
partner_shipping_id
.
zip
)
or
''
]]
[[
(
picking
.
sale_id
and
picking
.
sale_id
.
partner_shipping_id
and
picking
.
sale_id
.
partner_shipping
_id
.
city
)
or
''
]]
[[
(
picking
.
address_id
and
picking
.
address_id
.
state_id
and
picking
.
address_id
.
state_id
.
name
)
or
''
]]
<
/
para
>
<
para
style
=
"
terp_tblheader_Details
"
>
[[
picking
.
address
_id
and
'
Shipping
Address
:'
or
removeParentNode
(
'para'
)
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
address_id
and
picking
.
address_id
.
title
)
or
''
]]
[[
(
picking
.
address_id
and
picking
.
address
_id
.
name
)
or
''
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
address_id
and
picking
.
address
_id
.
street
)
or
''
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
address_id
and
picking
.
address_id
.
zip
)
or
''
]]
[[
(
picking
.
address_id
and
picking
.
address
_id
.
city
)
or
''
]]
[[
(
picking
.
address_id
and
picking
.
address_id
.
state_id
and
picking
.
address_id
.
state_id
.
name
)
or
''
]]
<
/
para
>
<
para
style
=
"
terp_default_9
"
>
[[
(
picking
.
address_id
and
picking
.
address_id
.
country_id
and
picking
.
address_id
.
country_id
.
name
)
or
''
]]<
/
para
>
<
/
td
>
<
/
tr
>
...
...
@@ -241,7 +241,7 @@
<
font
color
=
"
white
"
>
<
/
font
>
<
/
para
>
<
section
>
<
para
style
=
"
terp_default_8
"
>
[[
repeatIn
([
line
for
line
in
picking
.
move_lines
if
(
line
.
state
==
'assigned'
)],
'move_lines'
)
]]<
/
para
>
<
para
style
=
"
terp_default_8
"
>
[[
repeatIn
([
line
for
line
in
picking
.
move_lines
if
(
line
.
state
==
'assigned'
)],
'move_lines'
)
or
removeParentNode
(
'section'
)
]]<
/
para
>
<
blockTable
colWidths
=
"
257.0
,
58.0
,
61.0
,
46.0
,
26.0
,
74.0
"
style
=
"
Move_Line_Contect_Assign_State
"
>
<
tr
>
<
td
>
...
...
@@ -267,10 +267,11 @@
<
para
style
=
"
terp_default_2
"
>
<
font
color
=
"
white
"
>
<
/
font
>
<
/
para
>
<
/
section
>
<
para
style
=
"
terp_default_5cm_Above_Space
"
>
[[
(
move_lines
.
state
==
'done'
or
move_lines
.
state
==
'confirmed'
)
and
removeParentNode
(
'
para
'
)
]]<
/
para
>
<
para
style
=
"
terp_default_5cm_Above_Space
"
>
[[
(
move_lines
.
state
==
'done'
or
move_lines
.
state
==
'confirmed'
)
and
removeParentNode
(
'
s
'
)
]]<
/
para
>
<
para
style
=
"
terp_default_Bold_9
"
>
Non
Assigned
Products
:
[[
(
move_lines
.
state
==
'assigned'
or
move_lines
.
state
==
'done'
or
move_lines
.
state
==
'confirmed'
)
and
removeParentNode
(
'para'
)
]]<
/
para
>
<
para
style
=
"
terp_default_1cm_above_space
"
>
[[
(
move_lines
.
state
==
'done'
or
move_lines
.
state
==
'confirmed'
)
and
removeParentNode
(
'para'
)
]]<
/
para
>
<
/
section
>
<
section
>
<
para
style
=
"
terp_default_8
"
>
[[
repeatIn
([
line
for
line
in
picking
.
move_lines
if
(
line
.
state
!=
'assigned'
)],
'move_lines'
)
]]<
/
para
>
<
blockTable
colWidths
=
"
257.0
,
57.0
,
62.0
,
46.0
,
26.0
,
74.0
"
style
=
"
Move_Line_Content_Other_State
"
>
...
...
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