devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #721 from expsa/dev_odex25_accounting 

Dev odex25 accounting
This commit is contained in:
Mostafa 2024-08-14 15:49:14 +03:00 committed by GitHub
parent e0351c0f75 e5d54626d6
commit fbe78e665f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_accounting/account_budget_custom/models/account_budget.py
View File

@ -83,7 +83,7 @@ class CrossoveredBudgetLines(models.Model):
for rec in self:
orders = self.env['purchase.order.line'].search(
[('account_analytic_id', '=', rec.analytic_account_id.id),
('order_id.state', 'in', ['purchase'])]).mapped('order_id')
('order_id.state', 'in', ['purchase','done'])]).mapped('order_id')
total_orders = sum(orders.mapped('amount_total'))
invoiced = self.env['account.move'].search(
[('purchase_id', 'in', orders.ids), ('state', 'not in', ['draft', 'cancel'])]).mapped('amount_total')

2
odex25_accounting/exp_budget_check/models/account_budget.py
View File

@ -14,7 +14,7 @@ class CrossoveredBudgetLines(models.Model):
for rec in self:
orders = self.env['purchase.order.line'].search(
[('account_analytic_id', '=', rec.analytic_account_id.id),
('order_id.state', 'in', ['purchase'])]).mapped('order_id')
('order_id.state', 'in', ['purchase','done'])]).mapped('order_id')
total_orders = sum(orders.mapped('amount_total'))
invoiced = self.env['account.move'].search(
[('purchase_id', 'in', orders.ids), ('state', 'not in', ['draft', 'cancel'])]).mapped('amount_total')