diff --git a/.github/helper/documentation.py b/.github/helper/documentation.py index 258035e4cf6..d9588f5633f 100644 --- a/.github/helper/documentation.py +++ b/.github/helper/documentation.py @@ -68,6 +68,32 @@ def check_pull_request(number: str) -> "tuple[int, str]": if __name__ == "__main__": +<<<<<<< HEAD exit_code, message = check_pull_request(sys.argv[1]) print(message) sys.exit(exit_code) +======= + pr = sys.argv[1] + response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr)) + + if response.ok: + payload = response.json() + title = (payload.get("title") or "").lower().strip() + head_sha = (payload.get("head") or {}).get("sha") + body = (payload.get("body") or "").lower() + + if (title.startswith("feat") + and head_sha + and "no-docs" not in body + and "backport" not in body + ): + if docs_link_exists(body): + print("Documentation Link Found. You're Awesome! 🎉") + + else: + print("Documentation Link Not Found! ⚠️") + sys.exit(1) + + else: + print("Skipping documentation checks... 🏃") +>>>>>>> 8bbec42fa0 (fix: undo changes to patch (#26983)) diff --git a/erpnext/patches/v13_0/shopify_deprecation_warning.py b/erpnext/patches/v13_0/shopify_deprecation_warning.py index 8b0f1935cfb..6f199c87b6c 100644 --- a/erpnext/patches/v13_0/shopify_deprecation_warning.py +++ b/erpnext/patches/v13_0/shopify_deprecation_warning.py @@ -4,10 +4,6 @@ import frappe def execute(): - frappe.reload_doc("erpnext_integrations", "doctype", "shopify_settings") - if not frappe.db.get_single_value("Shopify Settings", "enable_shopify"): - return - click.secho( "Shopify Integration is moved to a separate app and will be removed from ERPNext in version-14.\n" "Please install the app to continue using the integration: https://github.com/frappe/ecommerce_integrations",