Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1146077-sunil into lp:openobject-addons

  1. trunk-bug-1146077-sunil
  2. Merge into trunk
Proposed by sunil prajapati(OpenERP Trainee)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1146077-sunil
Merge into: lp:openobject-addons
Diff against target: 29 lines (+4/-4)
2 files modified
product/product_view.xml (+2/-2)
stock/product_view.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1146077-sunil
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+151902@code.launchpad.net

Description of the change

Hello,

I have solved following issue in this branch.

Problem:
It Will show the error window with the message
"ValueError: invalid literal for int() with base 10: 'Chicago Warehouse'"
  Now, solve this problem

Thanks,
Sunil

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-bug-1146077-sunil updated
8597. By sunil prajapati(OpenERP Trainee)

MERGE with trunk

8598. By sunil prajapati(OpenERP Trainee)

MERGE with trunk

Unmerged revisions

8598. By sunil prajapati(OpenERP Trainee)

MERGE with trunk

8597. By sunil prajapati(OpenERP Trainee)

MERGE with trunk

8596. By sunil prajapati(OpenERP Trainee)

[FIX] Search Box for field warehouse,location and price should return ids of db instead of value string

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product/product_view.xml'
2--- product/product_view.xml 2013-02-20 08:27:07 +0000
3+++ product/product_view.xml 2013-03-12 05:34:21 +0000
4@@ -15,8 +15,8 @@
5 <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
6 <field name="categ_id"/>
7 <group expand="0" string="Context...">
8- <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
9- <field name="company_id" groups="base.group_multi_company"/>
10+ <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
11+ <field name="company_id" groups="base.group_multi_company"/>
12 </group>
13 <group expand='0' string='Group by...'>
14 <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/>
15
16=== modified file 'stock/product_view.xml'
17--- stock/product_view.xml 2013-02-24 11:21:42 +0000
18+++ stock/product_view.xml 2013-03-12 05:34:21 +0000
19@@ -8,8 +8,8 @@
20 <field name="inherit_id" ref="product.product_search_form_view"/>
21 <field name="arch" type="xml">
22 <field name="pricelist_id" position="before">
23- <field name="location_id" context="{'location': self}"/>
24- <field name="warehouse_id" context="{'warehouse': self}"/>
25+ <field name="location_id" widget="selection" context="{'location': self}"/>
26+ <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/>
27 </field>
28 </field>
29 </record>

Subscribers

People subscribed via source and target branches

to all changes: