odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20111111135247-eq8dbs76mj18ayoz
This commit is contained in:
Fabien Pinckaers 2011-11-11 14:52:47 +01:00
parent 2ce3a03001 f5890b15e8
commit 1825f5e284
49 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_followup/__openerp__.py
View File

@ -25,7 +25,7 @@
'category': 'Accounting & Finance', 'category': 'Accounting & Finance',
'complexity': "normal", 'complexity': "normal",
'description': """ '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: You can define your multiple levels of recall through the menu:

4
addons/account_followup/account_followup.py
View File

@ -45,7 +45,7 @@ class followup(osv.osv):
company.append(l.company_id.id) company.append(l.company_id.id)
return True return True
_constraints = [ _constraints = [
(check_company_uniq, 'Only One Folllowup by Company.',['company_id'] ) (check_company_uniq, 'Only One Followup by Company.',['company_id'] )
] ]
followup() followup()
@ -85,7 +85,7 @@ class account_move_line(osv.osv):
_columns = { _columns = {
'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'), 'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'),
'followup_date': fields.date('Latest Follow-up', select=True), 'followup_date': fields.date('Latest Follow-up', select=True),
} }
account_move_line() account_move_line()

4
addons/account_followup/account_followup_demo.xml
View File

@ -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. 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). 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. 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. 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. I trust that this action will prove unnecessary and details of due payments is printed below.

2
addons/account_followup/i18n/account_followup.pot
View File

@ -18,7 +18,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:295 #: code:addons/account_followup/wizard/account_followup_print.py:295
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/ar.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/bg.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/bs.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/ca.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Informe de seguiment" msgstr "Informe de seguiment"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/cs.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/de.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Mahnverfolgung Zusammenfassung" msgstr "Mahnverfolgung Zusammenfassung"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/el.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/es.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Informe de seguimiento" msgstr "Informe de seguimiento"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/es_AR.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/es_EC.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/es_PY.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Informe de seguimiento" msgstr "Informe de seguimiento"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/et.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/fi.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Muistutuksen yhteenveto" msgstr "Muistutuksen yhteenveto"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/fr.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Sommaire des suivis" msgstr "Sommaire des suivis"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/gl.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Informe de seguimento" msgstr "Informe de seguimento"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/hr.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/hu.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Fizetési emlékeztető összesítő" msgstr "Fizetési emlékeztető összesítő"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/id.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/it.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Riepilogo Follow up" msgstr "Riepilogo Follow up"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/ko.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/lt.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/mn.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/nb.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Oppfølging Oppsummering" msgstr "Oppfølging Oppsummering"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/nl.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Samenvatting aanmaningen" msgstr "Samenvatting aanmaningen"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/nl_BE.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Samenvatting aanmaningen" msgstr "Samenvatting aanmaningen"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/oc.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/pl.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/pt.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/pt_BR.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Resumo de Acompanhamento" msgstr "Resumo de Acompanhamento"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/ro.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/ru.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Напоминание кратко" msgstr "Напоминание кратко"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/sl.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/sq.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/sr.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Sumarno Pracenje" msgstr "Sumarno Pracenje"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/sr@latin.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Sumarno Pracenje" msgstr "Sumarno Pracenje"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/sv.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "Uppföljningssammanfattning" msgstr "Uppföljningssammanfattning"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/tlh.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/tr.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "İzleme Özeti" msgstr "İzleme Özeti"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/uk.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/vi.po
View File

@ -20,7 +20,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/zh_CN.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "催款摘要" msgstr "催款摘要"
#. module: account_followup #. module: account_followup

2
addons/account_followup/i18n/zh_TW.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "Follwoup Summary" msgid "Followup Summary"
msgstr "" msgstr ""
#. module: account_followup #. module: account_followup

4
addons/account_followup/report/account_followup_print.py
View File

@ -27,13 +27,13 @@ from report import report_sxw
class report_rappel(report_sxw.rml_parse): class report_rappel(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context): def __init__(self, cr, uid, name, context):
super(report_rappel, self).__init__(cr, uid, name, context=context) super(report_rappel, self).__init__(cr, uid, name, context=context)
self.localcontext.update( { self.localcontext.update({
'time': time, 'time': time,
'ids_to_objects': self._ids_to_objects, 'ids_to_objects': self._ids_to_objects,
'adr_get': self._adr_get, 'adr_get': self._adr_get,
'getLines': self._lines_get, 'getLines': self._lines_get,
'get_text': self._get_text 'get_text': self._get_text
}) })
def _ids_to_objects(self, partner_ids): def _ids_to_objects(self, partner_ids):
pool = pooler.get_pool(self.cr.dbname) pool = pooler.get_pool(self.cr.dbname)

30
addons/account_followup/report/account_followup_report.py
View File

@ -45,23 +45,23 @@ class account_followup_stat(osv.osv):
def search(self, cr, uid, args, offset=0, limit=None, order=None, def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False): context=None, count=False):
for arg in args: for arg in args:
if arg[0] == 'period_id' and arg[2] == 'current_year': if arg[0] == 'period_id' and arg[2] == 'current_year':
current_year = self.pool.get('account.fiscalyear').find(cr, uid) 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'] ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
args.append(['period_id','in',ids]) args.append(['period_id','in',ids])
args.remove(arg) args.remove(arg)
return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
context=context, count=count) context=context, count=count)
def read_group(self, cr, uid, domain, *args, **kwargs): def read_group(self, cr, uid, domain, *args, **kwargs):
for arg in domain: for arg in domain:
if arg[0] == 'period_id' and arg[2] == 'current_year': if arg[0] == 'period_id' and arg[2] == 'current_year':
current_year = self.pool.get('account.fiscalyear').find(cr, uid) 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'] ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
domain.append(['period_id','in',ids]) domain.append(['period_id','in',ids])
domain.remove(arg) domain.remove(arg)
return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs) return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs)
def init(self, cr): def init(self, cr):
tools.drop_view_if_exists(cr, 'account_followup_stat') tools.drop_view_if_exists(cr, 'account_followup_stat')

6
addons/account_followup/wizard/account_followup_print.py
View File

@ -32,7 +32,7 @@ class account_followup_print(osv.osv_memory):
_columns = { _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"), '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) 'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True)
} }
def _get_followup(self, cr, uid, context=None): def _get_followup(self, cr, uid, context=None):
if context is None: if context is None:
@ -289,7 +289,7 @@ class account_followup_print_all(osv.osv_memory):
if not msg_unsent: if not msg_unsent:
summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent
else: 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 msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent
line = '==========================================================================' line = '=========================================================================='
summary = msg_unsent + line + msg_sent 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.'}) 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 { return {
'name': _('Follwoup Summary'), 'name': _('Followup Summary'),
'view_type': 'form', 'view_type': 'form',
'context': context, 'context': context,
'view_mode': 'tree,form', 'view_mode': 'tree,form',