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

[IMP]: Removed unnecessary changes. 

bzr revid: uco@tinyerp.com-20120305054120-ctletmvngymuke3v
This commit is contained in:
Ujjvala Collins (OpenERP) 2012-03-05 11:11:20 +05:30
parent 05477792a4
commit 2fdbb02ee8
6 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/delivery/delivery.py
View File

@ -250,23 +250,4 @@ class delivery_grid_line(osv.osv):
delivery_grid_line()
#class define_delivery_steps(osv.osv_memory):
# _name = 'delivery.define.delivery.steps.wizard'
#
# _columns = {
# 'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Picking Policy'),
# }
# _defaults = {
# 'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']
# }
#
# 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()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

30
addons/delivery/delivery_view.xml
View File

@ -337,35 +337,5 @@
<field name="sequence">10</field>
</record>
<!--record model="ir.ui.view" id="define_delivery_steps_form">
<field name="name">delivery.define_delivery_steps</field>
<field name="model">delivery.define.delivery.steps.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Setup Your Picking Policy">
<separator string="Choose Your Default Picking Policy" colspan="4"/>
<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" />
</group>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="action_define_delivery_steps">
<field name="name">Setup Your Picking Policy</field>
<field name="res_model">delivery.define.delivery.steps.wizard</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record model="ir.actions.todo" id="todo_define_delivery_steps">
<field name="action_id" ref="action_define_delivery_steps" />
<field name="category_id" ref="base.category_sales_management_config"/>
<field name="type">once</field>
</record-->
</data>
</openerp>

2
addons/delivery/test/delivery_cost.yml
View File

@ -67,6 +67,6 @@
-
I set default delivery policy.
-
!record {model: sale.configuration, id: default_delivery_policy}:
!record {model: res.config.settings, id: default_delivery_policy}:
{}

3
addons/product/pricelist_view.xml
View File

@ -4,7 +4,8 @@
<menuitem id="base.menu_sale_config_sales" name="Sales"
parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
<menuitem id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" sequence="50"/>
<menuitem id="menu_product_pricelist_main" name="Pricelists"
parent="base.menu_base_config" groups="base.group_sale_pricelist_per_customer" sequence="50"/>
<record id="product_pricelist_version_form_view" model="ir.ui.view">
<field name="name">product.pricelist.version.form</field>

1
addons/sale/sale.py
View File

@ -28,7 +28,6 @@ from tools.translate import _
from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, float_compare
import decimal_precision as dp
import netsvc
#from openerp.addons.base.res import res_config_sale as sale_config
class sale_shop(osv.osv):
_name = "sale.shop"

2
addons/sale/sale_view.xml
View File

@ -8,8 +8,6 @@
parent="base.menu_base_partner" sequence="1"
/>
<menuitem groups="base.group_sale_pricelist_per_customer" id="product.menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
<record id="view_shop_form" model="ir.ui.view">