diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss index 3868fb09..8495e5cd 100644 --- a/sf_base/static/src/scss/test.scss +++ b/sf_base/static/src/scss/test.scss @@ -121,20 +121,12 @@ td.o_required_modifier { //font-weight: bold; } -.o_list_table th > div > i { - display: none !important; +.text-truncate { + overflow: unset !important; + text-overflow: unset !important; + white-space: unset !important; } -body .o_list_table th:nth-child(4) { - width: 100px !important; +.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) { + white-space: nowrap !important; } - -//body .o_list_table th:nth-child(5) { -// width: 500px !important; -//} - -.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove).o_list_text { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} \ No newline at end of file diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 8b95c5af..c29abbf4 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -472,3 +472,22 @@ class ReStockMove(models.Model): item.product_id.write({'register_state': '注册失败'}) except Exception as e: raise UserError("注册刀具到云端失败,请联系管理员!") + + +class ReStockQuant(models.Model): + _inherit = 'stock.quant' + + def action_apply_inventory(self): + inventory_diff_quantity = self.inventory_diff_quantity + super(ReStockQuant, self).action_apply_inventory() + if inventory_diff_quantity >= 1: + stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True), + ('reference', '=', '更新的产品数量'), ('state', '=', 'done')], + limit=1, order='id desc') + if self.product_id.categ_type == '夹具': + stock._register_fixture() + elif self.product_id.categ_type == '刀具': + stock._register_cutting_tool() + return True + +