update ent

app_base_chinese/__manifest__.py

@@ -18,7 +18,7 @@
 
 {
     'name': "App base chinese，中国化基本模块增强",
-    'version': '15.22.07.20',
+    'version': '13.21.01.02',
     'author': 'Sunpop.cn',
     'category': 'Base',
     'website': 'https://www.sunpop.cn',
@@ -67,8 +67,7 @@
         'views/sale_order_views.xml',
         'views/account_move_views.xml',
         'views/ir_default_views.xml',
-        # todo: set assets
+        'views/templates.xml',
-        # 'views/templates.xml',
         'wizard/sale_make_invoice_advance_views.xml',
         'data/ir_default_data.xml',
         'data/base_data.xml',
@@ -92,7 +91,6 @@
     ],
     'js': [
     ],
-    'post_init_hook': 'post_init_hook',
     'installable': True,
     'application': True,
     'auto_install': False,

app_base_chinese/data/stock.location.csv

@@ -1,7 +1,7 @@
 id,name
-stock.stock_location_locations_partner,<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ
+stock.stock_location_locations_partner,往来单位
-stock.stock_location_customers,<EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD>λ
+stock.stock_location_customers,客户区位
-stock.stock_location_suppliers,<EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ
+stock.stock_location_suppliers,供应商区位
-stock.stock_location_locations,<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ
+stock.stock_location_locations,物理区位
-stock.stock_location_locations_virtual,<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ
+stock.stock_location_locations_virtual,虚拟区位
-stock.stock_location_inter_wh,<EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>λ
+stock.stock_location_inter_wh,内部中转区位

app_base_chinese/data/stock_location_data.xml

@@ -1,31 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="stock.removal_fifo" model="product.removal">
+        <record id="stock.removal_fifo" model="product.removal" context="{'lang': 'zh_CN'}">
             <field name="name">先进先出(FIFO)</field>
         </record>
-        <record id="stock.removal_lifo" model="product.removal">
+        <record id="stock.removal_lifo" model="product.removal" context="{'lang': 'zh_CN'}">
             <field name="name">后进先出(LIFO)</field>
         </record>
     </data>
     <data noupdate="0">
-        <record id="stock.stock_location_locations" model="stock.location">
+        <function model="stock.location" name="write" context="{'lang': 'zh_CN'}">
-            <field name="name">物理区位</field>
+            <value eval="[ref('stock.stock_location_locations', False)]"/>
-        </record>
+            <value model="stock.location" eval="{
-        <record id="stock.stock_location_locations_partner" model="stock.location">
+                'name': '物理区位',
-            <field name="name">往来单位</field>
+            }"/>
-        </record>
+        </function>
-        <record id="stock.stock_location_locations_virtual" model="stock.location">
+        <function model="stock.location" name="write" context="{'lang': 'zh_CN'}">
-            <field name="name">虚拟区位</field>
+            <value eval="[ref('stock.stock_location_locations_partner', False)]"/>
-        </record>
+            <value model="stock.location" eval="{
-        <record id="stock.stock_location_suppliers" model="stock.location">
+                'name': '往来单位',
-            <field name="name">供应商区位</field>
+            }"/>
-        </record>
+        </function>
-        <record id="stock.stock_location_customers" model="stock.location">
+        <function model="stock.location" name="write" context="{'lang': 'zh_CN'}">
-            <field name="name">客户区位</field>
+            <value eval="[ref('stock.stock_location_locations_virtual', False)]"/>
-        </record>
+            <value model="stock.location" eval="{
-        <record id="stock.stock_location_inter_wh" model="stock.location">
+                'name': '虚拟区位',
-            <field name="name">内部中转区位</field>
+            }"/>
-        </record>
+        </function>
+        <function model="stock.location" name="write" context="{'lang': 'zh_CN'}">
+            <value eval="[ref('stock.stock_location_suppliers', False)]"/>
+            <value model="stock.location" eval="{
+                'name': '供应商区位',
+            }"/>
+        </function>
+        <function model="stock.location" name="write" context="{'lang': 'zh_CN'}">
+            <value eval="[ref('stock.stock_location_customers', False)]"/>
+            <value model="stock.location" eval="{
+                'name': '客户区位',
+            }"/>
+        </function>
+        <function model="stock.location" name="write" context="{'lang': 'zh_CN'}">
+            <value eval="[ref('stock.stock_location_inter_wh', False)]"/>
+            <value model="stock.location" eval="{
+                'name': '中转区位',
+            }"/>
+        </function>
+<!--        几个特殊区位处理-->
+        <function model="res.company" name="_adjust_wh_cn_name"/>
     </data>
 </odoo>

