!8874 !8873 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…

Merge pull request !8874 from 李鹏宇/dev

yuthon_property/models/property_accounts_receivable.py

@@ -15,11 +15,8 @@ class PropertyAccountsReceivable(models.Model):
     due_date = fields.Date(string='应收开始')
     due_date_end = fields.Date(string='应收结束')
     reconciliation_time = fields.Datetime('对账时间')
-    year = fields.Selection(selection=[(str(i), str(i)) for i in range(2024, 2060)], string='所属年', )
-    month = fields.Selection([('1', '一月'), ('2', '二月'), ('3', '三月'), ('4', '四月'),
-                              ('5', '五月'), ('6', '六月'), ('7', '七月'), ('8', '八月'),
-                              ('9', '九月'), ('10', '十月'), ('11', '十一月'),
-                              ('12', '十二月')], string='选择月份')
+    month_id = fields.Many2one('base.month', string='月份', compute="_compute_display_date", store=True)
+    year_id = fields.Many2one('base.year', string='年份', compute="_compute_display_date", store=True)
     original_amount = fields.Float(string='当期金额')
     discount_amount = fields.Float(string='减免金额')
     discount_date = fields.Date(string='减免日期')
@@ -69,6 +66,18 @@ class PropertyAccountsReceivable(models.Model):
                 record.due_date = record.due_date_end
                 record.due_date_end = None
 
+    @api.depends('due_date')
+    def _compute_display_date(self):
+        for rec in self:
+            if rec.due_date:
+                month_id = rec.env['base.month'].search([('name', '=', int(rec.due_date.month))])
+                rec.month_id = month_id.id if month_id else False
+                year_id = rec.env['base.year'].search([('name', '=', int(rec.due_date.year))])
+                rec.year_id = year_id.id if year_id else False
+            else:
+                rec.month_id = False
+                rec.year_id = False
+
     @api.onchange('is_invalid')
     def _onchange_is_invalid(self):
         if self.is_invalid:

yuthon_property/models/property_tenant_information.py

@@ -27,6 +27,7 @@ class PropertyTenantInformation(models.Model):
     power_attorney_id = fields.Many2one('ir.attachment', string='委托代理书')
     attorne_card_id = fields.Many2one('ir.attachment', string='委托代理人身份证')
     bank_ids = fields.One2many('property.bank.line', 'tenant_id', string='银行信息')
