diff options
| author | JMA (OpenERP) <jma@tinyerp.com> | 2010-06-16 17:12:11 +0530 |
|---|---|---|
| committer | JMA (OpenERP) <jma@tinyerp.com> | 2010-06-16 17:12:11 +0530 |
| commit | 3fcdccbeca610a645085e652de4fa2824be99568 (patch) | |
| tree | f833d7a3e3c2980f4d3c00fb7f17393b29496aaa /addons/base_setup | |
| parent | 291f6cc29b04c67c61566ad4534d22a16fdae229 (diff) | |
| parent | 80fcbdb4d66f88c7f0f663c5aa7edda847f22ec5 (diff) | |
[MERGE] Merge the changes from main trunk branch.
bzr revid: jma@tinyerp.com-20100616114211-baomq9ypqtpbv3ck
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/base_setup_installer.xml | 1 | ||||
| -rw-r--r-- | addons/base_setup/installer.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index cbe4c9d24a2..46c4dbc6e0b 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -36,6 +36,7 @@ If you don't think you need any of these right now, you can easily install them <field name="profile_association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="profile_auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> </group> </data> </field> diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index b7123b1ba38..0ab47197d66 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -75,6 +75,9 @@ class base_setup_installer(osv.osv_memory): "OpenERP's report creation."), 'thunderbird' :fields.boolean('Thunderbird'), # Vertical modules + 'product_expiry':fields.boolean('Food Industry', + help="Installs a preselected set of OpenERP " + "applications which will help you manage foods."), 'profile_association':fields.boolean('Associations', help="Installs a preselected set of OpenERP " "applications which will help you manage your association " |