From 2ea0ca0aa00cb829a1dac8a485f7abe5facb9cfb Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 24 Jun 2010 17:18:39 +0530
Subject: [PATCH 1/3] [FIX] account_followup : M2M field corrected in
 followup_print wizard

bzr revid: ach@tinyerp.com-20100624114839-pvlr8pmtomvawu4h
---
 addons/account_followup/wizard/account_followup_print.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 3ba9301a365..89353993a85 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -272,7 +272,7 @@ class account_followup_print_all(osv.osv_memory):
         data['followup_id'] = 'followup_id' in context and context['followup_id'] or False
         date = 'date' in context and context['date'] or data['date']
         for id in to_update.keys():
-            if to_update[id]['partner_id'] in data['partner_ids'][0][2]:
+            if to_update[id]['partner_id'] in data['partner_ids']:
                 cr.execute(
                     "UPDATE account_move_line "\
                     "SET followup_line_id=%s, followup_date=%s "\

From 1aa1dd95a6f541fef846a784519c2c99cd860510 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 24 Jun 2010 17:57:34 +0530
Subject: [PATCH 2/3] [REF] project_planning : refactored code

bzr revid: ach@tinyerp.com-20100624122734-gapjx7hro2734uhw
---
 addons/project_planning/project_planning.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 2124b59b5c3..23fb780f334 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -383,7 +383,7 @@ class report_account_analytic_planning_account(osv.osv):
                     FROM report_account_analytic_planning_line
                     WHERE planning_id = %s AND account_id=%s
                 )""", (line.planning_id.id,line.account_id.id ))
-            result[line.id] = cr.fetchall()[0][0] / div *div2
+            result[line.id] = cr.fetchall()[0][0] / div * div2
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
@@ -493,13 +493,13 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         for line in self.browse(cr, uid, ids, context):
             where = ''
             if line.user_id:
-                where='user_id='+str(line.user_id.id)+' and '
+                where = 'user_id=' + str(line.user_id.id) + ' and '
             cr.execute('''select
                     sum(planned_hours)
                 from
                     project_task
                 where
-                '''+where+'''
+                ''' + where + '''
                     project_id in (select id from project_project where category_id=%s) and
                     date_close>=%s and
                     date_close<=%s''', (

From 2b8671c90c000502ec1700e323749041568f28a8 Mon Sep 17 00:00:00 2001
From: "rch (OpenERP)" <>
Date: Thu, 24 Jun 2010 18:16:02 +0530
Subject: [PATCH 3/3] [IMP]: Sale Dashboard.

bzr revid: jni@tinyerp.com-20100624124602-evw18dmacdivhlj9
---
 addons/sale/board_sale_view.xml         |  6 +--
 addons/sale/report/sale_report_view.xml | 54 ++++++++++++++++---------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index c89b90ecb65..2f290ce5dd8 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -30,11 +30,11 @@
                 <form string="Sales Manager board">
                     <hpaned position="100">
                         <child1>
-                            <action  name="%(sale.action_quotation_for_sale)d" string="Quotation For Sale"/>
-                            <action width="510" name="%(sale.action_view_product_category_total_price_graph)d" string="Total Price By Product Category"/>
+                            <action  name="%(sale.action_quotation_for_sale)d" string="Top Quotations"/>
+                            <action width="510" name="%(sale.action_view_sales_by_month)d" string="Total Sales By Month"/>
                         </child1>
                         <child2>
-                            <action  name="%(sale.action_sales_product_total_price_graph)d" string="Sold products and Total Price"/>
+                            <action  name="%(sale.action_sales_product_total_price)d" string="Sold products and Total Price"/>
                             <action  name="%(sale.action_sales_by_partner)d" string="Sales By Partner"/>
                             <action  name="%(sale.action_sales_by_salesman)d" string="Sales By Salesman"/>
                         </child2>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index e2fd3ae54e8..c9aee627857 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -213,7 +213,7 @@
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
+        <field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_by_salesman_graph"/>
     </record>
    <record id="open_view_sales_by_salesman_graph" model="ir.actions.act_window.view">
@@ -252,54 +252,72 @@
          </field>
     </record>
 
-   <record id="action_sales_product_total_price_graph" model="ir.actions.act_window">
+   <record id="action_sales_product_total_price" model="ir.actions.act_window">
         <field name="name">Sold product and Total Price</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
+        <field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_product_total_price_graph"/>
     </record>
     <record id="open_view_sales_product_total_price_graph" model="ir.actions.act_window.view">
             <field eval="3" name="sequence"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_sales_product_total_price_graph"/>
-            <field name="act_window_id" ref="action_sales_product_total_price_graph"/>
+            <field name="act_window_id" ref="action_sales_product_total_price"/>
     </record>
     <record id="open_view_sales_product_total_price_tree" model="ir.actions.act_window.view">
             <field eval="4" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_sales_product_total_price_tree"/>
-            <field name="act_window_id" ref="action_sales_product_total_price_graph"/>
+            <field name="act_window_id" ref="action_sales_product_total_price"/>
    </record>
 
-	<record id="view_product_category_total_price_tree" model="ir.ui.view">
-		<field name="name">sales.category.product.price.tree</field>
+	<record id="view_sales_by_month_tree" model="ir.ui.view">
+		<field name="name">view.sales.by.month.tree</field>
 		<field name="model">sale.report</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Total Price By Product Category">
-				<field name="categ_id"/>
-				<field name="price_total"/>
+			<tree string="Total Sales By Month">
+				<field name="month" />
+				<field name="price_total" />
 			</tree>
 		</field>
 	</record>
-	<record id="action_view_product_category_total_price_graph" model="ir.actions.act_window">
-		<field name="name">Total Price By Product Category</field>
+	<record id="action_view_sales_by_month" model="ir.actions.act_window">
+		<field name="name">Sales By Month</field>
 		<field name="res_model">sale.report</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree</field>
-		<field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-		<field name="view_id" ref="view_product_category_total_price_tree"/>
-    </record>
+		<field name="domain">[('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))]</field>
+		<field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+		<field name="view_id" ref="view_sales_by_month_tree"/>
+		<field name="search_view_id" ref="view_order_product_search"/>
+	</record>
+
+	 <record id="view_top_quotations_tree" model="ir.ui.view">
+            <field name="name">sale.top.quotations.tree</field>
+            <field name="model">sale.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Top Quotations">
+                    <field name="date_order"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" />
+                    <field name="amount_untaxed" />
+                    <field name="amount_total"/>
+                </tree>
+            </field>
+        </record>
 
     <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">Quotation For Sale</field>
+        <field name="name">Top Quotations</field>
         <field name="res_model">sale.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft'),('date_order','&lt;=', time.strftime('%Y-%m-%d')),('date_order','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-   		<field name="view_id" ref="sale.view_order_tree"/>
+        <field name="domain">[('state','=','draft')]</field>
+  		<field name="view_id" ref="view_top_quotations_tree"/>
     </record>
 
 </data>