From eb961370ff81f7ce81b10937f4e1e455db60d757 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 4 Jan 2016 15:48:37 +0530 Subject: [PATCH 1/3] [translations] fixes #4532 --- .../budget_variance_report.js | 9 +++++++-- erpnext/buying/doctype/supplier/supplier.js | 4 ++-- erpnext/config/desktop.py | 6 ++++-- erpnext/public/js/controllers/transaction.js | 18 +++++++++--------- erpnext/public/js/financial_statements.js | 7 ++++++- erpnext/public/js/stock_analytics.js | 10 ++++++++-- erpnext/public/js/templates/address_list.html | 2 +- erpnext/public/js/templates/contact_list.html | 2 +- erpnext/selling/doctype/customer/customer.js | 2 +- ...s_person_target_variance_item_group_wise.js | 9 +++++++-- ...erritory_target_variance_item_group_wise.js | 9 +++++++-- erpnext/stock/get_item_details.py | 2 +- 12 files changed, 54 insertions(+), 26 deletions(-) diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js index 203f22322c..a58b8f2cf2 100644 --- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js @@ -14,7 +14,12 @@ frappe.query_reports["Budget Variance Report"] = { fieldname: "period", label: __("Period"), fieldtype: "Select", - options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", + options: [ + { "value": "Monthly", "label": __("Monthly") }, + { "value": "Quarterly", "label": __("Quarterly") }, + { "value": "Half-Yearly", "label": __("Half-Yearly") }, + { "value": "Yearly", "label": __("Yearly") } + ], default: "Monthly" }, { @@ -25,4 +30,4 @@ frappe.query_reports["Budget Variance Report"] = { default: frappe.defaults.get_user_default("Company") }, ] -} \ No newline at end of file +} diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js index 646dfbf018..375d4d2409 100644 --- a/erpnext/buying/doctype/supplier/supplier.js +++ b/erpnext/buying/doctype/supplier/supplier.js @@ -25,7 +25,7 @@ cur_frm.cscript.make_dashboard = function(doc) { if(doc.__islocal) return; if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) - cur_frm.dashboard.set_headline('Loading...') + cur_frm.dashboard.set_headline('' + __('Loading') + '') cur_frm.dashboard.add_doctype_badge("Supplier Quotation", "supplier"); cur_frm.dashboard.add_doctype_badge("Purchase Order", "supplier"); @@ -41,7 +41,7 @@ cur_frm.cscript.make_dashboard = function(doc) { callback: function(r) { if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) { cur_frm.dashboard.set_headline( - __("Total Billing This Year: ") + "" + __("Total billing this year") + ": " + format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency) + ' / ' + __("Total Unpaid") + ": " + format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index c3fe141ff8..a8ce6a7a68 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -32,7 +32,8 @@ def get_data(): "icon": "icon-th", "icon": "octicon octicon-credit-card", "type": "page", - "link": "pos" + "link": "pos", + "label": _("POS") }, "Projects": { "color": "#8e44ad", @@ -68,6 +69,7 @@ def get_data(): "force_show": True, "icon": "octicon octicon-device-camera-video", "type": "module", - "is_help": True + "is_help": True, + "label": _("Learn") } } diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 4c81b42b8a..d3fa0a8c1e 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -489,7 +489,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ if(docfield) { var label = __(docfield.label || "").replace(/\([^\)]*\)/g, ""); field_label_map[grid_doctype + "-" + fname] = - label.trim() + " (" + currency + ")"; + label.trim() + " (" + __(currency) + ")"; } }); } @@ -876,36 +876,36 @@ frappe.ui.form.on(cur_frm.doctype, "additional_discount_percentage", function(fr if (frm.via_discount_amount) { return; } - + if(!frm.doc.apply_discount_on) { frappe.msgprint(__("Please set 'Apply Additional Discount On'")); return } - + frm.via_discount_percentage = true; - + if(frm.doc.additional_discount_percentage && frm.doc.discount_amount) { // Reset discount amount and net / grand total frm.set_value("discount_amount", 0); } - + var total = flt(frm.doc[frappe.model.scrub(frm.doc.apply_discount_on)]); - var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100, + var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100, precision("discount_amount")); - + frm.set_value("discount_amount", discount_amount); delete frm.via_discount_percentage; }); frappe.ui.form.on(cur_frm.doctype, "discount_amount", function(frm) { frm.cscript.set_dynamic_labels(); - + if (!frm.via_discount_percentage) { frm.via_discount_amount = true; frm.set_value("additional_discount_percentage", 0); delete frm.via_discount_amount; } - + frm.cscript.calculate_taxes_and_totals(); }); diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js index fd3165edcd..206be3c287 100644 --- a/erpnext/public/js/financial_statements.js +++ b/erpnext/public/js/financial_statements.js @@ -22,7 +22,12 @@ erpnext.financial_statements = { "fieldname": "periodicity", "label": __("Periodicity"), "fieldtype": "Select", - "options": "Yearly\nHalf-yearly\nQuarterly\nMonthly", + "options": [ + { "value": "Monthly", "label": __("Monthly") }, + { "value": "Quarterly", "label": __("Quarterly") }, + { "value": "Half-Yearly", "label": __("Half-Yearly") }, + { "value": "Yearly", "label": __("Yearly") } + ], "default": "Yearly", "reqd": 1 } diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js index e07e3d4c5b..a8229baf0f 100644 --- a/erpnext/public/js/stock_analytics.js +++ b/erpnext/public/js/stock_analytics.js @@ -51,7 +51,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ }, filters: [ {fieldtype:"Select", label: __("Value or Qty"), fieldname: "value_or_qty", - options:["Value", "Quantity"], + options:[{label:__("Value"), value:"Value"}, {label:__("Quantity"), value:"Quantity"}], filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }}, @@ -64,7 +64,13 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ {fieldtype:"Date", label: __("From Date"), fieldname: "from_date"}, {fieldtype:"Date", label: __("To Date"), fieldname: "to_date"}, {fieldtype:"Select", label: __("Range"), fieldname: "range", - options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]} + options:[ + {label:__("Daily"), value:"Daily"}, + {label:__("Weekly"), value:"Weekly"}, + {label:__("Monthly"), value:"Monthly"}, + {label:__("Quarterly"), value:"Quarterly"}, + {label:__("Yearly"), value:"Yearly"}, + ]} ], setup_filters: function() { var me = this; diff --git a/erpnext/public/js/templates/address_list.html b/erpnext/public/js/templates/address_list.html index 54f8ce2c09..0e8b3459e0 100644 --- a/erpnext/public/js/templates/address_list.html +++ b/erpnext/public/js/templates/address_list.html @@ -1,4 +1,4 @@ -

