diff --git a/odex25_project/project_base/models/project.py b/odex25_project/project_base/models/project.py index 00f664292..5cf3e4449 100644 --- a/odex25_project/project_base/models/project.py +++ b/odex25_project/project_base/models/project.py @@ -67,12 +67,12 @@ class Project(models.Model): close_reason = fields.Text(string="Close Reason") project_team_ids = fields.One2many('project.team', 'project_id', string="Project Team") invoice_ids = fields.One2many('project.invoice', 'project_id', "Invoice", copy=False, help="The Details of invoice") - total_invoiced_amount = fields.Float('Total Invoiced Amount', compute='compute_total_invoiced_amount') + total_invoiced_amount = fields.Float('Total Invoiced Amount',store=True, compute='compute_total_invoiced_amount') no_of_invoices = fields.Integer(compute='compute_total_invoiced_payment') no_of_paid_invoices = fields.Integer(compute='compute_total_invoiced_payment') - total_invoiced_payment = fields.Float('Paid Amount', compute='compute_total_invoiced_payment') - residual_amount = fields.Float('Remaining Amount', compute='compute_residual_amount') - back_log_amount = fields.Float('Back Log Amount', compute='compute_back_log_amount') + total_invoiced_payment = fields.Float('Paid Amount',store=True, compute='compute_total_invoiced_payment') + residual_amount = fields.Float('Remaining Amount',store=True, compute='compute_residual_amount') + back_log_amount = fields.Float('Back Log Amount',store=True, compute='compute_back_log_amount') # TODO check if this fields needed is_down_payment = fields.Boolean('Down Payment') to_invoice = fields.Boolean(compute="compute_to_invoice", store=True) diff --git a/odex25_project/project_base/models/project_invoice.py b/odex25_project/project_base/models/project_invoice.py index 78fb08262..59d0808af 100644 --- a/odex25_project/project_base/models/project_invoice.py +++ b/odex25_project/project_base/models/project_invoice.py @@ -34,8 +34,8 @@ class ProjectInvoice(models.Model): project_downinv_ids = fields.One2many('project.invoice.line', 'project_invoice_id', string='Lines', domain=[('is_downpayment', '=', True)]) currency_id = fields.Many2one(related="project_id.currency_id", store=True) - payment_amount = fields.Monetary(string='Paid Amount', compute="_compute_payment_amount") - residual_amount = fields.Monetary('Remaining Amount', compute_sudo=True , compute='_compute_indo_invoice_id') + payment_amount = fields.Monetary(string='Paid Amount',store=True, compute="_compute_payment_amount") + residual_amount = fields.Monetary('Remaining Amount',store=True, compute_sudo=True , compute='_compute_indo_invoice_id') invoice_type = fields.Selection([('project', 'Project'), ('consultant','Consultant'), ('variation_order', 'Variation Order')], string='Invoice Type', default='project') has_downpayment = fields.Boolean(compute="_check_downpayment") @@ -269,7 +269,7 @@ class ProjectInvoiceLine(models.Model): product_uom_qty = fields.Float(string='Percentage', digits='Product Unit of Measure', required=True, default=0.0) amount = fields.Monetary("Amount") product_uom = fields.Many2one('uom.uom', string='Unit of Measure', ) - price_unit = fields.Float('Unit Price', digits='Project Amount', compute="get_price_unit_value") + price_unit = fields.Float('Unit Price', digits='Project Amount',store=True, compute="get_price_unit_value") discount = fields.Float(string='Discount (%)', digits='Discount') price_subtotal = fields.Monetary(string='Subtotal', store=True) price_tax = fields.Float(string='Total Tax', compute="_compute_amount", store=True) diff --git a/odex25_project/project_base/views/project_invoice_views.xml b/odex25_project/project_base/views/project_invoice_views.xml index 7386cf1b1..5ac1b1a82 100644 --- a/odex25_project/project_base/views/project_invoice_views.xml +++ b/odex25_project/project_base/views/project_invoice_views.xml @@ -57,11 +57,11 @@ - + - + - + diff --git a/odex25_project/project_base/views/project_views.xml b/odex25_project/project_base/views/project_views.xml index 8ef2959e5..a1f2ea773 100644 --- a/odex25_project/project_base/views/project_views.xml +++ b/odex25_project/project_base/views/project_views.xml @@ -172,7 +172,7 @@ - + @@ -224,12 +224,12 @@ - + - +