From d3b6294546bbfd6d09e7bf8220cf37e6612c8691 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 1 Mar 2010 22:28:50 +0100
Subject: [PATCH] [IMP] adding a report for sale module

bzr revid: fp@tinyerp.com-20100301212850-ox7dn1vo33jliavq
---
 addons/resource/resource.py | 2 +-
 addons/sale/__init__.py     | 1 +
 addons/sale/__terp__.py     | 1 +
 addons/sale/sale_view.xml   | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 4d4eeaab028..d38bb40af5d 100755
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -155,7 +155,7 @@ class resource_resource(osv.osv):
         'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
         'user_id' : fields.many2one('res.users', 'User',help='Related user name for the resource to manage its access.'),
         'time_efficiency' : fields.float('Efficiency factor', size=8, required=True,help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
-        'calendar_id' : fields.many2one("resource.calendar", "Working time",required=True, help="Define the schedule of resource"),
+        'calendar_id' : fields.many2one("resource.calendar", "Working time",help="Define the schedule of resource"),
     }
     _defaults = {
         'resource_type' : lambda *a: 'user',
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index bb873b9a524..8e1da80d257 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -27,6 +27,7 @@ import sale
 import stock
 import product
 import mrp
+import sale_report
 
 import wizard
 import report
diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index f685bacde9c..70d9f084afb 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -52,6 +52,7 @@
         'sale_data.xml',
         'sale_wizard.xml',
         'sale_view.xml',
+        'sale_report_view.xml',
         'sale_report.xml',
         'sale_wizard.xml',
         'stock_view.xml',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 60d925d6fe4..563739c53ae 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -399,7 +399,7 @@
                         <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="4" col="8">
+                    <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'}"/>