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

[FIX]: Fix menu and workflow problem 

bzr revid: atp@tinyerp.com-20120727062841-cg5qtd34nnll8n5r
This commit is contained in:
Atul Patel (OpenERP) 2012-07-27 11:58:41 +05:30
parent 0ba2495536
commit bab2f1959f
7 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/sale/sale_demo.xml
View File

@ -111,8 +111,6 @@
<field name="product_uom_qty">3</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="order6"/>
<!--Resource: sale.order-->
@ -195,7 +193,7 @@
<field name="product_uom_qty">4</field>
<field name="price_unit">500</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="order6"/>
<!--Resource: sale.order-->
<record id="order7" model="sale.order">

6
addons/sale/security/sale_security.xml
View File

@ -42,12 +42,6 @@
<field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
</record>
<record id="group_invoice_deli_orders" model="res.groups">
<field name="name">Enable Invoicing Delivery orders</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record model="res.users" id="base.user_root">
<field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
</record>

4
addons/sale_stock/res_config.py
View File

@ -27,7 +27,7 @@ class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
_columns = {
'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',
implied_group='sale.group_invoice_deli_orders',
implied_group='group_invoice_deli_orders',
help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
'task_work': fields.boolean('Based on Task Activities',
help="""Lets you transfer the entries under tasks defined for Project Management to
@ -45,7 +45,7 @@ class sale_configuration(osv.osv_memory):
'default_picking_policy' : fields.boolean("Configurable Shipping Policy",
help = "You will be able to configure, per sale order, if you deliver all products at once or if you deliver each product when it is available. This may have an impact on the shipping price."),
'group_mrp_properties': fields.boolean('Properties on Lines',
implied_group='sale.group_mrp_properties',
implied_group='group_mrp_properties',
help="Allows you to tag sale order lines with properties."),
'group_multiple_shops': fields.boolean("Manage Multiple Shops",
implied_group='stock.group_locations',

5
addons/sale_stock/sale_stock_demo.xml
View File

@ -12,15 +12,18 @@
<field name="order_policy">manual</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="sale.order5"/>
<record id="sale.order6" model="sale.order">
<field name="order_policy">manual</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="sale.order6"/>
<workflow action="manual_invoice" model="sale.order" ref="sale.order6"/>
<record id="sale.order7" model="sale.order">
<field name="order_policy">manual</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="sale.order5"/>
<record id="sale.order" model="sale.order">
<field name="order_policy">picking</field>

5
addons/sale_stock/sale_stock_view.xml
View File

@ -133,13 +133,10 @@
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='th_weight']" position="after">
<field name="product_packaging" invisible="1"/>
</xpath>
<xpath expr="//page[@string='Other Information']/field[@name='order_line']/group/group[@name='logistics']/field[@name='order_policy']" position="before">
<xpath expr="//page[@string='Other Information']/group/group[@name='logistics']/field[@name='order_policy']" position="before">
<field name="incoterm" widget="selection" groups="base.group_user"/>
<field name="picking_policy" required="True"/>
</xpath>
<xpath expr="//page[@string='Other Information']/field[@name='order_line']/group/group/field[@name='invoiced']" position="after">
<field name="shipped"/>
</xpath>
</data>
</field>
</record>

4
addons/sale_stock/security/sale_stock_security.xml
View File

@ -7,6 +7,10 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_invoice_deli_orders" model="res.groups">
<field name="name">Enable Invoicing Delivery orders</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
</data>
</openerp>

2
addons/sale_stock/stock_view.xml
View File

@ -77,7 +77,7 @@
<field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1, 'default_invoice_state': '2binvoiced'}</field>
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
<menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale.group_invoice_deli_orders" sequence="20"/>
<menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="group_invoice_deli_orders" sequence="20"/>
</data>
</openerp>