From 20168419245b21029e92ad779bc56e593ed0c7a5 Mon Sep 17 00:00:00 2001 From: Viet Pham Date: Mon, 31 Oct 2016 20:36:32 +0700 Subject: [PATCH 1/3] Fix 'engine' attribute error --- frappe/model/db_schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/db_schema.py b/frappe/model/db_schema.py index b6dafd701f..3ad1915c56 100644 --- a/frappe/model/db_schema.py +++ b/frappe/model/db_schema.py @@ -178,7 +178,7 @@ class DbTable: ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci""".format(varchar_len=varchar_len, - engine=self.meta.engine or 'InnoDB') % (self.name, add_text)) + engine=self.meta.get("engine") or 'InnoDB') % (self.name, add_text)) def get_column_definitions(self): column_list = [] + default_columns From 427a97774ed22f9269f9a09841799969d4549013 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 31 Oct 2016 20:20:43 +0530 Subject: [PATCH 2/3] [path][fix] paypal integration --- .../integrations/doctype/paypal_settings/paypal_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/paypal_settings/paypal_settings.py b/frappe/integrations/doctype/paypal_settings/paypal_settings.py index 56b59dcbb4..2702cb7f2f 100644 --- a/frappe/integrations/doctype/paypal_settings/paypal_settings.py +++ b/frappe/integrations/doctype/paypal_settings/paypal_settings.py @@ -135,7 +135,7 @@ class PayPalSettings(IntegrationService): "PAYMENTREQUEST_0_PAYMENTACTION": "SALE", "PAYMENTREQUEST_0_AMT": amount, "PAYMENTREQUEST_0_CURRENCYCODE": currency.upper(), - "returnUrl": get_url("/api/method/frappe.integrations.paypal.get_express_checkout_details"), + "returnUrl": get_url("/api/method/frappe.integrations.doctype.paypal_settings.paypal_settings.get_express_checkout_details"), "cancelUrl": get_url("/payment-cancel") }) @@ -210,7 +210,7 @@ def get_express_checkout_details(token): frappe.local.response["type"] = "redirect" frappe.local.response["location"] = get_url( \ - "/api/method/frappe.integrations.paypal.confirm_payment?token={0}".format(token)) + "/api/method/frappe.integrations.doctype.paypal_settings.paypal_settings.confirm_payment?token={0}".format(token)) @frappe.whitelist(allow_guest=True, xss_safe=True) def confirm_payment(token): From 4f4dd9c51c28aae9032d4c5fcda3668bab1111a6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 1 Nov 2016 13:08:50 +0600 Subject: [PATCH 3/3] bumped to version 7.1.4 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index e88b3ff0b2..5ad3acd969 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '7.1.3' +__version__ = '7.1.4' __title__ = "Frappe Framework" local = Local()