diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/website/data | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/website/data')
| -rw-r--r-- | addons/website/data/data.xml | 12 | ||||
| -rw-r--r-- | addons/website/data/demo.xml | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml index c5254d65c0f..08ef965104c 100644 --- a/addons/website/data/data.xml +++ b/addons/website/data/data.xml @@ -52,6 +52,18 @@ </field> </record> + <record id="action_module_theme" model="ir.actions.act_window"> + <field name="name">Website Theme</field> + <field name="res_model">ir.module.module</field> + <field name="view_type">form</field> + <field name="view_mode">kanban,form</field> + <field name="context" eval="'{\'search_default_category_id\':'+str(ref('base.module_category_theme'))+'}'"/> + <field name="help" type="html"> + <p><b>No theme module found!</b></p> + <p>You should try others search criteria.</p> + </field> + </record> + <record id="action_website" model="ir.actions.act_url"> <field name="name">Website</field> <field name="url">/</field> diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml index 63900506741..55feac2bd5d 100644 --- a/addons/website/data/demo.xml +++ b/addons/website/data/demo.xml @@ -3,10 +3,10 @@ <data> <record id="default_website" model="website"> - <field name="social_twitter">https://twitter.com/openerp</field> - <field name="social_facebook">https://www.facebook.com/OpenERP</field> - <field name="social_googleplus">https://plus.google.com/+openerp</field> - <field name="social_linkedin">http://www.linkedin.com/company/openerp</field> + <field name="social_twitter">https://twitter.com/odooapps</field> + <field name="social_facebook">https://www.facebook.com/Odoo</field> + <field name="social_googleplus">https://plus.google.com/+Odooapps</field> + <field name="social_linkedin">http://www.linkedin.com/company/odoo</field> </record> <record id="base.main_company" model="res.company"> |