vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: clean merge artifacts

Browse source
This commit is contained in:
Packeting 2026-01-04 10:45:24 +08:00
parent 57e7374870
commit dff76a1f07
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/form/print_utils.js
View file

@ -95,13 +95,7 @@ frappe.ui.get_print_settings = function (
settings.letter_head_name = null;
} else {
const letter_head_name =
<<<<<<< HEAD
settings.letter_head || settings.letter_head_name || print_settings.letter_head;
=======
settings.letter_head ||
settings.letter_head_name ||
print_settings.letter_head;
>>>>>>> b1263e2604 (fix: render report letterhead jinja on print/pdf)
if (letter_head_name) {
settings.letter_head_name = letter_head_name;
settings.letter_head = frappe.boot.letter_heads[letter_head_name];

8
frappe/public/js/frappe/form/tab.js
View file

@ -35,14 +35,6 @@ export default class Tab {
type="button"
role="tab"
aria-controls="${id}">
<<<<<<< HEAD
${
ICON_MAP[this.label] || this.df.icon
? frappe.utils.icon(this.df.icon || ICON_MAP[this.label])
: ""
}
=======
>>>>>>> 19cdf236bc (fix: remove icon from form tabs)
${__(this.label, null, this.doctype)}
</button>
</li>