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

fix: resolve merge conflicts

Browse source
This commit is contained in:
Raffael Meyer 2021-09-02 11:30:57 +02:00 • committed by GitHub
parent 6c847987f1
commit ba07f3bc95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/public/js/frappe/list/bulk_operations.js
View file

@ -251,7 +251,6 @@ export default class BulkOperations {
dialog.show();
}
add_tags (docnames, done) {
const dialog = new frappe.ui.Dialog({
title: __('Add Tags'),
@ -289,9 +288,8 @@ export default class BulkOperations {
});
dialog.show();
}
<<<<<<< HEAD
export(doctype, docnames) {
export (doctype, docnames) {
frappe.require('data_import_tools.bundle.js', () => {
const data_exporter = new frappe.data_import.DataExporter(doctype, 'Insert New Records');
data_exporter.dialog.set_value('export_records', 'by_filter');
@ -301,6 +299,3 @@ export default class BulkOperations {
});
}
}
=======
}
>>>>>>> 1c6688fd9c (feat: Choose Letter Head when printing multiple documents from List /Report)