+    kingdee_tenant_id = fields.Char(string='金蝶云承租方id')
 
     def update_tenant_wizard(self):
         return {

yuthon_property/models/yuthon_property.py

@@ -96,6 +96,7 @@ class YuthonProperty(models.Model):
     rent_unit = fields.Float(string='租金单价', igits=(6, 2))
     property_type = fields.Selection([('property', '物业'), ('guanggao', '广告位'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型", default='property')
     is_new = fields.Boolean(string="是否最新物业", compute= 'compute_is_new', default=True, store=True)
+    kingdee_property_id = fields.Char(string="金蝶云物业资产id")
 
     def update_property_state(self):
         today = date.today()

yuthon_property/models/yuthon_resource_mgmt_config.py

@@ -111,6 +111,7 @@ class YuthonPropertyCompany(models.Model):
     rent_account = fields.Char(string="收租公司账号")
     start_data = fields.Date(string="开始日期")
     end_data = fields.Date(string="结束日期")
+    kingdee_company_id = fields.Char(string="金蝶云物业公司id")
 
 
 class YuthonIndustrySetting(models.Model):

yuthon_property/views/property_accounts_receivable_views.xml

@@ -3,7 +3,7 @@
         <field name="name">property.accounts.receivable.tree</field>
         <field name="model">property.accounts.receivable</field>
         <field name="arch" type="xml">
-            <tree editable="bottom" string="应收账单" decoration-success="is_reconciliation == True" limit="15" delete="false"
+            <tree editable="bottom" string="应收账单" decoration-success="is_reconciliation == True" default_order="due_date desc" limit="15" delete="false"
                   decoration-muted="is_invalid">
                 <field name="acc_type" string=" "/>
                 <field name="management_type_id" readonly="0"/>

yuthon_property/views/property_tenant_information_views.xml

@@ -45,6 +45,7 @@
                             <field name="invoicing_type"/>
                             <field name="invoicing_begins"/>
                             <field name="tax_number"/>
+                            <field name="kingdee_tenant_id"/>
                             <field name="power_attorney_id" widget="preview_many2one"/>
                             <field name="attorne_card_id" widget="preview_many2one"/>
                             <field name="end_date"/>

yuthon_property/views/yuthon_property_views.xml

@@ -66,6 +66,7 @@
                             <field name="financial_address"/>
                             <field name="effective_date"/>
                             <field name="property_type"/>
+                            <field name="kingdee_property_id"/>
                         </group>
                         <group>
                             <field name="company_id" invisible="1"/>

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -190,6 +190,7 @@
                 <field name="phone"/>
                 <field name="start_data"/>
                 <field name="end_data"/>
+                <field name="kingdee_company_id"/>
             </tree>
         </field>
     </record>

yuthon_property_approval/views/inherit_yuthon_property_views.xml

@@ -468,15 +468,20 @@
                     <filter name="contract_sort" string="资产类型" context="{'group_by':'contract_sort'}"/>
                     <filter name="group_management_type_id" string="应收类型" context="{'group_by':'management_type_id'}"/>
                     <filter name="group_tenure_type" string="权属类型" context="{'group_by':'tenure_type'}"/>
+                    <filter name="group_precinct_id" string="片区管理员" context="{'group_by':'precinct_id'}"/>
                     <filter name="group_due_date" string="应收开始" context="{'group_by':'due_date'}"/>
                 </group>
-             <header_search>
+             <header_search class="header-search-inline">
                 <quick_filter string="应收状态">
                      <filter string="红冲" name="is_red" domain="[('is_red', '=', True)]"/>
                      <filter string="对账" name="is_reconciliation" domain="[('is_reconciliation', '=', True)]"/>
                      <filter string="未对账" name="not_reconciliation" domain="[('is_reconciliation', '=', False)]"/>
                      <filter string="作废" name="is_invalid" domain="[('is_invalid', '=', True)]"/>
                 </quick_filter>
+                <field name="precinct_id" placeholder="片区管理员" options="{'no_label': True}"/>
+                <field name="year_id" placeholder="年" options="{'no_label': True}"/>
+                <field name="month_id" placeholder="月" options="{'no_label': True}"/>
+                <field name="company_id" placeholder="公司" options="{'no_label': True}"/>
             </header_search>
             </search>
         </field>
@@ -492,7 +497,7 @@
         <field name="name">应收账单</field>
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'search_default_group_by_contract_id': True}</field>
+        <field name="context">{'search_default_group_company_id': True, 'group_by': ['company_id', 'due_date:year', 'due_date:month'], 'orderedBy': [{'name': 'due_date', 'asc': False}]}</field>
         <field name="search_view_id" ref="view_property_accounts_receivable_search"/>
         <field name="view_id" ref="yuthon_property.view_property_accounts_receivable_tree"/>
     </record>
@@ -501,6 +506,7 @@
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_mode">tree</field>
         <field name="domain">[('management_type_id.name','=', '违约金')]</field>
+        <field name="context">{'search_default_group_company_id': True, 'group_by': ['company_id', 'due_date:year', 'due_date:month'], 'orderedBy': [{'name': 'due_date', 'asc': False}]}</field>
         <field name="search_view_id" ref="view_property_accounts_receivable_search"/>
         <field name="view_id" ref="yuthon_property.view_property_accounts_receivable_tree"/>
     </record>
@@ -508,7 +514,7 @@
         <field name="name">押金列表</field>
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'search_default_group_by_contract_id': True}</field>
+        <field name="context">{'search_default_group_company_id': True, 'group_by': ['company_id', 'due_date:year', 'due_date:month'], 'orderedBy': [{'name': 'due_date', 'asc': False}]}</field>
         <field name="domain">[('management_type_id.name','=', '押金')]</field>
         <field name="search_view_id" ref="view_property_accounts_receivable_search"/>
         <field name="view_id" ref="yuthon_property.view_property_accounts_receivable_tree1"/>