diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index 3f794682e06..3fe52186f03 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -25,7 +25,7 @@ 'category': 'Accounting & Finance', 'complexity': "normal", 'description': """ -Modules to automate letters for unpaid invoices, with multi-level recalls. +Module to automate letters for unpaid invoices, with multi-level recalls. ========================================================================== You can define your multiple levels of recall through the menu: diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index fd8b7026d74..8bc364ad306 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -45,7 +45,7 @@ class followup(osv.osv): company.append(l.company_id.id) return True _constraints = [ - (check_company_uniq, 'Only One Folllowup by Company.',['company_id'] ) + (check_company_uniq, 'Only One Followup by Company.',['company_id'] ) ] followup() @@ -85,7 +85,7 @@ class account_move_line(osv.osv): _columns = { 'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'), 'followup_date': fields.date('Latest Follow-up', select=True), - } + } account_move_line() diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml index 3799033b24a..4c3d84fb642 100644 --- a/addons/account_followup/account_followup_demo.xml +++ b/addons/account_followup/account_followup_demo.xml @@ -37,7 +37,7 @@ Dear %(partner_name)s, We are disappointed to see that despite sending a reminder, that your account is now seriously overdue. It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services). -Please, take appropriate measures in order to carry out this payment in the next 8 days +Please, take appropriate measures in order to carry out this payment in the next 8 days. If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly. @@ -58,7 +58,7 @@ Dear %(partner_name)s, Despite several reminders, your account is still not settled. -Unless full payment is made in next 8 days , then legal action for the recovery of the debt, will be taken without further notice. +Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice. I trust that this action will prove unnecessary and details of due payments is printed below. diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot index ea2f84c6ed3..4e51d25143d 100644 --- a/addons/account_followup/i18n/account_followup.pot +++ b/addons/account_followup/i18n/account_followup.pot @@ -18,7 +18,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:295 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po index 3aed4c28b94..ad17f7d9411 100644 --- a/addons/account_followup/i18n/ar.po +++ b/addons/account_followup/i18n/ar.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po index ac49da1868c..fa4129a0122 100644 --- a/addons/account_followup/i18n/bg.po +++ b/addons/account_followup/i18n/bg.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po index 7899ed8a279..5602303571d 100644 --- a/addons/account_followup/i18n/bs.po +++ b/addons/account_followup/i18n/bs.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po index 06cb758dd43..663df223523 100644 --- a/addons/account_followup/i18n/ca.po +++ b/addons/account_followup/i18n/ca.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Informe de seguiment" #. module: account_followup diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po index 58085df6558..63c7deb236a 100644 --- a/addons/account_followup/i18n/cs.po +++ b/addons/account_followup/i18n/cs.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po index 8102b93316e..e396665bf15 100644 --- a/addons/account_followup/i18n/de.po +++ b/addons/account_followup/i18n/de.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Mahnverfolgung Zusammenfassung" #. module: account_followup diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po index 0a5f24090eb..6b3b8649431 100644 --- a/addons/account_followup/i18n/el.po +++ b/addons/account_followup/i18n/el.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po index 5f4809a9c4b..e68a786f8ad 100644 --- a/addons/account_followup/i18n/es.po +++ b/addons/account_followup/i18n/es.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Informe de seguimiento" #. module: account_followup diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po index 739b7f440d5..ade948c8bfb 100644 --- a/addons/account_followup/i18n/es_AR.po +++ b/addons/account_followup/i18n/es_AR.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/es_EC.po b/addons/account_followup/i18n/es_EC.po index 35810591c0d..d7b68823bb1 100644 --- a/addons/account_followup/i18n/es_EC.po +++ b/addons/account_followup/i18n/es_EC.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/es_PY.po b/addons/account_followup/i18n/es_PY.po index feab913c927..4d11cc4dc62 100644 --- a/addons/account_followup/i18n/es_PY.po +++ b/addons/account_followup/i18n/es_PY.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Informe de seguimiento" #. module: account_followup diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po index 46ece9dc0bf..62d643271c2 100644 --- a/addons/account_followup/i18n/et.po +++ b/addons/account_followup/i18n/et.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po index dbd9f90e1e0..e1e93023819 100644 --- a/addons/account_followup/i18n/fi.po +++ b/addons/account_followup/i18n/fi.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Muistutuksen yhteenveto" #. module: account_followup diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po index 36a15475e27..26e948438df 100644 --- a/addons/account_followup/i18n/fr.po +++ b/addons/account_followup/i18n/fr.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Sommaire des suivis" #. module: account_followup diff --git a/addons/account_followup/i18n/gl.po b/addons/account_followup/i18n/gl.po index 39481ef8bb1..ae2d7084acb 100644 --- a/addons/account_followup/i18n/gl.po +++ b/addons/account_followup/i18n/gl.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Informe de seguimento" #. module: account_followup diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po index 185bdc32d63..1ddfcf1bec6 100644 --- a/addons/account_followup/i18n/hr.po +++ b/addons/account_followup/i18n/hr.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po index ac34be5f53c..4d4f877dc87 100644 --- a/addons/account_followup/i18n/hu.po +++ b/addons/account_followup/i18n/hu.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Fizetési emlékeztető összesítő" #. module: account_followup diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po index 8602356e4c7..ee677dab51e 100644 --- a/addons/account_followup/i18n/id.po +++ b/addons/account_followup/i18n/id.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po index 72b520d6700..b2bc7b17a58 100644 --- a/addons/account_followup/i18n/it.po +++ b/addons/account_followup/i18n/it.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Riepilogo Follow up" #. module: account_followup diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po index af9fa2a0c88..ed15cd52ac7 100644 --- a/addons/account_followup/i18n/ko.po +++ b/addons/account_followup/i18n/ko.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po index 5fa0752873d..62c56948271 100644 --- a/addons/account_followup/i18n/lt.po +++ b/addons/account_followup/i18n/lt.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/mn.po b/addons/account_followup/i18n/mn.po index d8f1aec67a1..56f98d51721 100644 --- a/addons/account_followup/i18n/mn.po +++ b/addons/account_followup/i18n/mn.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po index 494570d2a70..d11dfccde6b 100644 --- a/addons/account_followup/i18n/nb.po +++ b/addons/account_followup/i18n/nb.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Oppfølging Oppsummering" #. module: account_followup diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po index ef1685b9667..1148eabc32b 100644 --- a/addons/account_followup/i18n/nl.po +++ b/addons/account_followup/i18n/nl.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Samenvatting aanmaningen" #. module: account_followup diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po index 3959d1f8b10..f124569c0ec 100644 --- a/addons/account_followup/i18n/nl_BE.po +++ b/addons/account_followup/i18n/nl_BE.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Samenvatting aanmaningen" #. module: account_followup diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po index 1e48b722018..211bd9ea88c 100644 --- a/addons/account_followup/i18n/oc.po +++ b/addons/account_followup/i18n/oc.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po index 9adf5ad716b..dacab699973 100644 --- a/addons/account_followup/i18n/pl.po +++ b/addons/account_followup/i18n/pl.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po index 83de36aac80..7c9c2735b7f 100644 --- a/addons/account_followup/i18n/pt.po +++ b/addons/account_followup/i18n/pt.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po index adbdb305aff..898a1f6d36c 100644 --- a/addons/account_followup/i18n/pt_BR.po +++ b/addons/account_followup/i18n/pt_BR.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Resumo de Acompanhamento" #. module: account_followup diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po index d74ad9a0929..076e72af50b 100644 --- a/addons/account_followup/i18n/ro.po +++ b/addons/account_followup/i18n/ro.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po index 62b346534d9..e1ccb39e72a 100644 --- a/addons/account_followup/i18n/ru.po +++ b/addons/account_followup/i18n/ru.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Напоминание кратко" #. module: account_followup diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po index ff3385a7d22..b0ed8f14fa5 100644 --- a/addons/account_followup/i18n/sl.po +++ b/addons/account_followup/i18n/sl.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/sq.po b/addons/account_followup/i18n/sq.po index 28c4dcc7c61..2a993b30466 100644 --- a/addons/account_followup/i18n/sq.po +++ b/addons/account_followup/i18n/sq.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po index 170d1572ba5..944d1bf63dc 100644 --- a/addons/account_followup/i18n/sr.po +++ b/addons/account_followup/i18n/sr.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Sumarno Pracenje" #. module: account_followup diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po index 253859cd775..1223bf281f8 100644 --- a/addons/account_followup/i18n/sr@latin.po +++ b/addons/account_followup/i18n/sr@latin.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Sumarno Pracenje" #. module: account_followup diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po index d72f3dac235..36fd83122b2 100644 --- a/addons/account_followup/i18n/sv.po +++ b/addons/account_followup/i18n/sv.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "Uppföljningssammanfattning" #. module: account_followup diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po index 424d2462fd6..4de7f52286a 100644 --- a/addons/account_followup/i18n/tlh.po +++ b/addons/account_followup/i18n/tlh.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po index 53686a136ef..092bba9e211 100644 --- a/addons/account_followup/i18n/tr.po +++ b/addons/account_followup/i18n/tr.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "İzleme Özeti" #. module: account_followup diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po index ed92d1144b8..859374051c3 100644 --- a/addons/account_followup/i18n/uk.po +++ b/addons/account_followup/i18n/uk.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/vi.po b/addons/account_followup/i18n/vi.po index f8ef2871b51..0c69e2646c7 100644 --- a/addons/account_followup/i18n/vi.po +++ b/addons/account_followup/i18n/vi.po @@ -20,7 +20,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po index 4ea24ac7660..33ddfd20e97 100644 --- a/addons/account_followup/i18n/zh_CN.po +++ b/addons/account_followup/i18n/zh_CN.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "催款摘要" #. module: account_followup diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po index c94c5e17307..72967431e74 100644 --- a/addons/account_followup/i18n/zh_TW.po +++ b/addons/account_followup/i18n/zh_TW.po @@ -19,7 +19,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "Follwoup Summary" +msgid "Followup Summary" msgstr "" #. module: account_followup diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 557364372b0..1d471d00ec2 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -27,13 +27,13 @@ from report import report_sxw class report_rappel(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(report_rappel, self).__init__(cr, uid, name, context=context) - self.localcontext.update( { + self.localcontext.update({ 'time': time, 'ids_to_objects': self._ids_to_objects, 'adr_get': self._adr_get, 'getLines': self._lines_get, 'get_text': self._get_text - }) + }) def _ids_to_objects(self, partner_ids): pool = pooler.get_pool(self.cr.dbname) diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py index 8d4b914ffa6..25fc37691f4 100644 --- a/addons/account_followup/report/account_followup_report.py +++ b/addons/account_followup/report/account_followup_report.py @@ -45,23 +45,23 @@ class account_followup_stat(osv.osv): def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): - for arg in args: - if arg[0] == 'period_id' and arg[2] == 'current_year': - current_year = self.pool.get('account.fiscalyear').find(cr, uid) - ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] - args.append(['period_id','in',ids]) - args.remove(arg) - return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, - context=context, count=count) + for arg in args: + if arg[0] == 'period_id' and arg[2] == 'current_year': + current_year = self.pool.get('account.fiscalyear').find(cr, uid) + ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] + args.append(['period_id','in',ids]) + args.remove(arg) + return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, + context=context, count=count) def read_group(self, cr, uid, domain, *args, **kwargs): - for arg in domain: - if arg[0] == 'period_id' and arg[2] == 'current_year': - current_year = self.pool.get('account.fiscalyear').find(cr, uid) - ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] - domain.append(['period_id','in',ids]) - domain.remove(arg) - return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs) + for arg in domain: + if arg[0] == 'period_id' and arg[2] == 'current_year': + current_year = self.pool.get('account.fiscalyear').find(cr, uid) + ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] + domain.append(['period_id','in',ids]) + domain.remove(arg) + return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs) def init(self, cr): tools.drop_view_if_exists(cr, 'account_followup_stat') diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index cd75fb60a26..3fe404134ae 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -32,7 +32,7 @@ class account_followup_print(osv.osv_memory): _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) - } + } def _get_followup(self, cr, uid, context=None): if context is None: @@ -289,7 +289,7 @@ class account_followup_print_all(osv.osv_memory): if not msg_unsent: summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent else: - msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n%s") % msg_unsent + msg_unsent = _("E-Mail not sent to following Partners, E-mail not available !\n\n%s") % msg_unsent msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent line = '==========================================================================' summary = msg_unsent + line + msg_sent @@ -298,7 +298,7 @@ class account_followup_print_all(osv.osv_memory): context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'}) return { - 'name': _('Follwoup Summary'), + 'name': _('Followup Summary'), 'view_type': 'form', 'context': context, 'view_mode': 'tree,form',