rpa-erpnext 1.0.1__py3-none-any.whl → 1.0.5__py3-none-any.whl

RPA/ERPNext.py

@@ -41,37 +41,72 @@ class ERPNextLibrary:
         """
         Thiết lập kết nối với ERPNext từ file credential JSON.
         
-        Hỗ trợ 2 format:
-        1. Token Auth (API Key/Secret):
+        Args:
+            token_file_path: Đường dẫn đến file token JSON
+            
+        Format 1 (Standard ERPNext):
         {
             "base_url": "...",
             "api_key": "...",
             "api_secret": "..."
         }
         
-        2. OAuth2 (Access Token):
+        Format 2 (Google-like / Moodle structure):
         {
-            "base_url": "...",
-            "access_token": "..."
+            "access_token": "http://erpnext.example.com",  # Mapping base_url here
+            "refresh_token": "key:secret"                 # Mapping credentials here
         }
         """
+        if not token_file_path:
+             raise Exception("Token file path is required")
+
+        # Fix for potential argument naming issue from Robot Framework (connection=...)
+        if token_file_path.startswith("connection="):
+             token_file_path = token_file_path.split("=", 1)[1]
+
         with open(token_file_path, 'r', encoding='utf-8') as f:
             data = json.load(f)
             
-        base_url = data.get("base_url")
-        api_key = data.get("api_key")
-        api_secret = data.get("api_secret")
-        access_token = data.get("access_token")
+        base_url = None
+        api_key = None
+        api_secret = None
+        access_token = None
+
+        # Logic to parse different formats
+        if 'access_token' in data and 'refresh_token' in data:
+            # Format 2: Google-like structure
+            # access_token field holds the URL
+            # refresh_token field holds the credentials (key:secret)
+            base_url = data.get('access_token')
+            creds = data.get('refresh_token')
+            
+            if ":" in creds:
+                parts = creds.split(":")
+                api_key = parts[0]
+                api_secret = parts[1]
+            else:
+                # If no colon, assume it's a bearer token? Or just raw key?
+                # For consistency with user request "y chang moodle", we assume this structure.
+                # But ERPNext needs key:secret. If it's a single string, maybe it's bearer?
+                # Let's support bearer if it's not key:secret
+                access_token = creds
+
+        else:
+            # Format 1: Standard
+            base_url = data.get("base_url")
+            api_key = data.get("api_key")
+            api_secret = data.get("api_secret")
+            access_token = data.get("access_token") # Real OAuth2 access token
         
         if not base_url:
-             raise Exception("Token file must contain base_url")
+             raise Exception("Could not find base_url in token file")
 
         if access_token:
             return self.connect(base_url, access_token=access_token)
         elif api_key and api_secret:
             return self.connect(base_url, api_key=api_key, api_secret=api_secret)
         else:
-             raise Exception("Token file must contain credentials (api_key+api_secret OR access_token)")
+             raise Exception("Token file must contain credentials (api_key+api_secret OR access_token/refresh_token)")
 
     # ===========================================================
     #  Utility Methods
@@ -279,7 +314,7 @@ class ERPNextLibrary:
     # ===========================================================
 
     @keyword("Create Sales Order")
-    def create_sales_order(self, customer: str, items: list, delivery_date: str, company: str):
+    def create_sales_order(self, customer: str, items, delivery_date: str, company: str):
         """
         Tạo Sales Order (Đơn hàng bán).
         
@@ -297,6 +332,9 @@ class ERPNextLibrary:
         """
         self.ensure_customer_exist(customer)
         
