← Back to team overview

clearcorp team mailing list archive

lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_voucher_feature into lp:openerp-costa-rica

 

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_voucher_feature into lp:openerp-costa-rica.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_voucher_feature/+merge/113656

Merge account_voucher_date (openerp-ccorp-addons) to l10n_cr_account_voucher
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_account_voucher_feature/+merge/113656
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_account_voucher/__init__.py'
--- l10n_cr_account_voucher/__init__.py	2012-05-29 20:59:10 +0000
+++ l10n_cr_account_voucher/__init__.py	2012-07-05 22:28:18 +0000
@@ -21,6 +21,6 @@
 ##############################################################################
 
 
-import account_voucher
+import l10n_cr_account_voucher
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_voucher/l10n_cr_account_voucher.py'
--- l10n_cr_account_voucher/l10n_cr_account_voucher.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_voucher/l10n_cr_account_voucher.py	2012-07-05 22:28:18 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    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 netsvc
+from osv import fields, orm
+import tools
+from tools.translate import _
+
+class AccountVoucher(orm.Model):
+    _inherit = 'account.voucher'
+    
+    _defaults = {
+        'date': '',
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_cr_account_voucher/l10n_cr_account_voucher_view.xml'
--- l10n_cr_account_voucher/l10n_cr_account_voucher_view.xml	2012-05-29 15:35:04 +0000
+++ l10n_cr_account_voucher/l10n_cr_account_voucher_view.xml	2012-07-05 22:28:18 +0000
@@ -16,7 +16,7 @@
             </field>
         </record>
 
-	<record id="cr_account_voucher_form" model="ir.ui.view">
+        <record id="cr_account_voucher_form" model="ir.ui.view">
             <field name="name">cr.account.voucher.form</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>

=== modified file 'l10n_cr_account_voucher/l10n_cr_voucher_payment_receipt_view.xml'
--- l10n_cr_account_voucher/l10n_cr_voucher_payment_receipt_view.xml	2012-05-29 15:35:04 +0000
+++ l10n_cr_account_voucher/l10n_cr_voucher_payment_receipt_view.xml	2012-07-05 22:28:18 +0000
@@ -16,7 +16,7 @@
             </field>
         </record>
 
-	<record id="cr_view_vendor_payment_form" model="ir.ui.view">
+        <record id="cr_view_vendor_payment_form" model="ir.ui.view">
             <field name="name">cr.view.vendor.payment.form</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
@@ -26,11 +26,14 @@
                     <field name = "reference" position = "replace">
                         <field name="reference" select="1" required="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                     </field>
+                    <field name = "date" position = "replace">
+                        <field name="date" select="1" required = "1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                    </field>
                 </data>
             </field>
         </record>
 
-	<record id="cr_view_vendor_receipt_form" model="ir.ui.view">
+        <record id="cr_view_vendor_receipt_form" model="ir.ui.view">
             <field name="name">cr.view.vendor.receipt.form</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
@@ -40,6 +43,9 @@
                     <field name = "reference" position = "replace">
                         <field name="reference" select="1" required="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                     </field>
+                    <field name = "date" position = "replace">
+                        <field name="date" select="1" required = "1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                    </field>
                 </data>
             </field>
         </record>


Follow ups