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

[IMP] Invoice_state in stock_location: defaults/... should be removed for invoice_state in procrule 

bzr revid: jco@openerp.com-20130902133252-8mipn3owtwelwqkg
This commit is contained in:
Josse Colpaert 2013-09-02 15:32:52 +02:00
parent 4e805a6a5a
commit 61dba9384c
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/stock_account/stock_account_view.xml
View File

@ -41,6 +41,16 @@
<field name="invoice_state" groups="account.group_account_invoice"/>
</xpath>
</field>
</record>
</record>
<record model="ir.ui.view" id="view_procurement_rule_form_inherit">
<field name="name">stock.procurement.rule.inherit.form</field>
<field name="model">procurement.rule</field>
<field name="inherit_id" ref="stock.view_procurement_rule_form"/>
<field name="arch" type="xml">
<field name="location_id" position="after">
<field name="invoice_state"/>
</field>
</field>
</record>
</data>
</openerp>

1
addons/stock_location/stock_location.py
View File

@ -140,7 +140,6 @@ class procurement_rule(osv.osv):
}
_defaults = {
'procure_method': 'make_to_stock',
'invoice_state': 'none',
'propagate': True,
'delay': 0,
}

2
addons/stock_location/stock_location_demo_cpu1.xml
View File

@ -38,7 +38,6 @@
<field name="location_src_id" ref="stock.stock_location_intermediatelocation0"/>
<field name="location_id" ref="stock.stock_location_shop0"/>
<field name="partner_address_id" ref="base.main_partner"/>
<field name="invoice_state">none</field>
<field name="company_id" ref="stock.res_company_1"/>
<field name="type_proc">move</field>
<field eval="0" name="propagate"/>
@ -53,7 +52,6 @@
<field name="location_src_id" ref="stock.stock_location_stock"/>
<field name="partner_address_id" ref="stock.res_partner_address_41"/>
<field name="type_proc">move</field>
<field name="invoice_state">none</field>
<field name="company_id" ref="base.main_company"/>
<field eval="0" name="propagate"/>
<field name="procure_method">make_to_stock</field>

1
addons/stock_location/stock_location_view.xml
View File

@ -17,7 +17,6 @@
</field>
<field name="group_id" position="before">
<field name="procure_method"/>
<field name="invoice_state"/>
<field name="partner_address_id"/>
</field>
</field>