Merge lp:~elbati/c2c-rd-addons/fix_chricar_partner_parent_companies_menu_id into lp:c2c-rd-addons

Proposed by Lorenzo Battistini
Status: Needs review
Proposed branch: lp:~elbati/c2c-rd-addons/fix_chricar_partner_parent_companies_menu_id
Merge into: lp:c2c-rd-addons
Diff against target: 12 lines (+1/-1)
1 file modified
chricar_partner_parent_companies/partner_parent_companies_view.xml (+1/-1)
To merge this branch: bzr merge lp:~elbati/c2c-rd-addons/fix_chricar_partner_parent_companies_menu_id
Reviewer Review Type Date Requested Status
Lorenzo Battistini (community) Disapprove
Camptocamp Pending
Review via email: mp+122908@code.launchpad.net

Description of the change

This change makes chricar_partner_parent_companies work with openerp trunk

To post a comment you must log in.
Revision history for this message
Lorenzo Battistini (elbati) wrote :

I think it's better if we keep this modules compatible with 6.1, as long as 6.1 'c2c-rd-addons' branch doesn't exist.

review: Disapprove
Revision history for this message
Ferdinand (office-chricar) wrote :

we are working on creating a 6.1 and 7.0 branch

Unmerged revisions

276. By Lorenzo Battistini on 2012-09-05

[FIX] chricar_partner_parent_companies
referring to wrong menu ID (trunk)

275. By Launchpad Translations on behalf of c2c on 2012-09-05

Launchpad automatic translations update.

274. By <email address hidden> <email address hidden> on 2012-09-04

[FIX] default must match field type

273. By <email address hidden> <email address hidden> on 2012-09-04

merge

272. By <email address hidden> <email address hidden> on 2012-08-28

[REF] added packagin qty to harvest

271. By <email address hidden> <email address hidden> on 2012-08-28

[REF] added packagin qty to harvest

270. By <email address hidden> <email address hidden> on 2012-08-28

[REF] added packagin qty to harvest

269. By <email address hidden> <email address hidden> on 2012-08-28

[REF] added print notes for internal picking

268. By <email address hidden> <email address hidden> on 2012-08-28

merge

267. By <email address hidden> <email address hidden> on 2012-07-25

merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'chricar_partner_parent_companies/partner_parent_companies_view.xml'
2--- chricar_partner_parent_companies/partner_parent_companies_view.xml 2012-07-17 17:16:45 +0000
3+++ chricar_partner_parent_companies/partner_parent_companies_view.xml 2012-09-05 16:02:22 +0000
4@@ -247,7 +247,7 @@
5 <menuitem
6 action="action_partner_parent_companies_form"
7 id="menu_partner_parent_companies_form"
8- parent="base.menu_address_book"/>
9+ parent="base.menu_config_address_book"/>
10 <!-- not working, because the structure must be in the resource not foreign
11 <record id="view_partner_parent_companies_tree2" model="ir.ui.view">
12 <field name="name">res.partner.parent_company.tree2</field>

Subscribers

People subscribed via source and target branches