Skip to content

Commit 1c08475

Browse files
committed
Merge branch 'develop'
2 parents 4c55d73 + c2daa8f commit 1c08475

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

frappe/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from .exceptions import *
1414
from .utils.jinja import get_jenv, get_template, render_template
1515

16-
__version__ = '8.0.24'
16+
__version__ = '8.0.25'
1717
__title__ = "Frappe Framework"
1818

1919
local = Local()

frappe/email/doctype/auto_email_report/auto_email_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def get_report_content(self):
5959
columns, data = report.get_data(limit=self.no_of_rows or 100, user = self.user,
6060
filters = self.filters, as_dict=True)
6161

62-
if len(data)==1 and self.send_if_data:
62+
if len(data)==0 and self.send_if_data:
6363
return None
6464

6565
if self.format == 'HTML':

frappe/installer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def check_if_ready_for_barracuda():
360360
msg = ("Creation of your site - {x} failed because MariaDB is not properly {sep}"
361361
"configured to use the Barracuda storage engine. {sep}"
362362
"Please add the settings below to MariaDB's my.cnf, restart MariaDB then {sep}"
363-
"run `bench new-site site17.local` again.{sep2}"
363+
"run `bench new-site {x}` again.{sep2}"
364364
"").format(x=site, sep2="\n"*2, sep="\n")
365365

366366
print_db_config(msg, expected_config_for_barracuda)

frappe/patches/v8_0/set_currency_field_precision.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ def execute():
1717

1818
ss = frappe.get_doc("System Settings")
1919
ss.currency_precision = precision
20+
ss.flags.ignore_mandatory = True
2021
ss.save()
2122

0 commit comments

Comments
 (0)