From 3d91fc7ea2dd9d9b0d5ff64cb425d33c02c93bde Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 15 Apr 2010 14:02:32 +0530 Subject: [PATCH] [IMP]: olap: Add Remaining doc string + some formating bzr revid: ksa@tinyerp.co.in-20100415083232-j0nw7vyes744y3yu --- addons/olap/olap.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/addons/olap/olap.py b/addons/olap/olap.py index 306ade9c915..338d61f81fa 100644 --- a/addons/olap/olap.py +++ b/addons/olap/olap.py @@ -142,20 +142,12 @@ class olap_schema(osv.osv ): def _app_detect(self, cr, uid, ids, field_name, arg, context = {}): """ -<<<<<<< TREE Return a Application type @param self: The object pointer @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param ids: List of Detected Application’s IDs @param context: A standard dictionary for contextual values -======= - Return a Application type - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of Detected Application’s IDs - @param context: A standard dictionary for contextual values ->>>>>>> MERGE-SOURCE """ res = {}