Merge lp:~vauxoo/openerp-venezuela-localization/7.0-unleashed into lp:openerp-venezuela-localization

[Nhomar - Vauxoo]

Varias cosas resueltas.

- Varias vistas estaban incorrectamente organizadas.

- La vista de partenr Form estaba sobreescrita por completo perdiento la posibilidad de manejar la forma original en v7.0 padre - > Hijo con contactos.

- Varios errores no leíbles por humano manejados para poder dar mensajes que guíen al usuario a saber que configurar, sobre todo referido a los journals y a las cuentas contables, dejando inutilizable las facturas de compra.

- Agregada dependencia a Document.

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Antes de mezclar debes poner el archivo actualizado pot en el módulo que
modificas.

Saludos
On Nov 14, 2013 2:07 AM, <email address hidden> wrote:

> The proposal to merge
> lp:~vauxoo/openerp-venezuela-localization/7.0-unleashed into
> lp:openerp-venezuela-localization has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/7.0-unleashed/+merge/195174
> --
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/7.0-unleashed/+merge/195174
> You are subscribed to branch lp:openerp-venezuela-localization.
>

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Esto debido a que estuviste creando contenido que es sensible a ser
traducido
On Nov 14, 2013 2:59 AM, "Humberto Arocha" <email address hidden> wrote:

> Antes de mezclar debes poner el archivo actualizado pot en el módulo que
> modificas.
>
> Saludos
> On Nov 14, 2013 2:07 AM, <email address hidden> wrote:
>
>> The proposal to merge
>> lp:~vauxoo/openerp-venezuela-localization/7.0-unleashed into
>> lp:openerp-venezuela-localization has been updated.
>>
>> Status: Needs review => Merged
>>
>> For more details, see:
>>
>> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/7.0-unleashed/+merge/195174
>> --
>>
>> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/7.0-unleashed/+merge/195174
>> You are subscribed to branch lp:openerp-venezuela-localization.
>>
>

=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2013-11-14 06:32:44 +0000
@@ -12,58 +12,52 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
+                <!-- Dates on invoices necesary to include the concept of "received by customer" -->
                 <xpath expr="//field[@name='date_invoice']" position="replace">
-                    <group colspan="6" cols="2">
-                        <field name="date_invoice"/>
-                        <label align="0.0" string="(keep empty to use the current date, this will be date used in accounting and Fiscal moves)"/>
-                    </group>
-                    <newline/>
-                    <group colspan="6" cols="2">
-                        <field name="date_document"/>
-                        <label align="0.0" string="(Put here the date when Sale Invoice was delivered to customer)"/>
-                    </group>
-                    <newline/>
-                </xpath>
-                
+                    <group colspan="4" cols="2">
+                    <group colspan="1" cols="1">
+                        <label for="date_invoice" />
+                        <newline/>
+                        <field name="date_invoice" nolabel="1"/>
+                        <newline/>
+                        <label
+                            string="(keep empty to use the current date, this will be date used in accounting and Fiscal moves)"/>
+                    </group>
+                    <group colspan="1" cols="1">
+                        <label for="date_document" />
+                        <newline/>
+                        <field name="date_document" nolabel="1"/>
+                        <newline/>
+                        <label string="(Put here the date when Sale Invoice was delivered to customer)"/>
+                    </group>
+                    </group>
+                    <newline/>
+                </xpath> <!-- End of dates Section -->
                 <xpath expr="//page[@string='Payments']" position="after">
                     <page string="Debit-Credit Notes" attrs="{'invisible':['|','|',('type','=','in_refund'),('type','=','out_refund'),('parent_id','!=',False)]}">
                         <newline/>
                         <field name="child_ids" nolabel="1" widget="many2many" domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['out_invoice', 'out_refund'])]"/>
                     </page>
                 </xpath>
-                
                 <xpath expr="//page[@string='Other Info']/group/group[2]" position="after">
-                      
                     <group colspan="2">
                      <separator colspan="6" string="Fiscal Information"/>
                         <field name="sin_cred"/>
