Small UI enh for budget plan and control

Author: kittiu

account_budget_activity/models/account_budget.py

@@ -163,7 +163,7 @@ class AccountBudget(models.Model):
         store=True,
     )
     past_consumed = fields.Float(
-        string='Past Actual',
+        string='Consumed',
         compute='_compute_past_future_rolling',
         help="Commitment + Actual for the past months",
     )
@@ -192,13 +192,22 @@ def _get_past_consumed_domain(self):
                ('period_id', '<', current_period.id)]
         return dom
 
+    @api.multi
+    def _budget_expense_lines_hook(self):
+        self.ensure_one()
+        return self.budget_expense_line_ids
+
     @api.multi
     def _get_future_plan_amount(self):
         self.ensure_one()
         Period = self.env['account.period']
-        period_num = Period.get_num_period_by_period()  # Now
+        period_num = 1
+        date_start = Period.find().date_start
+        if self.fiscalyear_id.date_start <= date_start:
+            period_num = Period.get_num_period_by_period()  # Now
         future_plan = 0.0
-        for line in self.budget_expense_line_ids:
+        expense_lines = self._budget_expense_lines_hook()
+        for line in expense_lines:
             for i in range(period_num, 13):
                 future_plan += line['m%s' % (i,)]
         return future_plan
@@ -694,9 +703,12 @@ def write(self, vals):
     @api.depends()
     def _compute_current_period(self):
         Period = self.env['account.period']
+        date_start = Period.find().date_start
         for rec in self:
             if rec.budget_id.budget_level_id.adjust_past_plan:
                 rec.current_period = 0
+            elif rec.fiscalyear_id.date_start > date_start:
+                rec.current_period = 0
             else:
                 rec.current_period = Period.get_num_period_by_period()
 

account_budget_activity/views/account_budget_view.xml

@@ -98,7 +98,7 @@
                                 <field name="creating_user_id"/>
                                 <field name="budgeted_revenue"/>
                                 <field name="budgeted_expense"/>
-                                <field name="budgeted_overall"/>
+                                <field name="budgeted_overall" invisible="1"/>
                                 <field name="budget_level_id" invisible="1"/>
                             </group>
                             <group>
@@ -172,7 +172,7 @@
                     <field name="name"/>
                     <field name="budgeted_revenue"/>
                     <field name="budgeted_expense"/>
-                    <field name="budgeted_overall"/>
+                    <field name="budgeted_overall" invisible="1"/>
                     <field name="released_amount" sum="Released Amount"/>
                     <field name="creating_user_id"/>
                     <field name="state"/>

pabi_budget_internal_charge/models/account_budget.py

@@ -60,17 +60,10 @@ def _compute_budgeted_overall(self):
             rec.budgeted_expense_internal = expense_internal
 
     @api.multi
-    def _get_future_plan_amount(self):
-        """ Overwrite """
+    def _budget_expense_lines_hook(self):
         self.ensure_one()
-        Period = self.env['account.period']
-        period_num = Period.get_num_period_by_period()  # Now
-        future_plan = 0.0
-        for line in self.budget_expense_line_ids.\
-                filtered(lambda l: l.charge_type == 'external'):  # Add this
-            for i in range(period_num, 13):
-                future_plan += line['m%s' % (i,)]
-        return future_plan
+        return self.budget_expense_line_ids.\
+            filtered(lambda l: l.charge_type == 'external')
 
 
 class AccountBudgetLine(models.Model):

pabi_budget_plan/models/account_budget.py

@@ -7,20 +7,10 @@ class AccountBudget(models.Model):
     _inherit = 'account.budget'
     _order = 'create_date desc'
 
-    # prev_planned_amount = fields.Float(
-    #     string='Planned Amount',
-    #     readonly=True,
-    # )
     policy_amount = fields.Float(
         string='Policy Amount',
         readonly=True,
     )
-    # ref_breakdown_id = fields.Many2one(
-    #     'budget.fiscal.policy.breakdown',
-    #     string="Breakdown Reference",
-    #     copy=True,
-    #     readonly=True,
-    # )
 
     @api.multi
     def _get_doc_number(self):
