lp:~openerp-dev/openobject-addons/trunk-bug-1156546-mahendra

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

Nimesh Contractor(Open ERP) (community): Approve on 2013-03-20

OpenERP Core Team: Pending requested 2013-03-20

Diff: 11 lines (+0/-1)

1 file modified

product/product_view.xml (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1156546: [7.0] product template form has 2 fields categ_id

Low

Fix Committed

Link a bug report

Related blueprints

8636. By Mahendra Barad(OpenERP) on 2013-03-19

[FIX] Product template form has 2 fields categ_id, one should be removed

8635. By Launchpad Translations on behalf of openerp on 2013-03-19

Launchpad automatic translations update.

8634. By Quentin (OpenERP) <email address hidden> on 2013-03-18

[FIX] auth_signup: fixed wrong xml syntax due to poor conflict-resolving

8633. By Quentin (OpenERP) <email address hidden> on 2013-03-18

[REF] account_payment: removal of amount_to_pay field on account.move.line and account.invoice, replaced by amount_residual

8632. By Quentin (OpenERP) <email address hidden> on 2013-03-18

[MERGE] forward port of fixes made in v7 addons branch up to revision 8872

8631. By Thibault Delavallée (OpenERP) on 2013-03-18

[MERGE] 'Invite & Quick Create User' update. Addons branch; see server branch for more details.

Quick Create:
- [ADD] in context of 'user_id' fields the xml_ids of necessary groups,
Invite:
- [ADD] added send_mail boolean field on invite wizard, allowing to avoid sending emails when inviting someone as a follower on the document,
- [IMP] notification and invite signature: improved signature (now including: sender name, company name as a link to the company website); invite message and subject improved, small code re-organization
Misc:
- [IMP] sheet tags added in various form views in HR

8630. By Launchpad Translations on behalf of openerp on 2013-03-18

Launchpad automatic translations update.

8629. By Launchpad Translations on behalf of openerp on 2013-03-17

Launchpad automatic translations update.

8628. By Launchpad Translations on behalf of openerp on 2013-03-16

Launchpad automatic translations update.

8627. By Olivier Dony (Odoo) on 2013-03-15

[FIX] account_analytic_analysis: remove duplicate method kept by mistake while porting 7.0 fixes to trunk in rev.8620