Meera Trambadia (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-787052-mtr into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #787052 in OpenERP Addons: "OpenERP 6.0.2 - Multicompany - Cannot assign
secuence purchase / sale order on company 2"
https://bugs.launchpad.net/openobject-addons/+bug/787052
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-787052-mtr/+merge/64817
multicompany, sale:-created a ir.sequence for companies(Shop1 and Shop2) and
modified sql constraint on sale.order" --fixes=lp:787052
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-787052-mtr/+merge/64817
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-787052-mtr.
=== modified file 'multi_company/__openerp__.py'
--- multi_company/__openerp__.py 2011-03-18 14:06:18 +0000
+++ multi_company/__openerp__.py 2011-06-16 13:01:31 +0000
@@ -39,7 +39,8 @@
],
'init_xml': [],
'update_xml': [
- 'res_company_view.xml'
+ 'res_company_view.xml',
+ 'multi_company_sequence.xml',
],
'demo_xml': [
'multi_company_demo.xml'
=== added file 'multi_company/multi_company_sequence.xml'
--- multi_company/multi_company_sequence.xml 1970-01-01 00:00:00 +0000
+++ multi_company/multi_company_sequence.xml 2011-06-16 13:01:31 +0000
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+
+ <!-- Sequence types -->
+
+ <record id="seq_type_sale_order_multi_company" model="ir.sequence.type">
+ <field name="name">Sales Order</field>
+ <field name="code">sale.order</field>
+ </record>
+
+ <!-- Sequences types for pickings -->
+
+ <record id="seq_type_picking_in_multi_company" model="ir.sequence.type">
+ <field name="name">Picking IN</field>
+ <field name="code">stock.picking.in</field>
+ </record>
+
+ <record id="seq_type_picking_out_multi_company" model="ir.sequence.type">
+ <field name="name">Picking OUT</field>
+ <field name="code">stock.picking.out</field>
+ </record>
+
+ <record id="seq_type_picking_internal_multi_company" model="ir.sequence.type">
+ <field name="name">Picking INT</field>
+ <field name="code">stock.picking.internal</field>
+ </record>
+
+ <!-- Sequences types for tracking numbers -->
+
+ <record id="sequence_type_serial_multi_company" model="ir.sequence.type">
+ <field name="name">Production Lots</field>
+ <field name="code">stock.lot.serial</field>
+ </record>
+
+ <record id="sequence_type_tracking_multi_company" model="ir.sequence.type">
+ <field name="name">Packs</field>
+ <field name="code">stock.lot.tracking</field>
+ </record>
+
+ <!-- Sequences for Sale-->
+
+ <record id="seq_sale_order_shop1" model="ir.sequence">
+ <field name="name">Sales Order</field>
+ <field name="code">sale.order</field>
+ <field name="prefix">SO</field>
+ <field name="padding">3</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="seq_sale_order_shop2" model="ir.sequence">
+ <field name="name">Sales Order</field>
+ <field name="code">sale.order</field>
+ <field name="prefix">SO</field>
+ <field name="padding">3</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ <!-- Sequences for Picking -->
+
+ <record id="seq_picking_in_shop1" model="ir.sequence">
+ <field name="name">Picking IN</field>
+ <field name="code">stock.picking.in</field>
+ <field name="prefix">IN/</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="seq_picking_in_shop2" model="ir.sequence">
+ <field name="name">Picking IN</field>
+ <field name="code">stock.picking.in</field>
+ <field name="prefix">IN/</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ <record id="seq_picking_out_shop1" model="ir.sequence">
+ <field name="name">Picking OUT</field>
+ <field name="code">stock.picking.out</field>
+ <field name="prefix">OUT/</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="seq_picking_out_shop2" model="ir.sequence">
+ <field name="name">Picking OUT</field>
+ <field name="code">stock.picking.out</field>
+ <field name="prefix">OUT/</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ <record id="seq_picking_internal_shop1" model="ir.sequence">
+ <field name="name">Picking INT</field>
+ <field name="code">stock.picking.internal</field>
+ <field name="prefix">INT/</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="seq_picking_internal_shop2" model="ir.sequence">
+ <field name="name">Picking INT</field>
+ <field name="code">stock.picking.internal</field>
+ <field name="prefix">INT/</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ <!-- Sequences for Tracking Lots -->
+
+ <record id="sequence_production_lots_shop1" model="ir.sequence">
+ <field name="name">Production Lots</field>
+ <field name="code">stock.lot.serial</field>
+ <field name="prefix"></field>
+ <field name="padding">7</field>
+ <field name="number_next">1</field>
+ <field name="number_increment">1</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="sequence_production_lots_shop2" model="ir.sequence">
+ <field name="name">Production Lots</field>
+ <field name="code">stock.lot.serial</field>
+ <field name="prefix"></field>
+ <field name="padding">7</field>
+ <field name="number_next">1</field>
+ <field name="number_increment">1</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ <record id="sequence_tracking_shop1" model="ir.sequence">
+ <field name="name">Packs</field>
+ <field name="code">stock.lot.tracking</field>
+ <field name="prefix"></field>
+ <field name="padding">7</field>
+ <field name="number_next">1</field>
+ <field name="number_increment">1</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="sequence_tracking_shop2" model="ir.sequence">
+ <field name="name">Packs</field>
+ <field name="code">stock.lot.tracking</field>
+ <field name="prefix"></field>
+ <field name="padding">7</field>
+ <field name="number_next">1</field>
+ <field name="number_increment">1</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ </data>
+</openerp>
=== modified file 'sale/sale.py'
--- sale/sale.py 2011-05-18 16:45:45 +0000
+++ sale/sale.py 2011-06-16 13:01:31 +0000
@@ -279,7 +279,7 @@
'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
}
_sql_constraints = [
- ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+ ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique !'),
]
_order = 'name desc'
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
