fix scm qty

This commit is contained in:
ivan deng
2019-02-01 12:36:29 +08:00
parent d02165e76d
commit b54183b644
7 changed files with 30 additions and 12 deletions

View File

@@ -34,8 +34,9 @@
odoo Chinese Enhance. 中国化增强-基础 odoo Chinese Enhance. 中国化增强-基础
1. 中文默认值,如国家、时区、货币等。处理模块 base, product. 1. 中文默认值,如国家、时区、货币等。处理模块 base, product.
2. 客户加简称,地址显示中文化,客户编码显示优先 2. 客户加简称,地址显示中文化,客户编码显示优先
3. 货币处理,增加排序显示 3. 客户地址显示增加手机号与电话号码
4. todo:中文演示数据(只有demo模式才加载) 4. 货币处理,增加排序显示
5. todo:中文演示数据(只有demo模式才加载)
""", """,
'pre_init_hook': 'pre_init_hook', 'pre_init_hook': 'pre_init_hook',

View File

@@ -3,7 +3,7 @@
<data noupdate="1"> <data noupdate="1">
<!-- Country --> <!-- Country -->
<record id="base.cn" model="res.country"> <record id="base.cn" model="res.country">
<field eval="'%(country_name)s%(state_name)s%(city)s%(zip)s\n%(street)s\n%(street2)s'" name="address_format" /> <field name="address_format" eval="'%(country_name)s%(state_name)s%(city)s%(zip)s\n%(street)s\n%(street2)s'"/>
</record> </record>
</data> </data>
</odoo> </odoo>

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from . import res_partner from . import res_partner
from . import res_partner_category
from . import res_currency from . import res_currency

View File

@@ -9,9 +9,16 @@ class ResPartner(models.Model):
short_name = fields.Char('Short Name') # 简称 short_name = fields.Char('Short Name') # 简称
# 增加地址显示中的手机号与电话号码
class PartnerCategory(models.Model): # 选项 show_address 开启则增加显示手机与电话号
_inherit = 'res.partner.category' def _get_name(self):
_order = 'sequence, name' name = super(ResPartner, self)._get_name() or ''
partner = self
sequence = fields.Integer('Sequence', help="Used to order partner category") if self._context.get('show_address'):
if partner.mobile and partner.phone:
name = name + "\n" + partner.mobile + "," + partner.phone
elif partner.mobile:
name = name + "\n" + partner.mobile
elif partner.phone:
name = name + "\n" + partner.phone
return name

View File

@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
from odoo import api, models, fields, _
class PartnerCategory(models.Model):
_inherit = 'res.partner.category'
_order = 'sequence, name'
sequence = fields.Integer('Sequence', help="Used to order partner category")

View File

@@ -8,13 +8,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//search"> <xpath expr="//search">
<superbar view_mode="kanban,tree"> <superbar view_mode="kanban,tree">
<field name="category_id"/>
<field name="country_id"/>
<field name="commercial_partner_id" <field name="commercial_partner_id"
widget="ztree_search" widget="ztree_search"
model="res.partner" model="res.partner"
domain="[('is_company', '=', 1)]" domain="[('is_company', '=', 1)]"
level="0"/> level="0"/>
<field name="category_id"/>
<field name="country_id"/>
</superbar> </superbar>
</xpath> </xpath>
</field> </field>

View File

@@ -30,4 +30,4 @@ class ProductCategory(models.Model):
new_res.append((category.id, name)) new_res.append((category.id, name))
return new_res return new_res
else: else:
return super(ProductCategory, self).name_get() return super(ProductCategory, self).name_get()