Merge branch 'develop' into workflow-button-icon

This commit is contained in:
Ejaaz Khan 2022-12-07 12:12:44 +05:30 committed by GitHub
commit 785d534eca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -4,7 +4,7 @@ set -e
echo "Setting Up System Dependencies..."
sudo apt update
sudo apt install libcups2-dev redis-server mariadb-client-10.3
sudo apt install libcups2-dev redis-server mariadb-client-10.6
install_wkhtmltopdf() {
wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb

View file

@ -364,7 +364,7 @@ def raise_link_exists_exception(doc, reference_doctype, reference_docname, row="
frappe.throw(
_("Cannot delete or cancel because {0} {1} is linked with {2} {3} {4}").format(
doc.doctype, doc_link, reference_doctype, reference_link, row
_(doc.doctype), doc_link, _(reference_doctype), reference_link, row
),
frappe.LinkExistsError,
)