lp:~openerp-dev/openobject-addons/trunk-ren-email-follow-up-tch

bzr revid: jam@tinyerp.com-20120627065023-eairdm8sp2fg06bm

8 files changed, 20 insertions, 20 deletions

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index bd7d1b3e711..2846e258aaf 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -96,7 +96,7 @@ class account_config_settings(osv.osv_memory):
         'module_account_voucher': fields.boolean('Manage Customer Payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('Manage Customer Payment Follow-Ups',
+        'module_account_followup': fields.boolean('Manage Customer Payment Follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
         'module_account_invoice_layout': fields.boolean('Allow Notes and Subtotals',
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index fdbca004c09..49e7f09863d 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -28,7 +28,7 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
 
 You can define your multiple levels of recall through the menu:
-    Accounting/Configuration/Miscellaneous/Follow-Ups
+    Accounting/Configuration/Miscellaneous/Follow-ups
 
 Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
     Accounting/Periodical Processing/Billing/Send follow-ups
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index e7d64c30b5e..60499603295 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -23,11 +23,11 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Account Follow-Up'
+    _description = 'Account Follow-up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
-        'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-Up'),
+        'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-up'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
@@ -38,7 +38,7 @@ followup()
 
 class followup_line(osv.osv):
     _name = 'account_followup.followup.line'
-    _description = 'Follow-Up Criteria'
+    _description = 'Follow-up Criteria'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 4c3d84fb642..7103ffa0386 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="demo_followup1" model="account_followup.followup">
-            <field name="name">Default Follow-Up</field>
+            <field name="name">Default Follow-up</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="description">First letter after 15 net days, 30 net days and 45 days end of month levels.</field>
         </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 93ca4edd333..9c11815e05b 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up Steps">
+                <tree string="Follow-up Steps">
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="start"/>
@@ -19,7 +19,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up Steps" version="7.0">
+                <form string="Follow-up Steps" version="7.0">
                     <group col="4">
                        <field name="name"/>
                        <field name="delay"/>
@@ -43,7 +43,7 @@
             <field name="model">account_followup.followup</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up" version="7.0">
+                <form string="Follow-up" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -58,7 +58,7 @@
             <field name="model">account_followup.followup</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up">
+                <tree string="Follow-up">
                     <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
@@ -81,7 +81,7 @@
         </record>
 
         <record id="action_account_followup_definition_form" model="ir.actions.act_window">
-            <field name="name">Follow-Ups</field>
+            <field name="name">Follow-ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account_followup.followup</field>
             <field name="search_view_id" ref="view_account_followup_filter"/>
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index aefd41bc76e..c0173b056a0 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -34,7 +34,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
-msgid "Follow-Up"
+msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
@@ -430,7 +430,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-msgid "Follow-Up lines"
+msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
@@ -469,7 +469,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-msgid "Follow-Up Steps"
+msgid "Follow-up Steps"
 msgstr ""
 
 #. module: account_followup
@@ -496,12 +496,12 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
-msgid "Max Follow-Up Level"
+msgid "Max Follow-up Level"
 msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
-msgid "Review Invoicing Follow-Ups"
+msgid "Review Invoicing Follow-ups"
 msgstr ""
 
 #. module: account_followup
@@ -687,6 +687,6 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
-msgid "Follow-Up Criteria"
+msgid "Follow-up Criteria"
 msgstr ""
 
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 17dd130aba7..2bdf8eb74bf 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -7,7 +7,7 @@
             <field name="model">account_followup.stat</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up lines">
+                <tree string="Follow-up lines">
                     <field name="partner_id"/>
                     <field name="date_move"/>
                     <field name="date_move_last"/>
@@ -28,7 +28,7 @@
            <field name="model">account_followup.stat</field>
            <field name="type">graph</field>
            <field name="arch" type="xml">
-               <graph string="Follow-Up lines" type="bar">
+               <graph string="Follow-up lines" type="bar">
                   <field name="partner_id"/>
                   <field name="balance" operator="+"/>
                </graph>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index c01bef5d145..bf3b95a0189 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -12,7 +12,7 @@
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
                     <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
                 </header>
-                <separator string="Send Follow-Ups"/>
+                <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>