Merge lp:~openerp-india/openerp-india/7.0-l10n_in_account_voucher into lp:openerp-india/7.0

Proposed by Sunny Sheth(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-india/openerp-india/7.0-l10n_in_account_voucher
Merge into: lp:openerp-india/7.0
Diff against target: 733 lines (+694/-0)
6 files modified
l10n_in_account_voucher/__init__.py (+24/-0)
l10n_in_account_voucher/__openerp__.py (+46/-0)
l10n_in_account_voucher/account_voucher_action_data.xml (+91/-0)
l10n_in_account_voucher/l10n_in_account_voucher.py (+56/-0)
l10n_in_account_voucher/l10n_in_account_voucher_report.xml (+13/-0)
l10n_in_account_voucher/report/account_voucher.rml (+464/-0)
To merge this branch: bzr merge lp:~openerp-india/openerp-india/7.0-l10n_in_account_voucher
Reviewer Review Type Date Requested Status
OpenERP Indian Team Pending
Review via email: mp+216571@code.launchpad.net

Description of the change

Create new module : l10n_in_account_voucher.
- Improve Account Voucher Print report and Email Template on Voucher
- show company name, company full address and company report footer with position center after title of report.
      - override account voucher report rml and sxw
- add new email template on account vouchers / journal vouchers.
- On chatter when user change below fields to make history for future.
     - Amount of Payment, Partner, Write Off, Period, Journal.
     - inherit account.voucher object and field.
- Add new followers on voucher from all the invoice's followers attached in Account voucher lines.

Thanks

To post a comment you must log in.
80. By Sunny Sheth(OpenERP)

[IMP]: improve indentation in l10n_in_account_voucher py file and improve format in openerp py file and change company address in report

81. By Sunny Sheth(OpenERP)

[IMP]: improve indentation in __openerp__.py file

82. By Sunny Sheth(OpenERP)

[IMP]: improve header part of email template for vouchers

83. By Sunny Sheth(OpenERP)

[IMP]: improve indantation in __openerp__.py file and remove unwanted code in account_voucher.rml file for email template vouchers

84. By Sunny Sheth(OpenERP)

[IMP]: improve code in account_voucher.rml file for company title

85. By Sunny Sheth(OpenERP)

[IMP]: amount (in words) is not display when draft state in voucher report

86. By Sunny Sheth(OpenERP)

[IMP]: Add followers automatically after click on validate button and improve header part of voucher report

87. By Sunny Sheth(OpenERP)

[IMP]: improve header part of voucher report

88. By pna-openerp

[IMP]l10n_account_voucher: add followers in customer payment and supplier payment

89. By Sunny Sheth(OpenERP)

[IMP]: improve code in l10n_in_account_voucher.py file

Unmerged revisions

89. By Sunny Sheth(OpenERP)

[IMP]: improve code in l10n_in_account_voucher.py file

88. By pna-openerp

[IMP]l10n_account_voucher: add followers in customer payment and supplier payment

87. By Sunny Sheth(OpenERP)

[IMP]: improve header part of voucher report

86. By Sunny Sheth(OpenERP)

[IMP]: Add followers automatically after click on validate button and improve header part of voucher report

85. By Sunny Sheth(OpenERP)

[IMP]: amount (in words) is not display when draft state in voucher report

84. By Sunny Sheth(OpenERP)

[IMP]: improve code in account_voucher.rml file for company title

83. By Sunny Sheth(OpenERP)

[IMP]: improve indantation in __openerp__.py file and remove unwanted code in account_voucher.rml file for email template vouchers

82. By Sunny Sheth(OpenERP)

[IMP]: improve header part of email template for vouchers

81. By Sunny Sheth(OpenERP)

[IMP]: improve indentation in __openerp__.py file

80. By Sunny Sheth(OpenERP)

[IMP]: improve indentation in l10n_in_account_voucher py file and improve format in openerp py file and change company address in report

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'l10n_in_account_voucher'
2=== added file 'l10n_in_account_voucher/__init__.py'
3--- l10n_in_account_voucher/__init__.py 1970-01-01 00:00:00 +0000
4+++ l10n_in_account_voucher/__init__.py 2014-05-16 04:56:06 +0000
5@@ -0,0 +1,24 @@
6+# -*- coding: utf-8 -*-
7+##############################################################################
8+#
9+# OpenERP, Open Source Management Solution
10+# Copyright (C) 2004-2014 Tiny SPRL (<http://tiny.be>).
11+#
12+# This program is free software: you can redistribute it and/or modify
13+# it under the terms of the GNU Affero General Public License as
14+# published by the Free Software Foundation, either version 3 of the
15+# License, or (at your option) any later version.
16+#
17+# This program is distributed in the hope that it will be useful,
18+# but WITHOUT ANY WARRANTY; without even the implied warranty of
19+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+# GNU Affero General Public License for more details.
21+#
22+# You should have received a copy of the GNU Affero General Public License
23+# along with this program. If not, see <http://www.gnu.org/licenses/>.
24+#
25+##############################################################################
26+
27+import l10n_in_account_voucher
28+
29+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
30
31=== added file 'l10n_in_account_voucher/__openerp__.py'
32--- l10n_in_account_voucher/__openerp__.py 1970-01-01 00:00:00 +0000
33+++ l10n_in_account_voucher/__openerp__.py 2014-05-16 04:56:06 +0000
34@@ -0,0 +1,46 @@
35+# -*- coding: utf-8 -*-
36+##############################################################################
37+#
38+# OpenERP, Open Source Management Solution
39+# Copyright (C) 2004-2014 Tiny SPRL (<http://tiny.be>).
40+#
41+# This program is free software: you can redistribute it and/or modify
42+# it under the terms of the GNU Affero General Public License as
43+# published by the Free Software Foundation, either version 3 of the
44+# License, or (at your option) any later version.
45+#
46+# This program is distributed in the hope that it will be useful,
47+# but WITHOUT ANY WARRANTY; without even the implied warranty of
48+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
49+# GNU Affero General Public License for more details.
50+#
51+# You should have received a copy of the GNU Affero General Public License
52+# along with this program. If not, see <http://www.gnu.org/licenses/>.
53+#
54+##############################################################################
55+{
56+ 'name': 'Indian- Accouting Voucher',
57+ 'version': '1.0',
58+ 'author': 'OpenERP SA',
59+ 'category': 'Indian Localization',
60+ 'description': """
61+Voucher Report and Template
62+===========================
63+
64+This module allows you following feature:
65+-----------------------------------------
66+ * make history for future when user change fields Amount of Payment, Partner, Write Off, Period, Journal.
67+ * Add new followers on voucher from all the invoice's followers attached in Account Vourcher lines
68+ * Add email template to be used by Finance Department to send receipt to customer once they receive Payment
69+ * Improve header of current voucher report such that it can display company details after title of report
70+""",
71+ 'summary': 'Voucher Report, Template and invoice Followers',
72+ 'website': 'http://www.openerp.com',
73+ 'data': [
74+ 'l10n_in_account_voucher_report.xml',
75+ 'account_voucher_action_data.xml',
76+ ],
77+ 'depends': ['account_voucher'],
78+ 'installable': True,
79+}
80+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
81
82=== added file 'l10n_in_account_voucher/account_voucher_action_data.xml'
83--- l10n_in_account_voucher/account_voucher_action_data.xml 1970-01-01 00:00:00 +0000
84+++ l10n_in_account_voucher/account_voucher_action_data.xml 2014-05-16 04:56:06 +0000
85@@ -0,0 +1,91 @@
86+<?xml version="1.0" ?>
87+<openerp>
88+ <data>
89+ <!-- Email Templates menu -->
90+ <record model="ir.actions.act_window" id="action_email_templates_voucher">
91+ <field name="name">Voucher Email Templates</field>
92+ <field name="res_model">account.voucher</field>
93+ <field name="view_type">form</field>
94+ <field name="view_mode">form,tree</field>
95+ <field name="view_id" ref="email_template.email_template_tree" />
96+ <field name="search_view_id" ref="email_template.view_email_template_search"/>
97+ <field name="context" eval="{'search_default_model_id': ref('account_voucher.model_account_voucher')}"/>
98+ </record>
99+ </data>
100+ <!-- Mail template is done in a NOUPDATE block
101+ so users can freely customize/delete them -->
102+ <data noupdate="1">
103+ <!--Email template -->
104+ <record id="email_template_account_voucher" model="email.template">
105+ <field name="name"> Voucher Receipt Send by Email</field>
106+ <field name="email_from">${(object.company_id.email or 'noreply@localhost')|safe}</field>
107+ <field name="subject">${object.company_id.name} Receipt (Ref ${object.number or 'n/a'})</field>
108+ <field name="email_recipients">${object.partner_id.id}</field>
109+ <field name="model_id" ref="account_voucher.model_account_voucher"/>
110+ <field name="auto_delete" eval="True"/>
111+ <field name="report_template" ref="report_account_voucher"/>
112+ <field name="report_name">Receipt_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft'
113+or ''}</field>
114+ <field name="lang">${object.partner_id.lang}</field>
115+ <field name="body_html"><![CDATA[
116+<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
117+
118+ <p>Hello ${object.partner_id.name},</p>
119+
120+ <p> A receipt is available for you: </p>
121+<p style="border-left: 1px solid #8e0000; margin-left: 30px;">
122+
123+ <strong>REFERENCES</strong><br />
124+ &nbsp;&nbsp; Voucher number: <strong>${object.number or ''}</strong><br />
125+ &nbsp;&nbsp; Voucher total: <strong> ${object.amount} ${object.currency_id.name}</strong><br />
126+ &nbsp;&nbsp; Voucher date: ${object.date}<br />
127+ % if object.reference:
128+ &nbsp;&nbsp;Payment reference: ${object.reference }<br />
129+ % endif
130+ % if object.name:
131+ &nbsp;&nbsp;Memo: ${object.name}<br />
132+ % endif
133+ % if object.narration:
134+ &nbsp;&nbsp;Payment Details: ${object. narration }
135+ % endif
136+</p>
137+ <br/>
138+ <p>If you have any question, do not hesitate to contact us.</p>
139+ <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
140+ <br/>
141+ <br/>
142+ <div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
143+ <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;">
144+ <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
145+ </div>
146+ <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
147+ <span style="color: #222; margin-bottom: 5px; display: block; ">
148+ % if object.company_id.street:
149+ ${object.company_id.street}<br/>
150+ % endif
151+ % if object.company_id.street2:
152+ ${object.company_id.street2}<br/>
153+ % endif
154+ % if object.company_id.city or object.company_id.zip:
155+ ${object.company_id.zip} ${object.company_id.city}<br/>
156+ % endif
157+ % if object.company_id.country_id:
158+ ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
159+ % endif
160+ </span>
161+ % if object.company_id.phone:
162+ <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; ">
163+ Phone:&nbsp; ${object.company_id.phone}
164+ </div>
165+ % endif
166+ % if object.company_id.website:
167+ <div>
168+ Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
169+ </div>
170+ %endif
171+ </div>
172+</div>
173+ ]]></field>
174+ </record>
175+ </data>
176+</openerp>
177
178=== added file 'l10n_in_account_voucher/l10n_in_account_voucher.py'
179--- l10n_in_account_voucher/l10n_in_account_voucher.py 1970-01-01 00:00:00 +0000
180+++ l10n_in_account_voucher/l10n_in_account_voucher.py 2014-05-16 04:56:06 +0000
181@@ -0,0 +1,56 @@
182+# -*- coding: utf-8 -*-
183+##############################################################################
184+#
185+# OpenERP, Open Source Management Solution
186+# Copyright (C) 2004-2014 Tiny SPRL (<http://tiny.be>).
187+#
188+# This program is free software: you can redistribute it and/or modify
189+# it under the terms of the GNU Affero General Public License as
190+# published by the Free Software Foundation, either version 3 of the
191+# License, or (at your option) any later version.
192+#
193+# This program is distributed in the hope that it will be useful,
194+# but WITHOUT ANY WARRANTY; without even the implied warranty of
195+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
196+# GNU Affero General Public License for more details.
197+#
198+# You should have received a copy of the GNU Affero General Public License
199+# along with this program. If not, see <http://www.gnu.org/licenses/>.
200+#
201+##############################################################################
202+
203+from openerp.osv import fields, osv
204+
205+class account_voucher(osv.Model):
206+ _inherit = 'account.voucher'
207+ _columns = {
208+ 'amount': fields.float('Total', track_visibility='onchange', required=True, readonly=True, states={'draft':[('readonly',False)]}),
209+ 'partner_id': fields.many2one('res.partner', 'Partner', change_default=1, track_visibility='onchange', readonly=True, states={'draft':[('readonly',False)]}),
210+ 'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', track_visibility='onchange', readonly=True, states={'draft': [('readonly', False)]}),
211+ 'journal_id': fields.many2one('account.journal', 'Journal', track_visibility='onchange', required=True, readonly=True, states={'draft':[('readonly',False)]}),
212+ 'period_id': fields.many2one('account.period', 'Period', track_visibility='onchange', required=True, readonly=True, states={'draft':[('readonly',False)]}),
213+ }
214+
215+ def get_invoice_followers(self, cr, uid, move_ids, context=None):
216+ message_follower_ids = []
217+ move_line_obj = self.pool.get('account.move.line')
218+ for move_id in move_ids:
219+ invoice = move_id and move_line_obj.browse(cr, uid, move_id, context=context).invoice
220+ if invoice:
221+ for follower in invoice.message_follower_ids:
222+ if follower.id not in message_follower_ids:
223+ message_follower_ids.append(follower.id)
224+ return message_follower_ids
225+
226+ def proforma_voucher(self, cr, uid, ids, context=None):
227+ vals ={'message_follower_ids': []}
228+ for voucher in self.browse(cr, uid, ids, context=context):
229+ if voucher.type in ('sale', 'receipt'):
230+ move_ids = [l.move_line_id.id for l in voucher.line_cr_ids]
231+ elif voucher.type in ('purchase', 'payment'):
232+ move_ids = [l.move_line_id.id for l in voucher.line_dr_ids]
233+ vals['message_follower_ids'] = self.get_invoice_followers(cr, uid, move_ids, context=context)
234+ self.write(cr, uid, ids, vals, context=context)
235+ return super(account_voucher, self).proforma_voucher(cr, uid, ids, context=context)
236+
237+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
238
239=== added file 'l10n_in_account_voucher/l10n_in_account_voucher_report.xml'
240--- l10n_in_account_voucher/l10n_in_account_voucher_report.xml 1970-01-01 00:00:00 +0000
241+++ l10n_in_account_voucher/l10n_in_account_voucher_report.xml 2014-05-16 04:56:06 +0000
242@@ -0,0 +1,13 @@
243+<?xml version="1.0"?>
244+<openerp>
245+ <data>
246+ <report id="report_account_voucher"
247+ string="Voucher"
248+ model="account.voucher"
249+ name="voucher.cash_receipt.drcr"
250+ rml="addons/l10n_in_account_voucher/report/account_voucher.rml"
251+ auto="False"
252+ header = "False"
253+ menu="True"/>
254+ </data>
255+</openerp>
256
257=== added directory 'l10n_in_account_voucher/report'
258=== added file 'l10n_in_account_voucher/report/account_voucher.rml'
259--- l10n_in_account_voucher/report/account_voucher.rml 1970-01-01 00:00:00 +0000
260+++ l10n_in_account_voucher/report/account_voucher.rml 2014-05-16 04:56:06 +0000
261@@ -0,0 +1,464 @@
262+<?xml version="1.0"?>
263+<document filename="test.pdf">
264+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
265+ <pageTemplate id="first">
266+ <frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
267+ </pageTemplate>
268+ </template>
269+ <stylesheet>
270+ <blockTableStyle id="Standard_Outline">
271+ <blockAlignment value="LEFT"/>
272+ <blockValign value="TOP"/>
273+ </blockTableStyle>
274+ <blockTableStyle id="Table4">
275+ <blockAlignment value="LEFT"/>
276+ <blockValign value="TOP"/>
277+ </blockTableStyle>
278+ <blockTableStyle id="Table7">
279+ <blockAlignment value="LEFT"/>
280+ <blockValign value="TOP"/>
281+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
282+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
283+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
284+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
285+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
286+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
287+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
288+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
289+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
290+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
291+ <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
292+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
293+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
294+ </blockTableStyle>
295+ <blockTableStyle id="Table8">
296+ <blockAlignment value="LEFT"/>
297+ <blockValign value="TOP"/>
298+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
299+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
300+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
301+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
302+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
303+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
304+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
305+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
306+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
307+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
308+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
309+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
310+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="4,0" stop="4,-1"/>
311+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
312+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
313+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
314+ <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
315+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="5,0" stop="5,0"/>
316+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="5,-1" stop="5,-1"/>
317+ </blockTableStyle>
318+ <blockTableStyle id="Heading1">
319+ <blockAlignment value="LEFT"/>
320+ <blockValign value="TOP"/>
321+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
322+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
323+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
324+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
325+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
326+ <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
327+ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
328+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
329+ </blockTableStyle>
330+ <blockTableStyle id="Table2">
331+ <blockAlignment value="LEFT"/>
332+ <blockValign value="TOP"/>
333+ </blockTableStyle>
334+ <blockTableStyle id="Table6">
335+ <blockAlignment value="LEFT"/>
336+ <blockValign value="TOP"/>
337+ </blockTableStyle>
338+ <blockTableStyle id="Table1">
339+ <blockAlignment value="LEFT"/>
340+ <blockValign value="TOP"/>
341+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
342+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
343+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
344+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
345+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
346+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
347+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
348+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
349+ </blockTableStyle>
350+ <blockTableStyle id="Table3">
351+ <blockAlignment value="LEFT"/>
352+ <blockValign value="TOP"/>
353+ </blockTableStyle>
354+ <initialize>
355+ <paraStyle name="all" alignment="justify"/>
356+ </initialize>
357+ <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
358+ <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
359+ <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
360+ <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
361+ <paraStyle name="P5" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
362+ <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
363+ <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
364+ <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
365+ <paraStyle name="Standard" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
366+ <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
367+ <paraStyle name="Text body" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
368+ <paraStyle name="List" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
369+ <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
370+ <paraStyle name="Index" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
371+ <paraStyle name="Table Contents" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
372+ <paraStyle name="Table Heading" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
373+ <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
374+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
375+ <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
376+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
377+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
378+ <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
379+ <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
380+ <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
381+ <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
382+ <paraStyle name="Footer" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
383+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
384+ <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
385+ <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
386+ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
387+ <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
388+ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
389+ <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
390+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
391+ <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
392+ <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
393+ <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
394+ <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
395+ <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
396+ <paraStyle name="terp_default_8_Italic" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
397+ <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
398+ <paraStyle name="Header" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
399+ <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
400+ <paraStyle name="Addressee" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
401+ <paraStyle name="Signature" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
402+ <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
403+ <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
404+ <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
405+ <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
406+ <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
407+ <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
408+ <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
409+ <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
410+ <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
411+ <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
412+ <paraStyle name="Salutation" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
413+ <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
414+ <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
415+ <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
416+ <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
417+ <paraStyle name="terp_default_9_with_indent_10" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
418+ <paraStyle name="terp_default_9_50" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
419+ <images/>
420+ </stylesheet>
421+ <story>
422+ <para style="P7">[[ repeatIn(objects,'voucher') ]]</para>
423+ <blockTable colWidths="524.0" style="Table4">
424+ <tr>
425+ <td>
426+ <para style="P3">[[ voucher.company_id.name]]</para>
427+ <para style="P6">[[ display_address(voucher.company_id)]]</para>
428+ <para style="P6">[[ voucher.company_id.rml_footer_readonly]]</para>
429+ <para style="P6">
430+ <font color="white"> </font>
431+ </para>
432+ <para style="terp_header_Centre">[[ get_title(voucher.type) ]]</para>
433+ </td>
434+ </tr>
435+ </blockTable>
436+ <para style="terp_default_9">
437+ <font color="white"> </font>
438+ </para>
439+ <blockTable colWidths="63.0,200.0,52.0,210.0" style="Table7">
440+ <tr>
441+ <td>
442+ <para style="terp_tblheader_General">Journal:</para>
443+ </td>
444+ <td>
445+ <para style="terp_default_9">[[ voucher.type ]]</para>
446+ </td>
447+ <td>
448+ <para style="terp_tblheader_General">Number:</para>
449+ </td>
450+ <td>
451+ <para style="terp_default_9">[[ voucher.number ]]</para>
452+ </td>
453+ </tr>
454+ </blockTable>
455+ <blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table8">
456+ <tr>
457+ <td>
458+ <para style="terp_tblheader_General">State:</para>
459+ </td>
460+ <td>
461+ <para style="P2">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
462+ <para style="P2">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
463+ <para style="P2">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
464+ <para style="P2">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
465+ </td>
466+ <td>
467+ <para style="terp_tblheader_General">Ref. :</para>
468+ </td>
469+ <td>
470+ <para style="terp_default_9">[[ voucher.reference or '' ]]</para>
471+ </td>
472+ <td>
473+ <para style="terp_tblheader_General">Date:</para>
474+ </td>
475+ <td>
476+ <para style="terp_default_9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
477+ </td>
478+ </tr>
479+ </blockTable>
480+ <para style="terp_default_8">
481+ <font color="white"> </font>
482+ </para>
483+ <para style="terp_default_8">
484+ <font color="white"> </font>
485+ </para>
486+ <blockTable colWidths="277.0,124.0,124.0" style="Heading1">
487+ <tr>
488+ <td>
489+ <para style="terp_tblheader_Details">Particulars</para>
490+ </td>
491+ <td>
492+ <para style="terp_tblheader_Details_Right">Debit</para>
493+ </td>
494+ <td>
495+ <para style="terp_tblheader_Details_Right">Credit</para>
496+ </td>
497+ </tr>
498+ </blockTable>
499+ <para style="terp_default_1">
500+ <font color="white"> </font>
501+ </para>
502+ <section>
503+ <para style="terp_default_8">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
504+ <blockTable colWidths="276.0,126.0,123.0" style="Table2">
505+ <tr>
506+ <td>
507+ <para style="P4">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] </para>
508+ </td>
509+ <td>
510+ <para style="terp_default_Right_9">[[ formatLang(move_ids.debit) ]]</para>
511+ </td>
512+ <td>
513+ <para style="terp_default_Right_9">[[ formatLang(move_ids.credit) ]]</para>
514+ </td>
515+ </tr>
516+ <tr>
517+ <td>
518+ <para style="P5">[[ move_ids.account_id.name ]] </para>
519+ </td>
520+ <td>
521+ <para style="terp_default_Right_9">
522+ <font color="white"> </font>
523+ </para>
524+ </td>
525+ <td>
526+ <para style="terp_default_Right_9">
527+ <font color="white"> </font>
528+ </para>
529+ </td>
530+ </tr>
531+ <tr>
532+ <td>
533+ <para style="terp_default_8_Italic">[[ move_ids.name ]] - [[ get_ref(voucher.id,move_ids) ]]</para>
534+ </td>
535+ <td>
536+ <para style="terp_default_9_50">
537+ <font color="white"> </font>
538+ </para>
539+ </td>
540+ <td>
541+ <para style="terp_default_9_50">
542+ <font color="white"> </font>
543+ </para>
544+ </td>
545+ </tr>
546+ </blockTable>
547+ <para style="terp_default_1">
548+ <font color="white"> </font>
549+ </para>
550+ </section>
551+ <para style="terp_default_1">
552+ <font color="white"> </font>
553+ </para>
554+ <blockTable colWidths="276.0,126.0,123.0" style="Table6">
555+ <tr>
556+ <td>
557+ <para style="terp_tblheader_Details">Through : </para>
558+ </td>
559+ <td>
560+ <para style="terp_tblheader_Details">
561+ <font color="white"> </font>
562+ </para>
563+ </td>
564+ <td>
565+ <para style="terp_tblheader_Details">
566+ <font color="white"> </font>
567+ </para>
568+ </td>
569+ </tr>
570+ <tr>
571+ <td>
572+ <para style="terp_default_9">[[ voucher.narration or '']]</para>
573+ </td>
574+ <td>
575+ <para style="terp_default_9">
576+ <font color="white"> </font>
577+ </para>
578+ </td>
579+ <td>
580+ <para style="terp_default_9">
581+ <font color="white"> </font>
582+ </para>
583+ </td>
584+ </tr>
585+ <tr>
586+ <td>
587+ <para style="terp_tblheader_Details">On Account of : </para>
588+ </td>
589+ <td>
590+ <para style="terp_tblheader_Details">
591+ <font color="white"> </font>
592+ </para>
593+ </td>
594+ <td>
595+ <para style="terp_tblheader_Details">
596+ <font color="white"> </font>
597+ </para>
598+ </td>
599+ </tr>
600+ <tr>
601+ <td>
602+ <para style="terp_default_9">[[ voucher.name ]]</para>
603+ </td>
604+ <td>
605+ <para style="terp_default_9">
606+ <font color="white"> </font>
607+ </para>
608+ </td>
609+ <td>
610+ <para style="terp_default_9">
611+ <font color="white"> </font>
612+ </para>
613+ </td>
614+ </tr>
615+ <tr>
616+ <td>
617+ <para style="terp_tblheader_Details">Amount (in words) : </para>
618+ </td>
619+ <td>
620+ <para style="terp_tblheader_Details">
621+ <font color="white"> </font>
622+ </para>
623+ </td>
624+ <td>
625+ <para style="terp_tblheader_Details">
626+ <font color="white"> </font>
627+ </para>
628+ </td>
629+ </tr>
630+ <tr>
631+ <td>
632+ <para style="terp_default_9">[[ ((voucher.state != 'draft') or removeParentNode('para')) and '' ]] [[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
633+ </td>
634+ <td>
635+ <para style="terp_default_9">
636+ <font color="white"> </font>
637+ </para>
638+ </td>
639+ <td>
640+ <para style="terp_default_9">
641+ <font color="white"> </font>
642+ </para>
643+ </td>
644+ </tr>
645+ </blockTable>
646+ <para style="terp_default_1">
647+ <font color="white"> </font>
648+ </para>
649+ <blockTable colWidths="276.0,127.0,122.0" style="Table1">
650+ <tr>
651+ <td>
652+ <para style="P1">
653+ <font color="white"> </font>
654+ </para>
655+ </td>
656+ <td>
657+ <para style="terp_default_Right_9_Bold">[[ debit(voucher.move_ids)]]</para>
658+ </td>
659+ <td>
660+ <para style="terp_default_Right_9_Bold">[[ credit(voucher.move_ids) ]]</para>
661+ </td>
662+ </tr>
663+ </blockTable>
664+ <para style="terp_default_1">
665+ <font color="white"> </font>
666+ </para>
667+ <para style="terp_default_1">
668+ <font color="white"> </font>
669+ </para>
670+ <para style="terp_default_1">
671+ <font color="white"> </font>
672+ </para>
673+ <blockTable colWidths="157.0,119.0,126.0,123.0" style="Table3">
674+ <tr>
675+ <td>
676+ <para style="terp_default_9">
677+ <font color="white"> </font>
678+ </para>
679+ <para style="terp_default_9">
680+ <font color="white"> </font>
681+ </para>
682+ <para style="terp_default_9">
683+ <font color="white"> </font>
684+ </para>
685+ </td>
686+ <td>
687+ <para style="terp_default_9">
688+ <font color="white"> </font>
689+ </para>
690+ </td>
691+ <td>
692+ <para style="terp_default_9">
693+ <font color="white"> </font>
694+ </para>
695+ </td>
696+ <td>
697+ <para style="terp_default_9">
698+ <font color="white"> </font>
699+ </para>
700+ </td>
701+ </tr>
702+ <tr>
703+ <td>
704+ <para style="terp_default_9">Receiver's Signature</para>
705+ </td>
706+ <td>
707+ <para style="terp_default_9">
708+ <font color="white"> </font>
709+ </para>
710+ </td>
711+ <td>
712+ <para style="terp_default_9">
713+ <font color="white"> </font>
714+ </para>
715+ </td>
716+ <td>
717+ <para style="terp_default_Right_9">Authorised Signatory</para>
718+ </td>
719+ </tr>
720+ </blockTable>
721+ <para style="terp_default_8">
722+ <font color="white"> </font>
723+ </para>
724+ </story>
725+</document>
726
727=== added file 'l10n_in_account_voucher/report/account_voucher.sxw'
728Binary files l10n_in_account_voucher/report/account_voucher.sxw 1970-01-01 00:00:00 +0000 and l10n_in_account_voucher/report/account_voucher.sxw 2014-05-16 04:56:06 +0000 differ
729=== added directory 'l10n_in_account_voucher/static'
730=== added directory 'l10n_in_account_voucher/static/src'
731=== added directory 'l10n_in_account_voucher/static/src/img'
732=== added file 'l10n_in_account_voucher/static/src/img/icon.png'
733Binary files l10n_in_account_voucher/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and l10n_in_account_voucher/static/src/img/icon.png 2014-05-16 04:56:06 +0000 differ

Subscribers

People subscribed via source and target branches