@@ -92,25 +82,6 @@ def _check_fiscalyear_section_unique(self):
                 raise ValidationError(
                     _('Duplicated budget on the same fiscal year!'))
 
-    # @api.multi
-    # def budget_confirm(self):
-    #     for rec in self:
-    #        name = self.env['ir.sequence'].next_by_code('budget.control.unit')
-    #         rec.write({'name': name})
-    #         # rec.ref_budget_id.budget_cancel()
-    #     return super(AccountBudget, self).budget_confirm()
-
-    # # New Revision
-    # @api.multi
-    # def new_minor_revision(self):
-    #     result = super(AccountBudget, self).new_minor_revision()
-    #     if result.get('domain', []):
-    #         new_budget_id = result['domain'][0][2]
-    #         new_budget = self.browse(new_budget_id)
-    #         new_budget.ref_budget_id = self.id
-    #         new_budget.name = '/'
-    #     return result
-
     @api.multi
     def unlink(self):
         for policy in self:
@@ -119,35 +90,3 @@ def unlink(self):
                     _('Cannot delete budget(s)\
                     which are not in draft or cancelled.'))
         return super(AccountBudget, self).unlink()
-
-    # @api.multi
-    # def get_all_version(self):
-    #     self.ensure_one()
-    #     budget_ids = []
-    #     if self.ref_budget_id:
-    #         budget = self.ref_budget_id
-    #         while budget:
-    #             budget_ids.append(budget.id)
-    #             budget = budget.ref_budget_id
-    #     budget = self
-    #     while budget:
-    #         ref_budget =\
-    #             self.search([('ref_budget_id', '=', budget.id)])
-    #         if ref_budget:
-    #             budget_ids.append(ref_budget.id)
-    #         budget = ref_budget
-    #     act = 'account_budget_activity.act_account_budget_view'
-    #     action = self.env.ref(act)
-    #     result = action.read()[0]
-    #     dom = [('id', 'in', budget_ids)]
-    #     result.update({'domain': dom})
-    #     return result
-
-
-class AccountBudgetLine(models.Model):
-    _inherit = 'account.budget.line'
-
-    planned_amount = fields.Float(
-        string='Current Amount',  # Existing field, change label only
-        help="Current Planned Amount"
-    )

pabi_chartfield/views/account_budget_view.xml

@@ -197,7 +197,7 @@
 
                     <!-- ACTIVITY -->
                     <field name="activity_group_id" invisible="0"/>
-                    <field name="activity_id" invisible="0" domain="[('activity_group_ids', 'in', [activity_group_id or -1]), ('budget_method', '=', budget_method)]"/>
+                    <field name="activity_id" invisible="1" domain="[('activity_group_ids', 'in', [activity_group_id or -1]), ('budget_method', '=', budget_method)]"/>
 
                     <!-- PERIOD -->
                     <field name="planned_amount" sum="Planned Amount"/>
@@ -267,7 +267,7 @@
 
                     <!-- ACTIVITY -->
                     <field name="activity_group_id" invisible="0"/>
-                    <field name="activity_id" invisible="0" domain="[('activity_group_ids', 'in', [activity_group_id or -1]), ('budget_method', '=', budget_method)]"/>
+                    <field name="activity_id" invisible="1" domain="[('activity_group_ids', 'in', [activity_group_id or -1]), ('budget_method', '=', budget_method)]"/>
 
                     <!-- PERIOD -->
                     <field name="planned_amount" sum="Planned Amount"/>
@@ -328,7 +328,7 @@
                     <field name="cost_control_id" invisible="1" />
                     <!-- ACTIVITY -->
                     <field name="activity_group_id" invisible="0"/>
-                    <field name="activity_id" invisible="0"  domain="[('activity_group_ids', 'in', [activity_group_id or -1]), ('budget_method', '=', budget_method)]"/>
+                    <field name="activity_id" invisible="1"  domain="[('activity_group_ids', 'in', [activity_group_id or -1]), ('budget_method', '=', budget_method)]"/>
                     <!-- PERIOD -->
                     <field name="planned_amount" sum="Planned Amount"/>
                     <field name="budget_release" invisible="0"/>