X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Faccount_asset%2Faccount_asset_view.xml;h=8f8a017c376c7a86813e868ffeaa3ee7adbfddb4;hb=refs%2Ftags%2F6.1.1-addons;hp=faf13749403ee92070fa483b645a9c0034ff6ce7;hpb=bb1c9574b6f67be55b4da21c954af9885f7388b7;p=odoo%2Fodoo.git

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index faf1374..8f8a017 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0"?>
 <openerp>
 <data>
 
     <!--
-        Asset Category 
+        Asset Category
      -->
 
     <record model="ir.ui.view" id="view_account_asset_category_form">
@@ -12,32 +11,32 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset category">
-                <field name="name" select="1"/>
+                <field name="name"/>
                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                <separator string="Accounting information" colspan="4" />
+                <separator string="Accounting information" colspan="4"/>
                 <field name="journal_id"/>
                 <field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/>
                 <field name="account_depreciation_id"/>
                 <field name="account_expense_depreciation_id"/>
                 <group colspan="2" col="2">
-                    <separator string="Depreciation Dates" colspan="2" />
+                    <separator string="Depreciation Dates" colspan="2"/>
                     <field name="method_time"/>
                     <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
                     <field name="method_period"/>
                     <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                 </group>
                 <group colspan="2" col="2">
-                    <separator string="Depreciation Method" colspan="2" />
+                    <separator string="Depreciation Method" colspan="2"/>
                     <field name="method"/>
                     <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                    <field name="prorata" attrs="{'invisible':[('method','&lt;&gt;','linear')]}"/>
+                    <field name="prorata"/>
                     <field name="open_asset"/>
                 </group>
-        	<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
-        	    <separator string="Analytic information" colspan="4" />
-        	    <newline/>
-        	    <field name="account_analytic_id" />
-        	</group>
+            <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
+                <separator string="Analytic information" colspan="4"/>
+                <newline/>
+                <field name="account_analytic_id"/>
+            </group>
                 <separator string="Notes" colspan="4"/>
                 <field name="note" colspan="4" nolabel="1"/>
             </form>
@@ -52,9 +51,7 @@
             <tree string="Asset category">
                 <field name="name"/>
                 <field name="journal_id"/>
-                <field name="method_time"/>
                 <field name="method"/>
-                <field name="open_asset"/>
                 <field name="company_id" groups="base.group_multi_company"/>
             </tree>
         </field>
@@ -83,53 +80,48 @@
         <field name="arch" type="xml">
            <form string="Asset">
               <group col="6" colspan="4">
-                 <field name="name" select="1"/>
-                 <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
-                 <field name="code" select="1"/>
-                 <field name="purchase_value" select="1"/>
+                 <field name="name"/>
+                 <field name="category_id" on_change="onchange_category_id(category_id)"/>
+                 <field name="code"/>
+                 <field name="purchase_value"/>
                  <field name="salvage_value"/>
                  <field name="value_residual"/>
-                 <field name="currency_id" select="1"/>
-                 <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                 <field name="currency_id"/>
+                 <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
               </group>
               <notebook colspan="4">
                  <page string="General">
                     <separator string="Other Information" colspan="4"/>
-                    <field name="parent_id"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
+                    <field name="parent_id" groups="base.group_extended"/>
                     <newline/>
                     <group colspan="2" col="2">
-                        <separator string="Depreciation Dates" colspan="2" />
+                        <separator string="Depreciation Dates" colspan="2"/>
                         <field name="method_time" on_change="onchange_method_time(method_time)"/>
                         <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
                         <field name="method_period"/>
                         <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                         <newline/>
-                        <button 
-                             name="%(action_asset_modify)d" 
-                             states="open" 
-                             string="Change Duration" 
-                             type="action"
-                             icon="terp-stock_effects-object-colorize" 
-                             colspan="2"/> 
+                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
                     </group>
                     <group colspan="2" col="2">
