Merge lp:~vxkikevx/openerp-venezuela-localization/luis-correcciondepagos into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Luis Escobar V. (Vauxoo)
Status: Merged
Merged at revision: 522
Proposed branch: lp:~vxkikevx/openerp-venezuela-localization/luis-correcciondepagos
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 26 lines (+3/-2)
2 files modified
l10n_ve_fiscal_requirements/view/account_invoice_view.xml (+1/-1)
l10n_ve_withholding_iva/model/invoice.py (+2/-1)
To merge this branch: bzr merge lp:~vxkikevx/openerp-venezuela-localization/luis-correcciondepagos
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
OpenERP para localizaciĆ³n Venezolana. Pending
Review via email: mp+88432@code.launchpad.net

Description of the change

Comment raise statement and return 0 in 'action_wh_iva_create' method

To post a comment you must log in.
522. By Luis Escobar V. (Vauxoo)

Comment raise statement and return 0 in 'action_wh_iva_create' method

523. By Luis Escobar V. (Vauxoo)

drop require to 'reference' field

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-01-09 18:21:14 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-01-12 23:34:23 +0000
@@ -57,7 +57,7 @@
57 <field name="inherit_id" ref="account.invoice_tree"/>57 <field name="inherit_id" ref="account.invoice_tree"/>
58 <field name="arch" type="xml">58 <field name="arch" type="xml">
59 <xpath expr="/tree/field[@name='name']" position="after">59 <xpath expr="/tree/field[@name='name']" position="after">
60 <field name="reference" required="1" />60 <field name="reference" />
61 </xpath>61 </xpath>
62 </field>62 </field>
63 </record>63 </record>
6464
=== modified file 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/model/invoice.py 2012-01-03 15:23:32 +0000
+++ l10n_ve_withholding_iva/model/invoice.py 2012-01-12 23:34:23 +0000
@@ -153,7 +153,8 @@
153 wh_iva_obj = self.pool.get('account.wh.iva')153 wh_iva_obj = self.pool.get('account.wh.iva')
154 for inv in self.browse(cr, uid, ids):154 for inv in self.browse(cr, uid, ids):
155 if inv.wh_iva_id:155 if inv.wh_iva_id:
156 raise osv.except_osv('Invalid Action !', _('This invoice is already withholded'))156 #raise osv.except_osv('Invalid Action !', _('This invoice is already withholded'))
157 return 0
157 ret_line = []158 ret_line = []
158 if inv.type in ('out_invoice', 'out_refund'):159 if inv.type in ('out_invoice', 'out_refund'):
159 acc_id = inv.partner_id.property_account_receivable.id160 acc_id = inv.partner_id.property_account_receivable.id