+

{% for(var i=0, l=addr_list.length; i diff --git a/erpnext/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html index a2aedc52cd..363e07613f 100644 --- a/erpnext/public/js/templates/contact_list.html +++ b/erpnext/public/js/templates/contact_list.html @@ -1,5 +1,5 @@

+ {{ __("New Contact") }}

{% for(var i=0, l=contact_list.length; i" + __("Total billing this year") + ": " + format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency) + ' / ' + __("Unpaid") + ": " + format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency) diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js index 7bfabb2f06..f1cb3b7461 100644 --- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js @@ -14,7 +14,12 @@ frappe.query_reports["Sales Person Target Variance Item Group-Wise"] = { fieldname: "period", label: __("Period"), fieldtype: "Select", - options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", + options: [ + { "value": "Monthly", "label": __("Monthly") }, + { "value": "Quarterly", "label": __("Quarterly") }, + { "value": "Half-Yearly", "label": __("Half-Yearly") }, + { "value": "Yearly", "label": __("Yearly") } + ], default: "Monthly" }, { @@ -25,4 +30,4 @@ frappe.query_reports["Sales Person Target Variance Item Group-Wise"] = { default: "Quantity" }, ] -} \ No newline at end of file +} diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js index 1e39146a2e..7631fcb02f 100644 --- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js +++ b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js @@ -14,7 +14,12 @@ frappe.query_reports["Territory Target Variance Item Group-Wise"] = { fieldname: "period", label: __("Period"), fieldtype: "Select", - options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", + options: [ + { "value": "Monthly", "label": __("Monthly") }, + { "value": "Quarterly", "label": __("Quarterly") }, + { "value": "Half-Yearly", "label": __("Half-Yearly") }, + { "value": "Yearly", "label": __("Yearly") } + ], default: "Monthly" }, { @@ -25,4 +30,4 @@ frappe.query_reports["Territory Target Variance Item Group-Wise"] = { default: "Quantity" }, ] -} \ No newline at end of file +} diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 43aa0598f9..fa51ab9de9 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -246,7 +246,7 @@ def insert_item_price(args): "price_list_rate": price_list_rate }) item_price.insert() - frappe.msgprint("Item Price added for {0} in Price List {1}".format(args.item_code, + frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code, args.price_list)) def get_price_list_rate_for(args, item_code): From 5760b79747553ced8be244cb86601be1d871c47f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 4 Jan 2016 15:57:01 +0530 Subject: [PATCH 2/3] [translations] fixes #4533 --- erpnext/crm/doctype/opportunity/opportunity.js | 4 ++-- erpnext/projects/doctype/task/task.js | 4 ++-- erpnext/selling/page/sales_funnel/sales_funnel.js | 2 +- erpnext/selling/page/sales_funnel/sales_funnel.py | 10 ++++++---- erpnext/stock/doctype/delivery_note/delivery_note.js | 6 +++--- .../stock/doctype/purchase_receipt/purchase_receipt.js | 4 ++-- erpnext/support/doctype/issue/issue.js | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js index 961dbe1a1e..43e2dd5872 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.js +++ b/erpnext/crm/doctype/opportunity/opportunity.js @@ -90,12 +90,12 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { var frm = cur_frm; if(frm.perm[0].write && doc.docstatus==0) { if(frm.doc.status==="Open") { - frm.add_custom_button("Close", function() { + frm.add_custom_button(__("Close"), function() { frm.set_value("status", "Closed"); frm.save(); }); } else { - frm.add_custom_button("Reopen", function() { + frm.add_custom_button(__("Reopen"), function() { frm.set_value("status", "Open"); frm.save(); }); diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js index 871d14d86a..18f5ca06c8 100644 --- a/erpnext/projects/doctype/task/task.js +++ b/erpnext/projects/doctype/task/task.js @@ -31,12 +31,12 @@ frappe.ui.form.on("Task", { if(frm.perm[0].write) { if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") { - frm.add_custom_button("Close", function() { + frm.add_custom_button(__("Close"), function() { frm.set_value("status", "Closed"); frm.save(); }); } else { - frm.add_custom_button("Reopen", function() { + frm.add_custom_button(__("Reopen"), function() { frm.set_value("status", "Open"); frm.save(); }); diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js index b3a97967de..a516342c1b 100644 --- a/erpnext/selling/page/sales_funnel/sales_funnel.js +++ b/erpnext/selling/page/sales_funnel/sales_funnel.js @@ -180,6 +180,6 @@ erpnext.SalesFunnel = Class.extend({ context.fillStyle = "black"; context.textBaseline = "middle"; context.font = "1.1em sans-serif"; - context.fillText(title, width + 20, y_mid); + context.fillText(__(title), width + 20, y_mid); } }); diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.py b/erpnext/selling/page/sales_funnel/sales_funnel.py index 78db8735cd..eb3b996c6c 100644 --- a/erpnext/selling/page/sales_funnel/sales_funnel.py +++ b/erpnext/selling/page/sales_funnel/sales_funnel.py @@ -4,6 +4,8 @@ from __future__ import unicode_literals import frappe +from frappe import _ + @frappe.whitelist() def get_funnel_data(from_date, to_date): active_leads = frappe.db.sql("""select count(*) from `tabLead` @@ -26,8 +28,8 @@ def get_funnel_data(from_date, to_date): where docstatus = 1 and (date(`creation`) between %s and %s)""", (from_date, to_date))[0][0] return [ - { "title": "Active Leads / Customers", "value": active_leads, "color": "#B03B46" }, - { "title": "Opportunities", "value": opportunities, "color": "#F09C00" }, - { "title": "Quotations", "value": quotations, "color": "#006685" }, - { "title": "Sales Orders", "value": sales_orders, "color": "#00AD65" } + { "title": _("Active Leads / Customers"), "value": active_leads, "color": "#B03B46" }, + { "title": _("Opportunities"), "value": opportunities, "color": "#F09C00" }, + { "title": _("Quotations"), "value": quotations, "color": "#006685" }, + { "title": _("Sales Orders"), "value": sales_orders, "color": "#00AD65" } ] diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 4bef0d86a3..de6a85d849 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -46,13 +46,13 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) { this.show_general_ledger(); } - if (this.frm.has_perm("submit") && (doc.status !== "Closed") + if (this.frm.has_perm("submit") && (doc.status !== "Closed") && this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) { cur_frm.add_custom_button(__("Close"), this.close_delivery_note) } } - if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 + if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 && !doc.is_return && doc.status!="Closed") { // show Make Invoice button only if Delivery Note is not created from Sales Invoice var from_sales_invoice = false; @@ -65,7 +65,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( } if(doc.docstatus==1 && doc.status === "Closed" && this.frm.has_perm("submit")) { - cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note) + cur_frm.add_custom_button(__('Reopen'), this.reopen_delivery_note) } erpnext.stock.delivery_note.set_print_hide(doc, dt, dn); diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 93f1b0873a..9a24eed30f 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -60,7 +60,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice).addClass("btn-primary"); } - if (this.frm.has_perm("submit") && + if (this.frm.has_perm("submit") && this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) { cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt) } @@ -69,7 +69,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed" && this.frm.has_perm("submit")) { - cur_frm.add_custom_button(__('Re-open'), this.reopen_purchase_receipt) + cur_frm.add_custom_button(__('Reopen'), this.reopen_purchase_receipt) } this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes"); diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js index 28617cb694..21ef5b8f3b 100644 --- a/erpnext/support/doctype/issue/issue.js +++ b/erpnext/support/doctype/issue/issue.js @@ -5,12 +5,12 @@ frappe.ui.form.on("Issue", { "refresh": function(frm) { if(frm.doc.status==="Open") { - frm.add_custom_button("Close", function() { + frm.add_custom_button(__("Close"), function() { frm.set_value("status", "Closed"); frm.save(); }); } else { - frm.add_custom_button("Reopen", function() { + frm.add_custom_button(__("Reopen"), function() { frm.set_value("status", "Open"); frm.save(); }); From 969d48a554d7d7cf44ab875d4193da92525ce777 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 4 Jan 2016 16:09:40 +0530 Subject: [PATCH 3/3] [translations] fixes #4534-38 --- erpnext/hr/doctype/employee/employee.json | 112 ++++++++++++++---- .../process_payroll/process_payroll.py | 6 +- .../hr/doctype/salary_slip/salary_slip.json | 79 ++++++------ 3 files changed, 123 insertions(+), 74 deletions(-) diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json index dd54623d09..0f72fbb40a 100644 --- a/erpnext/hr/doctype/employee/employee.json +++ b/erpnext/hr/doctype/employee/employee.json @@ -25,6 +25,7 @@ "oldfieldtype": "Section Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -46,6 +47,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -69,6 +71,7 @@ "no_copy": 1, "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 1, "reqd": 0, @@ -94,6 +97,7 @@ "options": "EMP/", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -119,6 +123,7 @@ "options": "\nMr\nMs", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -143,6 +148,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -166,6 +172,7 @@ "options": "", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -189,6 +196,7 @@ "options": "image", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -210,6 +218,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -235,6 +244,7 @@ "options": "User", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -259,6 +269,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -283,6 +294,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -308,6 +320,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -333,6 +346,7 @@ "options": "\nMale\nFemale", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -356,6 +370,7 @@ "options": "Company", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -378,6 +393,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -399,6 +415,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -425,6 +442,7 @@ "options": "\nActive\nLeft", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -450,6 +468,7 @@ "options": "Employment Type", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -476,6 +495,7 @@ "options": "Holiday List", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -497,6 +517,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -521,6 +542,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -545,6 +567,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -569,6 +592,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -593,6 +617,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -615,6 +640,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -636,6 +662,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -662,6 +689,7 @@ "options": "Branch", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -687,6 +715,7 @@ "options": "Department", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -712,6 +741,7 @@ "options": "Designation", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -738,6 +768,7 @@ "options": "Email", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -762,6 +793,7 @@ "oldfieldtype": "Int", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -785,6 +817,7 @@ "oldfieldtype": "Section Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -811,6 +844,7 @@ "options": "\nBank\nCash\nCheque", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -836,6 +870,7 @@ "oldfieldtype": "Link", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -861,6 +896,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -883,6 +919,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -908,6 +945,7 @@ "options": "Employee", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -932,6 +970,7 @@ "options": "Employee Leave Approver", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -954,6 +993,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -975,6 +1015,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -998,6 +1039,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1021,6 +1063,7 @@ "options": "Email", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1043,6 +1086,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1052,30 +1096,7 @@ }, { "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "emergency_contact_details", - "fieldtype": "HTML", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Emergency Contact Details", - "length": 0, - "no_copy": 0, - "options": "

Emergency Contact Details

", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, + "bold": 1, "collapsible": 0, "fieldname": "person_to_be_contacted", "fieldtype": "Data", @@ -1088,6 +1109,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1110,6 +1132,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1119,7 +1142,7 @@ }, { "allow_on_submit": 0, - "bold": 0, + "bold": 1, "collapsible": 0, "fieldname": "emergency_phone_number", "fieldtype": "Data", @@ -1132,6 +1155,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1153,6 +1177,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1177,6 +1202,7 @@ "options": "\nRented\nOwned", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1199,6 +1225,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1222,6 +1249,7 @@ "options": "\nRented\nOwned", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1244,6 +1272,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1266,6 +1295,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1289,6 +1319,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1311,6 +1342,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1332,6 +1364,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1355,6 +1388,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1377,6 +1411,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1399,6 +1434,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1421,6 +1457,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1442,6 +1479,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1466,6 +1504,7 @@ "options": "\nSingle\nMarried\nDivorced\nWidowed", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1489,6 +1528,7 @@ "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1512,6 +1552,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1535,6 +1576,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1557,6 +1599,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1580,6 +1623,7 @@ "options": "Employee Education", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1603,6 +1647,7 @@ "options": "Simple", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1626,6 +1671,7 @@ "options": "Employee External Work History", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1649,6 +1695,7 @@ "options": "Simple", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1672,6 +1719,7 @@ "options": "Employee Internal Work History", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1695,6 +1743,7 @@ "oldfieldtype": "Section Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1716,6 +1765,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1741,6 +1791,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1765,6 +1816,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1789,6 +1841,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1814,6 +1867,7 @@ "options": "\nYes\nNo", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1838,6 +1892,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1862,6 +1917,7 @@ "oldfieldtype": "Column Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1887,6 +1943,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1912,6 +1969,7 @@ "options": "\nBetter Prospects\nHealth Concerns", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1936,6 +1994,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1960,6 +2019,7 @@ "oldfieldtype": "Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1978,7 +2038,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-11-16 06:29:46.290512", + "modified": "2016-01-04 05:37:04.262434", "modified_by": "Administrator", "module": "HR", "name": "Employee", diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py index b6b76c9d3a..13516b693c 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.py +++ b/erpnext/hr/doctype/process_payroll/process_payroll.py @@ -80,9 +80,9 @@ class ProcessPayroll(Document): def create_log(self, ss_list): - log = "

No employee for the above selected criteria OR salary slip already created

" + log = "

" + _("No employee for the above selected criteria OR salary slip already created") + "

" if ss_list: - log = "Salary Slip Created For\ + log = "" + _("Salary Slip Created") + "\

%s" % '
'.join(self.format_as_links(ss_list)) return log @@ -205,4 +205,4 @@ def get_month_details(year, month): 'month_start_date': msd, 'month_end_date': med, 'month_days': month_days - }) \ No newline at end of file + }) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json index 2680b529d6..5bb00f110a 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.json +++ b/erpnext/hr/doctype/salary_slip/salary_slip.json @@ -22,6 +22,7 @@ "oldfieldtype": "Column Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -48,6 +49,7 @@ "options": "Employee", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -72,6 +74,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -97,6 +100,7 @@ "options": "Department", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -122,6 +126,7 @@ "options": "Designation", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -147,6 +152,7 @@ "options": "Branch", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -170,6 +176,7 @@ "options": "Letter Head", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -193,6 +200,7 @@ "options": "Company", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -215,6 +223,7 @@ "oldfieldtype": "Column Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -241,6 +250,7 @@ "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -267,6 +277,7 @@ "options": "Fiscal Year", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -291,6 +302,7 @@ "oldfieldtype": "Int", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -315,6 +327,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -339,6 +352,7 @@ "oldfieldtype": "Float", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -363,6 +377,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -387,6 +402,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -411,6 +427,7 @@ "oldfieldtype": "Check", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 1, "reqd": 0, @@ -436,6 +453,7 @@ "options": "Salary Slip", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -459,6 +477,7 @@ "oldfieldtype": "Section Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -482,6 +501,7 @@ "oldfieldtype": "Column Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -490,28 +510,6 @@ "unique": 0, "width": "50%" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "html_21", - "fieldtype": "HTML", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -530,6 +528,7 @@ "options": "Salary Slip Earning", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -553,6 +552,7 @@ "oldfieldtype": "Column Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -561,28 +561,6 @@ "unique": 0, "width": "50%" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "html_24", - "fieldtype": "HTML", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -601,6 +579,7 @@ "options": "Salary Slip Deduction", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -624,6 +603,7 @@ "oldfieldtype": "Section Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -645,6 +625,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -666,6 +647,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -691,6 +673,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -716,6 +699,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -741,6 +725,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -766,6 +751,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -792,6 +778,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -815,6 +802,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -840,6 +828,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -858,7 +847,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-11-16 06:29:55.474041", + "modified": "2016-01-04 05:31:35.363767", "modified_by": "Administrator", "module": "HR", "name": "Salary Slip",