app_base_chinese/models/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from . import res_company
 from . import res_partner
 from . import res_currency
 from . import product_category

app_base_chinese/models/res_company.py

@@ -7,11 +7,24 @@ from odoo.exceptions import UserError, ValidationError
 class ResCompany(models.Model):
     _inherit = 'res.company'
 
-    short_name = fields.Char('Short Name', related='partner_id.short_name', readonly=False)
+    @api.model
-
+    def _adjust_wh_cn_name(self):
-    # 当传参 show_short_company 时，只显示简称
+        companys = self.env['res.company'].with_context(active_test=False, lang='zh_CN').search([])
-    def name_get(self):
+        for rec in companys:
-        if self._context.get('show_short_company'):
+            # 修正区位名称
-            return [(value.id, "%s" % (value.short_name if value.short_name else value.name)) for value in self]
+            ids = self.env['stock.location'].with_context(active_test=False).search(
-        else:
+                [('name', 'like', ': Transit Location'), ('company_id', '=', rec.id)])
-            return super().name_get()
+            ids.write({'name': '%s: 中转区位' % rec.name})
+            ids = self.env['stock.location'].with_context(active_test=False).search(
+                [('name', 'like', ': Scrap'), ('company_id', '=', rec.id)])
+            ids.write({'name': '%s: 报废区位' % rec.name})
+            ids = self.env['stock.location'].with_context(active_test=False).search(
+                [('name', 'like', ': Inventory adjustment'), ('company_id', '=', rec.id)])
+            ids.write({'name': '%s: 盘点区位' % rec.name})
+            # 注意，原生没有在生产中使用 _
+            ids = self.env['stock.location'].with_context(active_test=False).search([
+                ('name', 'like', ': Production'), ('company_id', '=', rec.id)])
+            ids.write({'name': '%s: 生产区位' % rec.name})
+            ids = self.env['stock.location'].with_context(active_test=False).search([
+                ('name', 'like', ': Subcontracting Location'), ('company_id', '=', rec.id)])
+            ids.write({'name': '%s: 委外区位' % rec.name})

app_base_chinese/views/res_partner_views.xml

@@ -94,25 +94,25 @@
             </field>
         </record>
         <!--res.partner open地址中国化 -->
-<!--        <record id="app_view_partner_short_form" model="ir.ui.view">-->
+        <record id="app_view_partner_short_form" model="ir.ui.view">
-<!--            <field name="name">app.res.partner.form</field>-->
+            <field name="name">app.res.partner.form</field>
-<!--            <field name="model">res.partner</field>-->
+            <field name="model">res.partner</field>
-<!--            <field name="inherit_id" ref="base.view_partner_short_form"/>-->
+            <field name="inherit_id" ref="base.view_partner_short_form"/>
-<!--            <field name="arch" type="xml">-->
+            <field name="arch" type="xml">
-<!--                <xpath expr="//field[@name='street']" position="before">-->
+                <xpath expr="//field[@name='street']" position="before">
-<!--                    <xpath expr="//field[@name='country_id']" position="move"/>-->
+                    <xpath expr="//field[@name='country_id']" position="move"/>
-<!--                </xpath>-->
+                </xpath>
-<!--                <xpath expr="//field[@name='street']" position="before">-->
+                <xpath expr="//field[@name='street']" position="before">
-<!--                    <xpath expr="//field[@name='state_id']" position="move"/>-->
+                    <xpath expr="//field[@name='state_id']" position="move"/>
-<!--                </xpath>-->
+                </xpath>
-<!--                <xpath expr="//field[@name='street']" position="before">-->
+                <xpath expr="//field[@name='street']" position="before">
-<!--                    <xpath expr="//field[@name='city']" position="move"/>-->
+                    <xpath expr="//field[@name='city']" position="move"/>
-<!--                </xpath>-->
+                </xpath>
-<!--                <xpath expr="//field[@name='street']" position="before">-->
+                <xpath expr="//field[@name='street']" position="before">
-<!--                    <xpath expr="//field[@name='zip']" position="move"/>-->
+                    <xpath expr="//field[@name='zip']" position="move"/>
-<!--                </xpath>-->
+                </xpath>
-<!--            </field>-->
+            </field>
-<!--        </record>-->
+        </record>
         <!--res.partner 私人地址中国化 -->
         <record id="app_res_partner_view_form_private" model="ir.ui.view">
             <field name="name">app.res.partner.view.form.private</field>