Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步

# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml

sf_base/views/change_base_view.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="sf_base_res_partner_kanban_view">
+            <field name="name">sf.base.res.partner.kanban</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//kanban//templates//t//div//div//div//ul//li[last()]" position="after">
+                    <li t-if="record.vat.raw_value" class="o_text_overflow"><field name="vat"/></li>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>