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 @@ - Default Follow-Up + Default Follow-up First letter after 15 net days, 30 net days and 45 days end of month levels. 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 @@ account_followup.followup.line tree - + @@ -19,7 +19,7 @@ account_followup.followup.line form -
+ @@ -43,7 +43,7 @@ account_followup.followup form - + @@ -58,7 +58,7 @@ account_followup.followup tree - + @@ -81,7 +81,7 @@ - Follow-Ups + Follow-ups ir.actions.act_window account_followup.followup 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 @@ account_followup.stat tree - + @@ -28,7 +28,7 @@ account_followup.stat 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 @@