+        if isinstance(items, str):
+            items = json.loads(items)
+        
         order_items = []
         for item in items:
             order_items.append({
@@ -317,7 +355,7 @@ class ERPNextLibrary:
         return self.create_resource("Sales Order", data)
 
     @keyword("Create Sales Invoice")
-    def create_sales_invoice(self, customer: str, items: list, company: str, posting_date=None):
+    def create_sales_invoice(self, customer: str, items, company: str, posting_date=None):
         """
         Tạo Sales Invoice (Hóa đơn bán hàng).
         
@@ -331,6 +369,9 @@ class ERPNextLibrary:
         """
         self.ensure_customer_exist(customer)
         
+        if isinstance(items, str):
+            items = json.loads(items)
+        
         invoice_items = []
         for item in items:
             invoice_items.append({
@@ -356,7 +397,7 @@ class ERPNextLibrary:
     # ===========================================================
 
     @keyword("Create Stock Entry")
-    def create_stock_entry(self, purpose: str, items: list, company: str, posting_date=None):
+    def create_stock_entry(self, purpose: str, items, company: str, posting_date=None):
         """
         Tạo Stock Entry (Phiếu nhập/xuất kho).
         
@@ -379,6 +420,10 @@ class ERPNextLibrary:
             | ${items}= | Create List | {"item_code": "ITEM-001", "qty": 100, "t_warehouse": "Stores - EDU"} |
             | Create Stock Entry | Material Receipt | ${items} | My Company |
         """
+
+        if isinstance(items, str):
+            items = json.loads(items)
+
         stock_items = []
         for item in items:
             stock_items.append({
@@ -403,7 +448,7 @@ class ERPNextLibrary:
         return self.create_resource("Stock Entry", data)
 
     @keyword("Create Purchase Receipt")
-    def create_purchase_receipt(self, supplier: str, items: list, company: str, posting_date=None):
+    def create_purchase_receipt(self, supplier: str, items, company: str, posting_date=None):
         """
         Tạo Purchase Receipt (Phiếu nhận hàng mua).
         
@@ -417,6 +462,9 @@ class ERPNextLibrary:
         """
         self.ensure_supplier_exist(supplier)
         
+        if isinstance(items, str):
+            items = json.loads(items)
+        
         receipt_items = []
         for item in items:
             receipt_items.append({
@@ -438,8 +486,10 @@ class ERPNextLibrary:
             
         return self.create_resource("Purchase Receipt", data)
 
+
+
     @keyword("Create Purchase Order")
-    def create_purchase_order(self, supplier: str, items: list, company: str, schedule_date=None):
+    def create_purchase_order(self, supplier: str, items, company: str, schedule_date=None):
         """
         Tạo Purchase Order (Đơn hàng mua).
         
@@ -453,6 +503,9 @@ class ERPNextLibrary:
         """
         self.ensure_supplier_exist(supplier)
         
+        if isinstance(items, str):
+            items = json.loads(items)
+            
         po_items = []
         for item in items:
             po_items.append({
@@ -479,7 +532,7 @@ class ERPNextLibrary:
     # ===========================================================
 
     @keyword("Create Purchase Invoice")
-    def create_purchase_invoice(self, supplier: str, items: list, company: str, posting_date=None):
+    def create_purchase_invoice(self, supplier: str, items, company: str, posting_date=None):
         """
         Tạo Purchase Invoice (Hóa đơn mua hàng).
         
@@ -493,6 +546,9 @@ class ERPNextLibrary:
         """
         self.ensure_supplier_exist(supplier)
         
+        if isinstance(items, str):
+            items = json.loads(items)
+
         invoice_items = []
         for item in items:
             invoice_items.append({
@@ -599,8 +655,15 @@ class ERPNextLibrary:
     # ===========================================================
 
     @keyword("Send RFQ From Material Request")
-    def send_rfq_from_mr(self, mr_name: str, suppliers: list):
+    def send_rfq_from_mr(self, mr_name: str, suppliers):
         """Tạo RFQ dựa trên Material Request."""
+        if isinstance(suppliers, str):
+            try:
+                suppliers = json.loads(suppliers)
+            except ValueError:
+                # Nếu không phải JSON list, coi như là 1 supplier duy nhất
+                suppliers = [suppliers]
+
         mr_doc = self.get_doc("Material Request", mr_name)
         company = mr_doc["company"]
         self.ensure_warehouse_exist(f"Stores - EDU", company)
@@ -633,30 +696,69 @@ class ERPNextLibrary:
     # ===========================================================
 
     @keyword("Receive Supplier Quotation")
-    def receive_supplier_quotation(self, rfq_name: str, supplier_name: str, quotation_data: list):
+    def receive_supplier_quotation(self, rfq_name: str, supplier_name: str, quotation_data):
+        """
+        Nhận báo giá từ Supplier.
+        
+        Args:
+            rfq_name: Mã Request for Quotation
+            supplier_name: Tên nhà cung cấp
+            quotation_data: 
+                - Đường dẫn file Excel (.xlsx) chứa các cột: item_code, qty, rate
+                - Hoặc List/JSON string chứa thông tin items
+        """
         rfq_doc = self.get_doc("Request for Quotation", rfq_name)
         company = rfq_doc["company"]
         self.ensure_supplier_exist(supplier_name)
+        
+        items_list = []
+
+        # Case 1: Input is Excel file path
+        if isinstance(quotation_data, str) and (quotation_data.endswith('.xlsx') or quotation_data.endswith('.xls')):
+            df = pd.read_excel(quotation_data)
+            # Clean column names (optional: lowercase)
+            df.columns = [c.lower().strip() for c in df.columns]
+            
+            for _, row in df.iterrows():
+                # Flexible column mapping
+                item_code = row.get("item_code") or row.get("itemcode")
+                qty = row.get("qty") or row.get("quantity")
+                rate = row.get("rate") or row.get("price") or 0
+                
+                items_list.append({
+                    "item_code": item_code,
+                    "qty": float(qty),
+                    "rate": float(rate),
+                    "uom": "Nos",
+                    "stock_uom": "Nos",
+                    "conversion_factor": 1.0,
+                    "warehouse": f"Stores - EDU"
+                })
+        
+        # Case 2: Input is List or JSON String
+        else:
+            if isinstance(quotation_data, str):
+                quotation_data = json.loads(quotation_data)
+
+            for q in quotation_data:
+                items_list.append({
+                    "item_code": q["item_code"],
+                    "qty": q["qty"],
+                    "rate": q["rate"],
+                    "uom": "Nos",
+                    "stock_uom": "Nos",
+                    "conversion_factor": 1.0,
+                    "warehouse": f"Stores - EDU"
+                })
 
         sq_data = {
             "doctype": "Supplier Quotation",
             "supplier": supplier_name,
             "company": company,
             "transaction_date": "2026-01-28",
-            "items": [],
+            "items": items_list,
         }
 
-        for q in quotation_data:
-            sq_data["items"].append({
-                "item_code": q["item_code"],
-                "qty": q["qty"],
-                "rate": q["rate"],
-                "uom": "Nos",
-                "stock_uom": "Nos",
-                "conversion_factor": 1.0,
-                "warehouse": f"Stores - EDU"
-            })
-
         return self.create_resource("Supplier Quotation", sq_data)
 
     # ===========================================================

{rpa_erpnext-1.0.1.dist-info → rpa_erpnext-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rpa-erpnext
-Version: 1.0.1
+Version: 1.0.5
 Summary: Robot Framework library for automating ERPNext using REST API
 Author-email: Your Name <youremail@example.com>
 License: MIT

rpa_erpnext-1.0.5.dist-info/RECORD

@@ -0,0 +1,7 @@
+RPA/ERPNext.py,sha256=BzT0W0ren0bizXq4rjVR3DqoY8Tro56-HgQfnd3ytiQ,28815
+RPA/__init__.py,sha256=doHeY54VPWzBDnkSMGvGGSYfkpxt4dFXAV8YOi-Ebig,110
+rpa_erpnext-1.0.5.dist-info/licenses/LICENSE,sha256=sexHbU6pNlqsmC_TQZJLdZ59qC_Bym7mQ0HrNeHHQ3Y,1063
+rpa_erpnext-1.0.5.dist-info/METADATA,sha256=aXYwFzm_EC1MXWKOOiIk3ecFU2TT0FJTAtQTfEDCLXM,800
+rpa_erpnext-1.0.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+rpa_erpnext-1.0.5.dist-info/top_level.txt,sha256=s4yaEXbcdPUcIyAxSvrLKKIMD62cqoNPsOGmdx94U5k,4
+rpa_erpnext-1.0.5.dist-info/RECORD,,

rpa_erpnext-1.0.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-RPA/ERPNext.py,sha256=OGunPSMxX9jdsfqi0wpwfcncSBQuekHsSOa_SZc-vhg,24914
-RPA/__init__.py,sha256=doHeY54VPWzBDnkSMGvGGSYfkpxt4dFXAV8YOi-Ebig,110
-rpa_erpnext-1.0.1.dist-info/licenses/LICENSE,sha256=sexHbU6pNlqsmC_TQZJLdZ59qC_Bym7mQ0HrNeHHQ3Y,1063
-rpa_erpnext-1.0.1.dist-info/METADATA,sha256=xRXJi0s8br9c0FbCtksyHZESnkpNofLz4iyen5HE8NY,800
-rpa_erpnext-1.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-rpa_erpnext-1.0.1.dist-info/top_level.txt,sha256=s4yaEXbcdPUcIyAxSvrLKKIMD62cqoNPsOGmdx94U5k,4
-rpa_erpnext-1.0.1.dist-info/RECORD,,