[IMP] sale_margin: replaced tabs with 4 spaces in view and removed the button 'create invoice' in order to reuse the one defined in the first tab
bzr revid: qdp-launchpad@tinyerp.com-20101216163025-x1rbfsd4bcrxgdu9
This commit is contained in:
qdp-launchpad@tinyerp.com
parent
a86a432edf
commit
10868c2eb5
|
|
@ -76,16 +76,16 @@ class stock_picking(osv.osv):
|
|||
'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]),
|
||||
}
|
||||
|
||||
def create_invoice(self, cr, uid, ids, *args):
|
||||
def action_invoice_create(self, cr, uid, ids, journal_id=False,
|
||||
group=False, type='out_invoice', context=None):
|
||||
# need to carify with new requirement
|
||||
invoice_ids = []
|
||||
margin_deduce = 0.0
|
||||
picking_obj = self.pool.get('stock.picking')
|
||||
picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'})
|
||||
res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={})
|
||||
res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=False,
|
||||
group=False, type='out_invoice', context=None)
|
||||
invoice_ids = res.values()
|
||||
picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
|
||||
return True
|
||||
return res
|
||||
|
||||
stock_picking()
|
||||
|
||||
|
|
|
|||
|
|
@ -2,84 +2,80 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order">
|
||||
<field name="name">sale.order.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="amount_total" position="after">
|
||||
<field name="margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_line">
|
||||
<field name="name">sale.order.line.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
|
||||
<field name="purchase_price"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_line_form">
|
||||
<field name="name">sale.order.line.tree.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
|
||||
<field name="purchase_price"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_tree">
|
||||
<field name="name">sale.order.margin.view.tree</field>
|
||||
<field name="type">tree</field>
|
||||
<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="margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
|
||||
<field name="name">sale.order.margin.line.view.tree</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="model">sale.order.line</field>
|
||||
<field name="inherit_id" ref="sale.view_order_line_tree" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="price_subtotal" position="after">
|
||||
<field name="margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order">
|
||||
<field name="name">sale.order.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="amount_total" position="after">
|
||||
<field name="margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_line">
|
||||
<field name="name">sale.order.line.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
|
||||
<field name="purchase_price"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_line_form">
|
||||
<field name="name">sale.order.line.tree.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
|
||||
<field name="purchase_price"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_tree">
|
||||
<field name="name">sale.order.margin.view.tree</field>
|
||||
<field name="type">tree</field>
|
||||
<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="margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
|
||||
<field name="name">sale.order.margin.line.view.tree</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="model">sale.order.line</field>
|
||||
<field name="inherit_id" ref="sale.view_order_line_tree" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="price_subtotal" position="after">
|
||||
<field name="margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_margin_out_form">
|
||||
<field name="name">picking.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_out_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page[@string='Additional info']" position="after">
|
||||
<page string="Customer Invoices">
|
||||
<field colspan="4" name="invoice_ids" nolabel="1"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_margin_out_form">
|
||||
<field name="name">picking.margin.view.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_out_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page[@string='Additional info']" position="after">
|
||||
<page string="Customer Invoices">
|
||||
<field colspan="4" name="invoice_ids" nolabel="1"/>
|
||||
<group col="10" colspan="4">
|
||||
<label colspan="6"/>
|
||||
<button name="create_invoice" icon='gtk-execute' string="Create Invoice" type="object"/>
|
||||
</group>
|
||||
</page>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue