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

[FIX] delivery methods 

bzr revid: fp@tinyerp.com-20111001222809-kv3za5932qfajrv0
This commit is contained in:
Fabien Pinckaers 2011-10-02 00:28:09 +02:00
parent 142313d012
commit 4c7e390891
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/account_analytic_plans/account_analytic_plans_installer_view.xml
View File

@ -7,14 +7,15 @@
<field name="res_model">account.analytic.plan</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="account_analytic_plans.account_analytic_plan_form"/>
<field name="view_id" eval="False"/>
<field name="help">To setup a multiple analytic plans environment, you must define the root analytic accounts for each plan set. Then, you must attach a plan set to your account journals.</field>
</record>
<record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="account_analytic_plan_form_action_installer"/>
<field name="category_id" ref="account.category_accounting_configuration"/>
<field name="sequence">15</field>
</record>
<record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="account_analytic_plan_form_action_installer"/>
<field name="category_id" ref="account.category_accounting_configuration"/>
<field name="sequence">15</field>
</record>
</data>
</openerp>

3
addons/delivery/delivery.py
View File

@ -255,11 +255,8 @@ class define_delivery_steps(osv.osv_memory):
def apply_cb(self, cr, uid, ids, context=None):
ir_values_obj = self.pool.get('ir.values')
wizard = self.browse(cr, uid, ids, context=context)[0]
ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
return {'type' : 'ir.actions.act_window_close'}
define_delivery_steps()

4
addons/delivery/delivery_view.xml
View File

@ -342,9 +342,9 @@
<field name="model">delivery.define.delivery.steps.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Define Delivery Steps">
<label string="" />
<form string="Setup Your Delivery Steps">
<field name="picking_policy" />
<separator string="" colspan="4"/>
<group colspan="4">
<button string="Cancel" icon="gtk-cancel" special="cancel" />
<button string="Apply" icon="gtk-apply" name="apply_cb" type="object" />

10
addons/mrp/mrp_installer.xml
View File

@ -40,16 +40,8 @@
<field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
</record>
<record id="action_create_bill_of_materials" model="ir.actions.act_window">
<field name="name">Create Bill of Materials</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.bom</field>
<field name="view_mode">form,tree</field>
<field name="view_type">form</field>
</record>
<record id="todo_action_create_bill_of_materials" model="ir.actions.todo">
<field name="action_id" ref="action_create_bill_of_materials" />
<field name="action_id" ref="mrp_bom_form_action" />
<field name="category_id" ref="category_mrp_config" />
</record>