-                        <!--
-                             <field name="invoice_printer" groups="parameters_fiscal_printer.group_parameters_fiscal_printer_user"/>
-                        <field name="fiscal_printer" groups="parameters_fiscal_printer.group_parameters_fiscal_printer_user"/>
-                        -->
                         <field name="loc_req" invisible="1"/>
                         <field name="invoice_printer" attrs="{'invisible':[('loc_req','=',True)]}"/>
                         <field name="fiscal_printer" attrs="{'invisible':[('loc_req','=',True)]}"/>
                         <field name="z_report" attrs="{'invisible':[('loc_req','=',True)]}"/>
-                        
                         <field name="parent_id" attrs="{'invisible':[('parent_id','=',False)]}" domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['out_invoice', 'out_refund'])]"/>
                         <field name="nro_ctrl"/>
-                        <button name="%(action_wiz_nroctrl)d" type="action" string="Change control number" icon="gtk-execute" colspan="6"/>
+                        <button name="%(action_wiz_nroctrl)d" type="action" string="Change control number" colspan="6"/>
                     </group>
                 </xpath>
-<!--
-                <xpath expr="//field[@name='address_invoice_id']" position="replace">
-                    <field name="address_invoice_id"  domain="[('partner_id','=',partner_id), ('type','=','invoice')]"/>
-                </xpath>
--->
-                <xpath expr="//button[@string='Refund Invoice']" position="after">
-                    <button name="%(action_account_invoice_debit)d" type="action" string="Debit Note" icon="gtk-execute" attrs="{'invisible':['|','|',('state','in',['proforma2','proforma','cancel', 'draft']),('type','in',['out_refund', 'in_refund']),('parent_id','!=',False)]}"/>
-                </xpath>
-                <xpath expr="//button[@string='Refund Invoice']" position="after">
-                    <button name="%(action_account_invoice_parent)d" type="action" string="Parent Invoice" states="open,paid" icon="gtk-execute" attrs="{'invisible':[('type','!=','out_refund')]}"/>
+                <xpath expr="//button[@string='Refund Invoice']" position="after">
+                    <button name="%(action_account_invoice_debit)d" type="action" string="Debit Note" attrs="{'invisible':['|','|',('state','in',['proforma2','proforma','cancel', 'draft']),('type','in',['out_refund', 'in_refund']),('parent_id','!=',False)]}"/>
+                    <button name="%(action_account_invoice_parent)d" type="action" string="Parent Invoice" states="open,paid" attrs="{'invisible':[('type','!=','out_refund')]}"/>
                 </xpath>
                 <xpath expr="//button[@string='Refund Invoice']" position="replace">
-                         <button name="%(account.action_account_invoice_refund)d" type="action" string="Refund Invoice" icon="gtk-execute" attrs="{'invisible':['|',('type','in',['out_refund', 'in_refund']),('parent_id','!=',False)]}"/> 
+                         <button name="%(account.action_account_invoice_refund)d" type="action" string="Refund Invoice" attrs="{'invisible':['|',('type','in',['out_refund', 'in_refund']),('parent_id','!=',False)]}"/> 
                             
                 </xpath>
             </field>
@@ -82,10 +76,11 @@
             <field name="inherit_id" ref="account.invoice_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='origin']" position="after">
-                    <field name="parent_id"/>
+                    <field name="parent_id" string="Invoice Related"/>
                 </xpath>
             </field>
         </record>
+
     <!-- 
     =====================================================
     Invoices Extension SUPPLIER
