From 05e12b35f3311fb443e0513bf65764f6ff8bc0ab Mon Sep 17 00:00:00 2001 From: wilson gomez Date: Wed, 18 Aug 2021 13:52:52 -0500 Subject: [PATCH] minor fix report --- __init__.py | 2 +- sale.py | 155 +++++++++++++++-------------- view/connection_companies_tree.xml | 2 +- 3 files changed, 80 insertions(+), 79 deletions(-) diff --git a/__init__.py b/__init__.py index 3e1ec47..b318563 100644 --- a/__init__.py +++ b/__init__.py @@ -22,7 +22,7 @@ def register(): module='syncronize_companies', type_='model') Pool.register( account.TrialBalanceClassic, - sale.SaleDailyReport, + # sale.SaleDailyReport, sale.SaleDetailedReport, sale.PortfolioDetailedReport, sale.ExpiredPortfolioReport, diff --git a/sale.py b/sale.py index c1a911b..3e4d43d 100644 --- a/sale.py +++ b/sale.py @@ -32,83 +32,84 @@ class SaleIncomeDailyStart(metaclass=PoolMeta): ) -class SaleDailyReport(metaclass=PoolMeta): - __name__ = 'sale_goal.sale_daily_report' - - @classmethod - def get_context(cls, records, header, data): - # report_context = super(SaleDailyReport, cls).get_context(records, data) - report_context = {} - pool = Pool() - Sale = pool.get('sale.sale') - User = pool.get('res.user') - Company = pool.get('company.company') - company = Company(data['company']) - Journal = pool.get('account.statement.journal') - user_ = User(Transaction().user) - - dom_sales = [ - ('company', '=', data['company']), - ('sale_date', '=', data['sale_date']), - ('number', '!=', None), - ] - states_sale = ['confirmed', 'processing', 'done'] - if data['include_canceled']: - states_sale.append('cancel') - dom_sales.append(('state', 'in', states_sale)) - - journal_name = '' - if data['journal']: - dom_sales.append(('payments.statement.journal', '=', data['journal'])) - journal = Journal(data['journal']) - journal_name = journal.name.upper() - - ctx = { - 'company': user_.company.id, - 'user': user_.id, - 'shops': [s.id for s in user_.shops], - 'shop': user_.shop.id, - } - with Transaction().set_context(ctx): - sales = Sale.search(dom_sales, order=[('number', 'ASC')]) - - untaxed_amount_ = [] - tax_amount_ = [] - total_amount_ = [] - total_amount_ = [] - total_journal_paid_ = [] - sequence = 0 - - for sale in sales: - sequence += 1 - setattr(sale, 'sequence', sequence) - journal_paid = _ZERO - if data['journal'] and sale.state != 'cancel': - for p in sale.payments: - if p.statement.journal.id == data['journal']: - journal_paid += p.amount - total_journal_paid_.append(journal_paid) - - setattr(sale, 'journal_paid', journal_paid) - if not hasattr(sale, 'sale_device'): - setattr(sale, 'sale_device', None) - if sale.state == 'cancel': - continue - - untaxed_amount_.append(sale.untaxed_amount) - tax_amount_.append(sale.tax_amount) - total_amount_.append(sale.total_amount) - - report_context['data'] = data - report_context['records'] = sales - report_context['total_amount'] = sum(total_amount_) - report_context['tax_amount'] = sum(tax_amount_) - report_context['untaxed_amount'] = sum(untaxed_amount_) - report_context['date'] = data['sale_date'] - report_context['company'] = company.party.name - report_context['journal'] = journal_name - report_context['total_journal_paid'] = sum(total_journal_paid_) - return report_context +# class SaleDailyReport(metaclass=PoolMeta): +# __name__ = 'sale_goal.sale_daily_report' +# +# @classmethod +# def get_context(cls, records, header, data): +# # report_context = super(SaleDailyReport, cls).get_context(records, data) +# report_context = {} +# pool = Pool() +# Sale = pool.get('sale.sale') +# User = pool.get('res.user') +# Company = pool.get('company.company') +# company = Company(data['company']) +# Journal = pool.get('account.statement.journal') +# user_ = User(Transaction().user) +# +# dom_sales = [ +# ('company', '=', data['company']), +# ('sale_date', '=', data['sale_date']), +# ('number', '!=', None), +# ] +# states_sale = ['confirmed', 'processing', 'done'] +# if data['include_canceled']: +# states_sale.append('cancel') +# dom_sales.append(('state', 'in', states_sale)) +# +# journal_name = '' +# if data['journal']: +# dom_sales.append(('payments.statement.journal', '=', data['journal'])) +# journal = Journal(data['journal']) +# journal_name = journal.name.upper() +# +# ctx = { +# 'company': user_.company.id, +# 'user': user_.id, +# 'shops': [s.id for s in user_.shops], +# 'shop': user_.shop.id, +# } +# with Transaction().set_context(ctx): +# sales = Sale.search(dom_sales, order=[('number', 'ASC')]) +# +# untaxed_amount_ = [] +# tax_amount_ = [] +# total_amount_ = [] +# total_amount_ = [] +# total_journal_paid_ = [] +# sequence = 0 +# +# for sale in sales: +# sequence += 1 +# +# setattr(sale, 'sequence', sequence) +# journal_paid = _ZERO +# if data['journal'] and sale.state != 'cancel': +# for p in sale.payments: +# if p.statement.journal.id == data['journal']: +# journal_paid += p.amount +# total_journal_paid_.append(journal_paid) +# +# setattr(sale, 'journal_paid', journal_paid) +# if not hasattr(sale, 'sale_device'): +# setattr(sale, 'sale_device', None) +# if sale.state == 'cancel': +# continue +# +# untaxed_amount_.append(sale.untaxed_amount) +# tax_amount_.append(sale.tax_amount) +# total_amount_.append(sale.total_amount) +# +# report_context['data'] = data +# report_context['records'] = sales +# report_context['total_amount'] = sum(total_amount_) +# report_context['tax_amount'] = sum(tax_amount_) +# report_context['untaxed_amount'] = sum(untaxed_amount_) +# report_context['date'] = data['sale_date'] +# report_context['company'] = company.party.name +# report_context['journal'] = journal_name +# report_context['total_journal_paid'] = sum(total_journal_paid_) +# return report_context class SaleMonthByShopStart(metaclass=PoolMeta): diff --git a/view/connection_companies_tree.xml b/view/connection_companies_tree.xml index cb061d9..addd076 100644 --- a/view/connection_companies_tree.xml +++ b/view/connection_companies_tree.xml @@ -1,7 +1,7 @@ - +