odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] sale_journal: visible invoice type in picking, added group by section, remove selection widget 

bzr revid: hmo@tinyerp.com-20120912132646-g4bczb16skc8mdc2
This commit is contained in:
Harry (OpenERP) 2012-09-12 18:56:46 +05:30
parent d5166364b7
commit 0299786786
2 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/sale_journal/sale_journal.py
View File

@ -61,6 +61,21 @@ class picking(osv.osv):
}
picking()
class stock_picking_in(osv.osv):
_inherit = "stock.picking.in"
_columns = {
'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
}
stock_picking_in()
class stock_picking_out(osv.osv):
_inherit = "stock.picking.out"
_columns = {
'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
}
stock_picking_out()
class sale(osv.osv):
_inherit = "sale.order"
_columns = {

73
addons/sale_journal/sale_journal_view.xml
View File

@ -52,7 +52,7 @@
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="invoice_type_id" widget="selection"/>
<field name="invoice_type_id"/>
</field>
</field>
</record>
@ -64,8 +64,8 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_tree" />
<field name="arch" type="xml">
<field name="state" position="after">
<field name="invoice_type_id" widget="selection"/>
<field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
</record>
@ -77,8 +77,8 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="invoice_type_id" widget="selection"/>
<field name="move_type" position="before">
<field name="invoice_type_id"/>
</field>
</field>
</record>
@ -90,7 +90,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.vpicktree" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@ -98,10 +98,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_in">
<field name="name">stock.picking.journal.view.form</field>
<field name="model">stock.picking</field>
<field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_in_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="move_type" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@ -109,10 +109,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
<field name="name">stock.picking.journal.view.tree</field>
<field name="model">stock.picking</field>
<field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_in_tree" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@ -120,10 +120,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_out">
<field name="name">stock.picking.journal.view.form</field>
<field name="model">stock.picking</field>
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_out_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="move_type" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@ -131,10 +131,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
<field name="name">stock.picking.journal.view.tree</field>
<field name="model">stock.picking</field>
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_out_tree" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@ -148,11 +148,54 @@
<page string="Sales &amp; Purchases" position="inside">
<group colspan="2" col="2">
<separator string="Invoicing" colspan="2"/>
<field name="property_invoice_type" widget="selection"/>
<field name="property_invoice_type"/>
</group>
</page>
</field>
</record>
<record id="view_sales_order_search" model="ir.ui.view">
<field name="name">sale.order.search.inherit</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_sales_order_filter"/>
<field name="arch" type="xml">
<xpath expr="//group/filter[@string='Customer']" position="after">
<filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
</xpath>
</field>
</record>
<record id="view_picking_internal_search" model="ir.ui.view">
<field name="name">stock.picking.internal.search.inherit</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_internal_search"/>
<field name="arch" type="xml">
<xpath expr="//group/filter[@string='Journal']" position="after">
<filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
</xpath>
</field>
</record>
<record id="view_picking_out_search" model="ir.ui.view">
<field name="name">stock.picking.out.search.inherit</field>
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_out_search"/>
<field name="arch" type="xml">
<xpath expr="//group/filter[@string='Journal']" position="after">
<filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
</xpath>
</field>
</record>
<record id="view_picking_in_search" model="ir.ui.view">
<field name="name">stock.picking.in.search.inherit</field>
<field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_in_search"/>
<field name="arch" type="xml">
<xpath expr="//group/filter[@string='Journal']" position="after">
<filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
</xpath>
</field>
</record>
</data>
</openerp>