From 68683ca04c82fc18b4f85bfdc3312a13fd307c28 Mon Sep 17 00:00:00 2001
From: rde <>
Date: Tue, 23 Jan 2007 12:42:35 +0000
Subject: [PATCH] bzr revid: rde-1196cc69a7802dd72423b6c2a173b6681ef971cf

---
 .../report/analytic_partners_report.py        | 26 +++++++------------
 .../__init__.py                               |  0
 .../__terp__.py                               |  0
 .../report/__init__.py                        |  0
 .../report/sale_category_report.py            |  0
 .../report/sale_category_report.rml           |  0
 .../sale.py                                   |  0
 .../sale_category_report.xml                  |  0
 .../sale_category_view.xml                    |  0
 9 files changed, 9 insertions(+), 17 deletions(-)
 rename addons/{sale_category => sale_order_category}/__init__.py (100%)
 rename addons/{sale_category => sale_order_category}/__terp__.py (100%)
 rename addons/{sale_category => sale_order_category}/report/__init__.py (100%)
 rename addons/{sale_category => sale_order_category}/report/sale_category_report.py (100%)
 rename addons/{sale_category => sale_order_category}/report/sale_category_report.rml (100%)
 rename addons/{sale_category => sale_order_category}/sale.py (100%)
 rename addons/{sale_category => sale_order_category}/sale_category_report.xml (100%)
 rename addons/{sale_category => sale_order_category}/sale_category_view.xml (100%)

diff --git a/addons/analytic_partners/report/analytic_partners_report.py b/addons/analytic_partners/report/analytic_partners_report.py
index 555a131dd56..0d70cad9c87 100644
--- a/addons/analytic_partners/report/analytic_partners_report.py
+++ b/addons/analytic_partners/report/analytic_partners_report.py
@@ -3,27 +3,19 @@ import time
 from report import report_sxw
 
 class analytic_partners_report(report_sxw.rml_parse):
-	# o must be an instance of
-	# analytic_partners_account_analytic_account.
-	def _init_dict(self, o):
-		self.partners_by_account.clear()
- 		for a in o.address_ids:
-			p = a.partner_id
- 			for c in p.category_id:
- 				self.partners_by_account.setdefault(c.name, []).append(p)
- 			if not p.category_id:
- 				self.partners_by_account.setdefault('Non classifie', []).append(p)
-
-
+	# o must be an instance of analytic_partners_account_analytic_account.
+	# contacts_by_partners_by_account returns a list of categories. Each
+	# category contains a list of partner names, each partner name contains
+	# a list of partner contacts. This list reflects the selected partners
+	# contacts for the selected analytic account.
+	def contacts_by_partners_by_categories(self, o):
+		categs = {} 
+		
 	def __init__(self, cr, uid, name, context):
-		# self.partners_by_account is a dictionnary where keys are category
-		# names and values are lists of partner_id.
-		self.partners_by_account={}
 		super(analytic_partners_report, self).__init__(cr, uid, name, context)
 		self.localcontext.update( {
 			'time' : time,
-			'_init_dict' : self._init_dict,
-			'partners_by_account' : self.partners_by_account,
+			'contacts_by_partners_by_categories' : self.contacts_by_partners_by_categories,
 		} )
 
 report_sxw.report_sxw(
diff --git a/addons/sale_category/__init__.py b/addons/sale_order_category/__init__.py
similarity index 100%
rename from addons/sale_category/__init__.py
rename to addons/sale_order_category/__init__.py
diff --git a/addons/sale_category/__terp__.py b/addons/sale_order_category/__terp__.py
similarity index 100%
rename from addons/sale_category/__terp__.py
rename to addons/sale_order_category/__terp__.py
diff --git a/addons/sale_category/report/__init__.py b/addons/sale_order_category/report/__init__.py
similarity index 100%
rename from addons/sale_category/report/__init__.py
rename to addons/sale_order_category/report/__init__.py
diff --git a/addons/sale_category/report/sale_category_report.py b/addons/sale_order_category/report/sale_category_report.py
similarity index 100%
rename from addons/sale_category/report/sale_category_report.py
rename to addons/sale_order_category/report/sale_category_report.py
diff --git a/addons/sale_category/report/sale_category_report.rml b/addons/sale_order_category/report/sale_category_report.rml
similarity index 100%
rename from addons/sale_category/report/sale_category_report.rml
rename to addons/sale_order_category/report/sale_category_report.rml
diff --git a/addons/sale_category/sale.py b/addons/sale_order_category/sale.py
similarity index 100%
rename from addons/sale_category/sale.py
rename to addons/sale_order_category/sale.py
diff --git a/addons/sale_category/sale_category_report.xml b/addons/sale_order_category/sale_category_report.xml
similarity index 100%
rename from addons/sale_category/sale_category_report.xml
rename to addons/sale_order_category/sale_category_report.xml
diff --git a/addons/sale_category/sale_category_view.xml b/addons/sale_order_category/sale_category_view.xml
similarity index 100%
rename from addons/sale_category/sale_category_view.xml
rename to addons/sale_order_category/sale_category_view.xml