clearcorp team mailing list archive

[Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>]

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-account_voucher_reverse into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-account_voucher_reverse/+merge/119022

Add journal items reverse in view
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-account_voucher_reverse/+merge/119022
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'account_voucher_reverse/account_voucher_reverse.py'
--- account_voucher_reverse/account_voucher_reverse.py	2012-07-19 22:57:59 +0000
+++ account_voucher_reverse/account_voucher_reverse.py	2012-08-09 19:37:38 +0000
@@ -27,6 +27,7 @@
     _inherit = 'account.voucher'
 
     _columns = {
+        'move_line_reverse_ids' : fields.related('move_id', 'move_reverse_id', 'line_id', type='one2many', relation='account.move.line', string='Journal Items Reverse', readonly=True),
         'state':fields.selection(
             [('draft','Draft'),
              ('proforma','Pro-forma'),

=== modified file 'account_voucher_reverse/account_voucher_reverse_view.xml'
--- account_voucher_reverse/account_voucher_reverse_view.xml	2012-07-04 22:55:47 +0000
+++ account_voucher_reverse/account_voucher_reverse_view.xml	2012-08-09 19:37:38 +0000
@@ -11,31 +11,25 @@
                   <xpath expr = "/form/group/field[@name='state']" position = "after">
                         <button name="reverse_voucher" string="Reverse" type="object" states="posted" invisible="context.get('line_type', False)" icon="STOCK_REVERT_TO_SAVED" confirm="Are you sure to reverse this record ?"/>
                     </xpath>
-                    <xpath expr = "/form/notebook/page[@string='Journal Items']" position = "replace">
-                        <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': ['|','|',('state','=','draft'),('state','=','proforma'),('state','=','cancel')]}">
-                            <group col="6" colspan="4">
-                                <field name="period_id"/>
-                                <field name="audit"/>
-                            </group>
-                            <field name="number" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
-                               <tree string="Journal Items">
-                                   <field name="move_id"/>
-                                   <field name="ref"/>
-                                   <field name="date"/>
-                                   <field name="statement_id"/>
-                                   <field name="partner_id"/>
-                                   <field name="account_id"/>
-                                   <field name="name"/>
-                                   <field name="debit"/>
-                                   <field name="credit"/>
-                                   <field name="state"/>
-                                   <field name="reconcile_id"/>
-                                   <field name="amount_currency"/>
-                                   <field name="currency_id"/>
-                               </tree>
-                            </field>
-                        </page>
+                    <xpath expr = "/form/notebook/page[@string='Journal Items']" position = "attributes">
+                        <attribute name="attrs">{'invisible': [('state','in',['draft', 'proforma', 'cancel'])]}</attribute>
+                    </xpath>
+                    <xpath expr = "/form/notebook/page/field[@name='move_ids']" position = "after">
+                        <field name="move_line_reverse_ids" colspan="4" nolabel="1" readonly="1" attrs = "{'invisible' : [('state','!=','reverse')]}" >
+                            <tree string="Journal Items Reverse">
+                                <field name="move_id"/>
+                                <field name="ref"/>
+                                <field name="date"/>
+                                <field name="statement_id"/>
+                                <field name="partner_id"/>
+                                <field name="account_id"/>
+                                <field name="name"/>
+                                <field name="debit"/>
+                                <field name="credit"/>
+                                <field name="state"/>
+                                <field name="reconcile_id"/>
+                            </tree>
+                        </field>
                     </xpath>
                 </data>
             </field>
@@ -51,31 +45,25 @@
                     <xpath expr = "/form/group/field[@name='state']" position = "after">
                         <button name="reverse_voucher" string="Reverse" type="object" states="posted" invisible="context.get('line_type', False)" icon="STOCK_REVERT_TO_SAVED" confirm="Are you sure to reverse this record ?"/>
                     </xpath>
-                    <xpath expr = "/form/notebook/page[@string='Journal Items']" position = "replace">
-                        <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': ['|','|',('state','=','draft'),('state','=','proforma'),('state','=','cancel')]}">
-                            <group col="6" colspan="4">
-                                <field name="period_id"/>
-                                <field name="audit"/>
-                            </group>
-                            <field name="number" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
-                               <tree string="Journal Items">
-                                   <field name="move_id"/>
-                                   <field name="ref"/>
-                                   <field name="date"/>
-                                   <field name="statement_id"/>
-                                   <field name="partner_id"/>
-                                   <field name="account_id"/>
-                                   <field name="name"/>
-                                   <field name="debit"/>
-                                   <field name="credit"/>
-                                   <field name="state"/>
-                                   <field name="reconcile_id"/>
-                                   <field name="amount_currency"/>
-                                   <field name="currency_id"/>
-                               </tree>
-                            </field>
-                        </page>
+                    <xpath expr = "/form/notebook/page[@string='Journal Items']" position="attributes">
+                        <attribute name="attrs">{'invisible': [('state','in',['draft', 'proforma', 'cancel'])]}</attribute>
+                    </xpath>
+                    <xpath expr = "/form/notebook/page/field[@name='move_ids']" position = "after">
+                        <field name="move_line_reverse_ids" colspan="4" nolabel="1" readonly="1" attrs = "{'invisible' : [('state','!=','reverse')]}" >
+                            <tree string="Journal Items Reverse">
+                                <field name="move_id"/>
+                                <field name="ref"/>
+                                <field name="date"/>
+                                <field name="statement_id"/>
+                                <field name="partner_id"/>
+                                <field name="account_id"/>
+                                <field name="name"/>
+                                <field name="debit"/>
+                                <field name="credit"/>
+                                <field name="state"/>
+                                <field name="reconcile_id"/>
+                            </tree>
+                        </field>
                     </xpath>
                 </data>
             </field>

=== modified file 'account_voucher_reverse/i18n/es_CR.po'
--- account_voucher_reverse/i18n/es_CR.po	2012-07-19 22:57:59 +0000
+++ account_voucher_reverse/i18n/es_CR.po	2012-08-09 19:37:38 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-19 22:18+0000\n"
-"PO-Revision-Date: 2012-07-19 22:18+0000\n"
+"POT-Creation-Date: 2012-08-09 17:42+0000\n"
+"PO-Revision-Date: 2012-08-09 17:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,12 @@
 msgstr "Apuntes contables"
 
 #. module: account_voucher_reverse
+#: view:account.voucher:0
+#: field:account.voucher,move_line_reverse_ids:0
+msgid "Journal Items Reverse"
+msgstr "Apuntes contables reversos"
+
+#. module: account_voucher_reverse
 #: model:ir.model,name:account_voucher_reverse.model_account_voucher
 msgid "Accounting Voucher"
 msgstr "Comprobantes contables"