Presik/trytonpsk-sale_pos
1
0
Fork 0
mirror of https://bitbucket.org/presik/trytonpsk-sale_pos.git synced 2023-12-14 07:13:02 +01:00
Code Issues Projects Releases Wiki Activity

minor fix

Browse source
This commit is contained in:
Camilo Sarmiento 2020-07-04 13:56:48 -05:00
parent f48e823758
commit 08572c66e8
1 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
sale.py
View file

@ -1377,7 +1377,7 @@ class SaleIncomeDailyStart(ModelView):
__name__ = 'sale_pos.sale_income_daily.start'
company = fields.Many2One('company.company', 'Company', required=True)
date = fields.Date('Date', required=True)
shop = fields.Many2One('sale.shop', 'Shop', required=True)
shop = fields.Many2One('sale.shop', 'Shop')
# user = fields.Many2One('res.user', 'User', required=True)
# journal = fields.Many2One('account.statement.journal', 'Journal')
@ -1438,10 +1438,12 @@ class SaleIncomeDailyReport(Report):
Shop = pool.get('sale.shop')
User = pool.get('res.user')
statements = Statement.search([
dom_statement = [
('date', '=', data['date']),
('sale_device.shop.id', '=', data['shop'])
])
]
if data['shop']:
dom_statement.append(('sale_device.shop.id', '=', data['shop']))
statements = Statement.search(dom_statement)
user_id = Transaction().user
user = User(user_id)
records = []
@ -1472,44 +1474,47 @@ class SaleIncomeDailyReport(Report):
else:
statement_electronic.append(l.amount)
sales = Sale.search([
('sale_date', '=', data['date']),
('shop', '=', data['shop']),
('vouchers', '!=', None)
])
advances_voucher = []
voucher_ids = []
for sale in sales:
for v in sale.vouchers:
cash, electronic = 0,0
if v.payment_mode.payment_type == 'cash':
advances_cash.append(v.amount_to_pay)
cash = v.amount_to_pay
else:
electronic = v.amount_to_pay
advances_electronic.append(v.amount_to_pay)
voucher_ids.append(v.id)
advances_voucher.append(v.amount_to_pay)
advances.append({
'number': v.number,
'reference': sale.number,
'party': v.party.name,
'total_amount': v.amount_to_pay,
'payment_mode': v.payment_mode.name,
'cash': cash,
'electronic': electronic,
})
total_advances.append(v.amount_to_pay)
# dom_sales = [
# ('sale_date', '=', data['date']),
# ('vouchers', '!=', None)
# ]
# if data['shop']:
# dom_sales.append(
# ('shop', '=', data['shop']),
# )
# sales = Sale.search(dom_sales)
# voucher_ids = []
# for sale in sales:
# for v in sale.vouchers:
# cash, electronic = 0,0
# if v.payment_mode.payment_type == 'cash':
# advances_cash.append(v.amount_to_pay)
# cash = v.amount_to_pay
# else:
# electronic = v.amount_to_pay
# advances_electronic.append(v.amount_to_pay)
# voucher_ids.append(v.id)
# advances_voucher.append(v.amount_to_pay)
# advances.append({
# 'number': v.number,
# 'reference': sale.number,
# 'party': v.party.name,
# 'total_amount': v.amount_to_pay,
# 'payment_mode': v.payment_mode.name,
# 'cash': cash,
# 'electronic': electronic,
# })
# total_advances.append(v.amount_to_pay)
dom_vouchers = [
('move', '!=', None),
('move.post_date', '=', data['date']),
('create_uid', '=', user_id)
]
if voucher_ids:
dom_vouchers.append(
('id', 'not in', voucher_ids)
)
# if voucher_ids:
# dom_vouchers.append(
# ('id', 'not in', voucher_ids)
# )
vouchers = Voucher.search(dom_vouchers)
for v in vouchers:
@ -1534,17 +1539,16 @@ class SaleIncomeDailyReport(Report):
})
total_advances.append(l.amount)
dom_ = [
dom_invoices = [
('company', '=', data['company']),
('invoice_date', '=', data['date']),
('shop', '=', data['shop']),
('number', '!=', None),
('state', 'in', ['posted', 'paid', 'canceled']),
]
shop_names = ''
if data['shop']:
shop_names = Shop(data['shop']).name
dom_.append(
dom_invoices.append(
('shop', '=', data['shop'])
)
else:
@ -1552,9 +1556,7 @@ class SaleIncomeDailyReport(Report):
for s in shops:
shop_names += s.name + ', '
invoices = Invoice.search(dom_, order=[('number', 'ASC')])
invoices = Invoice.search(dom_invoices, order=[('number', 'ASC')])
invoices_number = []
total_invoices_cash = []
total_invoices_electronic = []