Accept Merge Request #1820: (feature/合同审批 -> develop)

Merge Request: 采购协议

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1820

sf_sale/models/sale_order.py

@@ -132,7 +132,7 @@ class ReSaleOrder(models.Model):
             'name': '%s/%s/%s/%s/%s/%s' % (
                 self.format_float(product.model_long),
                 self.format_float(product.model_width),
-                self.format_float(product.model_height), 
+                self.format_float(product.model_height),
                 self.format_float(product.model_volume),
                 machining_accuracy_name,
                 product.materials_id.name),

sf_sale/views/purchase_order_view.xml

@@ -139,7 +139,7 @@
                 </field>
                 <xpath expr="//field[@name='date_order']" position="after">
                     <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
-                    <field name="contract_summary"/>
+<!--                    <field name="contract_summary"/>-->
                 </xpath>
                 <field name="partner_ref" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}