Merge lp:~isaako34/moylop260-project/ot_fmt-account_invoice-regularization-receipt-dev-yzk into lp:~moylop260-team/moylop260-project/ot_fmt

[Isaac López Zúñiga]

add regularization receipt

[Moisés López - http://www.vauxoo.com (moylop260)]

El metodo onchange debe de mandar lo que recibe a su super clase y no mandarle los defaults de los parametros.

El rml sigue apareciendo o.partner_id.programa_id
En vez de obtenerlo directamente de la factura.

review: Needs Fixing

=== modified file 'account_invoice_receipt/report/voucher_receipt_report.py'
--- account_invoice_receipt/report/voucher_receipt_report.py	2011-07-12 15:37:40 +0000
+++ account_invoice_receipt/report/voucher_receipt_report.py	2011-12-05 16:27:25 +0000
@@ -40,7 +40,7 @@
             'get_address': self._get_address,
             'amount_to_text': self._get_amount_to_text,
         })
-        
+
     def _get_amount_to_text(self, amount, lang, currency=""):
         if currency.upper() in ('MXP', 'MXN', 'PESOS', 'PESOS MEXICANOS'):
             sufijo = 'M. N.'
@@ -55,10 +55,10 @@
         amount_text = amount_text and amount_text.upper() or ''
         return amount_text
 
-    
+
     def _get_address(self):
         return self.address
-    
+
     def _set_address(self, partner_id):
         partner_obj = self.pool.get('res.partner')
         partner_address_obj = self.pool.get('res.partner.address')
@@ -67,5 +67,5 @@
         self.address = address
         #return address
         return ""
-    
-report_sxw.report_sxw('report.account.payment.voucher.receipt', 'account.invoice', 'addons/account_invoice_receipt/report/voucher_voucher_receipt_report.rml', parser=voucher_receipt_report, header=False)
+
+report_sxw.report_sxw('report.account.payment.voucher.receipt', 'account.invoice', 'addons/account_invoice_receipt/report/voucher_receipt_report.rml', parser=voucher_receipt_report, header=False)

