pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] several bugfixes in account_followup

Browse Source 
bzr revid: qdp@tinyerp.com-20090202130033-5y5ier2kqzz232a7
This commit is contained in:
qdp
2009-02-02 14:00:33 +01:00
parent f6fd0320dc
commit 917a29131e
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_followup/__terp__.py
+1 -1
View File
@@ -45,8 +45,8 @@
'update_xml': [
'security/ir.model.access.csv',
'wizard/wizard_view.xml',
'followup_report_view.xml',
'followup_view.xml',
'followup_report_view.xml'
],
'demo_xml': ['followup_demo.xml'],
'installable': True,
addons/account_followup/followup_view.xml
+3 -7
View File
@@ -31,13 +31,9 @@
<separator string="Legend" colspan="4"/>
<label string="%%(partner_name)s: Partner name" colspan="2"/>
<label string="%%(user_signature)s: User name" colspan="2"/>
<label string="%%(followup_amount)s: Total Amount Due" colspan="2"/>
<label string="%%(date)s: Current Date" colspan="2"/>
<label string="%%(user_signature)s: User name" colspan="2"/>
<label string="%%(company_name)s: User's Company name" colspan="2"/>
<label string="%%(company_currency)s: User's Company Currency" colspan="2"/>
<label string="%%(heading)s: Move line header" colspan="2"/>
<label string="%%(line)s: Account Move lines" colspan="2"/>
</form>
</field>
</record>
@@ -134,11 +130,11 @@
<act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
<menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.account_followup_wizard_menu"/>
<menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.menu_action_followup_stat"/>
<act_window domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]" id="act_account_partner_account_move_payable_all" name="All payable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
<menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.account_followup_wizard_menu"/>
<menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
</data>
addons/account_followup/report/report_followup_print.py
+7 -2
View File
@@ -61,7 +61,7 @@ class report_rappel(report_sxw.rml_parse):
movelines = moveline_obj.read(self.cr, self.uid, movelines)
return movelines
def _get_text(self, partner, followup_id):
def _get_text(self, partner, followup_id, context={}):
fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup')
fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line
li_delay = []
@@ -82,7 +82,12 @@ class report_rappel(report_sxw.rml_parse):
partner_delay.append(delay)
text = partner_delay and a[max(partner_delay)] or ''
if text:
text = text % {'partner_name':partner.name}
text = text % {
'partner_name': partner.name,
'date': time.strftime('%Y-%m-%d'),
'company_name': fp_obj.browse(self.cr, self.uid, followup_id).company_id.name,
'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature,
}
return text
addons/account_followup/wizard/wizard_followup_print.py
+1 -1
View File
@@ -204,7 +204,7 @@ class followup_all_print(wizard.interface):
summary = msg_unsent + line + msg_sent
return {'summary' : summary}
else:
return {'summary' : '\n\n\nMain not sent to any partner if you want to sent it please tick send email confirmation on wizard'}
return {'summary' : '\n\n\nMail not sent to any partner if you want to sent it please tick send email confirmation on wizard'}
def _get_partners(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)