[REF] stock, stock_account: invoice_state field of push rule moved into the right module
bzr revid: qdp-launchpad@openerp.com-20140422124113-scgaooce0ofjawpk
This commit is contained in:
parent
36b0c079c9
commit
5afa7d8aaf
|
@ -3344,11 +3344,6 @@ class stock_location_path(osv.osv):
|
|||
'location_from_id': fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1, required=True),
|
||||
'location_dest_id': fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1, required=True),
|
||||
'delay': fields.integer('Delay (days)', help="Number of days to do this transition"),
|
||||
'invoice_state': fields.selection([
|
||||
("invoiced", "Invoiced"),
|
||||
("2binvoiced", "To Be Invoiced"),
|
||||
("none", "Not Applicable")], "Invoice Status",
|
||||
required=True,),
|
||||
'picking_type_id': fields.many2one('stock.picking.type', 'Type of the new Operation', required=True, help="This is the picking type associated with the different pickings"),
|
||||
'auto': fields.selection(
|
||||
[('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
|
||||
|
@ -3375,7 +3370,6 @@ class stock_location_path(osv.osv):
|
|||
_defaults = {
|
||||
'auto': 'auto',
|
||||
'delay': 0,
|
||||
'invoice_state': 'none',
|
||||
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c),
|
||||
'propagate': True,
|
||||
'active': True,
|
||||
|
|
|
@ -21,6 +21,19 @@
|
|||
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class stock_location_path(osv.osv):
|
||||
_inherit = "stock.location.path"
|
||||
_columns = {
|
||||
'invoice_state': fields.selection([
|
||||
("invoiced", "Invoiced"),
|
||||
("2binvoiced", "To Be Invoiced"),
|
||||
("none", "Not Applicable")], "Invoice Status",
|
||||
required=True,),
|
||||
}
|
||||
_defaults = {
|
||||
'invoice_state': 'none',
|
||||
}
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Procurement Rule
|
||||
#----------------------------------------------------------
|
||||
|
@ -31,8 +44,11 @@ class procurement_rule(osv.osv):
|
|||
("invoiced", "Invoiced"),
|
||||
("2binvoiced", "To Be Invoiced"),
|
||||
("none", "Not Applicable")], "Invoice Status",
|
||||
required=False),
|
||||
required=True),
|
||||
}
|
||||
_defaults = {
|
||||
'invoice_state': 'none',
|
||||
}
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Procurement Order
|
||||
|
|
|
@ -61,5 +61,15 @@
|
|||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_pusht_rule_form_stockaccount_inherit">
|
||||
<field name="name">stock.location.path.inherit.form</field>
|
||||
<field name="model">stock.location.path</field>
|
||||
<field name="inherit_id" ref="stock.stock_location_path_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='picking_type_id']" position="after">
|
||||
<field name="invoice_state"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
Loading…
Reference in New Issue