@@ -99,14 +94,21 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='date_invoice']" position="replace">
-                    <group colspan="6" cols="2">
-                        <field name="date_invoice"/>
-                        <label align="0.0" string="(keep empty to use the current date, this will be date used in accounting and Fiscal moves)"/>
-                   </group>
-                    <newline/>
-                    <group colspan="6" cols="2">
-                        <field name="date_document"/>
-                        <label align="0.0" string="(Put here the date when Purchase Invoice was generated for the supplier)"/>
+                    <group colspan="4" cols="2">
+                    <group colspan="1" cols="1">
+                        <label for="date_invoice" />
+                        <newline/>
+                        <field name="date_invoice" nolabel="1"/>
+                        <newline/>
+                        <label string="(keep empty to use the current date, this will be date used in accounting and Fiscal moves)"/>
+                    </group>
+                    <group colspan="1" cols="1">
+                        <label for="date_document"/>
+                        <newline/>
+                        <field name="date_document" nolabel="1"/>
+                        <newline/>
+                        <label string="(Put here the date when Purchase Invoice was generated for the supplier)"/>
+                    </group>
                     </group>
                    <newline/>
                 </xpath>
@@ -116,21 +118,17 @@
                         <field name="sin_cred"/>
                         <field name="parent_id" attrs="{'invisible':[('parent_id','=',False)]}" domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['out_invoice', 'out_refund'])]"/>
                         <field name="nro_ctrl" required="1"/>
-                        <button name="%(action_wiz_nroctrl)d" type="action" string="Change control number" icon="gtk-execute" colspan="6"/>
+                        <button name="%(action_wiz_nroctrl)d" type="action"
+                            string="Change control number" colspan="6"
+                            help="One time you print the invoice you must set the control number pre-printed in the paper, this is the button."/>
                     </group>
                 </xpath>
 
                 <xpath expr="//button[@string='Ask Refund']" position="replace">
-                    <button name="%(account.action_account_invoice_refund)d" type="action" string="Refund Invoice" states="open,paid" icon="gtk-execute"/>
-                </xpath>
-
-
-<!--
-                <xpath expr="//field[@name='supplier_invoice_number']" position="after">
-                    <field name="address_invoice_id"  domain="[('partner_id','=',partner_id), ('type','=','invoice')]"/>
-                </xpath>
--->
-                
+                    <button name="%(account.action_account_invoice_refund)d" type="action"
+                        string="Refund Invoice" states="open,paid"
+                        help="Create an Refund to pay this invoice, remember validate it this wizard only will relate both invoices."/>
+                </xpath>
                 <xpath expr="//page[@string='Payments']" position="after">
                     <page string="Debit-Credit Notes" attrs="{'invisible':['|','|',('type','=','in_refund'),('type','=','out_refund'),('parent_id','!=',False)]}">
                         <field name="child_ids" nolabel="1" widget="many2many" domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['in_invoice', 'in_refund'])]"/>
@@ -138,10 +136,12 @@
                 </xpath>
                 
                 <xpath expr="//button[@string='Refund Invoice']" position="after">
-                    <button name="%(action_account_invoice_debit)d" type="action" string="Debit Note" icon="gtk-execute" attrs="{'invisible':['|',('state','in',['proforma2','proforma','cancel', 'draft']),('type','in',['out_refund', 'in_refund'])]}"/>
+                    <button name="%(action_account_invoice_debit)d" type="action"
+                        string="Debit Note" attrs="{'invisible':['|',('state','in',['proforma2','proforma','cancel', 'draft']),('type','in',['out_refund', 'in_refund'])]}"
+                        help="A debit note from accounting and fiscal point of view is exactly as an invoice but with a parent invoice related, this module create an invoice automatically with this invoice as parent, remember Debit note will increase the payable and receivable exactly as an invoice."/>
                 </xpath>
                 <xpath expr="//button[@string='Refund Invoice']" position="after">
-                    <button name="%(action_account_invoice_parent)d" type="action" string="Parent Invoice" states="open,paid" icon="gtk-execute" attrs="{'invisible':[('type','!=','in_refund')]}"/>
+                    <button name="%(action_account_invoice_parent)d" type="action" string="Parent Invoice" states="open,paid" attrs="{'invisible':[('type','!=','in_refund')]}" help="If you want re-asign a parent invoice and avoid do this repeating all the process this is the button to do that, reasing securely a parent invoice to a debit note or a credit note."/>
                 </xpath>
 
             </field>
