!133 zhang

Merge pull request !133 from 李鹏宇/dev_zhang

yuthon_contract/__manifest__.py

@@ -17,6 +17,7 @@
         'views/inherit_hr_contract_views.xml',
         'views/inherit_sale_order_views.xml',
 
+
     ],
     'installable': True,
     'application': True,

yuthon_contract/models/inherit_hr_contract.py

@@ -7,3 +7,12 @@ class HrContract(models.Model):
     _inherit = "hr.contract"
     _description = "员工合同拓展"
 
+    first_party = fields.Selection([('thtz','天河投资'),
+                                    ('thcj','天河城建'),
+                                    ('thwg','天河物管'),
+                                    ('thlc','天河粮储存')],
+                                   string='甲方')
+    party_b = fields.Char("乙方")
+    account = fields.Char("账户")
+    bank = fields.Char("开户行")
+

yuthon_contract/models/inherit_sale_order.py

@@ -7,3 +7,45 @@ class SaleOrder(models.Model):
     _inherit = "sale.order"
     _description = "租赁合同拓展"
 
+    contract_id = fields.Char(string="合同编号")
+    first_years_rent = fields.Char(string="首年租金")
+    payout_address = fields.Char(string="物业地址")
+    uses = fields.Char(string="出租用途")
+
+    contact_number = fields.Char(string="联系电话")
+    email = fields.Char(string="邮箱")
+
+    deadline_time_point = fields.Char(string="违约金计算时点")
+    liquidated_damages_ratio = fields.Char(string="违约金比例")
+    deposit = fields.Float(string="押金")
+    property_rent_m = fields.Float(string="可租面积", help="单位：0㎡")
+    unit_price = fields.Float(string="单价")
+    rent = fields.Char(string="租金", help="单位：元")
+    rent_changes_regularly = fields.Char(string="租金变化规律", help="每0年递增0%")
+    lessee = fields.Char(string="承租方")
+    tax_rate = fields.Char(string="税率")
+    no_tax_price = fields.Char(string="不含税价")
+    tax_money = fields.Char(string="税金")
+    monthly_rent = fields.Char(string="月租金")
+    total_contract_receivable = fields.Char(string="合同总应收")
+    contract_date_signing = fields.Char(string="合同签订日期")
+    handover_date = fields.Char(string="交接日期")
+    #发票
+    billing_type = fields.Char(string="开票类型")
+    invoice_title = fields.Char(string="开票抬头")
+
+    other_conventions = fields.Text(string='其他约定')
+    #承租方信息
+    industry = fields.Char(string="行业")
+    partner_name = fields.Char(string="联系人")
+    partner_address = fields.Char(string="联系人地址")
+    contact_number = fields.Char(string="联系电话")
+    email = fields.Char(string="邮箱")
+    #物业列表
+    contracted_property_site = fields.Char(string="合同物业地址")
+    area = fields.Char(string='建筑面积')
+    evaluate_reference_price = fields.Char(string="评估单价",help="单位：元/㎡")
+
+
+
+

yuthon_contract/views/inherit_hr_contract_views.xml

@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="inherit_hr_contract_yuthon_tree" model="ir.ui.view">
-        <field name="name">inherit.hr.contract.yuthon.tree</field>
-        <field name="model">hr.contract</field>
-        <field name="inherit_id" ref="hr_contract.hr_contract_view_tree"/>
-        <field name="arch" type="xml">
-            <xpath expr="" postion="">
+<!--    <record id="inherit_hr_contract_yuthon_tree" model="ir.ui.view">-->
+<!--        <field name="name">inherit.hr.contract.yuthon.tree</field>-->
+<!--        <field name="model">hr.contract</field>-->
+<!--        <field name="inherit_id" ref="hr_contract.hr_contract_view_tree"/>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <xpath expr="" postion="">-->
 
-            </xpath>
-        </field>
-    </record>
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->
     <record id="inherit_hr_contract_yuthon_form" model="ir.ui.view">
         <field name="name">inherit.hr.contract.yuthon.form</field>
         <field name="model">hr.contract</field>
         <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="" postion="">
-
+            <xpath expr="//field[@name='contract_type_id']" position="after">
+                <field name="first_party"/>
+                <field name="bank"/>
+            </xpath>
+            <xpath expr="//field[@name='date_end']" position="after">
+                <field name="party_b"/>
+                <field name="account"/>
             </xpath>
         </field>
     </record>

yuthon_contract/views/inherit_sale_order_views.xml

@@ -1,22 +1,68 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="inherit_sale_renting_yuthon_tree" model="ir.ui.view">
-        <field name="name">inherit.sale.renting.yuthon.tree</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale_renting.rental_order_view_tree"/>
-        <field name="arch" type="xml">
-            <xpath expr="" postion="">
-                
-            </xpath>
-        </field>
-    </record>
+<!--    <record id="inherit_sale_renting_yuthon_tree" model="ir.ui.view">-->
+<!--        <field name="name">inherit.sale.renting.yuthon.tree</field>-->
+<!--        <field name="model">sale.order</field>-->
+<!--        <field name="inherit_id" ref="sale_renting.rental_order_view_tree"/>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <xpath expr="" postion="">-->
+
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->
     <record id="inherit_sale_renting_yuthon_form" model="ir.ui.view">
         <field name="name">inherit.sale.renting.yuthon.form</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale_renting.rental_order_primary_form_view"/>
         <field name="arch" type="xml">
-            <xpath expr="" postion="">
-                
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="contract_id"/>
+                <field name="payout_address"/>
+                <field name="uses"/>
+                <field name="unit_price"/>
+                <field name="rent"/>
+                <field name="monthly_rent"/>
+                <field name="rent_changes_regularly"/>
+                <field name="property_rent_m"/>
+                <field name="contract_date_signing"/>
+                <field name="other_conventions"/>
+            </xpath>
+            <xpath expr="//field[@name='rental_start_date']" position="before">
+                <field name="tax_rate"/>
+                <field name="no_tax_price"/>
+                <field name="tax_money"/>
+                <field name="deposit"/>
+                <field name="liquidated_damages_ratio"/>
+                <field name="deadline_time_point"/>
+                <field name="handover_date"/>
+            </xpath>
+             <xpath expr="//field[@name='journal_id']" position="after">
+                 <field name="billing_type"/>
+                 <field name="invoice_title"/>
+            </xpath>
+            <xpath expr="//page[@name='customer_signature']" position="after">
+                <page string="承租方信息">
+                    <group>
+                        <group>
+                            <field name="industry"/>
+                            <field name="partner_name"/>
+                            <field name="partner_address"/>
+                        </group>
+                        <group>
+                            <field name="contact_number"/>
+                            <field name="email"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+            <xpath expr="//page[@name='customer_signature']" position="after">
+                <page string="物业列表">
+                    <tree string="物业列表">
+                        <field name="contracted_property_site"/>
+                        <field name="area"/>
+                        <field name="evaluate_reference_price"/>
+                    </tree>
+                </page>
             </xpath>
         </field>
     </record>