=== modified file 'account_invoice_receipt/report/voucher_receipt_report.rml'
--- account_invoice_receipt/report/voucher_receipt_report.rml	2011-07-13 19:04:04 +0000
+++ account_invoice_receipt/report/voucher_receipt_report.rml	2011-12-05 16:27:25 +0000
@@ -1,168 +1,167 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="12.0" y1="57.0" width="510" height="764"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="Standard">[[ repeatIn(objects, 'o') ]] [[ set_address( o.partner_id.id ) ]]</para>
-    <section>
-      <para style="Standard">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="15.0,350.0,146.0" style="Tabla1">
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">[[ o.date_invoice and time.strftime('%d/%m/%Y', time.strptime( o.date_invoice, '%Y-%m-%d')) or '.' ]]</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="85.0,425.0" style="Tabla2">
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P2">( [[ o.partner_id.ref or '']] ) [[ get_address().name or o.partner_id.name or '.' ]] [[ o.partner_id.vat or '.' ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P2">[[ amount_to_text(o.amount_total, 'es_cheque', 'GTQ') ]]</para>
-            <para style="P2">[[ get_address().street ]] [[ get_address().street2 ]] [[ get_address().city ]] [[ get_address().state_id and get_address().state_id.name ]] [[ get_address().zip ]] [['.']]</para>
-            <para style="P2">[[ ', '.join( [line.name for line in o.invoice_line if line.name] ) ]]</para>
-            <para style="P2">[[ (o.partner_id.programa_id and o.partner_id.programa_id.name!='Administracion' or not o.partner_id.programa_id) and (o.partner_id.partner_alumno_ids and o.partner_id.partner_alumno_ids[0] and o.partner_id.partner_alumno_ids[0].name) or (o.partner_id.customer and o.partner_id.name) or '' ]] --- [[ o.partner_id.programa_id and o.partner_id.programa_id.name!='Administracion' and o.partner_id.programa_id.name or '' ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="Standard">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="98.0,156.0,156.0,101.0" style="Tabla3">
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="255.0,255.0" style="Tabla4">
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P3">
-              <font color="white"> </font>
-            </para>
-            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="Standard">
-        <font color="white"> </font>
-      </para>
-      <para style="Standard">
-        <font color="white"> </font>
-      </para>
-    </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
-
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="12.0" y1="57.0" width="510" height="764"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="Standard">[[ repeatIn(objects, 'o') ]] [[ set_address( o.partner_id.id ) ]]</para>
+    <section>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="15.0,350.0,146.0" style="Tabla1">
+        <tr>
+          <td>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P1">[[ o.date_invoice and time.strftime('%d/%m/%Y', time.strptime( o.date_invoice, '%Y-%m-%d')) or '.' ]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="85.0,425.0" style="Tabla2">
+        <tr>
+          <td>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P2">( [[ o.partner_id.ref or '']] ) [[ get_address().name or o.partner_id.name or '.' ]] [[ o.partner_id.vat or '.' ]] </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P2">[[ amount_to_text(o.amount_total, 'es_cheque', 'GTQ') ]]</para>
+            <para style="P2">[[ get_address().street ]] [[ get_address().street2 ]] [[ get_address().city ]] [[ get_address().state_id and get_address().state_id.name ]] [[ get_address().zip ]] [['.']]</para>
+            <para style="P2">[[ ', '.join( [line.name for line in o.invoice_line if line.name] ) ]]</para>
+            <para style="P2">[[ ( o.programa_id and o.programa_id.name!='Administracion' or not o.programa_id) and (o.partner_id.partner_alumno_ids and o.partner_id.partner_alumno_ids[0] and o.partner_id.partner_alumno_ids[0].name) or (o.partner_id.customer and o.partner_id.name) or '' ]] --- [[ o.programa_id and o.programa_id.name!='Administracion' and o.programa_id.name or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="98.0,156.0,156.0,101.0" style="Tabla3">
+        <tr>
+          <td>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P1">
+              <font color="white"> </font>
+            </para>
+            <para style="P1">
+              <font color="white"> </font>
+            </para>
+            <para style="P1">
+              <font color="white"> </font>
+            </para>
+            <para style="P1">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P1">
+              <font color="white"> </font>
+            </para>
+            <para style="P1">
+              <font color="white"> </font>
+            </para>
+            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
+          </td>
+          <td>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="255.0,255.0" style="Tabla4">
+        <tr>
+          <td>
+            <para style="Table Contents">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P3">
+              <font color="white"> </font>
+            </para>
+            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

=== modified file 'account_invoice_receipt/report/voucher_receipt_report.sxw'
Binary files account_invoice_receipt/report/voucher_receipt_report.sxw	2011-07-13 19:04:04 +0000 and account_invoice_receipt/report/voucher_receipt_report.sxw	2011-12-05 16:27:25 +0000 differ
=== added directory 'account_invoice_regularization_receipt'
=== added file 'account_invoice_regularization_receipt/__init__.py'
--- account_invoice_regularization_receipt/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_regularization_receipt/__init__.py	2011-12-05 16:27:25 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2011 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    Info ([e-mail])
+############################################################################
+#    Coded by: moylop260 ([e-mail])
+#    Coded by: isaac ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import account_invoice_regularization_receipt

=== added file 'account_invoice_regularization_receipt/__openerp__.py'
--- account_invoice_regularization_receipt/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_regularization_receipt/__openerp__.py	2011-12-05 16:27:25 +0000
@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2011 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    Info ([e-mail])
+############################################################################
+#    Coded by: moylop260 ([e-mail])
+#    Coded by: isaac ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Partner Custom For FMT",
+    "version" : "1.0",
+    "author" : "Vauxoo",
+    "category" : "Localization/Guatemala",
+    "description" : """This module add custom fields to account.invoice.
+    """,
+    "website" : "http://www.vauxoo.com",
+    "license" : "AGPL-3",
+    "depends" : ["base","account","partner_custom_fmt"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+        "account_invoice_regularization_receipt_view.xml",
+    ],
+    "installable" : True,
+    "active" : False,
+}

=== added file 'account_invoice_regularization_receipt/account_invoice_regularization_receipt.py'
--- account_invoice_regularization_receipt/account_invoice_regularization_receipt.py	1970-01-01 00:00:00 +0000
+++ account_invoice_regularization_receipt/account_invoice_regularization_receipt.py	2011-12-05 16:27:25 +0000
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2011 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    Info ([e-mail])
+############################################################################
+#    Coded by: moylop260 ([e-mail])
+#    Coded by: isaac ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id, date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+        res = super(account_invoice,self).onchange_partner_id(cr, uid, ids, type, partner_id, date_invoice, payment_term, partner_bank_id, company_id)
+        partner_obj = self.pool.get('res.partner')
+        if partner_id:
+            partner_brw = partner_obj.browse(cr, uid, partner_id)
+
+        res['value']['visita_id'] = partner_id and partner_brw.visita_id.id or False
+        res['value']['programa_id'] = partner_id and partner_brw.programa_id.id or False
+        res['value']['medio_id'] = partner_id and partner_brw.medio_id.id or False
+        res['value']['frecuencia_id'] = partner_id and partner_brw.frecuencia_id.id or False
+        return res
+
+    _columns = {
+        'visita_id': fields.many2one('res.partner.visita', "Fecha de visita"),
+        'programa_id': fields.many2one('res.partner.programa', "Programa"),
+        'medio_id': fields.many2one('res.partner.medio', "Medio"),
+        'frecuencia_id': fields.many2one('res.partner.frecuencia', "Frecuencia"),
+    }
+account_invoice()

=== added file 'account_invoice_regularization_receipt/account_invoice_regularization_receipt_view.xml'
--- account_invoice_regularization_receipt/account_invoice_regularization_receipt_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_regularization_receipt/account_invoice_regularization_receipt_view.xml	2011-12-05 16:27:25 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_account_invoice_form_inh_custom_fmt">
+            <field name="name">view.account.invoice.form.inh.custom.fmt</field>
+            <field name="type">form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Payments']" position="after">
+                    <page string="FMT">
+                        <field name="programa_id"/>
+                        <field name="medio_id"/>
+                        <field name="frecuencia_id"/>
+                        <field name="visita_id"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>