Merge 16c6aa1 into 8a322d9

good_process/models/mail_thread.py

@@ -170,8 +170,6 @@ def is_current_model(self):
 
     @api.model
     def create(self, vals):
-        if not self.is_current_model():
-            return super(MailThread, self).create(vals)
         thread_row = super(MailThread, self).create(vals)
         approvers = self.__add_approver__(thread_row, self._name, thread_row.id)
         thread_row._approver_num = len(approvers)
@@ -198,6 +196,20 @@ def write(self, vals):
                 continue
             change_state = vals.get('state', False)
 
+            if change_state == 'cancel':    # 作废时移除待审批人
+                model_row = th
+                manger_row = self.__has_manager__(th.id, th._name)
+
+                if (manger_row and manger_row.user_id.id == self.env.uid) or not manger_row:
+                    manger_user = []
+                    if manger_row:
+                        manger_user = [manger_row.user_id.id]
+                        self.__is_departement_manager__(manger_row)
+                users, can_clean_groups = (self.__get_user_group__(
+                    th.id, th._name, manger_user, model_row))
+                self.__remove_approver__(
+                    th.id, th._name, users, can_clean_groups)
+
             # 已提交，确认时报错
             if len(th._to_approver_ids) == th._approver_num and change_state == 'done':
                 raise ValidationError(u"审批后才能确认")

warehouse/tests/test_goods.py

@@ -137,6 +137,13 @@ def test_write(self):
         with self.assertRaises(UserError):
             self.goods_cable.conversion = 3
 
+    def test_get_matching_records_has_location(self):
+        '''获取匹配记录（出库单行填写了库位）'''
+        # 已有键鼠套装入库到总仓的a库位
+        wh_out = self.env.ref('warehouse.wh_out_whout1')
+        wh_out.line_out_ids[0].location_id = self.env.ref('warehouse.a001_location')
+        wh_out.approve_order()
+
 
 class TestResCompany(TransactionCase):