[ADD]所有单据增加作废状态和作废按钮 osbzr#1470

zhongjiahong · Nov 1, 2017 · 0f2263b · 0f2263b
1 parent f2cb735
commit 0f2263b
Show file tree

Hide file tree

Showing 25 changed files with 52 additions and 29 deletions.
diff --git a/account_cost/models/cost_order.py b/account_cost/models/cost_order.py
@@ -30,7 +30,7 @@
     ('draft', u'未审核'),
     ('done', u'已审核'),
     ('cancel', u'已中止'),
-]
+    ('cancel', u'已作废')]
 
 # 字段只读状态
 READONLY_STATES = {

diff --git a/account_cost/views/cost_order_view.xml b/account_cost/views/cost_order_view.xml
@@ -7,7 +7,7 @@
 			<field name="name">cost.order.tree</field>
 			<field name="model">cost.order</field>
 			<field name="arch" type="xml">
-				<tree string="服务订单">
+				<tree string="服务订单" colors='blue:state == "draft";lightgray:state == "cancel"'>
 					<field name="date"/>
 					<field name="name"/>
 					<field name="partner_id"/>
@@ -27,6 +27,7 @@
 					<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="action_cancel" states="draft" string="作废" type="object"/>
 						<field name="state" widget="statusbar" statusbar_visible="draft,done" statusbar_colors='{"done":"blue"}' readonly="1"/>
 					</header>
 					<sheet>

diff --git a/buy/models/buy_order.py b/buy/models/buy_order.py
@@ -29,7 +29,7 @@
 BUY_ORDER_STATES = [
     ('draft', u'未审核'),
     ('done', u'已审核'),
-]
+    ('cancel', u'已作废')]
 
 # 字段只读状态
 READONLY_STATES = {

diff --git a/buy/views/buy_adjust_view.xml b/buy/views/buy_adjust_view.xml
@@ -7,7 +7,7 @@
             <field name="name">buy.adjust.tree</field>
             <field name="model">buy.adjust</field>
             <field name="arch" type="xml">
-                <tree string="采购变更单" colors='blue:state == "draft"'>
+                <tree string="采购变更单" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="date"/>
                     <field name="name"/>
                     <field name="order_id"/>
@@ -26,6 +26,7 @@
                 <form string="采购变更单">
                 <header>
                 	<button name="buy_adjust_done" states="draft" string="审核" type="object" class="oe_highlight"/>
+                    <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>
                 <sheet>

diff --git a/buy/views/buy_order_view.xml b/buy/views/buy_order_view.xml
@@ -7,7 +7,7 @@
 			<field name="name">buy.order.tree</field>
 			<field name="model">buy.order</field>
 			<field name="arch" type="xml">
-				<tree string="购货订单" colors='blue:state == "draft"'>
+				<tree string="购货订单" colors='blue:state == "draft";lightgray:state == "cancel"'>
 					<field name="date"/>
 					<field name="name"/>
 					<field name="type"/>
@@ -34,6 +34,7 @@
 					<header>
 						<button name="buy_order_done" states="draft" string="审核" type="object" class="oe_highlight"/>
 						<button name="buy_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>
 					<sheet>

diff --git a/buy/views/buy_receipt_view.xml b/buy/views/buy_receipt_view.xml
@@ -7,7 +7,7 @@
             <field name="name">buy.receipt.tree</field>
             <field name="model">buy.receipt</field>
             <field name="arch" type="xml">
-                <tree string="采购入库单" colors='blue:state == "draft"'>
+                <tree string="采购入库单" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name='date'/>
             		<field name='name'/>
             		<field name="order_id"/>
@@ -36,6 +36,7 @@
                     <button name='buy_to_return' type='object' states="done" string='生成退货单' class="oe_highlight"/>
                 	<button name="buy_receipt_done" states="draft" string="审核" type="object" class="oe_highlight"/>
                 	<button name="buy_receipt_draft" states="done" string="反审核" type="object"/>
+                    <button name="action_cancel" states="draft" string="作废" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,done" readonly="1"/>
                 </header>
                 <sheet>
@@ -202,7 +203,7 @@
             <field name="name">buy.return.tree</field>
             <field name="model">buy.receipt</field>
             <field name="arch" type="xml">
-                <tree string="采购退货单" colors='blue:state == "draft"'>
+                <tree string="采购退货单" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name='date'/>
             		<field name='name'/>
             		<field name="order_id"/>
@@ -229,6 +230,7 @@
                 <header>
                 	<button name="buy_receipt_done" states="draft" string="审核" type="object" class="oe_highlight"/>
                 	<button name="buy_receipt_draft" states="done" string="反审核" type="object"/>
+                     <button name="action_cancel" states="draft" string="作废" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,done" readonly="1"/>
                 </header>
                 <sheet>

diff --git a/finance/models/finance.py b/finance/models/finance.py
@@ -75,7 +75,8 @@ def _compute_period_id(self):
     amount_text = fields.Float(u'总计', compute='_compute_amount', store=True,
                                track_visibility='always', help=u'凭证金额')
     state = fields.Selection([('draft', u'草稿'),
-                              ('done', u'已审核')], u'状态', default='draft',
+                              ('done', u'已审核'),
+                              ('cancel', u'已作废')], u'状态', default='draft',
                              index=True,
                              track_visibility='always', help=u'凭证所属状态!')
     is_checkout = fields.Boolean(u'结账凭证', help=u'是否是结账凭证')
