Launchpad automatic translations update.

[odoo/odoo.git] / addons / crm / crm_segmentation.py

diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 516873d..9cafe95 100644 (file)
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -21,9 +21,6 @@
 
 from osv import fields,osv,orm
 
-import crm_operators
-
-
 class crm_segmentation(osv.osv):
     '''
         A segmentation is a tool to automatically assign categories on partners.
@@ -37,46 +34,19 @@ class crm_segmentation(osv.osv):
         'description': fields.text('Description'),
         'categ_id': fields.many2one('res.partner.category', 'Partner Category',\
                          required=True, help='The partner category that will be \
-                         added to partners that match the segmentation criterions after computation.'),
-        'exclusif': fields.boolean('Exclusive', help='Check if the category is \
-                        limited to partners that match the segmentation criterions.\
-                        If checked, remove the category from partners that doesn\'t \
-                        match segmentation criterions'),
+added to partners that match the segmentation criterions after computation.'),
+        'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions.\
+                        \nIf checked, remove the category from partners that doesn\'t match segmentation criterions'),
         'state': fields.selection([('not running','Not Running'),\
                     ('running','Running')], 'Execution Status', readonly=True),
         'partner_id': fields.integer('Max Partner ID processed'),
         'segmentation_line': fields.one2many('crm.segmentation.line', \
                             'segmentation_id', 'Criteria', required=True),
-        'som_interval': fields.integer('Days per Periode', help="A period is the \
-                        average number of days between two cycle of sale or\
-                        purchase for this segmentation. It's mainly used to\
-                        detect if a partner has not purchased or buy for a too \
-                        long time, so we suppose that his state of mind has \
-                        decreased because he probably bought goods to another \
-                        supplier. Use this functionality for recurring businesses."),
-        'som_interval_max': fields.integer('Max Interval', help="The computation \
-                            is made on all events that occured during this \
-                            interval, the past X periods."),
-        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the \
-                                     partner has not purchased (or bought) \
-                                     during a period, decrease the state of \
-                                     mind by this factor. It\'s a multiplication"),
-        'som_interval_default': fields.float('Default (0=None)', help="Default \
-                                     state of mind for period preceeding the \
-                                     'Max Interval' computation. This is the \
-                                     starting state of mind by default if the \
-                                     partner has no event."),
-        'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules',\
-                                     help='Check if you want to use this tab as\
-                                    part of the segmentation rule. If not \
-                                    checked, the criteria beneath will be ignored')
+        'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules', help='Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored')
     }
     _defaults = {
         'partner_id': lambda *a: 0,
         'state': lambda *a: 'not running',
-        'som_interval_max': lambda *a: 3,
-        'som_interval_decrease': lambda *a: 0.8,
-        'som_interval_default': lambda *a: 0.5
     }
 
     def process_continue(self, cr, uid, ids, start=False):
@@ -91,7 +61,7 @@ class crm_segmentation(osv.osv):
         for categ in categs:
             if start:
                 if categ['exclusif']:
-                    cr.execute('delete from res_partner_category_rel \
+                    cr.execute('delete from res_partner_res_partner_category_rel \
                             where category_id=%s', (categ['categ_id'][0],))
 
             id = categ['id']
@@ -111,12 +81,10 @@ class crm_segmentation(osv.osv):
                     partners.remove(pid)
 
             for partner_id in partners:
-                cr.execute('insert into res_partner_category_rel (category_id,partner_id) \
+                cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \
                         values (%s,%s)', (categ['categ_id'][0], partner_id))
-            cr.commit()
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
-            cr.commit()
         return True
 
     def process_stop(self, cr, uid, ids, *args):
@@ -147,7 +115,7 @@ class crm_segmentation_line(osv.osv):
     _columns = {
         'name': fields.char('Rule Name', size=64, required=True),
         'segmentation_id': fields.many2one('crm.segmentation', 'Segmentation'),
-        'expr_name': fields.selection([('sale','Sale Amount'),('som','State of Mind'),\
+        'expr_name': fields.selection([('sale','Sale Amount'),
                         ('purchase','Purchase Amount')], 'Control Variable', size=64, required=True),
         'expr_operator': fields.selection([('<','<'),('=','='),('>','>')], 'Operator', required=True),
         'expr_value': fields.float('Value', required=True),
@@ -172,12 +140,7 @@ class crm_segmentation_line(osv.osv):
         for l in lst:
             cr.execute('select * from ir_module_module where name=%s and state=%s', ('account','installed'))
             if cr.fetchone():
-                if l['expr_name']=='som':
-                    datas = self.pool.get('crm.segmentation').read(cr, uid, [l['segmentation_id'][0]],
-                            ['som','som_interval','som_interval_max',\
-                             'som_interval_default', 'som_interval_decrease'])
-                    value = crm_operators.som(cr, uid, partner_id, datas[0])
-                elif l['expr_name']=='sale':
+                if l['expr_name']=='sale':
                     cr.execute('SELECT SUM(l.price_unit * l.quantity) ' \
                             'FROM account_invoice_line l, account_invoice i ' \
                             'WHERE (l.invoice_id = i.id) ' \