@@ -184,8 +184,6 @@
             <field name="act_window_id" ref="action_sale_debit_tree"/>
         </record>
 
-
-
         <menuitem action="action_sale_debit_tree" id="menu_action_sale_debit_tree" parent="account.menu_finance_receivables"/>
 
         <record id="action_purchase_debit_tree" model="ir.actions.act_window">
@@ -232,4 +230,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'l10n_ve_fiscal_requirements/view/partner_view.xml'
--- l10n_ve_fiscal_requirements/view/partner_view.xml	2013-05-31 20:17:10 +0000
+++ l10n_ve_fiscal_requirements/view/partner_view.xml	2013-11-14 06:32:44 +0000
@@ -1,51 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <openerp>
   <data>
-
-    <record id="view_partner_form2" model="ir.ui.view">
-        <field name="name">res.partner.vat.inherit2</field>
+    <record id="view_partner_form_ve" model="ir.ui.view">
+        <field name="name">res.partner.ve</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
-
-        <xpath expr="//button[@name=&quot;button_check_vat&quot;]" position="replace"/>
-        <xpath expr="//field[@name=&quot;vat&quot;]" position="replace"/>
-
-        <xpath expr="//field[@name='name']" position="replace">
+        <xpath expr="//div[@name='buttons']" position="inside">
             <field name="seniat_updated" invisible="1"/>
-            <field name="name" attrs="{'readonly': [('seniat_updated', '!=', False)]}"/>
+            <field name="uid_country" colspan="2" invisible="1"/>
+            <button name="%(action_wiz_name)d" string="Update Name" type="action"
+                help="Connect to SENIAT and update the name of the partner given an VAT Number. (See Accounting tab to write the VAT Number)"/>
         </xpath>
-
-            <xpath expr="//label[@for=&quot;vat&quot;]" position="replace">
-            </xpath>
-            <xpath expr="//field[@name=&quot;vat_subjected&quot;]" position="replace">
-            </xpath>
-
-          <xpath expr="//field[@name=&quot;parent_id&quot;]" position="before">
-             <label for="vat"/>
-             <field name="vat" colspan="2" placeholder="e.g. VE123456789" class="oe_inline" attrs="{'required':[('uid_country','=','VE'),'|','&amp;','&amp;',('is_company','=',False),('parent_id','!=',False),('type','=','invoice'), ('parent_id','=',False)] }"/>
-             <button name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/>
-             <button name="%(action_wiz_name)d" string="Update Name" type="action" icon="gtk-execute" class="oe_inline"/>
-            <field name="uid_country" colspan="2" invisible="1"/>
-          </xpath>
-
-          <xpath expr="//field[@name=&quot;street&quot;]" position="replace">
-          <field name="street" placeholder="Av. Siempre Viva" colspan="2" attrs="{'required':[('uid_country','=','VE'),'|','&amp;','&amp;',('is_company','=',False),('parent_id','!=',False),('type','=','invoice'), ('parent_id','=',False)] }"/>
-          </xpath>
-          
-          <xpath expr="//field[@name=&quot;city&quot;]" position="replace">
-          <field name="city" placeholder="Caracas" colspan="2" attrs="{'required':[('uid_country','=','VE'),'|','&amp;','&amp;',('is_company','=',False),('parent_id','!=',False),('type','=','invoice'), ('parent_id','=',False)] }"/>
-          </xpath>
-          
-          <xpath expr="//field[@name=&quot;country_id&quot;]" position="replace">
-          <field name="country_id" placeholder="Venezuela" class="oe_no_button" options="{&quot;no_open&quot;: True}" colspan="2" attrs="{'required':[('uid_country','=','VE'),'|','&amp;','&amp;',('is_company','=',False),('parent_id','!=',False),('type','=','invoice'), ('parent_id','=',False)] }"/>
-          </xpath>
-
-          <xpath expr="//field[@name=&quot;phone&quot;]" position="replace">
-          <field name="phone" placeholder="[phone]" class="oe_no_button" options="{&quot;no_open&quot;: True}" colspan="2" attrs="{'required':[('uid_country','=','VE'),'|','&amp;','&amp;',('is_company','=',False),('parent_id','!=',False),('type','=','invoice'), ('parent_id','=',False)] }"/>
-          </xpath>
         </field>
     </record>
