Merge lp:~vauxoo/openerp-venezuela-localization/jose-split-invoice into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com]

 Link the split invoice with sale order

[Gabriela Quilarque (gabrielaquilarque97)]

Merge Realizado

review: Approve

=== modified file 'l10n_ve_split_invoice/invoice.py'
--- l10n_ve_split_invoice/invoice.py	2011-12-20 14:43:41 +0000
+++ l10n_ve_split_invoice/invoice.py	2012-02-09 20:20:27 +0000
@@ -46,13 +46,18 @@
                         'state': 'draft',
                         'number': False,
                         'invoice_line': [],
-                        'tax_line': []
+                        'tax_line': [],
                     })
                     # take the id part of the tuple returned for many2one fields
                     for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
                             'account_id', 'currency_id', 'payment_term', 'journal_id', 'period_id'):
                         invoice[field] = invoice[field] and invoice[field][0]
-
+                    
+                    if self.browse(cr,uid,inv.id,context={}).sale_ids:
+                        invoice.update({
+                        'sale_ids':[(6,0,[i.id for i in self.browse(cr,uid,inv.id,context={}).sale_ids])]
+                    })
+                        
                     inv_id = self.create(cr, uid, invoice)
                     cont = 0
                     lst = inv.invoice_line
@@ -62,7 +67,6 @@
                     for il in lst:
                         self.pool.get('account.invoice.line').write(cr,uid,il.id,{'invoice_id':inv_id})
                     self.button_compute(cr, uid, [inv.id], set_total=True)
-        
             if inv_id:
                 wf_service = netsvc.LocalService("workflow")
                 self.button_compute(cr, uid, [inv_id], set_total=True)

=== modified file 'l10n_ve_withholding_islr/i18n/es.po'
--- l10n_ve_withholding_islr/i18n/es.po	2012-01-17 00:07:23 +0000
+++ l10n_ve_withholding_islr/i18n/es.po	2012-02-09 20:20:27 +0000
@@ -21,6 +21,11 @@
 msgstr "NO APLICA RETENCION"
 
 #. module: l10n_ve_withholding_islr
+#: view:islr.wh.doc:0
+msgid "Print Withholding Income"
+msgstr "Imprimir comprobante de retención"
+
+#. module: l10n_ve_withholding_islr
 #: field:islr.wh.doc,date_uid:0
 msgid "Withhold Date"
 msgstr "Fecha de Retención"

=== modified file 'l10n_ve_withholding_islr/i18n/es_VE.po'
--- l10n_ve_withholding_islr/i18n/es_VE.po	2012-01-18 23:14:35 +0000
+++ l10n_ve_withholding_islr/i18n/es_VE.po	2012-02-09 20:20:27 +0000
@@ -26,6 +26,12 @@
 msgstr "Fecha de Retención"
 
 #. module: l10n_ve_withholding_islr
+#: view:islr.wh.doc:0
+msgid "Print Withholding Income"
+msgstr "Imprimir comprobante de retención"
+
+
+#. module: l10n_ve_withholding_islr
 #: help:islr.wh.concept,rate_ids:0
 msgid "Withholding Concept rate"
 msgstr "Tasa asociada al concepto de retención"

=== modified file 'l10n_ve_withholding_islr/islr_wh_report.xml'
--- l10n_ve_withholding_islr/islr_wh_report.xml	2012-01-17 00:22:56 +0000
+++ l10n_ve_withholding_islr/islr_wh_report.xml	2012-02-09 20:20:27 +0000
@@ -8,7 +8,10 @@
             rml="addons/l10n_ve_withholding_islr/report/wh_islr_report.rml" 
             string="Voucher Withholding Income"
             auto="False"
-            header="False"/>
+            header="False"
+            menu="False"
+            />
+
         <report
             id="list_report_withholding_islr" 
             menu="True"

=== modified file 'l10n_ve_withholding_islr/view/islr_wh_doc_view.xml'
--- l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2012-01-27 14:03:00 +0000
+++ l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2012-02-09 20:20:27 +0000
@@ -143,8 +143,9 @@
                             <field name="state"/>
                             <button name="act_progress" string="Progress" states="draft" icon="gtk-go-forward"/>
                             <button name="act_confirmed" string="Confirmed" states="progress" icon="gtk-go-forward"/>
-                            <button name="act_done" string="Done" states="confirmed" icon="gtk-execute"/>
-                            <button name="act_cancel" string="Cancel" states="done" icon="gtk-cancel"/>
+                            <button name="act_done" string="Done" states="confirmed" icon="gtk-execute" />
+                            <button name="%(voucher_report_withholding_islr)d" string="Print Withholding Income" states="done" colspan="3" type="action" icon="gtk-execute"/>
+                            <button name="act_cancel" string="Cancel" states="done" icon="gtk-cancel" colspan="2" />
                             <button name="act_draft" colspan="2" string="Set to draft" states="cancel" icon="gtk-go-forward"/>
                         </group>
                 </form>