@@ -221,7 +222,7 @@ def default_get(self, fields):
         以适应企业管理和决策的需要.辅助核算一般通过核算项目来实现', ondelete='restrict')
     date = fields.Date(compute='_compute_voucher_date',
                        store=True, string=u'凭证日期')
-    state = fields.Selection([('draft', u'草稿'), ('done', u'已审核')], compute='_compute_voucher_state',
+    state = fields.Selection([('draft', u'草稿'), ('done', u'已审核'),('cancel', u'已作废')], compute='_compute_voucher_state',
                              index=True,
                              store=True, string=u'状态')
     init_obj = fields.Char(u'初始化对象', help=u'描述本条凭证行由哪个单证生成而来')

diff --git a/finance/views/finance_view.xml b/finance/views/finance_view.xml
@@ -34,6 +34,7 @@
 	                <header>
 	                	<button name='voucher_done' states="draft" string="审核" type="object" class="oe_highlight"/>
 	                	<button name='voucher_draft' states="done" string="反审核" type="object"/>
+                          <button name="action_cancel" states="draft" string="作废" type="object"/>
 	                    <field name="state" widget="statusbar" readonly="1"/>
 	                </header>
                     <sheet>
@@ -88,7 +89,7 @@
             <field name="name">voucher.tree</field>
             <field name="model">voucher</field>
             <field name="arch" type="xml">
-                <tree string="会计凭证" colors="blue:state == 'draft';">
+                <tree string="会计凭证" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="document_word_id"/>
                     <field name="date"/>
                     <field name="name"/>
@@ -151,7 +152,7 @@
             <field name="name">voucher.line.tree</field>
             <field name="model">voucher.line</field>
             <field name="arch" type="xml">
-                <tree string='分录查询'  create="false" edit='false'>
+                <tree string='分录查询' colors='blue:state == "draft";lightgray:state == "cancel"' create="false" edit='false'>
                     <field name='voucher_id'/>
                     <button name="view_document" type="object" string="查看凭证"
                             icon="fa-search" class="oe_highlight"/>

diff --git a/money/models/money_order.py b/money/models/money_order.py
@@ -876,6 +876,7 @@ def unlink(self):
     state = fields.Selection([
         ('draft', u'未审核'),
         ('done', u'已审核'),
+        ('cancel', u'已作废'),
     ], string=u'状态', readonly=True,
         default='draft', copy=False, index=True,
         help=u'核销单状态标识，新建时状态为未审核;审核后状态为已审核')

diff --git a/money/models/money_transfer_order.py b/money/models/money_transfer_order.py
@@ -40,6 +40,7 @@ def unlink(self):
     state = fields.Selection([
         ('draft', u'未审核'),
         ('done', u'已审核'),
+        ('cancel', u'已作废'),
     ], string=u'状态', readonly=True,
         default='draft', copy=False, index=True,
         help=u'资金转账单状态标识，新建时状态为未审核;审核后状态为已审核')

diff --git a/money/models/other_money_order.py b/money/models/other_money_order.py
@@ -68,6 +68,7 @@ def _compute_total_amount(self):
     state = fields.Selection([
         ('draft', u'未审核'),
         ('done', u'已审核'),
+        ('cancel', u'已作废'),
     ], string=u'状态', readonly=True,
         default='draft', copy=False, index=True,
         help=u'其他收支单状态标识，新建时状态为未审核;审核后状态为已审核')

diff --git a/money/views/money_transfer_order_view.xml b/money/views/money_transfer_order_view.xml
@@ -6,7 +6,7 @@
             <field name="name">money.transfer.order.tree</field>
             <field name="model">money.transfer.order</field>
             <field name="arch" type="xml">
-                <tree string="资金转账单" colors='blue:state == "draft"'>
+                <tree string="资金转账单" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="name"/>
                     <field name="date"/>
                     <field name="state"/>
@@ -26,6 +26,7 @@
                         <button name="money_transfer_done" states="draft" string="审核" type="object"
                                 class="oe_highlight"/>
                         <button name="money_transfer_draft" states="done" string="反审核" type="object"/>
+                        <button name="action_cancel" states="draft" string="作废" type="object"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>

diff --git a/money/views/other_money_order_view.xml b/money/views/other_money_order_view.xml
@@ -6,7 +6,7 @@
             <field name="name">other.money.order.tree</field>
             <field name="model">other.money.order</field>
             <field name="arch" type="xml">
-                <tree string="其他收支单" colors='blue:state == "draft"'>
+                <tree string="其他收支单" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="name"/>
                     <field name="date"/>
                     <field name="partner_id"/>
@@ -28,6 +28,7 @@
                 <header>
 					<button name="other_money_done" states="draft" string="审核" type="object" class="oe_highlight"/>
 					<button name="other_money_draft" states="done" string="反审核" type="object"/>
+                    <button name="action_cancel" states="draft" string="作废" type="object"/>
 					<!-- <button name="print_other_money_order" states="done" string="打印" type="object" class="oe_highlight"/> -->
                     <field name="state" widget="statusbar"/>
                 </header>

diff --git a/money/views/reconcile_order_view.xml b/money/views/reconcile_order_view.xml
@@ -6,7 +6,7 @@
             <field name="name">reconcile.order.tree</field>
             <field name="model">reconcile.order</field>
             <field name="arch" type="xml">
-                <tree string="Reconcile Order" colors='blue:state == "draft"'>
+                <tree string="Reconcile Order" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="name"/>
                     <field name="date"/>
                     <field name="partner_id"/>
@@ -23,6 +23,7 @@
                 <form string="Reconcile Order">
                 <header>
                 	<button name="reconcile_order_done" states="draft" string="审核" type="object" class="oe_highlight"/>
+                    <button name="action_cancel" states="draft" string="作废" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,done" readonly="1"/>
                 </header>
                 <sheet>

diff --git a/scm/models/stock_request.py b/scm/models/stock_request.py
@@ -10,7 +10,7 @@
     ('unsubmit', u'未提交'),
     ('draft', u'未审核'),
     ('done', u'已审核'),
-]
+    ('cancel', u'已作废')]
 
 
 class StockRequest(models.Model):

