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

[IMP] stock: Add stock jounral and set icon and field in move analysis

Browse Source 
bzr revid: sbh@tinyerp.com-20100923134502-zr473jgu0akix25i
This commit is contained in:
sbh (Open ERP)
2010-09-23 19:15:02 +05:30
parent 85f90718ab
commit e95c30c25f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/report/report_stock_move.py
+7 -4
View File
@@ -51,6 +51,7 @@ class report_stock_move(osv.osv):
'day_diff2':fields.float('Delay (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
'day_diff':fields.float('Real (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),
}
def init(self, cr):
@@ -79,7 +80,8 @@ class report_stock_move(osv.osv):
al.state as state ,
al.product_uom as product_uom,
al.categ_id as categ_id,
al.type as type
al.type as type,
al.stock_journal as stock_journal
FROM (SELECT
CASE WHEN sp.type in ('out','delivery') THEN
@@ -105,7 +107,8 @@ class report_stock_move(osv.osv):
sm.company_id as company_id,
sm.state as state,
sm.product_uom as product_uom,
sp.type as type
sp.type as type,
sp.stock_journal_id as stock_journal
from
stock_move sm
left join stock_picking sp on (sm.picking_id=sp.id)
@@ -118,14 +121,14 @@ class report_stock_move(osv.osv):
sm.id,sp.type, sm.date,sm.address_id,
sm.product_id,sm.state,sm.product_uom,sm.date_expected,
sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id)
sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
as al
group by
al.out_qty,al.in_qty,al.curr_year,al.curr_month,
al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
al.address_id,al.product_id,al.state,al.product_uom,
al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id
al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id, al.stock_journal
)
""")
addons/stock/report/report_stock_move_view.xml
+9 -6
View File
@@ -25,6 +25,7 @@
<field name="location_dest_id" invisible="1"/>
<field name="product_id" invisible="1"/>
<field name="categ_id" invisible="1"/>
<field name="stock_journal" invisible="1"/>
<field name="state" invisible="1"/>
<field name="product_qty"/>
<field name="product_qty_in"/>
@@ -64,11 +65,11 @@
<separator orientation="vertical"/>
<filter string="Done"
name="done"
icon="terp-dialog-close"
icon="terp-check"
domain="[('state','=','done')]"
help = "Completed Stock-Moves"/>
<filter string="Todo"
icon="terp-camera_test"
icon="terp-stock"
domain="[('state','in',('assigned','waiting','confirmed'))]"
help = "Future Stock-Moves"/>
@@ -85,11 +86,12 @@
<group expand="1" string="Group By...">
<filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter name="group_categ_id" string="Product Category" icon="terp-personal" context="{'group_by':'categ_id'}"/>
<filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
<filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
<separator orientation="vertical"/>
<filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
<filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>
<filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
<filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
<separator orientation="vertical"/>
@@ -101,11 +103,12 @@
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="location_id" widget = "selection"/>
<field name="location_dest_id" widget = "selection"/>
<field name="location_id" />
<field name="location_dest_id" />
<field name="categ_id"/>
<field name="stock_journal"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company" widget = "selection"/>
<newline/>
<field name="date"/>
</group>