Merge pull request #965 from expsa/setting_property

Setting property

odex25_realstate/property_management/models/property_management_conf.py

@@ -10,9 +10,12 @@ class ResConfigSettings(models.TransientModel):
     commission_percentage = fields.Float(string='Commission Percentage', help="The commission percentage.")
     commission_account_id = fields.Many2one('account.account', string='Commission Account', help="The account used to record commissions.")
     collecting_company_id = fields.Many2one('res.partner', string='Collecting Company', help="The company responsible for collecting the commission.")
-    
-
-
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        # Save the values to ir.config_parameter
+        self.env['ir.config_parameter'].sudo().set_param('property_management.commission_percentage', self.commission_percentage)
+        self.env['ir.config_parameter'].sudo().set_param('property_management.commission_account_id', self.commission_account_id.id)
+        self.env['ir.config_parameter'].sudo().set_param('property_management.collecting_company_id', self.collecting_company_id.id)
 class RentType(models.Model):
     _name = 'rent.type'
     _description = 'Rent Type'

odex25_realstate/property_management/models/rent_payment.py

@@ -200,8 +200,11 @@ class RentPayment(models.Model):
             raise exceptions.ValidationError(_('Cannot Cancel This Payment Because it Due'))
             
     def create_vendor_bill_for_payments(self):
-        action = self.env['rent.payment'].browse(context.get('active_ids', []))
-        payments_to_invoice = action.filtered(lambda p: p.state == 'paid' and p.collected_from_company and not p.invoice_commission_id)
+        active_ids = self._context.get('active_ids', [])
+        # action = self.env['rent.payment'].browse(context.get('active_ids', []))
+        # payments_to_invoice = action.filtered(lambda p: p.state == 'paid' and p.collected_from_company and not p.invoice_commission_id)
+         payments_to_invoice = self.env['rent.payment'].browse(active_ids).filtered(
+        lambda p: p.state == 'paid' and p.collected_from_company and not p.invoice_commission_id)
         vendor_id = self.env['ir.config_parameter'].get_param('property_management.collecting_company_id')
         account_id = self.env['ir.config_parameter'].get_param('property_management.commission_account_id ')
         total_commission_amount = sum(payments_to_invoice.mapped('commission_amount'))

odex25_realstate/property_management/views/property_conf_views.xml

@@ -3,7 +3,7 @@
     <data>
         
      <record id="res_property_settings_view_form" model="ir.ui.view">
-        <field name="name">res.dev.membership.config.settings</field>
+        <field name="name">res.property.config.settings</field>
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
@@ -19,8 +19,8 @@
                                 </div>
                                 <div class="text-muted content-group mt16">
                                     <field name="commission_percentage"  widget="percentage" class="text-left oe_inline"/>
-                                   <field name="commission_account_id" class="text-left oe_inline"/>
-                                    <field name="collecting_company_id" class="text-left oe_inline"/>
+                                   <field name="commission_account_id"/>
+                                    <field name="collecting_company_id"/>
                                    </div>
                             </div>
                         </div>

odex25_realstate/property_management/views/rent_payment_view.xml

@@ -103,6 +103,8 @@
                     <filter string="Not due" name="not_due_payment" domain="[('state','=','draft')]"/>
                     <filter string="Paid" name="paid_payment" domain="[('state','=','paid')]"/>
                     <filter string="Cancelled" name="cancel_payment" domain="[('state','=','cancel')]"/>
+                     <filter string="Collected From Company" name="collected_from_company" domain="[('collected_from_company','=',True)]"/>
+
                     <separator/>
                     <filter name="payment_state" string="Not Canceled Payment" domain="[('state','!=','cancel')]"/>
                     <separator/>

odex25_realstate/property_management_menu/views/property_management_menu_view.xml

@@ -243,6 +243,7 @@
         <field name="view_id" ref="property_management.res_property_settings_view_form"/>
         <field name="view_mode">form</field>
         <field name="target">inline</field>
+        <field name="context">{'module' : 'property_management'}</field>
     </record>