From 7c3605508df5bef7099bd4462ac215e5424a136e Mon Sep 17 00:00:00 2001
From: mtpc4s9 <mtpc4s9@gmail.com>
Date: Sat, 6 Dec 2025 12:09:51 +0700
Subject: [PATCH] =?UTF-8?q?Th=C3=AAm=2003=20tr=C6=B0=E1=BB=9Dng=20nh?=
 =?UTF-8?q?=E1=BA=ADp=20li=E1=BB=87u=20Vendors,=20chu=E1=BA=A9n=20b?=
 =?UTF-8?q?=E1=BB=8B=20cho=20vi=E1=BB=87c=20g=E1=BB=99p=20nhi=E1=BB=81u=20?=
 =?UTF-8?q?PR=20v=C3=A0o=20RFQs=20sau=20n=C3=A0y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tôi ưu UX

Thêm group Rejection

Điều chỉnh lại login nhận dạng Line Manager
---
 .../epr_purchase_request.cpython-312.pyc      | Bin 13420 -> 16045 bytes
 addons/epr/models/epr_purchase_request.py     | 150 +++++++++++-------
 addons/epr/security/epr_record_rules.xml      |   5 +-
 .../epr/views/epr_purchase_request_views.xml  | 145 +++++++++++++++--
 4 files changed, 231 insertions(+), 69 deletions(-)

