diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index a5be9239ed3..d733478bd37 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -1,9 +1,8 @@ - + + account.invoice.calendar account.invoice @@ -148,11 +147,13 @@
-
@@ -274,16 +275,18 @@
-
@@ -368,15 +371,15 @@ - + - + - + diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index 73bf64893ba..98f9f93dfa7 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -8,7 +8,7 @@ - + diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 3a3d247769d..5c872051ba1 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 ed397668148..49e7f09863d 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { - 'name': 'Followup Management', + 'name': 'Follow-up Management', 'version': '1.0', 'category': 'Accounting & Finance', 'description': """ @@ -28,16 +28,16 @@ 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 followups + Accounting/Periodical Processing/Billing/Send follow-ups It will generate a PDF with all the letters according to the the different levels of recall defined. You can define different policies for different companies. You can also send mail to the customer. -Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu: +Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu: Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent """, diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index b53558ab0e7..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 c2e89202553..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 - + @@ -70,9 +70,9 @@ account_followup.followup search - + - + @@ -81,16 +81,16 @@ - Follow-Ups + Follow-ups ir.actions.act_window 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 908bca04f70..c0173b056a0 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 @@ -34,12 +34,12 @@ 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 #: 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,13 +280,13 @@ 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 #: code:addons/account_followup/wizard/account_followup_print.py:296 #, python-format -msgid "All E-mails have been successfully sent to Partners:.\n" +msgid "All Emails have been successfully sent to Partners:.\n" "\n" "%s" msgstr "" @@ -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 @@ -326,7 +326,7 @@ msgstr "" #, python-format msgid "\n" "\n" -"E-Mail sent to following Partners successfully. !\n" +"Email sent to following Partners successfully. !\n" "\n" "%s" msgstr "" @@ -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 @@ -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 @@ -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,12 +464,12 @@ 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 #: view:account_followup.followup.line:0 -msgid "Follow-Up Steps" +msgid "Follow-up Steps" 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,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 @@ -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 @@ -522,7 +522,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "E-Mail not sent to following Partners, E-mail not available !\n" +msgid "Email not sent to following Partners, Email not available !\n" "\n" "%s" msgstr "" @@ -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,11 +682,11 @@ msgstr "" #. module: account_followup #: view:account_followup.stat:0 -msgid "Latest Followup Date" +msgid "Latest Follow-up Date" 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_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 @@ - -