|
@ -32,8 +32,8 @@ class PartnerView(models.TransientModel): |
|
|
partner_category_ids = fields.Many2many('res.partner.category', |
|
|
partner_category_ids = fields.Many2many('res.partner.category', |
|
|
string='Partner tags') |
|
|
string='Partner tags') |
|
|
reconciled = fields.Selection([ |
|
|
reconciled = fields.Selection([ |
|
|
('unreconciled', 'Unreconciled Only')], |
|
|
('unreconciled', 'Unreconciled Only'), ('all', 'All')], |
|
|
string='Reconcile Type', default='unreconciled') |
|
|
string='Reconcile Type', default='all') |
|
|
|
|
|
|
|
|
account_type_ids = fields.Many2many('account.account.type',string='Account Type', |
|
|
account_type_ids = fields.Many2many('account.account.type',string='Account Type', |
|
|
domain=[('type', 'in', ('receivable', 'payable'))]) |
|
|
domain=[('type', 'in', ('receivable', 'payable'))]) |
|
@ -127,6 +127,7 @@ class PartnerView(models.TransientModel): |
|
|
filters['category_list'] = data.get('category_list') |
|
|
filters['category_list'] = data.get('category_list') |
|
|
filters['account_type_list'] = data.get('account_type_list') |
|
|
filters['account_type_list'] = data.get('account_type_list') |
|
|
filters['target_move'] = data.get('target_move').capitalize() |
|
|
filters['target_move'] = data.get('target_move').capitalize() |
|
|
|
|
|
print(filters, "filters") |
|
|
return filters |
|
|
return filters |
|
|
|
|
|
|
|
|
def get_filter_data(self, option): |
|
|
def get_filter_data(self, option): |
|
@ -163,7 +164,7 @@ class PartnerView(models.TransientModel): |
|
|
accounts.append((j.id, j.name)) |
|
|
accounts.append((j.id, j.name)) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
print(r.reconciled, "rec") |
|
|
filter_dict = { |
|
|
filter_dict = { |
|
|
'journal_ids': r.journal_ids.ids, |
|
|
'journal_ids': r.journal_ids.ids, |
|
|
'account_ids': r.account_ids.ids, |
|
|
'account_ids': r.account_ids.ids, |
|
@ -293,7 +294,7 @@ class PartnerView(models.TransientModel): |
|
|
if data.get('partners'): |
|
|
if data.get('partners'): |
|
|
WHERE += ' AND p.id IN %s' % str( |
|
|
WHERE += ' AND p.id IN %s' % str( |
|
|
tuple(data.get('partners').ids) + tuple([0])) |
|
|
tuple(data.get('partners').ids) + tuple([0])) |
|
|
|
|
|
print(data, "data") |
|
|
if data.get('reconciled') == 'unreconciled': |
|
|
if data.get('reconciled') == 'unreconciled': |
|
|
WHERE += ' AND l.full_reconcile_id is null AND' \ |
|
|
WHERE += ' AND l.full_reconcile_id is null AND' \ |
|
|
' l.balance != 0 AND a.reconcile is true' |
|
|
' l.balance != 0 AND a.reconcile is true' |
|
|