[TYPO] Set the right category for the Point Of Sale

[odoo/odoo.git] / addons / account_analytic_default / account_analytic_default_view.xml

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 0065677..3e2ba0f 100644 (file)
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Defaults" colors="grey:date_stop and (date_stop &lt; datetime.date.today().strftime('%%Y-%%m-%%d'))" >
+                <tree string="Analytic Defaults">
                     <field name="sequence"/>
                     <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
@@ -24,16 +24,18 @@
             <field name="model">account.analytic.default</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Defaults">
-                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                    <field name="sequence"/>
-                    <separator string="Conditions" colspan="4"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                <form string="Analytic Defaults" version="7.0">
+                    <group col="4">
+                        <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
+                        <field name="sequence"/>
+                        <separator string="Conditions" colspan="4"/>
+                        <field name="product_id"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -44,24 +46,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group col="10" colspan="4">
-                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
-                    <separator orientation="vertical"/>
+                    <field name="date_stop"/>
                     <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
-                    <newline/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
-                                               <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-                                               <separator orientation="vertical"/>
-                                               <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+                        <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
                         <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
-                         <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}"  help="Comapny" groups="base.group_multi_company" />
+                        <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />
                     </group>
                 </search>
             </field>
@@ -81,7 +77,7 @@
             id="act_account_acount_move_line_open"
             res_model="account.move.line"
             src_model="account.account"
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"
             />
 
         <menuitem
@@ -95,24 +91,24 @@
             id="analytic_rule_action_partner"
             res_model="account.analytic.default"
             src_model="res.partner"
-            context="{'search_default_partner_id': [active_id]}"
-            groups="base.group_extended"/>
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
+            groups="analytic.group_analytic_accounting"/>
 
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_user"
             res_model="account.analytic.default"
             src_model="res.users"
-            context="{'search_default_user_id': [active_id]}"
-            groups="base.group_extended"/>
+            context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
+            groups="analytic.group_analytic_accounting"/>
 
         <act_window
             name="Analytic Rules"
             res_model="account.analytic.default"
             id="analytic_rule_action_product"
             src_model="product.product"
-            context="{'search_default_product_id': [active_id]}"
-            groups="base.group_extended"/>
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            groups="analytic.group_analytic_accounting"/>
 
     </data>
 </openerp>