clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00134
lp:~juan-munoz-clearcorp/openerp-ccorp-addons/voucher_check_feature into lp:openerp-ccorp-addons/6.1
Juan Felipe Muñoz Ramos has proposed merging lp:~juan-munoz-clearcorp/openerp-ccorp-addons/voucher_check_feature into lp:openerp-ccorp-addons/6.1.
Requested reviews:
CLEARCORP development team (clearcorp)
For more details, see:
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/voucher_check_feature/+merge/104486
--
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/voucher_check_feature/+merge/104486
Your team CLEARCORP development team is requested to review the proposed merge of lp:~juan-munoz-clearcorp/openerp-ccorp-addons/voucher_check_feature into lp:openerp-ccorp-addons/6.1.
=== modified file 'account_voucher_check/account_voucher_check_view.xml'
--- account_voucher_check/account_voucher_check_view.xml 2012-01-04 20:11:15 +0000
+++ account_voucher_check/account_voucher_check_view.xml 2012-05-03 05:26:22 +0000
@@ -44,7 +44,37 @@
<field name="view_id" ref="account_voucher.view_vendor_payment_form"/>
<field name="act_window_id" ref="action_check_payment"/>
</record>
-
+
+ <record model = "ir.ui.view" id = "rent_invoice_form_view">
+ <field name = "name">check.invoice.supplier.form</field>
+ <field name = "model">account.invoice</field>
+ <field name = "type">form</field>
+ <field name = "inherit_id" ref = "account.invoice_supplier_form"/>
+ <field name = "arch" type="xml">
+ <data>
+ <field name="date_invoice" position="before">
+ <field name = "name" />
+ </field>
+ </data>
+ </field>
+ </record>
+
+<!--
+ <record model = "ir.ui.view" id = "rent_invoice_tree_view">
+ <field name = "name">check.invoice.supplier.tree</field>
+ <field name = "model">account.invoice</field>
+ <field name = "type">tree</field>
+ <field name = "inherit_id" ref = "account.invoice_tree"/>
+ <field name = "arch" type="xml">
+ <data>
+ <field name="company_id" position="after">
+ <field name = "name" />
+ </field>
+ </data>
+ </field>
+ </record>
+-->
+
<menuitem action="action_check_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
id="menu_action_vendor_payment" parent="account.menu_finance_payables"/>
=== modified file 'account_voucher_check/report/check_voucher.mako'
--- account_voucher_check/report/check_voucher.mako 2012-04-16 18:01:54 +0000
+++ account_voucher_check/report/check_voucher.mako 2012-05-03 05:26:22 +0000
@@ -38,11 +38,15 @@
<div id = "document_desc">
<p> </p>
<div class = "detail_desc">
- %if check.narration:
- <span class = "text_font">${check.narration or ''|entity}</span>
- %else:
- <span> </span>
+ %if check.name:
+ <span class = "text_font">${check.name or ''|entity}</span>
+ %endif
+ %for line in check.move_ids :
+ %if line.invoice.name:
+ <span class = "text_font">${ line.invoice.name or ''|entity}</span>
+ <span> </span>
%endif
+ %endfor
</div>
</div>
</br>
@@ -50,7 +54,7 @@
<table width = "100%" id = "table_account" cellpadding = "0" cellspacing = "0">
<thead><tr><th> </th><th> </th><th> </th><th> </th></tr></thead>
<tbody>
- %for line in check.line_cr_ids :
+ %for line in check.move_ids :
<tr class = "account_line">
<td valign="top" class = "code_cell">
${line.account_id.code}
@@ -59,22 +63,22 @@
${line.account_id.name}
</td>
<td valign="top" class = "amount_acc">
- ${line.account_id.currency_id.symbol_prefix or ''|entity} ${formatLang(line.account_id.credit)} ${line.account_id.currency_id.symbol_suffix or ''|entity}
+ ${line.account_id.currency_id.symbol_prefix or ''|entity} ${formatLang(line.debit)} ${line.account_id.currency_id.symbol_suffix or ''|entity}
</td>
<td valign="top" class = "amount_acc">
- ${line.account_id.currency_id.symbol_prefix or ''|entity} ${formatLang(line.account_id.credit)} ${line.account_id.currency_id.symbol_suffix or ''|entity}
+ ${line.account_id.currency_id.symbol_prefix or ''|entity} ${formatLang(line.credit)} ${line.account_id.currency_id.symbol_suffix or ''|entity}
</td>
</tr>
%endfor
%for line in check.line_dr_ids :
- <tr class = "account_line">
+ <!--tr class = "account_line">
<td valign="top" class = "code_cell">${line.account_id.code}</td>
<td valign="top" class = "account_id">
${line.account_id.name}
</td>
<td valign="top" class = "amount_acc">${line.account_id.currency_id.symbol_prefix or ''|entity} ${formatLang(line.account_id.credit)} ${line.account_id.currency_id.symbol_suffix or ''|entity}</td>
<td valign="top" class = "amount_acc">${line.account_id.currency_id.symbol_prefix or ''|entity} ${formatLang(line.account_id.credit)} ${line.account_id.currency_id.symbol_suffix or ''|entity}</td>
- </tr>
+ </tr-->
%endfor
</tbody>
</table>
=== modified file 'account_voucher_check/report/check_voucher.py'
--- account_voucher_check/report/check_voucher.py 2012-04-16 18:01:54 +0000
+++ account_voucher_check/report/check_voucher.py 2012-05-03 05:26:22 +0000
@@ -4,6 +4,7 @@
# check_voucher.py
# account_voucher_check
# First author: Mag Guevara <mag.guevara@xxxxxxxxxxxxxxx> (ClearCorp S.A.)
+# Second author: Juan Felipe Muñoz <juan.munoz@xxxxxxxxxxxxxxx> (ClearCorp S.A.)
# Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are
@@ -49,6 +50,7 @@
'uid' : uid,
'get_text':self.get_text,
'count_text':self.count_text,
+ 'get_concept':self.get_concept,
})
self.context = context
self._node = None
@@ -79,6 +81,16 @@
res = len(self.get_text(amount,currency,lang,company_id))
return res
+
+ def get_concept(self,moves):
+ res = 'error'
+ for move in moves:
+ move_line = self.pool.get('acccount.move.line').browse(self.cr,self.uid,move.id)
+ invoice = self.pool.get('account.invoice').browse(self.cr,self.uid,move_line.invoice)
+ if invoice.name != ''or invoice.name != False:
+ res = invoice.name
+ return res
+
report_sxw.report_sxw(
'report.check.voucher.layout_ccorp',
'account.voucher',
Follow ups