-                        <separator string="Depreciation Method" colspan="2" />
-                        <field name="method" on_change="onchange_method_time(method)"/>
+                        <separator string="Depreciation Method" colspan="2"/>
+                        <field name="method"/>
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                        <field name="prorata" attrs="{'invisible': ['|',('method_time','=','end'),('method','!=','linear')]}"/>
+                        <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                     </group>
                     <newline/>
-                    <separator string="" colspan="4" />
+                    <separator string="" colspan="4"/>
                     <field name="state" readonly="1" colspan="2"/>
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="4">
                        <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
+                       <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
                        <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
                     </group>
                  </page>
-                 <page string="Depreciation board">
-                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph" >
+                 <page string="Depreciation Board">
+                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
                        <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
                           <field name="depreciation_date"/>
                           <field name="sequence" invisible="1"/>
@@ -166,7 +158,7 @@
         <field name="type">tree</field>
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
-            <tree string="Assets">
+            <tree string="Assets" colors="blue:(state == 'draft');grey:(state == 'close')">
                 <field name="name"/>
                 <field name="category_id"/>
                 <field name="purchase_date"/>
@@ -218,9 +210,9 @@
             </search>
         </field>
     </record>
-    
+
     <!--
-        Asset History 
+        Asset History
      -->
 
     <record model="ir.ui.view" id="view_account_asset_history_form">
@@ -230,12 +222,12 @@
         <field name="arch" type="xml">
             <form string="Asset history">
               <group col="6" colspan="4">
-                <field name="name" select="1"/>
-                <field name="date" select="1"/>
-                <field name="user_id" select="1"/>
+                <field name="name"/>
+                <field name="date"/>
+                <field name="user_id"/>
               </group>
               <group col="2" colspan="2">
-                <separator string="Depreciation Dates" colspan="2" />
+                <separator string="Depreciation Dates" colspan="2"/>
                 <field name="method_time"/>
                 <field name="method_number" attrs="{'invisible':[('method_time','=','end')]}"/>
                 <field name="method_period"/>
@@ -253,10 +245,11 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Asset history">
-                <field name="date" select="1"/>
-                <field name="name" select="1"/>
-                <field name="user_id" select="1"/>
-                <field name="method_number" select="2"/>
+                <field name="date"/>
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="method_time"/>
+                <field name="method_number"/>
                 <field name="method_period"/>
                 <field name="method_end"/>
             </tree>
@@ -282,7 +275,7 @@
             </field>
         </field>
     </record>
-    
+
     <record id="view_account_move_line_filter_inherit" model="ir.ui.view">
         <field name="name">Journal Items (Search)</field>
         <field name="model">account.move.line</field>
@@ -296,11 +289,12 @@
     </record>
 
     <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>
-    <menuitem
-        parent="menu_finance_assets"
-        id="menu_action_account_asset_asset_tree"
+    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
+        groups="base.group_extended"
+        sequence="100"
         action="action_account_asset_asset_tree"/>
-      <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">Assets</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">form</field>
@@ -308,17 +302,9 @@
         <field name="search_view_id" ref="view_account_asset_search"/>
     </record>
 
-    <menuitem
-        parent="menu_finance_assets"
-        id="menu_action_account_asset_asset_form"
-        action="action_account_asset_asset_form"/>
-    
-    <act_window
-        id="act_entries_open"
-        name="Entries"
-        res_model="account.move.line"
-        src_model="account.asset.asset"
-        context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
+    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form"/>
+
+    <act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
 
     <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_accounting"/>
     <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
@@ -328,10 +314,20 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem
-        parent="menu_finance_config_assets"
-        id="menu_action_account_asset_asset_list_normal"
-        action="action_account_asset_asset_list_normal"/>
+    <menuitem parent="menu_finance_config_assets" id="menu_action_account_asset_asset_list_normal" action="action_account_asset_asset_list_normal"/>
+
+    <record model="ir.actions.act_window" id="action_account_asset_asset_form_normal">
+        <field name="name">Review Asset Categories</field>
+        <field name="res_model">account.asset.category</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="asset_category_form_view_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_account_asset_asset_form_normal"/>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
+        <field name="sequence">3</field>
+    </record>
+
 </data>
 </openerp>
-