-
   </data>
 </openerp>

=== modified file 'l10n_ve_withholding/view/l10n_ve_withholding_view.xml'
--- l10n_ve_withholding/view/l10n_ve_withholding_view.xml	2013-05-31 20:17:10 +0000
+++ l10n_ve_withholding/view/l10n_ve_withholding_view.xml	2013-11-14 06:32:44 +0000
@@ -55,7 +55,7 @@
         <record id="wh_partner" model="ir.ui.view">
             <field name="name">res.partner.form.wh</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="l10n_ve_fiscal_requirements.view_partner_form2"/>
+            <field name="inherit_id" ref="l10n_ve_fiscal_requirements.view_partner_form_ve"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Internal Notes']" position="after">
                    <page string="Withholdings">

=== modified file 'l10n_ve_withholding_islr/model/invoice.py'
--- l10n_ve_withholding_islr/model/invoice.py	2013-11-11 16:26:50 +0000
+++ l10n_ve_withholding_islr/model/invoice.py	2013-11-14 06:32:44 +0000
@@ -174,13 +174,14 @@
         wh_ret_code = wh_doc_obj.retencion_seq_get(cr, uid)
 
         if wh_ret_code:
+            journal = wh_doc_obj._get_journal(cr, uid, context=context)
             islr_wh_doc_id = wh_doc_obj.create(cr, uid,
                                                {'name': wh_ret_code,
                                                 'partner_id': row.partner_id.id,
                                                 'period_id': row.period_id.id,
                                                 'account_id': row.account_id.id,
                                                 'type': row.type,
-                                                'journal_id': wh_doc_obj._get_journal(cr, uid, context=context), })
+                                                'journal_id': journal, })
             self._create_doc_invoices(cr, uid, row.id, islr_wh_doc_id)
 
             self.pool.get('islr.wh.doc').compute_amount_wh(cr, uid,

=== modified file 'l10n_ve_withholding_islr/model/islr_wh_doc.py'
--- l10n_ve_withholding_islr/model/islr_wh_doc.py	2013-07-23 14:23:34 +0000
+++ l10n_ve_withholding_islr/model/islr_wh_doc.py	2013-11-14 06:32:44 +0000
@@ -70,6 +70,11 @@
         if res:
             return res[0]
         else:
+            raise osv.except_osv(_('Configuration Incomplete.'),
+                _("""I couldn't find a journal to execute the Witholding ISLR
+                automatically, please create one in Accounting > Configuration > Journals, contact
+                to the account manager if you don't have access to this menu.!!!"""))
+
             return False
 
     def _get_currency(self, cr, uid, context):
@@ -782,6 +787,11 @@
             for i in ail_brws:
                 values = self._get_xml_lines(cr, uid, i, context=context)
                 values.update({'islr_wh_doc_inv_id': ret_line.id, })
+                if not values.get('supplier_invoice_number'):
+                    raise osv.except_osv(_("Error on Human Process"),
+                    _("Please fill the Invoice number to continue, without this number will be"
+                      " imposible form the system make the withholding"))
+                    
                 #~ Vuelve a crear las lineas
                 xml_id = ixwl_obj.create(cr, uid, values, context=context)
                 #~ Write back the new xml_id into the account_invoice_line

=== modified file 'ovl/__openerp__.py'
--- ovl/__openerp__.py	2013-03-05 15:25:37 +0000
+++ ovl/__openerp__.py	2013-11-14 06:32:44 +0000
@@ -30,6 +30,7 @@
                  "l10n_ve_withholding_islr" ,
                  "l10n_ve_withholding_muni",
                  "l10n_ve_withholding_src",
+                 "document",
                  #TODO: Uncomment when Fiscal Book Module becomes ready
                  #"l10n_ve_fiscal_book",