[REF] account_asset: cleaning

bzr revid: qdp-launchpad@openerp.com-20110510185209-cg78yzznrk5h59nd

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 6c0206f..6ba615c 100644 (file)
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -9,19 +9,21 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset category">
-                  <group col="6" colspan="4">
+           <group col="6" colspan="4">
                 <field name="name" select="1" colspan="4"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <newline/>
                 <field name="journal_id"/>
                 <field name="account_asset_id"/>
                 <field name="account_depreciation_id"/>
-                  </group>
-                <!--<field name="code" select="1"/>-->
+           </group>
+        <group col="6" colspan="4" groups="analytic.group_analytic_accounting">
+        <separator string="Accounts information" colspan="4" />
+        <field name="account_analytic_id" />
+        <field name="journal_analytic_id" />
+        </group>
                 <separator string="Note"/>
                 <field name="note" colspan="4" nolabel="1"/>
-                <!--<field name="type"/>-->
-
             </form>
         </field>
     </record>
@@ -33,139 +35,83 @@
         <field name="arch" type="xml">
             <tree string="Asset category">
                 <field name="name"/>
-                <!--<field name="code"/>-->
                 <field name="journal_id"/>
                 <field name="account_asset_id"/>
                 <field name="account_depreciation_id"/>
                 <field name="company_id" groups="base.group_multi_company"/>
-                <!--<field name="type"/>-->
-            </tree>
-        </field>
-    </record>
-    <!--<record model="ir.actions.act_window" id="action_account_asset_category_form">
-        <field name="name">Asset Category</field>
-        <field name="res_model">account.asset.category</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-    <menuitem 
-        parent="menu_finance_config_Assets"
-               id="menu_action_account_asset_category_form"
-               action="action_account_asset_category_form"/>
--->
-
-<!--    <record model="ir.ui.view" id="view_account_asset_property_tree">
-        <field name="name">account.asset.property.tree</field>
-        <field name="model">account.asset.property</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Assets methods">
-                <field name="asset_id"/>
-                <field name="name"/>
-                <field name="journal_id"/>
-                <field name="value_total"/>
-                <field name="value_residual"/>
-                <field name="state"/>
             </tree>
         </field>
     </record>
--->
-
 
     <record model="ir.ui.view" id="view_account_asset_asset_form">
         <field name="name">account.asset.asset.form</field>
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset">
-                  <group col="6" colspan="4">
-                       <field name="name" select="1"/>
-                       <field name="category_id" select="1"/>
-                       <field name="code" select="1"/>
-                       <field name="purchase_value" select="1"/>
-                       <field name="currency_id" select="1"/>
-                       <field name="company_id" select="1"/>
-                       <field name="value_residual"/> 
-                  </group>
-                   <!-- <field name="period_id" select="2"/>-->
-<!--                           <field name="name" select="1" colspan="4"/>-->
-                        <!--<separator string="Methods" colspan="4"/>-->
-
-
-                            <notebook colspan="4">
-                            <page string="Depreciation">
-                               <!--<field name="partner_id" select="2"/>
-                               <field name="parent_id" select="2"/>
-                               <field name="note" colspan="4" nolabel="1"/>-->
-                               <separator string="Other information" colspan="4"/>
-                               <field name="partner_id"/>
-                               <group col="6" colspan="4" groups="analytic.group_analytic_accounting">
-                                       <separator string="Accounts information" colspan="4" />
-                                       <field name="account_analytic_id" />
-                                       <field name="journal_analytic_id" />
-                               </group>
-                               <!--<separator string="Methods" colspan="4"/>
-                               <field name="name" select="1" colspan="2"/>-->
-                                <separator string="Depreciation duration" colspan="4"/>
-                               <field name="purchase_date"/>
-
-                                <field name="method"/>
-                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
-                               <newline/>
-                               <field name="prorata" colspan="1"/>
-                                <field name="method_time"/>
-                                       <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
-                                <button 
-                                    name="%(wizard_asset_modify)d" 
-                                    states="open" 
-                                    string="Change duration" 
-                                    type="action" 
-                                    colspan="2"/>
-
-                                       <field name="method_delay"/>
-                 <newline/>
-
-<!--
-                                                       <field name="method_end"/> -->
-                               </page>
-                            <page string="Depreciation board">
-<!--                                <field name="value_total"/>
-                                <field name="value_residual"/>-->
-                               <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
-                                  <tree>
-                               <field name="depreciation_date"/>
-                                <field name="sequence" invisible="1"/>
-                                <field name="amount"/>
-                               <field name="depreciated_value"/>
-                               <field name="remaining_value"/>
-                                 </tree>
-                                  <graph type="bar">
-                                    <field name="name"/>
-                                    <field name="amount"/>
-                                   <field name="depreciated_value"/>
-                                  </graph>
-                                </field>
-                                      
-                                <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
-                               <button type="object" name="account_move_line_deprec" string="Create move line" icon="gtk-execute" colspan="2"/>
-                            </page>
-
-                           <page string="History">
-                                <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>
-                                <field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
-                            </page>
-
-
-                           <page string="Notes">
-                                <field name="note" nolabel="1"/>
-                           </page>     
-                            </notebook>
-                   <field name="state" readonly="1"/>
-                    <group colspan="2" col="2">
-                        <button name="validate" states="draft" string="Confirm asset" type="object"/>
-                    </group>
-            </form>
-        </field>
+           <form string="Asset">
+              <group col="6" colspan="4">
+                 <field name="name" select="1"/>
+                 <field name="category_id" select="1"/>
+                 <field name="code" select="1"/>
+                 <field name="purchase_value" select="1"/>
+                 <field name="currency_id" select="1"/>
+                 <field name="company_id" select="1"/>
+                 <field name="value_residual"/> 
+              </group>
+              <notebook colspan="4">
+                 <page string="Depreciation">
+                    <separator string="Other information" colspan="4"/>
+                    <field name="partner_id"/>
+                    <field name="purchase_date"/>
+                    <separator string="Depreciation duration" colspan="4"/>
+                    <button 
+                         name="%(wizard_asset_modify)d" 
+                         states="open" 
+                         string="Change duration" 
+                         type="action" 
+                         colspan="2"/>
+                    <newline/>
+                    <field name="method"/>
+                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
+                    <newline/>
+                    <field name="method_time"/>
+                    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
+                    <field name="prorata" colspan="1"/>
+                    <field name="method_delay"/>
+                    <newline/>
+                 </page>
+                 <page string="Depreciation board">
+                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
+                       <tree>
+                          <field name="depreciation_date"/>
+                          <field name="sequence" invisible="1"/>
+                          <field name="amount"/>
+                          <field name="depreciated_value"/>
+                          <field name="remaining_value"/>
+                       </tree>
+                       <graph type="bar">
+                          <field name="name"/>
+                          <field name="amount"/>
+                          <field name="depreciated_value"/>
+                       </graph>
+                    </field>
+                    <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
+                    <button type="object" name="account_move_line_deprec" string="Create move line" icon="gtk-execute" colspan="2"/>
+                 </page>
+                 <page string="History">
+                    <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>
+                    <field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
+                 </page>
+                 <page string="Notes">
+                    <field name="note" nolabel="1"/>
+                 </page>    
+              </notebook>
+              <field name="state" readonly="1"/>
+              <group colspan="2" col="2">
+                 <button name="validate" states="draft" string="Confirm asset" type="object"/>
+              </group>
+           </form>
+       </field>
     </record>
 
     <record model="ir.ui.view" id="view_account_asset_history_form">
