Merge lp:~serpent-consulting-services/openobject-addons/6.1-960872-SerpentCS into lp:openobject-addons/6.1

[Serpent Consulting Services]

[Rifakat Husen (OpenERP) (rha-openerp)]

Hi Serpent Consulting Services,

It works.
Thanks for your fix.

Regards,
Rifakat Haradwala

review: Approve

[Serpent Consulting Services (serpent-consulting-services)]

Rifakat(OpenERP),

Thanks for the approval.

Waiting for this fix getting merged.
This looks like a simple one technically, but is really a show stopper for many accountants.

Regards,
Serpent Consulting Services.

[Serpent Consulting Services (serpent-consulting-services)]

Urge to get this upon 6.1 !

Unmerged revisions

6748. By Serpent Consulting Services on 2012-04-21

[FIX] Account : Corrected the Views of Account.period in order to fix the bug of states.State field should be in view if other fields depend on it.

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-02-14 11:07:04 +0000
+++ account/account_view.xml	2012-04-21 10:47:20 +0000
@@ -22,12 +22,13 @@
                     </group>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
-                        <form string="Period">
+                        <form string="Periods">
                             <field name="name"/>
                             <field name="code"/>
                             <field name="date_start"/>
                             <field name="date_stop"/>
                             <field name="special"/>
+                            <field name="state" invisible="1"/>
                         </form>
                     </field>
                     <separator colspan="4" string="States"/>
@@ -92,7 +93,7 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Period">
+                <form string="Periods">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -111,7 +112,7 @@
             <field name="model">account.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-              <tree colors="blue:state == 'draft';gray:state == 'done' " string="Period">
+              <tree colors="blue:state == 'draft';gray:state == 'done' " string="Periods">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>