[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120606104026-rchjsc71oyrcpo8y
2012-06-06 16:10:26 +05:30
parent 3cccfc797e 29c3da5730
commit a2e570575b
1 changed files with 2 additions and 2 deletions
@@ -170,11 +170,11 @@
                            string="Continue Process" type="object" icon="gtk-go-forward" />
                    </group>
                </page>
-                <!-- <page string="Sales Purchase">
+                <page string="Sales Purchase">
                    <field name="sales_purchase_active"/>
                    <separator string="Segmentation Test" colspan="4"/>
                    <field name="segmentation_line" widget="one2many_list" colspan="4"/>
-                </page> -->
+                </page>
                <page string="Profiling">
                    <field name="profiling_active" colspan="2"/>
                    <separator string="Profiling Options" colspan="4"/>