@@ -202,10 +148,6 @@
         </field>
     </record>
 
-
-
-
-
     <record model="ir.ui.view" id="view_account_asset_board_form">
         <field name="name">account.asset.board.form</field>
         <field name="model">account.asset.board</field>
@@ -214,14 +156,15 @@
             <form string="Asset board">
                 <field name="name" select="1"/>
                 <field name="asset_id" select="1"/>
-                       <field name="value_gross" select="2"/>
+                   <field name="value_gross" select="2"/>
                 <field name="value_asset"/>
                 <field name="value_asset_cumul"/>
                 <field name="value_net"/>
-               <field name="test"/>
+        <field name="test"/>
             </form>
         </field>
     </record>
+
     <record model="ir.ui.view" id="view_account_asset_board_tree">
         <field name="name">account.asset.board.tree</field>
         <field name="model">account.asset.board</field>
@@ -234,7 +177,7 @@
                 <field name="value_asset"/>
                 <field name="value_asset_cumul"/>
                 <field name="value_net"/>
-               <field name="test"/>
+        <field name="test"/>
             </tree>
         </field>
     </record>
@@ -255,12 +198,12 @@
         </field>
     </record>
 
-
-         <record model="ir.actions.act_window" id="action_account_asset_asset_form">
+      <record model="ir.actions.act_window" id="action_account_asset_asset_form">
         <field name="name">Asset</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">form</field>
     </record>
+
     <menuitem 
         parent="menu_finance_config_Assets" 
         id="menu_action_account_asset_asset_form"
@@ -273,14 +216,12 @@
         <field name="domain">[('parent_id','=',False)]</field>
         <field name="view_id" ref="view_account_asset_asset_tree"/>
     </record>
+
     <menuitem id="menu_finance_Assets" name="Assets" parent="account.menu_finance"/>
     <menuitem
         parent="menu_finance_Assets"
         id="menu_action_account_asset_asset_tree"
         action="action_account_asset_asset_tree"/>
-    
-
-    
 
     <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
         <field name="name">Assets</field>
@@ -288,21 +229,11 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
+
     <menuitem
         parent="menu_finance_Assets"
         id="menu_action_account_asset_asset_list_normal"
         action="action_account_asset_asset_list_normal"/>
-
-
-    
-            
-  
-       
-
-               
-               
-              
-                       
 </data>
 </openerp>