@@ -284,7 +285,8 @@
                             <button name="act_progress" string="Progress" states="draft" type="workflow"  icon="gtk-go-forward"/>
                             <button name="act_confirmed" string="Confirmed" states="progress" type="workflow"  icon="gtk-go-forward"/>
                             <button name="act_done" string="Done" states="confirmed" type="workflow"  icon="gtk-go-forward"/>
-                            <button name="act_cancel" string="Cancel" states="done" type="workflow"  icon="gtk-go-forward"/>
+                            <button name="%(voucher_report_withholding_islr)d" string="Print Withholding Income" colspan="3" states="done" type="action" icon="gtk-execute"/>
+                            <button name="act_cancel" string="Cancel" states="done" type="workflow"  colspan="2" icon="gtk-go-forward"/>
                             <button name="act_draft"  colspan="2"  string="Set to draft" states="cancel" type="workflow"  icon="gtk-go-forward"/>
                         </group>
                 </form>

=== modified file 'l10n_ve_withholding_iva/i18n/es.po'
--- l10n_ve_withholding_iva/i18n/es.po	2012-02-06 19:05:01 +0000
+++ l10n_ve_withholding_iva/i18n/es.po	2012-02-09 20:20:27 +0000
@@ -21,6 +21,11 @@
 msgstr "Retención del IVA para leyes Venezolanas."
 
 #. module: l10n_ve_withholding_iva
+#: view:account.wh.iva:0
+msgid "Print Voucher Withholding VAT"
+msgstr "Imprimir comprobante de retención"
+
+#. module: l10n_ve_withholding_iva
 #: help:account.wh.iva.line,move_id:0
 msgid "Account entry"
 msgstr "Cuenta de entrada"

=== modified file 'l10n_ve_withholding_iva/i18n/es_VE.po'
--- l10n_ve_withholding_iva/i18n/es_VE.po	2012-02-06 19:05:01 +0000
+++ l10n_ve_withholding_iva/i18n/es_VE.po	2012-02-09 20:20:27 +0000
@@ -26,6 +26,11 @@
 msgstr "Cuenta de entrada"
 
 #. module: l10n_ve_withholding_iva
+#: view:account.wh.iva:0
+msgid "Print Voucher Withholding VAT"
+msgstr "Imprimir comprobante de retención"
+
+#. module: l10n_ve_withholding_iva
 #: view:txt.iva:0
 msgid "Withholding lines"
 msgstr "Lineas de Retención"

=== modified file 'l10n_ve_withholding_iva/report/withholding_vat_report.xml'
--- l10n_ve_withholding_iva/report/withholding_vat_report.xml	2012-01-03 15:23:32 +0000
+++ l10n_ve_withholding_iva/report/withholding_vat_report.xml	2012-02-09 20:20:27 +0000
@@ -6,8 +6,11 @@
             model="account.wh.iva" 
             name="account.wh.iva"
             rml="addons/l10n_ve_withholding_iva/report/withholding_vat_report.rml" 
-            string="Voucher Withhondig VAT"
+            string="Voucher Withholding VAT"
             auto="False"
-            header="True"/>
+            header="True"
+            menu="False"
+            />
+            
     </data>
 </openerp>

=== modified file 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
--- l10n_ve_withholding_iva/view/wh_iva_view.xml	2012-01-19 20:10:51 +0000
+++ l10n_ve_withholding_iva/view/wh_iva_view.xml	2012-02-09 20:20:27 +0000
@@ -176,6 +176,7 @@
                             </group>
                             <group col="2" colspan="2">
                                 <button name="cancel" colspan="2"  states="done" string="Cancel" icon="gtk-cancel"/>
+                                <button name="%(withholding_vat)d" type="action" colspan="2"  states="done" string="Print Voucher Withholding VAT" icon="gtk-execute"/>
                                 <button name="set_to_draft" colspan="2"  states="cancel" string="Set to draft" icon="terp-stock_effects-object-colorize"/>
                                 <button colspan="2" name="compute_amount_wh" states="draft" string="Compute Withholding Vat" type="object" icon="terp-stock_format-scientific"/>
                                 <field name="amount_base_ret"/>
@@ -227,6 +228,7 @@
                             </group>
                             <group col="2" colspan="2">
                              <button name="cancel" colspan="2"  states="done" string="Cancel" icon="gtk-cancel"/>
+                             <button name="%(withholding_vat)d" type="action" colspan="2"  states="done" string="Print Voucher Withholding VAT" icon="gtk-execute"/>
                              <button name="set_to_draft" colspan="2"  states="cancel" string="Set to draft" icon="terp-stock_effects-object-colorize"/>
                                
 <!--