diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index b53558ab0e7..e7d64c30b5e 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -23,7 +23,7 @@ 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'),
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index c2e89202553..93ca4edd333 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -70,9 +70,9 @@
account_followup.followup
search
-
+
-
+
@@ -86,11 +86,11 @@
account_followup.followup
form
- Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.
+ Define follow-up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.
-
+
account.move.line.partner.tree
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index ce3c92e1cf1..aefd41bc76e 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -17,7 +17,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup:0
-msgid "Search Followup"
+msgid "Search Follow-up"
msgstr ""
#. module: account_followup
@@ -39,7 +39,7 @@ msgstr ""
#. module: account_followup
#: help:account.followup.print.all,test_print:0
-msgid "Check if you want to print followups without changing followups level."
+msgid "Check if you want to print follow-ups without changing follow-ups level."
msgstr ""
#. module: account_followup
@@ -80,7 +80,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_followup_stat
-msgid "Follow up on the reminders sent over to your partners for unpaid invoices."
+msgid "Follow-up on the reminders sent over to your partners for unpaid invoices."
msgstr ""
#. module: account_followup
@@ -91,7 +91,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Follow up Entries with period in current year"
+msgid "Follow-up Entries with period in current year"
msgstr ""
#. module: account_followup
@@ -117,7 +117,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
#: model:ir.ui.menu,name:account_followup.account_followup_menu
-msgid "Follow-Ups"
+msgid "Follow-ups"
msgstr ""
#. module: account_followup
@@ -175,7 +175,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup
-msgid "Account Follow Up"
+msgid "Account Follow-up"
msgstr ""
#. module: account_followup
@@ -227,7 +227,7 @@ msgstr ""
#. module: account_followup
#: field:account_followup.stat,date_followup:0
#: field:account_followup.stat.by.partner,date_followup:0
-msgid "Latest followup"
+msgid "Latest follow-up"
msgstr ""
#. module: account_followup
@@ -269,7 +269,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
-msgid "Send followups"
+msgid "Send follow-ups"
msgstr ""
#. module: account_followup
@@ -280,7 +280,7 @@ msgstr ""
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
-msgid "Follow Ups"
+msgid "Follow-ups"
msgstr ""
#. module: account_followup
@@ -308,7 +308,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
-msgid "Followup Statistics by Partner"
+msgid "Follow-up Statistics by Partner"
msgstr ""
#. module: account_followup
@@ -354,7 +354,7 @@ msgstr ""
#. module: account_followup
#: view:account.followup.print.all:0
-msgid "Print Follow Ups"
+msgid "Print Follow-ups"
msgstr ""
#. module: account_followup
@@ -364,7 +364,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat
-msgid "Followup Statistics"
+msgid "Follow-up Statistics"
msgstr ""
#. module: account_followup
@@ -453,7 +453,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_print
#: model:ir.model,name:account_followup.model_account_followup_print_all
-msgid "Print Followup & Send Mail to Customers"
+msgid "Print Follow-up & Send Mail to Customers"
msgstr ""
#. module: account_followup
@@ -464,7 +464,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
-msgid "Followup Report"
+msgid "Follow-up Report"
msgstr ""
#. module: account_followup
@@ -480,7 +480,7 @@ msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:307
#, python-format
-msgid "Followup Summary"
+msgid "Follow-up Summary"
msgstr ""
#. module: account_followup
@@ -496,7 +496,7 @@ 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
@@ -511,7 +511,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
-msgid "Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages."
+msgid "Define follow-up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages."
msgstr ""
#. module: account_followup
@@ -545,7 +545,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Followup Level"
+msgid "Follow-up Level"
msgstr ""
#. module: account_followup
@@ -556,7 +556,7 @@ msgstr ""
#. module: account_followup
#: constraint:account_followup.followup:0
-msgid "Only One Followup by Company."
+msgid "Only One Follow-up by Company."
msgstr ""
#. module: account_followup
@@ -682,7 +682,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Latest Followup Date"
+msgid "Latest Follow-up Date"
msgstr ""
#. module: account_followup
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index ae581528a1e..3d096ecf3ac 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index c2a842cfd4c..ceb8a389c0e 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -24,7 +24,7 @@ import tools
class account_followup_stat(osv.osv):
_name = "account_followup.stat"
- _description = "Followup Statistics"
+ _description = "Follow-up Statistics"
_rec_name = 'partner_id'
_auto = False
_columns = {
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 9627d12aa88..17dd130aba7 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -47,7 +47,7 @@
+ help="Follow-up Entries with period in current year"/>
-
-
+
+
@@ -77,7 +77,7 @@
tree,graph
{'search_default_followup_level':1}
- Follow up on the reminders sent over to your partners for unpaid invoices.
+ Follow-up on the reminders sent over to your partners for unpaid invoices.
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index f21c21e2367..fd90e16fec8 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -3,14 +3,14 @@
- Account Followup multi company rule
+ Account Follow-up multi company rule
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
- Account Followup Statistics by Partner Rule
+ Account Follow-up Statistics by Partner Rule
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index 5d4a7f3bd47..5b9ffa3d51c 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -1,23 +1,23 @@
-
- In order to test account followup module in OpenERP, I change the state of invoice to "open".
+ In order to test account follow-up module in OpenERP, I change the state of invoice to "open".
-
!record {model: account.invoice, id: account.demo_invoice_0}:
check_total: 14.0
-
!workflow {model: account.invoice, action: invoice_open, ref: account.demo_invoice_0}
-
- I create a followup.
+ I create a follow-up.
-
!record {model: account.followup.print, id: account_followup_print_0}:
{}
-
- I select the followup to send it to the partner.
+ I select the follow-up to send it to the partner.
-
!python {model: account.followup.print}: |
self.do_continue(cr, uid, [ref("account_followup_print_0")], {"active_ids": [ref("account_followup.account_followup_print_menu")], "active_id": ref("account_followup.account_followup_print_menu"),
})
-
- I select partners whom I want to send followups.
+ I select partners whom I want to send follow-ups.
-
!record {model: account.followup.print.all, id: account_followup_print_all_0}:
email_body: 'Date : %(date)s\n\nDear %(partner_name)s,\n\nPlease find in attachment
@@ -28,7 +28,7 @@
- base.res_partner_desertic_hispafuentes
partner_lang: 1
-
- I send a followup mail to partner.
+ I send a follow-up mail to partner.
-
!python {model: account.followup.print.all}: |
import time
diff --git a/addons/account_followup/test/account_followup_report.yml b/addons/account_followup/test/account_followup_report.yml
index 1aab384dc3b..f2ad8a5bb9f 100644
--- a/addons/account_followup/test/account_followup_report.yml
+++ b/addons/account_followup/test/account_followup_report.yml
@@ -1,10 +1,10 @@
-
- In order to test the report I print followup report.
+ In order to test the report I print follow-up report.
-
!python {model: account.followup.print.all}: |
import time
ctx = {'form_view_ref':'account_followup.view_account_followup_print_all', 'followup_id': ref('account_followup.demo_followup1'),'date': time.strftime('%Y-%m-%d'),'model': 'account_followup.followup','active_ids':[ref('account_followup_print_all_0')], 'company_id':ref('base.main_company')}
data_dict = {'email_conf': 1}
from tools import test_reports
- test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow Ups"], our_module='account_followup')
+ test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow-ups"], our_module='account_followup')
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 69b970e2538..b4629062455 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -28,7 +28,7 @@ from tools.translate import _
class account_followup_print(osv.osv_memory):
_name = 'account.followup.print'
- _description = 'Print Followup & Send Mail to Customers'
+ _description = 'Print Follow-up & Send Mail to Customers'
_columns = {
'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
@@ -71,14 +71,14 @@ account_followup_print()
class account_followup_stat_by_partner(osv.osv):
_name = "account_followup.stat.by.partner"
- _description = "Followup Statistics by Partner"
+ _description = "Follow-up Statistics by Partner"
_rec_name = 'partner_id'
_auto = False
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'date_move':fields.date('First move', readonly=True),
'date_move_last':fields.date('Last move', readonly=True),
- 'date_followup':fields.date('Latest followup', readonly=True),
+ 'date_followup':fields.date('Latest follow-up', readonly=True),
'max_followup_id': fields.many2one('account_followup.followup.line',
'Max Follow Up Level', readonly=True, ondelete="cascade"),
'balance':fields.float('Balance', readonly=True),
@@ -90,7 +90,7 @@ class account_followup_stat_by_partner(osv.osv):
# Here we don't have other choice but to create a virtual ID based on the concatenation
# of the partner_id and the company_id, because if a partner is shared between 2 companies,
# we want to see 2 lines for him in this table. It means that both company should be able
- # to send him followups separately . An assumption that the number of companies will not
+ # to send him follow-ups separately . An assumption that the number of companies will not
# reach 10 000 records is made, what should be enough for a time.
cr.execute("""
create or replace view account_followup_stat_by_partner as (
@@ -118,7 +118,7 @@ account_followup_stat_by_partner()
class account_followup_print_all(osv.osv_memory):
_name = 'account.followup.print.all'
- _description = 'Print Followup & Send Mail to Customers'
+ _description = 'Print Follow-up & Send Mail to Customers'
_columns = {
'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
'email_conf': fields.boolean('Send email confirmation'),
@@ -126,7 +126,7 @@ class account_followup_print_all(osv.osv_memory):
'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
'email_body': fields.text('Email body'),
'summary': fields.text('Summary', required=True, readonly=True),
- 'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
+ 'test_print': fields.boolean('Test Print', help='Check if you want to print follow-ups without changing follow-ups level.')
}
def _get_summary(self, cr, uid, context=None):
if context is None:
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 32b6383a8cc..c01bef5d145 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,7 +7,7 @@
account.followup.print
form
-
- Send followups
+ Send follow-ups
ir.actions.act_window
account.followup.print
form
@@ -75,7 +75,7 @@
account.followup.print.all
form
-
- Send followups
+ Send follow-ups
ir.actions.act_window
account.followup.print.all
form