rpa-erpnext 1.0.1__tar.gz → 1.0.4__tar.gz

{rpa_erpnext-1.0.1 → rpa_erpnext-1.0.4}/PKG-INFO

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

{rpa_erpnext-1.0.1 → rpa_erpnext-1.0.4}/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
@@ -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({
@@ -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({
@@ -417,6 +458,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,6 +482,8 @@ 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):
         """
@@ -453,6 +499,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({
@@ -601,6 +650,9 @@ class ERPNextLibrary:
     @keyword("Send RFQ From Material Request")
     def send_rfq_from_mr(self, mr_name: str, suppliers: list):
         """Tạo RFQ dựa trên Material Request."""
+        if isinstance(suppliers, str):
+            suppliers = json.loads(suppliers)
+
         mr_doc = self.get_doc("Material Request", mr_name)
         company = mr_doc["company"]
         self.ensure_warehouse_exist(f"Stores - EDU", company)
@@ -633,30 +685,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 → rpa_erpnext-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rpa-erpnext"
-version = "1.0.1"
+version = "1.0.4"
 description = "Robot Framework library for automating ERPNext using REST API"
 readme = "readme.md"
 requires-python = ">=3.8"

{rpa_erpnext-1.0.1 → rpa_erpnext-1.0.4}/rpa_erpnext.egg-info/PKG-INFO

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