Merge branch 'develop' into workflow-button-icon
This commit is contained in:
commit
785d534eca
2 changed files with 2 additions and 2 deletions
2
.github/helper/install_dependencies.sh
vendored
2
.github/helper/install_dependencies.sh
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue