← Back to branch summary

~openerp-commiter/openobject-addons/trunk-extra-addons

« back to all changes in this revision

Viewing changes to dm_extract_sale/dm_extract_sale.py

  • Committer: Mantavya Gajjar
  • Date: 2009-12-01 10:19:51 UTC
  • mfrom: (4060.1.16 trunk-extra-addons)
  • Revision ID: mga@tinyerp.com-20091201101951-cpznxoapupixro3p
[MERGE]: merging from same branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
dm_extract_sale/dm_extract_sale.py
44
44
            for i in browse_id.order_date_criteria_ids:
45
45
                criteria.append("so.%s %s '%s'"%(i.field_id.name, i.operator, i.value))
46
46
        if criteria:
47
 
            so_sql_query = ("""select distinct so.partner_invoice_id \n from sale_order so\n where %s\n""" % (' and '.join(criteria))).replace('isnot','is not')
48
 
            sql_query += ''' and id in (%s)'''%so_sql_query
 
47
            so_sql_query = ("""select distinct so.partner_invoice_id \nfrom sale_order so\nwhere %s\n""" % (' and '.join(criteria))).replace('isnot','is not')
 
48
            sql_query += '''and pa.id in (%s)'''%so_sql_query
49
49
        return sql_query
50
50
    _columns = {
51
51
        'order_text_criteria_ids' : fields.one2many('dm.extract.sale.text_criteria', 'segmentation_id', 'Customers Order Textual Criteria'),