Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-787052-mma into lp:openobject-addons

  1. trunk-bug-787052-mma
  2. Merge into trunk
Proposed by Mayur Maheshwari(OpenERP)
Status: Merged
Merged at revision: 5166
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-787052-mma
Merge into: lp:openobject-addons
Diff against target: 24 lines (+2/-1)
2 files modified
multi_company/multi_company_demo.xml (+1/-1)
purchase/purchase_sequence.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-787052-mma
Reviewer Review Type Date Requested Status
Rucha (Open ERP) (community) Approve
Mayur Maheshwari(OpenERP) (community) Needs Resubmitting
qdp (OpenERP) Pending
Review via email: mp+64990@code.launchpad.net

Description of the change

Hello

    multi_company : Adding a file for a purchase order sequence and add a Demo Data for company
shop1 and shop2

    purchase : modified sql constraint

Thanks

To post a comment you must log in.
Revision history for this message
Rucha (Open ERP) (rpa-openerp) wrote :

this seems not a proper fix as these changes are of purchase and in the dependency of this module (multi_company) there is no reference to purchase (though this fix doesn't break anything by traceback), so its good to fix the problem in purchase module itself,

- No need to change unique constraint of PO name (user can configure sequence so that its not conflicting with other names)

also this is not a good to refer company in data/update xml which is loaded in demo as it will give error of reference for the database without demo,

please improve it,
thanks

review: Needs Fixing
Revision history for this message
Mayur Maheshwari(OpenERP) (mma-openerp) wrote :

Hello

     I have made changes as per suggestion.

Thanks

review: Needs Resubmitting
Revision history for this message
Rucha (Open ERP) (rpa-openerp) wrote :

> - No need to change unique constraint of PO name (user can configure sequence
> so that its not conflicting with other names)

this is still not improved

Remove demo data of purchase in multi_company module

thanks

review: Needs Fixing
Revision history for this message
Mayur Maheshwari(OpenERP) (mma-openerp) wrote :

Hello,

     I have removed a demo data and sql constraint

Thanks

review: Needs Resubmitting
Revision history for this message
Rucha (Open ERP) (rpa-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml 2011-03-03 14:59:00 +0000
+++ multi_company/multi_company_demo.xml 2011-08-30 06:55:39 +0000
@@ -267,7 +267,7 @@
267 <field name="user_id" ref="base.user_root"/>267 <field name="user_id" ref="base.user_root"/>
268 <field name="company_id" ref="res_company_oerp_in"/>268 <field name="company_id" ref="res_company_oerp_in"/>
269 </record>269 </record>
270270
271 <record id="refund_expenses_journal_multi_in" model="account.journal">271 <record id="refund_expenses_journal_multi_in" model="account.journal">
272 <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>272 <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
273 <field name="code">ECNJ-OpenERP IN</field>273 <field name="code">ECNJ-OpenERP IN</field>
274274
=== modified file 'purchase/purchase_sequence.xml'
--- purchase/purchase_sequence.xml 2011-01-14 00:11:01 +0000
+++ purchase/purchase_sequence.xml 2011-08-30 06:55:39 +0000
@@ -11,6 +11,7 @@
11 <field name="code">purchase.order</field>11 <field name="code">purchase.order</field>
12 <field name="prefix">PO</field>12 <field name="prefix">PO</field>
13 <field name="padding">5</field>13 <field name="padding">5</field>
14 <field name="company_id"></field>
14 </record>15 </record>
15 </data>16 </data>
16</openerp>17</openerp>

Subscribers

People subscribed via source and target branches

to all changes: