Merge commit '4abfc9e161dc4de0c6324ebdba703102a42145c8'

* commit '4abfc9e161dc4de0c6324ebdba703102a42145c8': (447 commits)
  退货不能获取采购成本
  [IMP]增加限制：应收期初和应付期初不能同时存在
  [FIX]解决客户和供应商双重身份的期初问题等
  升级反核销资金单逻辑
  [ADD] 打印圆通快递面单换成三联单
  [FIX]bug:月末结账时报公司利润科目未配置
  [FIX]关于批次号的收货的bug osbzr#1887:入库单生成退货单时不该传入lot_id
  [FIX]业务伙伴对账单应收/应付余额涉及到折扣时计算的bug
  [FIX]漏提交了视图文件
  [ADD]销货订单上增加净重合计及添加测试
  提示字段不对应
  [FIX]修复作废时只能移除第一个审批组的bug，作废时应全部移除待审批人
  客户列表增加业务员字段
  [FIX]修复作废时的bug
  [FIX]1.审批向导进去所有单据跳过审批的bug，2.不需审批单据自动移除待审批人，3.作废单据时做判断
  Update sell_view.xml
  [FIX]关于作废单据审批问题 osbzr#1867
  完善销售单开单的业务员
  [FIX]修复bug:付款单设置了审批流程但入库单审核生成的付款单审批流程没加上； add test
  Update sell_view.xml
  ...

Author: gagaboy

.travis.yml

@@ -1,20 +1,23 @@
+language: python
+sudo: false
+cache:
+  apt: true
+  directories:
+    - $HOME/.cache/pip
+
+python:
+  - "2.7.13"
+
 addons:
+  postgresql: "9.5"
   apt:
     packages:
       - expect-dev  # provides unbuffer utility
-      - python-lxml # because pip installation is slow
-
-language: python
-
-python:
-  - "2.7"
 
 env:
-  - VERSION="10.0" ODOO_REPO="osbzr/base" LINT_CHECK="0"
-
-
-virtualenv:
-  system_site_packages: true
+  global:
+  - VERSION="10.0" ODOO_REPO="osbzr/base" LINT_CHECK="0" PGPASSWORD="travis"
+  - PHANTOMJS_VERSION="latest"
 
 install:
   - git clone http://github.com/GoodERPJeff/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
@@ -32,4 +35,4 @@ script:
   - travis_run_tests
 
 after_success:
-  coveralls
+  - travis_after_tests_success

access_control_goods/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

access_control_goods/__openerp__.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "GoodERP Access Control Goods 模块",
+    'author': "开阖软件",
+    'website': "http://www.osbzr.com",
+    'category': 'gooderp',
+    'summary': 'GoodERP 商品 读写建删权限控制',
+    "description":
+    '''
+该模块添加了 创建商品组，该组成员可以对商品进行增删改查，普通用户只能查看。
+    ''',
+    'version': '11.11',
+    'application': True,
+    'depends': ['core'],
+    'data': [
+        'security/groups.xml',
+        'security/ir.model.access.csv',
+    ],
+}

access_control_goods/security/groups.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="1">
+		<!--添加创建创建商品组-->
+		<record id="group_operate_goods_main_data" model="res.groups">
+			<field name='name'>创建商品</field>
+			<field name='category_id' ref="core.Gooderp"/>
+			<field name="users" eval="[(4, ref('base.user_root'))]"/>
+		</record>
+	</data>
+</openerp>

access_control_goods/security/ir.model.access.csv

@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+core.access_goods,access_goods_user,core.model_goods,base.group_user,1,0,0,0
+access_goods_operator,access_goods_operator,core.model_goods,access_control_goods.group_operate_goods_main_data,1,1,1,1

account_cost/models/cost_order.py

@@ -25,10 +25,10 @@
 from datetime import datetime
 from odoo.tools import float_compare, float_is_zero
 
-# 购货订单审核状态可选值
+# 购货订单确认状态可选值
 COST_ORDER_STATES = [
-    ('draft', u'未审核'),
-    ('done', u'已审核'),
+    ('draft', u'草稿'),
+    ('done', u'已确认'),
     ('cancel', u'已中止'),
     ('cancel', u'已作废')]
 
@@ -65,7 +65,7 @@ def _compute_amount(self):
     note = fields.Text(u'备注', help=u'单据备注')
     prepayment = fields.Float(u'预付款', states=READONLY_STATES,
                               digits=dp.get_precision('Amount'),
-                              help=u'输入预付款审核购货订单，会产生一张付款单')
+                              help=u'输入预付款确认购货订单，会产生一张付款单')
     bank_account_id = fields.Many2one('bank.account', u'结算账户',
                                       ondelete='restrict',
                                       help=u'用来核算和监督企业与其他单位或个人之间的债权债务的结算情况')
@@ -84,11 +84,11 @@ def _compute_amount(self):
                                    'cost_ids',
                                    'move_ids',
                                    u'费用分摊出入库明细', copy=False)
-    approve_uid = fields.Many2one('res.users', u'审核人',
+    approve_uid = fields.Many2one('res.users', u'确认人',
                                   copy=False, ondelete='restrict',
-                                  help=u'审核单据的人')
-    state = fields.Selection(COST_ORDER_STATES, u'审核状态', readonly=True,
-                             help=u"购货订单的审核状态", index=True, copy=False,
+                                  help=u'确认单据的人')
+    state = fields.Selection(COST_ORDER_STATES, u'确认状态', readonly=True,
+                             help=u"单据的确认状态", index=True, copy=False,
                              default='draft')
     amount = fields.Float(u'合计金额', store=True, readonly=True,
                           compute='_compute_amount', track_visibility='always',
@@ -194,14 +194,14 @@ def _create_mv_cost(self):
 
     @api.one
     def cost_order_confim(self):
-        '''审核服务订单'''
+        '''确认服务订单'''
         if not self.name:
             self.update(
                 {'name': self.env['ir.sequence'].next_by_code('cost.order') or '/'})
         if self.state == 'done':
-            raise UserError(u'请不要重复审核！')
+            raise UserError(u'请不要重复确认！')
         if self.state == 'cancel':
-            raise UserError(u'请不要审核已中止的订单！')
+            raise UserError(u'请不要确认已中止的订单！')
         if not self.line_ids:
             raise UserError(u'请输入服务明细行！')
         if not self.bank_account_id and self.prepayment:
@@ -215,9 +215,9 @@ def cost_order_confim(self):
 
     @api.one
     def cost_order_draft(self):
-        '''反审核服务订单'''
+        '''撤销确认服务订单'''
         if self.state == 'draft':
-            raise UserError(u'请不要重复反审核！')
+            raise UserError(u'请不要重复撤销确认！')
 
         for mv_id in self.wm_ids:
             cost_line_id = mv_id
@@ -230,11 +230,12 @@ def cost_order_draft(self):
             invoice_id.money_invoice_draft()
             invoice_id.unlink()
 
-        # 查找产生的付款单并反审核，删除
+        # 查找产生的付款单并撤销确认，删除
         money_order = self.env['money.order'].search(
             [('origin_name', '=', self.name)])
         if money_order:
-            money_order.money_order_draft()
+            if money_order.state == 'done':
+                money_order.money_order_draft()
             money_order.unlink()
 
         self.state = 'draft'

account_cost/tests/test_cost_order.py

@@ -88,9 +88,20 @@ def test_create_mv_cost(self):
 
     def test_cost_order_draft_has_prepayment(self):
         '''反审核服务订单'''
+        # 账户先收钱
+        get_money = self.env.ref('money.get_40000')
+        get_money.money_order_done()
+
         self.cost_order_1.prepayment = 20
-        self.cost_order_1.bank_account_id = self.env.ref('core.alipay')
+        self.cost_order_1.bank_account_id = self.env.ref('core.comm')
         self.cost_order_1.cost_order_confim()
+        # 找到对应的预收款单，并审核
+        money_order = self.env['money.order'].search(
+            [('origin_name', '=', self.cost_order_1.name)])
+        if money_order:
+            money_order.money_order_done()
+
+        # 反审核时，会找到已审核的预收款单，反审核并删除
         self.cost_order_1.cost_order_draft()
 
 

account_cost/views/cost_order_view.xml

@@ -25,8 +25,8 @@
 			<field name="arch" type="xml">
 				<form string="费用订单">
 					<header>
-						<button name="cost_order_confim" states="draft" string="审核" type="object" class="oe_highlight"/>
-						<button name="cost_order_draft" states="done" string="反审核" type="object"/>
+						<button name="cost_order_confim" states="draft" string="确认" type="object" class="oe_highlight"/>
+						<button name="cost_order_draft" states="done" string="撤销确认" type="object"/>
                         <button name="action_cancel" states="draft" string="作废" type="object"/>
 						<field name="state" widget="statusbar" statusbar_visible="draft,done" statusbar_colors='{"done":"blue"}' readonly="1"/>
 					</header>

app_odoo_customize/models/ir_ui_view.py

@@ -12,7 +12,6 @@ class View(models.Model):
     @api.model
     def render_template(self, template, values=None, engine='ir.qweb'):
         if template in ['web.login', 'web.webclient_bootstrap']:
-            if not values:
-                values = {}
+            values = values or {}
             values["title"] = self.env['ir.config_parameter'].get_param("app_system_name", "odooApp")
-        return super(View, self).render_template(template, values=values, engine=engine)
+        return super(View, self).render_template(template, values=values, engine=engine)

app_odoo_customize/tests/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import test_settings

app_odoo_customize/tests/test_settings.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from odoo.tests.common import TransactionCase
+from odoo.exceptions import UserError
+
+
+class TestSettings(TransactionCase):
+    def setUp(self):
+        super(TestSettings, self).setUp()
+
+    def test_create(self):
+        setting = self.env['app.theme.config.settings'].create({
+            'app_system_name': 'GoodERP',
+        })
+        setting.set_default_all()
+

asset/data/asset_data.xml

@@ -2,45 +2,46 @@
 <openerp>
     <data noupdate="1">
         <record id="small_business_chart160101" model='finance.account'>
-            <field name='code'>1601</field>
-            <field name='name'>固定资产</field>
-            <field name='costs_types'>assets</field>
+            <field name='code'>160101</field>
+            <field name='name'>固定资产-房屋</field>
+            <field name='user_type' ref='finance.base_assest' />
+            <field name='parent_id' ref='finance.small_business_chart1601' />
             <field name='balance_directions'>in</field>
         </record>
         <record id="small_business_chart410101" model='finance.account'>
             <field name='code'>410101</field>
             <field name='name'>制造费用－折旧费</field>
-            <field name='costs_types'>cost</field>
+            <field name='user_type' ref='finance.base_cost' />
             <field name='balance_directions'>in</field>
         </record>
         <record id="small_business_chart530101" model='finance.account'>
             <field name='code'>570101</field>
             <field name='name'>营业外收入－固定资产清理</field>
-            <field name='costs_types'>in</field>
+            <field name='user_type' ref='finance.base_in' />
             <field name='balance_directions'>out</field>
         </record>
         <record id="small_business_chart571101" model='finance.account'>
             <field name='code'>571101</field>
             <field name='name'>营业外支出－固定资产清理</field>
-            <field name='costs_types'>out</field>
+            <field name='user_type' ref='finance.base_in' />
             <field name='balance_directions'>in</field>
         </record>
         <record id="small_business_chart170101" model='finance.account'>
             <field name='code'>170101</field>
             <field name='name'>无形资产-土地</field>
-            <field name='costs_types'>assets</field>
+            <field name='user_type' ref='finance.base_assest' />
             <field name='balance_directions'>in</field>
         </record>
         <record id="small_business_chart170201" model='finance.account'>
             <field name='code'>170201</field>
             <field name='name'>累计摊销－土地</field>
-            <field name='costs_types'>assets</field>
+            <field name='user_type' ref='finance.base_assest' />
             <field name='balance_directions'>in</field>
         </record>
         <record id='small_business_chart5602022' model='finance.account'>
             <field name='code'>5602022</field>
             <field name='name'>管理费用-土地摊销</field>
-            <field name='costs_types'>out</field>
+            <field name='user_type' ref='finance.base_in' />
             <field name='balance_directions'>in</field>
         </record>
 

asset/models/asset.py

@@ -8,7 +8,7 @@
 
 # 字段只读状态
 READONLY_STATES = {
-    'done': [('readonly', True)],      # 已审核
+    'done': [('readonly', True)],      # 已确认
     'clean': [('readonly', True)],     # 已清理
 }
 
@@ -119,7 +119,7 @@ def _get_net_value(self):
         'Amount'), store=True, compute='_get_cost_depreciation')
 
     state = fields.Selection([('draft', u'草稿'),
-                              ('done', u'已审核'),
+                              ('done', u'已确认'),
                               ('clean', u'已清理')], u'状态', default='draft',
                              index=True,)
 
@@ -201,11 +201,11 @@ def onchange_bank_account(self):
 
     @api.one
     def _wrong_asset_done(self):
-        ''' 固定资产审核入账前的验证 '''
+        ''' 固定资产确认入账前的验证 '''
         if self.state == 'done':
-            raise UserError(u'请不要重复审核！')
+            raise UserError(u'请不要重复确认！')
         if self.period_id.is_closed:
-            raise UserError(u'该会计期间(%s)已结账！不能审核' % self.period_id.name)
+            raise UserError(u'该会计期间(%s)已结账！不能确认' % self.period_id.name)
         if self.cost <= 0:
             raise UserError(u'金额必须大于0！\n金额:%s' % self.cost)
         if self.tax < 0:
@@ -235,7 +235,7 @@ def _partner_generate_invoice(self):
 
         ''' 因分类上只能设置一个固定资产科目，这里要用当前固定资产的对应科目替换凭证 '''
 
-        # 如未自动审核，则审核一下结算单
+        # 如未自动确认，则确认一下结算单
         if money_invoice.state != 'done':
             money_invoice.money_invoice_done()
         # 找到结算单对应的凭证行并修改科目
@@ -285,7 +285,7 @@ def _construction_generate_voucher(self):
 
     @api.one
     def asset_done(self):
-        ''' 审核固定资产 '''
+        ''' 确认固定资产 '''
         self._wrong_asset_done()
         # 非初始化固定资产生成入账凭证
         if not self.is_init:
@@ -305,15 +305,17 @@ def asset_done(self):
 
     @api.one
     def asset_draft(self):
-        ''' 反审核固定资产 '''
+        ''' 撤销确认固定资产 '''
         if self.state == 'draft':
-            raise UserError(u'请不要重复反审核！')
+            raise UserError(u'请不要重复撤销确认！')
         if self.line_ids:
-            raise UserError(u'已折旧不能反审核！')
+            raise UserError(u'已折旧不能撤销确认！')
         if self.chang_ids:
-            raise UserError(u'已变更不能反审核！')
+            raise UserError(u'已变更不能撤销确认！')
         if self.period_id.is_closed:
-            raise UserError(u'该会计期间(%s)已结账！不能反审核' % self.period_id.name)
+            raise UserError(u'该会计期间(%s)已结账！不能撤销确认' % self.period_id.name)
+        if self.money_invoice.reconciled != 0:
+            raise UserError(u'固定资产已有核销，请不要撤销')
 
         '''删掉凭证'''
         if self.voucher_id:
@@ -411,7 +413,7 @@ def _clean_cost_generate_other_pay(self, clean_cost):
 
     @api.one
     def _generate_voucher(self, Asset):
-        ''' 生成凭证，并审核 '''
+        ''' 生成凭证，并确认 '''
         vouch_obj = self.env['voucher'].create({'date': self.date, 'ref': '%s,%s' % (self._name, self.id)})
         depreciation2 = sum(line.cost_depreciation for line in Asset.line_ids)
         depreciation = Asset.depreciation_previous + depreciation2
@@ -507,7 +509,7 @@ def create_chang_account(self):
                         'tax_amount': self.chang_tax
             })
 
-            # 如未自动审核，则审核一下结算单
+            # 如未自动确认，则确认一下结算单
             if money_invoice.state != 'done':
                 money_invoice.money_invoice_done()
             #将分类上的资产科目替换为固定资产上的资产科目
@@ -640,7 +642,7 @@ def create_depreciation(self):
         res = []
         asset_line_id_list = []
         for Asset in self.env['asset'].search([('no_depreciation', '=', False),           # 提折旧的
-                                               ('state', '=', 'done'),                    # 已审核
+                                               ('state', '=', 'done'),                    # 已确认
                                                ('period_id', '!=', self.period_id.id)]):  # 从入账下月开始
             # 本期间没有折旧过，本期间晚于固定资产入账期间
             if self.period_id not in [line.period_id for line in Asset.line_ids] and \
@@ -746,7 +748,7 @@ def init_asset(self):
         res = {}
         if self.env['asset'].search([('is_init', '=', True),
                                      ('state', '=', 'draft')]):
-            raise UserError(u'有未审核的初始化固定资产')
+            raise UserError(u'有未确认的初始化固定资产')
         for Asset in self.env['asset'].search([('is_init', '=', True),
                                                ('state', '=', 'done')]):
             cost = Asset.cost