X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fsale%2Fsale_view.xml;h=6a9afb92eb91696970b4da5603521336e367346d;hb=49fb0247c657f2310796c01772b972030da77de1;hp=2b3a7f3fed2bb35661cca273f0489c1a6ae723bf;hpb=8c78c734c2a824f076c2cd711126c7d513a92da5;p=odoo%2Fodoo.git

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2b3a7f3..6a9afb9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -3,10 +3,10 @@
     <data>
 <!--        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
 <!--            groups="group_sale_user"/>-->
-		<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
-		<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
-		<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
@@ -45,7 +45,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
-        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="60"/>
+        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="70"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -76,13 +76,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales orders">
-                    <field name="date_order"/>
+                    <field name="date_order" string="Order date"/>
                     <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="partner_shipping_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="amount_untaxed"/>
+                    <field name="amount_untaxed" sum="Total Untaxed amount"/>
+                    <field name="amount_total" sum="Total amount"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -99,7 +101,7 @@
                         <field name="client_order_ref" select="2"/>
                         <field name="shipped" select="2"/>
                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2" widget="selection"/>
-                        <field name="date_order" select="1"/>
+                        <field name="date_order" select="1" string="Order date" />
                         <field name="invoiced" select="2"/>
                     </group>
                     <notebook colspan="4">
@@ -148,7 +150,12 @@
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
-                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
+                                                <button colspan="1"
+                                                    name="%(action_view_sale_order_line_make_invoice)d"
+                                                    states="confirmed"
+                                                    string="Make Invoice"
+                                                    type="action"
+                                                    icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -203,15 +210,29 @@
                             </group>
                         </page>
                         <page string="Other data">
-                            <field groups="base.group_extended" name="incoterm"/>
-                            <field groups="base.group_extended" name="picking_policy" required="True"/>
-                            <field name="user_id"/>
-                            <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                            <field groups="base.group_extended" name="origin"/>
-                            <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
-                            <field name="payment_term" widget="selection"/>
-                            <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group colspan="2" col="2">
+                                <separator string="Logistic" colspan="2"/>
+                                <field groups="base.group_extended" name="incoterm"/>
+                                <field groups="base.group_extended" name="picking_policy" required="True"/>
+                                <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
+                                <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="References" colspan="2"/>
+                                <field name="user_id"/>
+                                <field groups="base.group_extended" name="origin"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Conditions" colspan="2"/>
+                                <field name="payment_term" widget="selection"/>
+                                <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="date_confirm"/>
+                            </group>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -231,23 +252,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='8' colspan='4'>
-                        <filter icon="terp-sale" string="Quotation" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-sale" domain="[('user_id','=',uid)]" help="My Sale Orders"/>
-                            <filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
-                        </field>
-                        <field name="date_order" select="1"/>
-					</group>
-					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Partner" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-					</group>                        
+                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
+                    <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
+                    </field>
+                    <field name="date_order" select="1" string="Order date" />
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="11" col="11">
+                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
                </search>
             </field>
         </record>
@@ -273,17 +294,6 @@
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
-        <record id="action_order_tree3" model="ir.actions.act_window">
-            <field name="name">Sales To Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','manual')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_sales_order_filter"/>
-        </record>
-
         <record id="action_order_tree4" model="ir.actions.act_window">
             <field name="name">Sales Order in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -305,7 +315,7 @@
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
-		<record id="action_order_tree" model="ir.actions.act_window">
+        <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
@@ -336,7 +346,6 @@
                 <tree string="Sales order lines">
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
-                    <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
@@ -377,8 +386,14 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-no"/>
-                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
+                                <button name="button_done"
+                                	states="confirmed,exception"
+                                	string="Done" type="object"
+                                	icon="gtk-jump-to" />
+                                <button name="button_cancel"
+                                	states="confirmed,exception"
+                                	string="Cancel" type="object"
+                                	icon="gtk-cancel" />
                             </group>
                         </page>
                         <page string="Properties">
@@ -401,22 +416,47 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='8' colspan='4'>
-                        <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
-                        <separator orientation="vertical"/>
-                        <field name="order_id" select="1"/>
-                        <field name="order_partner_id" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="salesman_id" select="1" widget="selection">
-                            <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                            <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
-                        </field>
-					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="By Scheduled" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-					</group>                        
-                        
+                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <separator orientation="vertical"/>
+                    <field name="order_id" select="1"/>
+                    <field name="order_partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="salesman_id" select="1" widget="selection">
+                        <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                    </field>
+                    <newline/>
+                    <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
+                        <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_sales_order_uninvoiced_line_filter" model="ir.ui.view">
+            <field name="name">sale.order.uninvoiced.line</field>
+            <field name="model">sale.order.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Uninvoiced Lines">
+                	<filter icon="terp-purchase" string="Shipped"
+                		domain="[('state','=','done')]"
+                		separator="1" />
+                	<filter icon="terp-purchase" string="Uninvoiced"
+                		domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
+                		separator="1" />
+                	<separator orientation="vertical"/>
+                    <field name="order_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="order_partner_id" select="1"/>
+                    <field name="state" select="1"/>
+                    <newline />
+                    <group expand="1" string="Group By..." colspan="9" col="8">
+                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+<!--                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'order_partner_id'}"/>-->
+                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                     </group>
                 </search>
             </field>
@@ -428,7 +468,7 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
+            <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>
 
@@ -446,9 +486,8 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
-		<menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
-		<menuitem action="action_order_tree3" id="menu_invoicing_sales_order" parent="menu_invoiced" sequence="1"/>
-		<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
+        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
+        <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">