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

added checkbox in Print Setting and if checked then draft document prevent from printing and generating pdf

Browse source
This commit is contained in:
patilsangram 2016-03-16 17:47:08 +05:30
parent baea1f6d41
commit 49b1b3a8db
2 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
frappe/print/doctype/print_settings/print_settings.json
View file

@ -16,6 +16,7 @@
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "PDF Settings",
@ -41,6 +42,7 @@
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Send Print as PDF",
@ -65,6 +67,7 @@
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Repeat Header and Footer in PDF",
@ -89,6 +92,7 @@
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
@ -113,6 +117,7 @@
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "PDF Page Size",
@ -137,6 +142,7 @@
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Print Style",
@ -161,6 +167,7 @@
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Print Style",
@ -186,6 +193,7 @@
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Font",
@ -212,6 +220,7 @@
"fieldtype": "Float",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Font Size",
@ -235,6 +244,7 @@
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
@ -259,6 +269,7 @@
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "With Letterhead",
@ -274,6 +285,32 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"description": "Prevent Draft Document from Print and generating PDF",
"fieldname": "prevent_draft_from_printing",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Prevent Draft from Printing",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@ -282,6 +319,7 @@
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
@ -304,6 +342,7 @@
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Print Style Preview",
@ -330,7 +369,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2016-02-08 04:17:03.754492",
"modified": "2016-03-16 16:44:08.779171",
"modified_by": "Administrator",
"module": "Print",
"name": "Print Settings",

20
frappe/public/js/frappe/form/toolbar.js
View file

@ -5,12 +5,12 @@ frappe.provide("frappe.ui.form");
frappe.ui.form.Toolbar = Class.extend({
init: function(opts) {
$.extend(this, opts);
this.make_menu();
this.refresh();
this.add_update_button_on_dirty();
this.setup_editable_title();
},
refresh: function() {
this.make_menu();
this.set_title();
this.page.clear_user_actions();
this.show_title_as_dirty();
@ -96,16 +96,22 @@ frappe.ui.form.Toolbar = Class.extend({
}
},
make_menu: function() {
this.page.clear_icons();
this.page.clear_menu();
var me = this;
var p = this.frm.perm[0];
var docstatus = cint(this.frm.doc.docstatus);
var print_settings = frappe.model.get_doc(":Print Settings", "Print Settings")
var prevent_draft_from_printing = print_settings.prevent_draft_from_printing
// Print
if(frappe.model.can_print(null, me.frm)) {
this.page.add_menu_item(__("Print"), function() {
me.frm.print_doc();}, true);
this.print_icon = this.page.add_action_icon("icon-print", function() {
me.frm.print_doc();});
if(!prevent_draft_from_printing || prevent_draft_from_printing && docstatus !== 0 || in_list(user_roles, "Administrator")){
if(frappe.model.can_print(null, me.frm)) {
this.page.add_menu_item(__("Print"), function() {
me.frm.print_doc();}, true);
this.print_icon = this.page.add_action_icon("icon-print", function() {
me.frm.print_doc();});
}
}
// email