!6025 添加功能

Merge pull request !6025 from 李鹏宇/dev_zhou

yuthon_property/models/property_bank_statements.py

@@ -50,7 +50,7 @@ class PropertyBankStatements(models.Model):
     @api.depends('yes_amount', 'original_amount')
     def _compute_no_amount(self):
         for rec in self:
-            rec.no_amount = rec.original_amount - rec.yes_amount
+            rec.no_amount = max((rec.original_amount - rec.yes_amount), 0)
 
     def update_lending_direction(self):
         bank_ids = self.env["property.bank.statements"].browse(

yuthon_property_approval/wizard/click_reconciliation_wizard.py

@@ -83,6 +83,7 @@ class ClickReconciliationWizard(models.Model):
                     rec.write({
                         'is_reconciliation': True,
                         'delivered1': rec.original_amount,
+                        'change_amount': rec.original_amount,
                         'reconciliation_time': fields.Datetime.now() - timedelta(hours=8),
                         'payout_date': statements[0].start_time.date() if statements else False,  # 取第一笔流水日期
                         'receivable_log': f'当前登录人{self.env.user.name}于{fields.Datetime.now()}对户名为{statements[0].name_account}进行对账操作（多笔流水合并）'

yuthon_salary/models/inherit_hr_payslip.py

@@ -818,7 +818,7 @@ class InheritHrPayslip(models.Model):
             "name": "薪资明细",
             "view_mode": "tree",
             "views": [(False, "tree")],
-            "domain": [("slip_id", "=", self.id), ("amount", "!=", 0)],
+            "domain": [("slip_id", "=", self.id), ("total", "!=", 0)],
             "target": "new",
             "context": {
                 "tree_view_ref": "yuthon_salary.view_hr_payslip_line_tree_custom",

yuthon_salary/views/inherit_hr_payslip_views.xml

@@ -849,7 +849,7 @@
             <tree string="薪资明细" create="false">
                 <field name="name"/>
                 <field name="category_id"/>
-                <field name="amount" widget="monetary"/>
+                <field name="total" widget="monetary"/>
             </tree>
         </field>
     </record>