Jalpesh Patel(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-purchase_config_wizard_improvement-pja
into
lp:~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-purchase_config_wizard_improvement-pja/+merge/109277
Hello
i am improve purchase configuration wizard to remove
module_product_manufacturer field and improve
stock configuration wizard to add module_product_manufacturer field.
Thanks
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-purchase_config_wizard_improvement-pja/+merge/109277
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp.
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-05-14 12:18:27 +0000
+++ purchase/res_config.py 2012-06-08 05:19:18 +0000
@@ -48,13 +48,7 @@
help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
- 'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
- help="""This allows you to define the following for a product:
- * Manufacturer
- * Manufacturer Product Name
- * Manufacturer Product Code
- * Product Attributes.
- This installs the module product_manufacturer."""),
+
'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
help="""Provide a double validation mechanism for purchases exceeding minimum amount.
This installs the module purchase_double_validation."""),
@@ -89,5 +83,16 @@
implied_group='purchase.group_analytic_accounting',
help="Allows you to specify an analytic account on purchase orders."),
}
+class stock_config_settings(osv.osv_memory):
+ _inherit = 'stock.config.settings'
+ _columns = {
+ 'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+ help="""This allows you to define the following for a product:
+ * Manufacturer
+ * Manufacturer Product Name
+ * Manufacturer Product Code
+ * Product Attributes.
+ This installs the module product_manufacturer."""),
+ }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-06-04 12:11:39 +0000
+++ purchase/res_config_view.xml 2012-06-08 05:19:18 +0000
@@ -15,7 +15,7 @@
<separator string="Invoicing" colspan="4"/>
<field name="default_invoice_method"/>
<field name="decimal_precision"/>
-
+ <group>
<separator string="Purchase Order" colspan="4"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
@@ -23,9 +23,8 @@
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
-
- <separator string="Products" colspan="4"/>
- <field name="module_product_manufacturer"/>
+ </group>
+
</sheet>
</form>
</field>
@@ -58,6 +57,22 @@
</group>
</field>
</record>
+
+ <record id="view_stock_config" model="ir.ui.view">
+ <field name="name">stock settings</field>
+ <field name="model">stock.config.settings</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="stock.view_stock_config_settings"/>
+ <field name="priority" eval="18"/>
+ <field name="arch" type="xml">
+ <group name="module_claim" position="after">
+ <separator string="Products" colspan="4"/>
+ <group>
+ <field name="module_product_manufacturer"/>
+ </group>
+ </group>
+ </field>
+ </record>
</data>
</openerp>
=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml 2012-06-04 12:11:39 +0000
+++ stock/res_config_view.xml 2012-06-08 05:19:18 +0000
@@ -14,27 +14,33 @@
</header>
<sheet layout="auto">
<separator string="Traceability" colspan="4"/>
- <field name="group_stock_production_lot"/>
- <field name="module_product_expiry"
- attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+ <group>
+ <field name="group_stock_production_lot"/>
+ <field name="module_product_expiry"
+ attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
<newline/>
<field name="group_stock_tracking_lot"/>
-
+ </group>
<separator string="Logistics" colspan="4"/>
- <field name="group_stock_multiple_locations"/>
- <field name="module_stock_location"/>
- <field name="module_stock_invoice_directly"/>
- <field name="decimal_precision"/>
-
+ <group>
+ <field name="group_stock_multiple_locations"/>
+ <field name="module_stock_location"/>
+ <field name="module_stock_invoice_directly"/>
+ <field name="decimal_precision"/>
+ </group>
<separator string="Products" colspan="4"/>
- <field name="group_stock_packaging"/>
- <field name="group_stock_inventory_valuation"/>
- <field name="group_uom"/>
- <field name="group_uos"/>
- <field name="group_product_variant"/>
-
+ <group>
+ <field name="group_stock_packaging"/>
+ <field name="group_stock_inventory_valuation"/>
+ <field name="group_uom"/>
+ <field name="group_uos"/>
+ <field name="group_product_variant"/>
+ </group>
<separator string="Partners" colspan="4"/>
- <field name="module_claim_from_delivery"/>
+ <group name="module_claim">
+ <field name="module_claim_from_delivery"/>
+ </group>
+
</sheet>
</form>
</field>
_______________________________________________
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