diff --git a/addons/epr/models/__pycache__/epr_purchase_request.cpython-312.pyc b/addons/epr/models/__pycache__/epr_purchase_request.cpython-312.pyc
index d35b642b724e053518242f315f795661e9266629..c596ccf7d25bb10af9913b591118a8bcf894e079 100644
GIT binary patch
delta 4671
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
Rjqba6_`>1u1pdO0`Y%hK0`C9-

delta 2492
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

diff --git a/addons/epr/models/epr_purchase_request.py b/addons/epr/models/epr_purchase_request.py
index 67ca755..3d93f25 100644
--- a/addons/epr/models/epr_purchase_request.py
+++ b/addons/epr/models/epr_purchase_request.py
@@ -38,6 +38,12 @@ class EprPurchaseRequest(models.Model):
         readonly=True
     )
 
+    # Xác định người tạo PR
+    is_owner = fields.Boolean(
+        compute='_compute_is_owner',
+        store=False
+    )
+    
     date_required = fields.Date(
         string='Date Required',
         required=True,
@@ -64,7 +70,8 @@ class EprPurchaseRequest(models.Model):
         default='draft',
         tracking=True,
         index=True,
-        copy=False
+        copy=False,
+        group_expand='_expand_groups'
     )
 
     # approver_ids = fields.Many2many(
@@ -122,6 +129,21 @@ class EprPurchaseRequest(models.Model):
         help="Người đã phê duyệt."
     )
 
+    date_rejected = fields.Datetime(
+        string='Rejected Date',
+        readonly=True,
+        copy=False,
+        help="Ngày bị từ chối."
+    )
+
+    rejected_by_id = fields.Many2one(
+        comodel_name='res.users',
+        string='Rejected By',
+        readonly=True,
+        copy=False,
+        help="Người đã từ chối."
+    )
+
     date_submitted = fields.Datetime(
         string='Submitted Date',
         readonly=True,
@@ -131,7 +153,7 @@ class EprPurchaseRequest(models.Model):
     # ==========================================================================
     # MODEL METHODS
     # ==========================================================================
-
+    # Hàm tạo sequence cho Request Reference
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
@@ -139,6 +161,12 @@ class EprPurchaseRequest(models.Model):
                 vals['name'] = self.env['ir.sequence'].next_by_code('epr.purchase.request') or _('New')
         return super().create(vals_list)
 
+    # --- Kanban Grouping (Để Kanban hiển thị đủ cột Draft/Done dù không có data) ---
+    @api.model
+    def _expand_groups(self, states, domain, order=None):
+        """Force display all state columns in Kanban, even if empty"""
+        return ['draft', 'to_approve', 'approved', 'rejected', 'in_progress', 'done', 'cancel']
+
     # Compute estimated total
     @api.depends('line_ids.subtotal_estimated', 'currency_id')
     def _compute_estimated_total(self):
@@ -149,6 +177,12 @@ class EprPurchaseRequest(models.Model):
             total = sum(line.subtotal_estimated for line in request.line_ids)
             request.estimated_total = total
 
+    # Xác định người tạo PR
+    @api.depends_context('uid')
+    def _compute_is_owner(self):
+        for record in self:
+            record.is_owner = record.employee_id.user_id.id == self.env.uid
+
     # Compute approvers
     # @api.depends('employee_id', 'department_id', 'estimated_total')
     # def _compute_approvers(self):
@@ -254,19 +288,6 @@ class EprPurchaseRequest(models.Model):
             'approved_by_id': self.env.user.id
         })
 
-        # Mark activities as done
-        # NOTE: Commented out for testing without mail server
-        # self.activity_ids.filtered(
-        #     lambda a: a.user_id == self.env.user
-        # ).action_feedback(feedback='Approved')
-
-        # Post message to chatter
-        # self.message_post(
-        #     body=_('Purchase Request approved by %s') % (
-        #         self.env.user.name
-        #     )
-        # )
-
     # Hàm mở Wizard
     def action_reject_wizard(self):
         """Open rejection wizard"""
@@ -298,25 +319,14 @@ class EprPurchaseRequest(models.Model):
 
         # Thực hiện ghi dữ liệu
         self.write({
-            'state': 'draft',
+            'state': 'rejected',
             'rejection_reason': reason,
-            'approver_ids': [(5, 0, 0)]  # QUAN TRỌNG: Xóa sạch người duyệt để clear danh sách chờ
+            'approver_ids': [(5, 0, 0)],  # QUAN TRỌNG: Xóa sạch người duyệt để clear danh sách chờ
+            # LOG: Ghi nhận thông tin từ chối
+            'date_rejected': fields.Datetime.now(),
+            'rejected_by_id': self.env.user.id,
         })
 
-        # Mark activities as done
-        # NOTE: Commented out for testing without mail server
-        # self.activity_ids.filtered(
-        #     lambda a: a.user_id == self.env.user
-        # ).action_feedback(feedback='Rejected')
-
-        # Post message to chatter
-        # self.message_post(
-        #     body=_('Purchase Request rejected by %s\nReason: %s') % (
-        #         self.env.user.name,
-        #         reason
-        #     )
-        # )
-
     # User action: Reset to draft when accidentally submitted
     def action_reset_to_draft(self):
         """
@@ -435,16 +445,38 @@ class EprPurchaseRequestLine(models.Model):
         help="Mô tả chi tiết, có thể dán link, hình ảnh minh họa, thông số kỹ thuật..."
     )
 
-    # Dùng Char hoặc Text cho tên nhà cung cấp gợi ý (Staff không cần chọn trong danh bạ đối tác)
-    vendor_name = fields.Char(
-        string='Vendor Name',
+    # === 1. USER INPUT FIELDS ===
+    # User chọn từ danh bạ (Không cho tạo mới ở View)
+    user_vendor_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Approved Vendor',
+        domain=lambda self: [
+            ('supplier_rank', '>', 0),
+            '|', ('company_id', '=', False),
+            ('company_id', '=', self.env.company.id)
+        ],
+        help="Chọn nhà cung cấp có sẵn trong hệ thống."
+    )
+
+    # User nhập text tự do (Dùng khi không tìm thấy hoặc đề xuất mới)
+    suggested_vendor_name = fields.Char(
+        string='Suggested Vendor Name',
         help="Tên nhà cung cấp được đề xuất bởi người yêu cầu (tham khảo)."
     )
 
+    # === 2. PURCHASING ONLY FIELDS ===
+    # Purchasing chốt Vendor cuối cùng để làm RFQ
+    final_vendor_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Final Vendor',
+        domain="[('supplier_rank', '>', 0)]",
+        help="Nhà cung cấp chính thức được bộ phận Mua hàng chốt."
+    )
+
     quantity = fields.Float(
         string='Quantity',
         default=1.0,
-        digits='Product Unit of Measure', # Sử dụng độ chính xác cấu hình trong hệ thống
+        digits='Product Unit of Measure',  # Sử dụng độ chính xác cấu hình trong hệ thống
         required=True,
         help="Số lượng cần mua."
     )
@@ -475,26 +507,30 @@ class EprPurchaseRequestLine(models.Model):
             price = line.estimated_price or 0.0
             line.subtotal_estimated = qty * price
 
-    # === logic Onchange ===
-    # Chỉ chạy khi Purchasing Staff chọn product_id (lúc xử lý phiếu)
+    # ==========================================================================
+    # ONCHANGE FIELDS
+    # ==========================================================================
+    @api.onchange('user_vendor_id')
+    def _onchange_user_vendor_id(self):
+        """
+        UX Logic:
+        1. Nếu User chọn Vendor ID -> Tự động điền text & set Final Vendor.
+        2. Nếu User bỏ chọn Vendor ID -> Xóa Final Vendor để Purchasing xử lý lại.
+        """
+        if self.user_vendor_id:
+            # User đã chọn vendor từ danh bạ
+            self.suggested_vendor_name = self.user_vendor_id.name
+            self.final_vendor_id = self.user_vendor_id
+        else:
+            # User bỏ chọn vendor
+            self.final_vendor_id = False
+            # suggested_vendor_name giữ nguyên để User có thể nhập thủ công
 
-    @api.onchange('product_id')
-    def _onchange_product_id(self):
-        if not self.product_id:
-            return
-
-        # Đơn vị tính (UoM): NÊN ghi đè theo chuẩn hệ thống
-        # Lý do: Staff có thể nhập "Cái", nhưng hệ thống kho quản lý là "Unit(s)".
-        # Để tạo PO chính xác sau này, ta cần lấy UoM chuẩn của sản phẩm.
-        self.uom_name = self.product_id.uom_po_id.name or self.product_id.uom_id.name
-
-        # Giá dự kiến: Chỉ điền nếu Staff để bằng 0
-        if self.estimated_price == 0.0:
-            self.estimated_price = self.product_id.standard_price
-
-        # Tên sản phẩm: KHÔNG ghi đè (Giữ nguyên mô tả của Staff)
-        # Vì Staff mô tả nhu cầu thực tế (VD: "Máy tính Dell cho kế toán"), 
-        # còn tên Product hệ thống có thể chung chung (VD: "Laptop Dell Latitude").
-        # Ta chỉ điền nếu dòng này do Purchasing tạo mới hoàn toàn (name đang rỗng).
-        if not self.name:
-            self.name = self.product_id.display_name
+    @api.constrains('user_vendor_id', 'suggested_vendor_name')
+    def _check_vendor_presence(self):
+        """
+        Data Integrity: Bắt buộc phải có ít nhất 1 thông tin về nhà cung cấp.
+        """
+        for line in self:
+            if not line.user_vendor_id and not line.suggested_vendor_name:
+                raise ValidationError(_("Dòng sản phẩm '%s': Vui lòng chọn Nhà cung cấp hoặc nhập tên đề xuất.", line.name))
diff --git a/addons/epr/security/epr_record_rules.xml b/addons/epr/security/epr_record_rules.xml
index 4dbe231..1684470 100644
--- a/addons/epr/security/epr_record_rules.xml
+++ b/addons/epr/security/epr_record_rules.xml
@@ -23,10 +23,11 @@
         <record id="rule_epr_manager_approver" model="ir.rule">
             <field name="name">ePR: Manager sees department requests</field>
             <field name="model_id" ref="model_epr_purchase_request"/>
-            <field name="domain_force">['|', '|', 
+            <field name="domain_force">['|', '|', '|',
                 ('employee_id.user_id','=',user.id), 
                 ('approver_ids', 'in', user.id),
-                ('department_id.manager_id.user_id', '=', user.id)
+                ('department_id.manager_id.user_id', '=', user.id),
+                ('employee_id.parent_id.user_id', '=', user.id)
             ]</field>
             <field name="groups" eval="[(4, ref('epr.group_epr_manager'))]"/>
         </record>
diff --git a/addons/epr/views/epr_purchase_request_views.xml b/addons/epr/views/epr_purchase_request_views.xml
index 25058f2..67f3a4a 100644
--- a/addons/epr/views/epr_purchase_request_views.xml
+++ b/addons/epr/views/epr_purchase_request_views.xml
@@ -36,6 +36,101 @@
             </field>
         </record>
 
+        <!-- 
+            ===================================================================
+            2. KANBAN VIEW
+            Hiển thị dạng thẻ theo quy trình (Pipeline)
+            ===================================================================
+        -->
+        <record id="view_epr_purchase_request_kanban" model="ir.ui.view">
+            <field name="name">epr.purchase.request.kanban</field>
+            <field name="model">epr.purchase.request</field>
+            <field name="arch" type="xml">
+                <!-- 
+                    default_group_by="state": Kích hoạt chế độ cột theo trạng thái.
+                    records_draggable="false": Chặn kéo thả nếu bạn muốn quy trình chặt chẽ (chỉ đổi trạng thái bằng nút bấm).
+                    Nếu muốn cho phép kéo thả để duyệt nhanh, hãy bỏ attribute này.
+                -->
+                <kanban default_group_by="state" 
+                        class="o_kanban_small_column" 
+                        quick_create="false" 
+                        sample="1">
+                    
+                    <!-- Các field cần dùng trong logic hiển thị -->
+                    <field name="state"/>
+                    <field name="currency_id"/>
+                    <field name="activity_state"/>
+                    <field name="id"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                    <field name="date_required"/>
+                    <field name="priority"/>
+                    <field name="estimated_total"/>
+                    <field name="activity_ids"/>
+
+                    <!-- Thanh tiến độ (Progress Bar) trên đầu mỗi cột -->
+                    <progressbar field="state" 
+                                 colors='{"draft": "secondary", "to_approve": "warning", "approved": "success", "rejected": "danger"}'/>
+
+                    <templates>
+                        <t t-name="kanban-box">
+                            <!-- Khung thẻ: oe_kanban_global_click giúp click vào đâu cũng mở form -->
+                            <div class="oe_kanban_global_click oe_kanban_card d-flex flex-column">
+                                
+                                <!-- HEADER: Tên + Menu 3 chấm -->
+                                <div class="o_kanban_record_top mb-2">
+                                    <div class="o_kanban_record_headings">
+                                        <strong class="o_kanban_record_title">
+                                            <field name="name"/>
+                                        </strong>
+                                        <span class="float-end badge" 
+                                              t-attf-class="badge-{{record.state.raw_value == 'approved' ? 'success' : (record.state.raw_value == 'rejected' ? 'danger' : 'info')}}">
+                                            <field name="state"/>
+                                        </span>
+                                    </div>
+                                    <!-- Dropdown Menu (Odoo 18 dùng Bootstrap 5) -->
+                                    <div class="o_dropdown_kanban dropdown">
+                                        <a class="dropdown-toggle o-no-caret btn" role="button" data-bs-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
+                                            <span class="fa fa-ellipsis-v"/>
+                                        </a>
+                                        <div class="dropdown-menu" role="menu">
+                                            <a role="menuitem" type="edit" class="dropdown-item">Edit</a>
+                                            <a role="menuitem" type="delete" class="dropdown-item">Delete</a>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <!-- BODY: Thông tin chính -->
+                                <div class="o_kanban_record_body tags-section mb-2">
+                                    <div class="d-flex align-items-center mb-1">
+                                        <field name="employee_id" widget="many2one_avatar_user"/>
+                                        <span class="ms-2 text-muted small">
+                                            <field name="department_id"/>
+                                        </span>
+                                    </div>
+                                    <!-- Hiển thị ngày cần hàng nếu có -->
+                                    <div t-if="record.date_required.raw_value" class="text-muted small">
+                                        <i class="fa fa-clock-o me-1"/> <field name="date_required"/>
+                                    </div>
+                                </div>
+
+                                <!-- FOOTER: Priority + Activity + Total -->
+                                <div class="o_kanban_record_bottom mt-auto d-flex justify-content-between align-items-center">
+                                    <div class="oe_kanban_bottom_left d-flex align-items-center">
+                                        <field name="priority" widget="priority"/>
+                                        <field name="activity_ids" widget="kanban_activity" class="ms-2"/>
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <field name="estimated_total" widget="monetary" options="{'currency_field': 'currency_id'}" class="fw-bold"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <!-- 
             ===================================================================
             2. LIST VIEW
@@ -102,12 +197,14 @@
                                 invisible="state != 'to_approve'"
                                 groups="epr.group_epr_manager"/>
                         
-                        <!-- Nút Reset: Cho User sửa lại khi đã submit nhầm -->
+                        <field name="is_owner" invisible="1"/>
+
+                        <!-- Nút Reset: Cho phép PR's owner sửa lại khi đã submit nhầm -->
                         <button name="action_reset_to_draft" 
                                 string="Reset to Draft" 
                                 type="object" 
                                 class="btn-warning"
-                                invisible="state not in ['to_approve']"/>
+                                invisible="state not in ['to_approve', 'rejected'] or not is_owner"/>
                         
                         <field name="state" widget="statusbar" statusbar_visible="draft,to_approve,approved,done"/>
                     </header>
@@ -133,11 +230,6 @@
                             <group>
                                 <field name="date_required"/>
                                 <field name="priority" widget="priority"/>
-                                <!-- Lý do từ chối chỉ hiện khi bị từ chối -->
-                                <field name="rejection_reason" 
-                                       invisible="state != 'rejected'" 
-                                       readonly="1"
-                                       class="text-danger"/>
                             </group>
                         </group>
 
@@ -158,7 +250,30 @@
                                         <field name="subtotal_estimated" sum="Total"/>
                                         <field name="currency_id" invisible="1"/>
                                         
-                                        <field name="vendor_name" optional="hide"/>
+                                        <!-- ================= VENDOR SECTION ================= -->
+                                        <!-- 1. VENDOR LIST (User Search) -->
+                                        <!-- options="{'no_create': True}": Ngăn User tạo rác dữ liệu -->
+                                        <field name="user_vendor_id" 
+                                               placeholder="Select existing vendor..."
+                                               options="{'no_create': True, 'no_create_edit': True}"
+                                               widget="many2one"/>
+
+                                        <!-- 2. VENDOR TEXT (User Type)
+                                            "user_vendor_id": Tự động điền vào trường text nếu đã chọn được vendor trong danh bạ
+                                            "required="not user_vendor_id": Bắt buộc nhập nếu chưa chọn ID.
+                                        -->
+                                        <field name="suggested_vendor_name" 
+                                               placeholder="...or type new vendor name"
+                                               required="not user_vendor_id"/>
+                                        <!-- 3. FINAL VENDOR (Purchasing Only)
+                                            "groups="...": Chỉ hiện cột này cho Purchasing Officer.
+                                            User thường sẽ hoàn toàn không thấy cột này.
+                                            "optional="show": Cho phép ẩn/hiện trong menu 3 chấm nếu cần.
+                                        -->
+                                        <field name="final_vendor_id" 
+                                               groups="epr.group_epr_purchasing_officer"
+                                               widget="many2one"
+                                               optional="show"/>
                                         
                                         <!-- Product ID ẩn, dành cho Purchasing map sau này -->
                                         <field name="product_id" optional="hide" groups="epr.group_epr_purchasing_officer"/>
@@ -179,6 +294,16 @@
                                         <field name="approver_ids" widget="many2many_tags" readonly="1"/>
                                     </group>
                                 </group>
+
+                                <group>
+                                    <group string="Rejection" invisible="not date_rejected">
+                                        <field name="date_rejected" readonly="1"/>
+                                        <field name="rejected_by_id" readonly="1"/>
+                                        <field name="rejection_reason"
+                                               readonly="1"
+                                               class="text-danger"/>
+                                    </group>
+                                </group>
                             </page>
                         </notebook>
                     </sheet>
@@ -199,7 +324,7 @@
             <field name="name">Purchase Requests</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">epr.purchase.request</field>
-            <field name="view_mode">list,form,search</field>
+            <field name="view_mode">kanban,list,form,search</field>
             <field name="search_view_id" ref="view_epr_purchase_request_search"/>
             <field name="context">{'search_default_my_requests': 1}</field>
             <!-- <field name="context">{'search_default_my_requests': 1, 'search_default_to_approve_by_me': 1}</field> -->
@@ -215,7 +340,7 @@
             <field name="name">To Approve</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">epr.purchase.request</field>
-            <field name="view_mode">list,form,search</field>
+            <field name="view_mode">kanban,list,form,search</field>
             <field name="search_view_id" ref="view_epr_purchase_request_search"/>
             <field name="context">{'search_default_to_approve_by_me': 1, 'search_default_to_approve': 1}</field>
             <field name="domain">[('state', '=', 'to_approve')]</field>