pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] group by product_template,serial_number in stock valuation reporting

Browse Source
This commit is contained in:
Yannick Tivisse
2015-03-11 15:33:01 +01:00
committed by Richard Mathot
parent cf925c2a58
commit 27a7cab52b
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock_account/wizard/stock_valuation_history.py
+32 -12
View File
@@ -87,7 +87,9 @@ class stock_history(osv.osv):
'date': fields.datetime('Operation Date'),
'price_unit_on_quant': fields.float('Value'),
'inventory_value': fields.function(_get_inventory_value, string="Inventory Value", type='float', readonly=True),
'source': fields.char('Source')
'source': fields.char('Source'),
'product_template_id': fields.many2one('product.template', 'Product Template', required=True),
'serial_number': fields.char('Serial Number', required=True),
}
def init(self, cr):
@@ -100,10 +102,12 @@ class stock_history(osv.osv):
company_id,
product_id,
product_categ_id,
product_template_id,
SUM(quantity) as quantity,
date,
price_unit_on_quant,
source
source,
serial_number
FROM
((SELECT
stock_move.id::text || '-' || quant.id::text AS id,
@@ -112,23 +116,31 @@ class stock_history(osv.osv):
dest_location.id AS location_id,
dest_location.company_id AS company_id,
stock_move.product_id AS product_id,
product_template.id AS product_template_id,
product_template.categ_id AS product_categ_id,
quant.qty AS quantity,
stock_move.date AS date,
quant.cost as price_unit_on_quant,
stock_move.origin AS source
stock_move.origin AS source,
stock_production_lot.name AS serial_number
FROM
stock_quant as quant, stock_quant_move_rel, stock_move
stock_quant as quant
LEFT JOIN
stock_location dest_location ON stock_move.location_dest_id = dest_location.id
stock_quant_move_rel ON stock_quant_move_rel.quant_id = quant.id
LEFT JOIN
stock_move ON stock_move.id = stock_quant_move_rel.move_id
LEFT JOIN
stock_production_lot ON stock_production_lot.id = quant.lot_id
LEFT JOIN
stock_location dest_location ON stock_move.location_dest_id = dest_location.id
LEFT JOIN
stock_location source_location ON stock_move.location_id = source_location.id
LEFT JOIN
product_product ON product_product.id = stock_move.product_id
LEFT JOIN
product_template ON product_template.id = product_product.product_tmpl_id
WHERE stock_move.state = 'done' AND dest_location.usage in ('internal', 'transit') AND stock_quant_move_rel.quant_id = quant.id
AND stock_quant_move_rel.move_id = stock_move.id AND ((source_location.company_id is null and dest_location.company_id is not null) or
WHERE stock_move.state = 'done' AND dest_location.usage in ('internal', 'transit')
AND ((source_location.company_id is null and dest_location.company_id is not null) or
(source_location.company_id is not null and dest_location.company_id is null) or source_location.company_id != dest_location.company_id)
) UNION
(SELECT
@@ -138,13 +150,21 @@ class stock_history(osv.osv):
source_location.id AS location_id,
source_location.company_id AS company_id,
stock_move.product_id AS product_id,
product_template.id AS product_template_id,
product_template.categ_id AS product_categ_id,
- quant.qty AS quantity,
stock_move.date AS date,
quant.cost as price_unit_on_quant,
stock_move.origin AS source
stock_move.origin AS source,
stock_production_lot.name AS serial_number
FROM
stock_quant as quant, stock_quant_move_rel, stock_move
stock_quant as quant
LEFT JOIN
stock_quant_move_rel ON stock_quant_move_rel.quant_id = quant.id
LEFT JOIN
stock_move ON stock_move.id = stock_quant_move_rel.move_id
LEFT JOIN
stock_production_lot ON stock_production_lot.id = quant.lot_id
LEFT JOIN
stock_location source_location ON stock_move.location_id = source_location.id
LEFT JOIN
@@ -153,10 +173,10 @@ class stock_history(osv.osv):
product_product ON product_product.id = stock_move.product_id
LEFT JOIN
product_template ON product_template.id = product_product.product_tmpl_id
WHERE stock_move.state = 'done' AND source_location.usage in ('internal', 'transit') AND stock_quant_move_rel.quant_id = quant.id
AND stock_quant_move_rel.move_id = stock_move.id AND ((dest_location.company_id is null and source_location.company_id is not null) or
WHERE stock_move.state = 'done' AND source_location.usage in ('internal', 'transit')
AND ((dest_location.company_id is null and source_location.company_id is not null) or
(dest_location.company_id is not null and source_location.company_id is null) or dest_location.company_id != source_location.company_id)
))
AS foo
GROUP BY move_id, location_id, company_id, product_id, product_categ_id, date, price_unit_on_quant, source
GROUP BY move_id, location_id, company_id, product_id, product_categ_id, date, price_unit_on_quant, source, product_template_id, serial_number
)""")
addons/stock_account/wizard/stock_valuation_history_view.xml
+7 -5
View File
@@ -85,11 +85,13 @@
<field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
<field name="company_id" groups="base.group_multi_company"/>
<group expand="1" string="Group By">
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" name='group_by_product'/>
<filter string="Product Category" icon="terp-accessories-archiver" context="{'group_by':'product_categ_id'}"/>
<filter string="Location" icon="terp-accessories-archiver" context="{'group_by':'location_id'}" name='group_by_location'/>
<filter string="Move" icon="terp-accessories-archiver" context="{'group_by':'move_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Product" context="{'group_by':'product_id'}" name='group_by_product'/>
<filter string="Product Category" context="{'group_by':'product_categ_id'}"/>
<filter string="Product Template" context="{'group_by':'product_template_id'}" name="group_by_product_template"/>
<filter string="Location" context="{'group_by':'location_id'}" name='group_by_location'/>
<filter string="Move" context="{'group_by':'move_id'}"/>
<filter string="Serial Number" context="{'group_by':'serial_number'}" groups="stock.group_production_lot"/>
<filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group>
</search>
</field>