Merge lp:~vauxoo/addons-vauxoo/7.0_addons-vauxoo_account_move_report-yzk into lp:addons-vauxoo/7.0

Proposed by Isaac López Zúñiga
Status: Merged
Merged at revision: 924
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0_addons-vauxoo_account_move_report-yzk
Merge into: lp:addons-vauxoo/7.0
Diff against target: 583 lines (+535/-0)
9 files modified
account_move_report/__init__.py (+23/-0)
account_move_report/__openerp__.py (+50/-0)
account_move_report/account_move_report.xml (+21/-0)
account_move_report/data.xml (+99/-0)
account_move_report/i18n/account_move_report.pot (+77/-0)
account_move_report/i18n/es.po (+72/-0)
account_move_report/report/__init__.py (+24/-0)
account_move_report/report/account_move_html.py (+51/-0)
account_move_report/report/account_move_report_html.mako (+118/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0_addons-vauxoo_account_move_report-yzk
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Approve
Review via email: mp+194584@code.launchpad.net

Description of the change

Agrega el módulo account_move_report

To post a comment you must log in.
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

Hola Isaac puedes agregar por favor el archivo account_move_report.pot

Para que de ahora en adelante launchpad se encargue de la traducción

Saludos

926. By Isaac López Zúñiga

[ADD][account_move_report.pot]

927. By Isaac López Zúñiga

[REF][account_move_report] translation

Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'account_move_report'
=== added file 'account_move_report/__init__.py'
--- account_move_report/__init__.py 1970-01-01 00:00:00 +0000
+++ account_move_report/__init__.py 2013-11-08 21:42:25 +0000
@@ -0,0 +1,23 @@
1#!/usr/bin/python
2# -*- encoding: utf-8 -*-
3###########################################################################
4# Module Writen to OpenERP, Open Source Management Solution
5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved
7###############Credits######################################################
8# Coded by: Luis Ernesto García (ernesto_gm@vauxoo.com)
9#############################################################################
10# This program is free software: you can redistribute it and/or modify
11# it under the terms of the GNU Affero General Public License as published by
12# the Free Software Foundation, either version 3 of the License, or
13# (at your option) any later version.
14#
15# This program is distributed in the hope that it will be useful,
16# but WITHOUT ANY WARRANTY; without even the implied warranty of
17# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18# GNU Affero General Public License for more details.
19#
20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################
23import report
024
=== added file 'account_move_report/__openerp__.py'
--- account_move_report/__openerp__.py 1970-01-01 00:00:00 +0000
+++ account_move_report/__openerp__.py 2013-11-08 21:42:25 +0000
@@ -0,0 +1,50 @@
1#!/usr/bin/python
2# -*- encoding: utf-8 -*-
3###########################################################################
4# Module Writen to OpenERP, Open Source Management Solution
5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved
7###############Credits######################################################
8# Coded by: Luis Ernesto García (ernesto_gm@vauxoo.com)
9#############################################################################
10# This program is free software: you can redistribute it and/or modify
11# it under the terms of the GNU Affero General Public License as published by
12# the Free Software Foundation, either version 3 of the License, or
13# (at your option) any later version.
14#
15# This program is distributed in the hope that it will be useful,
16# but WITHOUT ANY WARRANTY; without even the implied warranty of
17# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18# GNU Affero General Public License for more details.
19#
20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################
23
24{
25 "name" : "Journal Entries report",
26 "version" : "1.0",
27 "author" : "Vauxoo",
28 "category" : "Accouting",
29 "description" : """
30Report for Journal Entries
31==========================
32
33This module adds a report in journal entries. You can print one o several
34journal entries in PDF file.
35
36 """,
37 "website" : "http://www.vauxoo.com/",
38 "license" : "AGPL-3",
39 "depends" : [
40 "account",
41 "report_webkit",
42 ],
43 "demo" : [],
44 "data" : [
45 "data.xml",
46 "account_move_report.xml",
47 ],
48 "installable" : True,
49 "active" : False,
50}
051
=== added file 'account_move_report/account_move_report.xml'
--- account_move_report/account_move_report.xml 1970-01-01 00:00:00 +0000
+++ account_move_report/account_move_report.xml 2013-11-08 21:42:25 +0000
@@ -0,0 +1,21 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4 <report auto="False"
5 id="account_move_report_webkit"
6 model="account.move"
7 name="account.move.report.webkit"
8 file="account_move_report/report/account_move_report_html.mako"
9 string="Report Journal Entries"
10 report_type="webkit"
11 attachment_use="1"/>
12
13 <record id="property_account_move_report_webkit" model="ir.property">
14 <field name="name">webkit_header</field>
15 <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
16 <field eval="'ir.header_webkit,'+str(ref('account_move_report.ir_header_webkit_account_move'))" model="ir.header_webkit" name="value"/>
17 <field eval="'ir.actions.report.xml,'+str(ref('account_move_report.account_move_report_webkit'))" model="ir.actions.report.xml" name="res_id"/>
18 </record>
19
20 </data>
21</openerp>
022
=== added file 'account_move_report/data.xml'
--- account_move_report/data.xml 1970-01-01 00:00:00 +0000
+++ account_move_report/data.xml 2013-11-08 21:42:25 +0000
@@ -0,0 +1,99 @@
1<?xml version="1.0" ?>
2<openerp>
3 <data noupdate="1">
4 <record id="ir_header_webkit_account_move" model="ir.header_webkit">
5 <field name="footer_html"><![CDATA[<html>
6 <head>
7 <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
8 <script>
9 function subst() {
10 var vars={};
11 var x=document.location.search.substring(1).split('&');
12 for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
13 var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
14 for(var i in x) {
15 var y = document.getElementsByClassName(x[i]);
16 for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
17 }
18 }
19 </script>
20 </head>
21 <body style="border:0; margin: 0;" onload="subst()">
22 <table style="border-top: 1px solid black; width: 100%">
23 <tr >
24 <td style="text-align:right;font-size:9;" width="35%">Generado con software libre en OpenERP y Webkit por http://www.vauxoo.com</td>
25 <td style="text-align:right;font-size:12;" width="55%">Page <span class="page"/></td><td style="text-align:left;font-size:12;"> of <span class="topage"/></td>
26 </tr>
27 </table>
28 </body>
29</html>]]></field>
30 <field name="orientation">Portrait</field>
31 <field name="format">Letter</field>
32 <field name="html"><![CDATA[<html>
33 <head>
34 <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
35 <script>
36 function subst() {
37 var vars={};
38 var x=document.location.search.substring(1).split('&');
39 for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
40 var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
41 for(var i in x) {
42 var y = document.getElementsByClassName(x[i]);
43 for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
44 }
45 }
46 </script>
47 <style type="text/css">
48 ${css}
49 </style>
50 </head>
51 <body style="border:0; margin: 0;" onload="subst()">
52 ${_debug or ''|n} </body>
53</html>]]>
54</field>
55 <field eval="0.0" name="margin_top"/>
56 <field name="css" ><![CDATA[
57.company_font{
58text-align: center;
59font-size: 16pt;
60}
61td.basic_td
62{
63text-align: center;
64font-size: 10;
65padding-right:3px;
66padding-left:3px;
67}
68td.dir_font{
69font-size: 10;
70text-align: center;
71}
72td.date_font{
73font-size: 12;
74text-align: center;
75}
76.title
77{
78text-align: center;
79border-top:1px solid #000000;
80border-bottom: solid 1.5px #000000;
81font-size: 12;
82padding-right:3px;
83padding-left:3px;
84}
85.table
86{
87border-collapse:collapse;
88}
89
90
91]]> </field>
92 <field name="name">Poliza</field>
93 </record>
94 <record id="ir_header_img_companylogo0" model="ir.header_img">
95 <field eval="&quot;&quot;&quot;jpg&quot;&quot;&quot;" name="type"/>
96 <field eval="&quot;&quot;&quot;company_logo&quot;&quot;&quot;" name="name"/>
97 </record>
98 </data>
99</openerp>
0100
=== added directory 'account_move_report/i18n'
=== added file 'account_move_report/i18n/account_move_report.pot'
--- account_move_report/i18n/account_move_report.pot 1970-01-01 00:00:00 +0000
+++ account_move_report/i18n/account_move_report.pot 2013-11-08 21:42:25 +0000
@@ -0,0 +1,77 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_move_report
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-11-08 21:04+0000\n"
10"PO-Revision-Date: 2013-11-08 21:04+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_move_report
19#: report:addons/account_move_report/report/account_move_report_html.mako:55
20msgid "Account"
21msgstr ""
22
23#. module: account_move_report
24#: report:addons/account_move_report/report/account_move_report_html.mako:49
25msgid "Name"
26msgstr ""
27
28#. module: account_move_report
29#: report:addons/account_move_report/report/account_move_report_html.mako:58
30msgid "Due date"
31msgstr ""
32
33#. module: account_move_report
34#: report:addons/account_move_report/report/account_move_report_html.mako:41
35msgid "Date: "
36msgstr ""
37
38#. module: account_move_report
39#: report:addons/account_move_report/report/account_move_report_html.mako:38
40msgid "Reference: "
41msgstr ""
42
43#. module: account_move_report
44#: report:addons/account_move_report/report/account_move_report_html.mako:67
45msgid "Analytic Account"
46msgstr ""
47
48#. module: account_move_report
49#: report:addons/account_move_report/report/account_move_report_html.mako:64
50msgid "Credit"
51msgstr ""
52
53#. module: account_move_report
54#: report:addons/account_move_report/report/account_move_report_html.mako:26
55msgid "Printing Date:"
56msgstr ""
57
58#. module: account_move_report
59#: model:ir.actions.report.xml,name:account_move_report.account_move_report_webkit
60msgid "Report Journal Entries"
61msgstr ""
62
63#. module: account_move_report
64#: report:addons/account_move_report/report/account_move_report_html.mako:61
65msgid "Debit"
66msgstr ""
67
68#. module: account_move_report
69#: report:addons/account_move_report/report/account_move_report_html.mako:52
70msgid "Partner"
71msgstr ""
72
73#. module: account_move_report
74#: report:addons/account_move_report/report/account_move_report_html.mako:34
75msgid "Journal Entries: "
76msgstr ""
77
078
=== added file 'account_move_report/i18n/es.po'
--- account_move_report/i18n/es.po 1970-01-01 00:00:00 +0000
+++ account_move_report/i18n/es.po 2013-11-08 21:42:25 +0000
@@ -0,0 +1,72 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_move_report
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-06-25 01:22+0000\n"
10"PO-Revision-Date: 2013-06-24 18:23-0800\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"Plural-Forms: \n"
17"X-Generator: Poedit 1.5.4\n"
18
19#. module: account_move_report
20#: report:addons/account_move_report/report/account_move_report_html.mako:51
21msgid "Account"
22msgstr "Cuenta"
23
24#. module: account_move_report
25#: report:addons/account_move_report/report/account_move_report_html.mako:48
26msgid "Name"
27msgstr "Nombre"
28
29#. module: account_move_report
30#: report:addons/account_move_report/report/account_move_report_html.mako:54
31msgid "Due date"
32msgstr "Fecha Vencimiento"
33
34#. module: account_move_report
35#: report:addons/account_move_report/report/account_move_report_html.mako:38
36msgid "Date: "
37msgstr "Fecha: "
38
39#. module: account_move_report
40#: report:addons/account_move_report/report/account_move_report_html.mako:41
41msgid "Reference: "
42msgstr "Referencia: "
43
44#. module: account_move_report
45#: report:addons/account_move_report/report/account_move_report_html.mako:63
46msgid "Analytic Account"
47msgstr "Cuenta Analítica"
48
49#. module: account_move_report
50#: report:addons/account_move_report/report/account_move_report_html.mako:60
51msgid "Credit"
52msgstr "Haber"
53
54#. module: account_move_report
55#: report:addons/account_move_report/report/account_move_report_html.mako:26
56msgid "Printing Date:"
57msgstr "Fecha de impresión:"
58
59#. module: account_move_report
60#: model:ir.actions.report.xml,name:account_move_report.account_move_report_webkit
61msgid "Report Journal Entries"
62msgstr "Reporte de Póliza"
63
64#. module: account_move_report
65#: report:addons/account_move_report/report/account_move_report_html.mako:57
66msgid "Debit"
67msgstr "Debe"
68
69#. module: account_move_report
70#: report:addons/account_move_report/report/account_move_report_html.mako:34
71msgid "Journal Entries: "
72msgstr "Póliza: "
073
=== added file 'account_move_report/i18n/es_MX.po'
=== added directory 'account_move_report/report'
=== added file 'account_move_report/report/__init__.py'
--- account_move_report/report/__init__.py 1970-01-01 00:00:00 +0000
+++ account_move_report/report/__init__.py 2013-11-08 21:42:25 +0000
@@ -0,0 +1,24 @@
1#!/usr/bin/python
2# -*- encoding: utf-8 -*-
3###########################################################################
4# Module Writen to OpenERP, Open Source Management Solution
5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved
7###############Credits######################################################
8# Coded by: Luis Ernesto García (ernesto_gm@vauxoo.com)
9#############################################################################
10# This program is free software: you can redistribute it and/or modify
11# it under the terms of the GNU Affero General Public License as published by
12# the Free Software Foundation, either version 3 of the License, or
13# (at your option) any later version.
14#
15# This program is distributed in the hope that it will be useful,
16# but WITHOUT ANY WARRANTY; without even the implied warranty of
17# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18# GNU Affero General Public License for more details.
19#
20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################
23
24import account_move_html
025
=== added file 'account_move_report/report/account_move_html.py'
--- account_move_report/report/account_move_html.py 1970-01-01 00:00:00 +0000
+++ account_move_report/report/account_move_html.py 2013-11-08 21:42:25 +0000
@@ -0,0 +1,51 @@
1#!/usr/bin/python
2# -*- encoding: utf-8 -*-
3###########################################################################
4# Module Writen to OpenERP, Open Source Management Solution
5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved
7###############Credits######################################################
8# Coded by: Luis Ernesto García (ernesto_gm@vauxoo.com)
9#############################################################################
10# This program is free software: you can redistribute it and/or modify
11# it under the terms of the GNU Affero General Public License as published by
12# the Free Software Foundation, either version 3 of the License, or
13# (at your option) any later version.
14#
15# This program is distributed in the hope that it will be useful,
16# but WITHOUT ANY WARRANTY; without even the implied warranty of
17# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18# GNU Affero General Public License for more details.
19#
20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################
23from openerp.report import report_sxw
24from openerp.tools.translate import _
25import time
26from report_webkit import report_helper
27from report_webkit import webkit_report
28
29class account_move_report_html(report_sxw.rml_parse):
30 def __init__(self, cr, uid, name, context):
31 super(account_move_report_html, self).__init__(cr, uid, name,
32 context=context)
33 self.localcontext.update({
34 'time': time,
35 'get_total_debit_credit' : self.get_total_debit_credit,
36 })
37
38 def get_total_debit_credit(self, line_ids):
39 sum_tot_debit = 0.00
40 sum_tot_credit = 0.00
41 for line in line_ids:
42 sum_tot_debit += (line.debit)
43 sum_tot_credit += (line.credit)
44 return {'sum_tot_debit' : sum_tot_debit, 'sum_tot_credit' : sum_tot_credit}
45
46webkit_report.WebKitParser('report.account.move.report.webkit',
47 'account.move',
48 'addons/report_account_move/report/account_move_report_html.mako',
49 parser=account_move_report_html)
50
51# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
052
=== added file 'account_move_report/report/account_move_report_html.mako'
--- account_move_report/report/account_move_report_html.mako 1970-01-01 00:00:00 +0000
+++ account_move_report/report/account_move_report_html.mako 2013-11-08 21:42:25 +0000
@@ -0,0 +1,118 @@
1<html>
2 <head>
3 <style type="text/css">
4 ${css}
5 </style>
6 </head>
7 <body>
8 %for o in objects :
9 <table width = '100%' class='table'>
10 <tr>
11 <td style="vertical-align: top;">
12 ${helper.embed_image('jpeg',str(o.company_id.logo),180, 85)}
13 </td>
14 <td class='dir_font'>
15 <div class='company_font'>${o.company_id.name or ''|entity}</div>
16 <br>${o.company_id.partner_id.street or ''|entity} No.
17 ${o.company_id.partner_id.l10n_mx_street4 or ''|entity}
18 ${o.company_id.partner_id.l10n_mx_street3 or ''|entity}
19 ${o.company_id.partner_id.street2 or ''|entity}
20 ${o.company_id.partner_id.zip or ''|entity}
21 <br/>${o.company_id.partner_id.city or ''|entity}
22 , ${o.company_id.partner_id.state_id.name or ''|entity}
23 , ${o.company_id.partner_id.country_id.name or ''|entity}
24 </td>
25 <td class='date_font'>
26 <div>${_("Printing Date:")} ${time.strftime('%Y-%m-%d %H:%M:%S')}</div>
27 </td>
28
29 </tr>
30 </table>
31
32 <table>
33 <tr>
34 <div>${_("Journal Entries: ")} ${o.name or '' |entity}</div>
35
36 </tr>
37 <tr>
38 <div>${_("Reference: ")} ${o.ref or '' |entity}</div>
39 </tr>
40 <tr>
41 <div>${_("Date: ")} ${o.date or '' |entity}</div>
42 </tr>
43
44 </table>
45
46 <table width= '100%' class='title'>
47 <tr>
48 <td width='14%'>
49 <div>${_("Name")}</div>
50 </td>
51 <td width='14%'>
52 <div>${_("Partner")}</div>
53 </td>
54 <td width='27%'>
55 <div>${_("Account")}</div>
56 </td>
57 <td width='7%'>
58 <div>${_("Due date")}</div>
59 </td>
60 <td width='12%'>
61 <div>${_("Debit")}</div>
62 </td>
63 <td width='12%'>
64 <div>${_("Credit")}</div>
65 </td>
66 <td width='14%'>
67 <div>${_("Analytic Account")}</div>
68 </td>
69 </tr>
70 </table>
71
72 <table width= '100%' class='table'>
73 %for line in o.line_id:
74 <tr>
75 <td width='14%' class='basic_td'>
76 <div>${line.name or '' |entity}</div>
77 </td>
78 <td width='14%' class='basic_td'>
79 <div>${line.partner_id.name}</div>
80 </td>
81 <td width='27%' class='basic_td'>
82 <div>${line.account_id.code or '' |entity} - ${line.account_id.name or '' |entity}</div>
83 </td>
84 <td width='7%' class='basic_td'>
85 <div>${line.date_maturity or '' |entity}</div>
86 </td>
87 <td width='12%' class='basic_td' style="text-align:right;">
88 <div>${line.debit or '0.00' |entity}</div>
89 </td>
90 <td width='12%' class='basic_td' style="text-align:right;">
91 <div>${line.credit or '0.00' |entity}</div>
92 </td>
93 <td width='14%' class='basic_td'>
94 <div>${line.analytic_account_id.name or '' |entity}</div>
95 </td>
96 </tr>
97 %endfor
98 </table>
99 <table width= '100%' class='table'>
100 <tr>
101 <td width='14%'></td>
102 <td width='37%'></td>
103 <td width='7%'></td>
104 <td style="border-top:1px solid #000000; text-align:right;" class='basic_td'>
105 <div width='14%' >${formatLang(get_total_debit_credit(o.line_id)['sum_tot_debit']) or '0.00' |entity}</div>
106 </td>
107 <td style="border-top:1px solid #000000; text-align:right;" class='basic_td'>
108 <div width='14%'>${formatLang(get_total_debit_credit(o.line_id)['sum_tot_credit']) or '0.00' |entity}</div>
109 </td>
110 <td width='14%'></td>
111 </tr>
112
113 </table>
114<p style="page-break-after:always"></p>
115 %endfor
116
117 </body>
118</html>