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/note | |
| 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/note')
| -rw-r--r-- | addons/note/note_demo.xml | 10 | ||||
| -rw-r--r-- | addons/note/static/description/index.html | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml index 26255238aeb..f594d312abe 100644 --- a/addons/note/note_demo.xml +++ b/addons/note/note_demo.xml @@ -98,17 +98,17 @@ <record id="note_9" model="note.note"> <field name="memo"><![CDATA[<b>Read those books</b> - <br/><br/>* Open ERP: a modern approach to integrated business management - <br/>* Open ERP for Retail and Industrial Management + <br/><br/>* Odoo: a modern approach to integrated business management + <br/>* Odoo for Retail and Industrial Management ]]> </field> <field name="stage_id" ref="demo_note_stage_02"/> </record> <record id="note_12" model="note.note"> - <field name="memo"><![CDATA[<b>Read some documentation about OpenERP before diving into the code</b> - <br/><br/>* Open ERP: a modern approach to integrated business management - <br/>* Open ERP for Retail and Industrial Management + <field name="memo"><![CDATA[<b>Read some documentation about Odoo before diving into the code</b> + <br/><br/>* Odoo: a modern approach to integrated business management + <br/>* Odoo for Retail and Industrial Management ]]> </field> <field name="message_follower_ids" eval="[(4, ref('base.group_user'))]"/> diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html index b9a60d3735d..cc59bf3cd0c 100644 --- a/addons/note/static/description/index.html +++ b/addons/note/static/description/index.html @@ -57,7 +57,7 @@ Quickly create to-dos, organize horizontally for the mid-term (today, this week, <h2 class="oe_slogan">Adapts to Your Creative Process</h2> <h3 class="oe_slogan">Customize to your own workflow</h3> <p> -Everyone has their own way to organize activities. OpenERP Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes. +Everyone has their own way to organize activities. Odoo Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes. </p> <img class="oe_picture oe_screenshot" src="notes_sc_03.png"> |