diff --git a/scm/views/stock_request_view.xml b/scm/views/stock_request_view.xml
@@ -15,7 +15,7 @@
             <field name='name'>stock.request.tree</field>
             <field name='model'>stock.request</field>
             <field name='arch' type='xml'>
-                <tree string='补货申请'>
+                <tree string='补货申请' colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="date"/>
@@ -32,6 +32,7 @@
                     <header>
                         <button name="stock_query" states="unsubmit" string="查询库存" type="object" class="oe_highlight"/>
                         <button name="stock_request_done" states="draft" string="审核" type="object" class="oe_highlight"/>
+                        <button name="action_cancel" states="draft" string="作废" type="object"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>

diff --git a/sell/models/sell_adjust.py b/sell/models/sell_adjust.py
@@ -9,7 +9,7 @@
 SELL_ORDER_STATES = [
     ('draft', u'未审核'),
     ('done', u'已审核'),
-]
+    ('cancel', u'已作废')]
 
 # 字段只读状态
 READONLY_STATES = {

diff --git a/sell/models/sell_order.py b/sell/models/sell_order.py
@@ -9,7 +9,7 @@
 SELL_ORDER_STATES = [
     ('draft', u'未审核'),
     ('done', u'已审核'),
-]
+    ('cancel', u'已作废')]
 
 # 字段只读状态
 READONLY_STATES = {

diff --git a/sell/views/sell_view.xml b/sell/views/sell_view.xml
@@ -6,7 +6,7 @@
         	<field name='name'>sell.order.tree</field>
         	<field name='model'>sell.order</field>
         	<field name='arch' type='xml'>
-                <tree string='销货订单' colors='blue:state == "draft"'>
+                <tree string='销货订单' colors='blue:state == "draft";lightgray:state == "cancel"'>
             		<field name='date'/>
             		<field name='name'/>
             		<field name='type'/>
@@ -36,6 +36,7 @@
             		<header>
             			<button name='sell_order_done' states='draft' string='审核' type='object' class='oe_highlight'/>
             			<button name="sell_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"/>
             		</header>
             		<sheet>
@@ -166,7 +167,7 @@
         	<field name='name'>sell.delivery.tree</field>
         	<field name='model'>sell.delivery</field>
         	<field name='arch' type='xml'>
-                <tree string='销售发货单' colors='blue:state == "draft"'>
+                <tree string='销售发货单' colors='blue:state == "draft";lightgray:state == "cancel"'>
             		<field name='date'/>
             		<field name='name'/>
             		<field name="order_id"/>
@@ -196,6 +197,7 @@
 						<button name='sell_to_return' type='object' states="done" string='生成退货单' class="oe_highlight"/>
             			<button name='sell_delivery_done' states='draft' type='object' string='审核' class='oe_highlight'/>
 						<button name='sell_delivery_draft' states='done' type='object' string='反审核'/>
+                        <button name="action_cancel" states="draft" string="作废" type="object"/>
 						<field name='state' widget='statusbar' statusbar_visible="draft,done"/>
             		</header>
             		<sheet>
@@ -373,7 +375,7 @@
         	<field name='name'>sell.return.tree</field>
         	<field name='model'>sell.delivery</field>
         	<field name='arch' type='xml'>
-                <tree string='销售退货单' colors='blue:state == "draft"'>
+                <tree string='销售退货单' colors='blue:state == "draft";lightgray:state == "cancel"'>
             		<field name='date'/>
             		<field name='name'/>
             		<field name="order_id"/>
@@ -404,6 +406,7 @@
             		<header>
             			<button name='sell_delivery_done' states="draft" type='object' string='审核' class='oe_highlight'/>
 						<button name='sell_delivery_draft' states='done' type='object' string='反审核'/>
+                        <button name="action_cancel" states="draft" string="作废" type="object"/>
 						<field name='state' widget='statusbar' statusbar_visible="draft,done"/>
             		</header>
             		<sheet>
@@ -562,7 +565,7 @@
             <field name="name">sell.adjust.tree</field>
             <field name="model">sell.adjust</field>
             <field name="arch" type="xml">
-                <tree string="销售变更单" colors='blue:state == "draft"'>
+                <tree string="销售变更单" colors='blue:state == "draft";lightgray:state == "cancel"'>
                     <field name="date"/>
                     <field name="name"/>
                     <field name="order_id"/>
@@ -581,6 +584,7 @@
                 <form string="销售变更单">
                 <header>
                 	<button name="sell_adjust_done" states="draft" string="审核" type="object" class="oe_highlight"/>
+                     <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>
                 <sheet>

diff --git a/staff/models/staff.py b/staff/models/staff.py
@@ -44,7 +44,7 @@ def view_detail(self):
             view_id = self.env.ref('staff.view_staff_department_form').id
 
             return {
-                'name': '部门/' + child_department.name,
+                'name': u'部门/' + child_department.name,
                 'view_type': 'form',
                 'view_mode': 'form',
                 'res_model': 'staff.department',

diff --git a/warehouse/models/production.py b/warehouse/models/production.py
@@ -21,7 +21,8 @@ class WhAssembly(models.Model):
 
     state = fields.Selection([('draft', u'草稿'),
                               ('feeding', u'已发料'),
-                              ('done', u'完成')],
+                              ('done', u'完成')
+                              ('cancel', u'已作废')],
                              u'状态', copy=False, default='draft',
                              index=True,
                              help=u'组装单状态标识，新建时状态为草稿；发料后状态为已发料，可以多次投料；成品入库后状态为完成。')

diff --git a/warehouse/models/warehouse_move.py b/warehouse/models/warehouse_move.py
@@ -11,7 +11,7 @@ class WhMove(models.Model):
     MOVE_STATE = [
         ('draft', u'草稿'),
         ('done', u'已审核'),
-    ]
+        ('cancel', u'已作废'),]
 
     @api.one
     @api.depends('line_out_ids', 'line_in_ids')

diff --git a/warehouse/models/warehouse_order.py b/warehouse/models/warehouse_order.py
@@ -18,7 +18,7 @@ class WhOut(models.Model):
     TYPE_SELECTION = [
         ('inventory', u'盘亏'),
         ('others', u'其他出库'),
-    ]
+        ('cancel', u'已作废')]
 
     move_id = fields.Many2one('wh.move', u'移库单', required=True, index=True, ondelete='cascade',
                               help=u'其他出库单对应的移库单')