Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-lunch_add_category_in_new_order-rmu into lp:openobject-addons

  1. trunk-lunch_add_category_in_new_order-rmu
  2. Merge into trunk
Proposed by Ravish(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-lunch_add_category_in_new_order-rmu
Merge into: lp:openobject-addons
Diff against target: 23 lines (+2/-0)
2 files modified
lunch/lunch.py (+1/-0)
lunch/lunch_view.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-lunch_add_category_in_new_order-rmu
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+141070@code.launchpad.net

Description of the change

Hello,

I have added category to the order lines in new order lunch.

Thanks,

To post a comment you must log in.

Unmerged revisions

8457. By Ravish(OpenERP)

added category to orderlines

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lunch/lunch.py'
2--- lunch/lunch.py 2012-12-18 13:41:18 +0000
3+++ lunch/lunch.py 2012-12-21 13:32:29 +0000
4@@ -388,6 +388,7 @@
5 ('cancelled', 'Cancelled')], \
6 'Status', readonly=True, select=True),
7 'cashmove': fields.one2many('lunch.cashmove', 'order_id', 'Cash Move', ondelete='cascade'),
8+ 'category_id': fields.many2one('lunch.product.category', 'Category', required=True),
9
10 }
11 _defaults = {
12
13=== modified file 'lunch/lunch_view.xml'
14--- lunch/lunch_view.xml 2012-12-21 10:35:03 +0000
15+++ lunch/lunch_view.xml 2012-12-21 13:32:29 +0000
16@@ -336,6 +336,7 @@
17 <field name='product_id' on_change='onchange_price(product_id)'/>
18 <field name='note' />
19 <field name='price' on_change='onchange_price(product_id)'/>
20+ <field name='category_id'/>
21 <field name='supplier' invisible="1"/>
22 <field name="state" invisible="1"/>
23 </tree>

Subscribers

People subscribed via source and target branches

to all changes: