From eb961370ff81f7ce81b10937f4e1e455db60d757 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 4 Jan 2016 15:48:37 +0530 Subject: [PATCH 1/8] [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 203f22322c9..a58b8f2cf25 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 646dfbf018c..375d4d24096 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 c3fe141ff89..a8ce6a7a68c 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 4c81b42b8ad..d3fa0a8c1e0 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 fd3165edcdd..206be3c287b 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 e07e3d4c5b3..a8229baf0f9 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 54f8ce2c094..0e8b3459e04 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 a2aedc52cdd..363e07613f1 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 7bfabb2f06b..f1cb3b74617 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 1e39146a2ed..7631fcb02f2 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 43aa0598f96..fa51ab9de9f 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/8] [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 961dbe1a1e6..43e2dd58721 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 871d14d86ac..18f5ca06c88 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 b3a97967ded..a516342c1b5 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 78db8735cd7..eb3b996c6c9 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 4bef0d86a3d..de6a85d8492 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 93f1b0873a4..9a24eed30f6 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 28617cb6940..21ef5b8f3ba 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/8] [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 dd54623d099..0f72fbb40a8 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 b6b76c9d3ad..13516b693cb 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 2680b529d6f..5bb00f110a4 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", From d35d74346d55c81625832e4604a6c05e2485178f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 4 Jan 2016 16:16:44 +0530 Subject: [PATCH 4/8] [fix] minor fix in stock projected qty --- .../report/stock_projected_qty/stock_projected_qty.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py index 7d3a2ee80a2..aef6c99121a 100644 --- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py @@ -50,10 +50,12 @@ def get_data(filters): if d.warehouse == bin.warehouse: re_order_level = d.warehouse_reorder_level re_order_qty = d.warehouse_reorder_qty + + shortage_qty = re_order_level - flt(bin.projected_qty) if re_order_level else 0 - data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse, - item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, bin.reserved_qty, - bin.projected_qty, re_order_level, re_order_qty, re_order_level - flt(bin.projected_qty)]) + data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse, + item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, + bin.reserved_qty, bin.projected_qty, re_order_level, re_order_qty, shortage_qty]) return data From e64fbd6d3cfb1f95b693bb5e162a4e0d04154572 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 4 Jan 2016 18:11:03 +0530 Subject: [PATCH 5/8] [minor] fixes for chart_of_accounts_builder app --- .../chart_of_accounts/chart_of_accounts.py | 28 ++++++++++--------- erpnext/setup/doctype/company/company.py | 14 ++++++---- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py index bfb5240fa82..e1f9f1ce9c6 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py @@ -82,24 +82,26 @@ def get_charts_for_country(country): def _get_chart_name(content): if content: content = json.loads(content) - if content and content.get("is_active", "No") == "Yes" and content.get("disabled", "No") == "No": + + if frappe.local.flags.allow_unverified_charts: + charts.append(content["name"]) + + elif content and content.get("is_active", "No") == "Yes" and content.get("disabled", "No") == "No": charts.append(content["name"]) country_code = frappe.db.get_value("Country", country, "code") if country_code: - path = os.path.join(os.path.dirname(__file__), "verified") - for fname in os.listdir(path): - if fname.startswith(country_code) and fname.endswith(".json"): - with open(os.path.join(path, fname), "r") as f: - _get_chart_name(f.read()) + folders = ("verified",) + if frappe.local.flags.allow_unverified_charts: + folders = ("verified", "unverified") - # countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros", - # "Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger", - # "Replica of Democratic Congo", "Senegal", "Chad", "Togo"] - # - # if country in countries_use_OHADA_system: - # with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f: - # _get_chart_name(f.read()) + for folder in folders: + path = os.path.join(os.path.dirname(__file__), folder) + + for fname in os.listdir(path): + if fname.startswith(country_code) and fname.endswith(".json"): + with open(os.path.join(path, fname), "r") as f: + _get_chart_name(f.read()) if len(charts) != 1: charts.append("Standard") diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index d3378053445..120106aaa43 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -216,13 +216,15 @@ class Company(Document): frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)""" % ', '.join(['%s']*len(warehouses)), tuple(warehouses)) - for f in ["income_account", "expense_account"]: - frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" - % (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts)) + if accounts: + for f in ["income_account", "expense_account"]: + frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" + % (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts)) - for f in ["selling_cost_center", "buying_cost_center"]: - frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" - % (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers)) + if cost_centers: + for f in ["selling_cost_center", "buying_cost_center"]: + frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" + % (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers)) # reset default company frappe.db.sql("""update `tabSingles` set value="" From f9eff57531f67b955b6de93425caaa61446fdb29 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 15:59:14 +0530 Subject: [PATCH 6/8] [fix] credit limit --- erpnext/selling/doctype/customer/customer.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index 72ec1dce177..8a7da63853c 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -229,9 +229,15 @@ def get_customer_outstanding(customer, company): def get_credit_limit(customer, company): - credit_limit, customer_group = frappe.db.get_value("Customer", customer, ["credit_limit", "customer_group"]) - if not credit_limit: - credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit") or \ - frappe.db.get_value("Company", company, "credit_limit") + credit_limit = None - return credit_limit + if customer: + credit_limit, customer_group = frappe.db.get_value("Customer", customer, ["credit_limit", "customer_group"]) + + if not credit_limit: + credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit") + + if not credit_limit: + credit_limit = frappe.db.get_value("Company", company, "credit_limit") + + return flt(credit_limit) From d7b7f74ac9c394e001c4624aa9d389382972a50e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 19:08:09 +0530 Subject: [PATCH 7/8] [docs] --- erpnext/docs/current/index.html | 2 +- .../accounts/payment_reconciliation.html | 8 +- .../models/accounts/shipping_rule.html | 9 -- erpnext/docs/current/models/hr/employee.html | 88 ++++++++----------- .../docs/current/models/hr/salary_slip.html | 48 +++------- .../current/models/stock/delivery_note.html | 55 +++++------- .../models/stock/delivery_note_item.html | 14 --- .../models/stock/purchase_receipt.html | 39 +++----- .../models/stock/purchase_receipt_item.html | 26 ++---- 9 files changed, 96 insertions(+), 193 deletions(-) diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 10582bef30c..fd23de4d886 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.15.1 + 6.16.1 diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation.html b/erpnext/docs/current/models/accounts/payment_reconciliation.html index 25a1edea82f..02e9dae0a98 100644 --- a/erpnext/docs/current/models/accounts/payment_reconciliation.html +++ b/erpnext/docs/current/models/accounts/payment_reconciliation.html @@ -152,7 +152,7 @@ Date - From Date + From Invoice Date @@ -164,7 +164,7 @@ Date - To Date + To Invoice Date @@ -176,7 +176,7 @@ Currency - Minimum Amount + Minimum Invoice Amount @@ -188,7 +188,7 @@ Currency - Maximum Amount + Maximum Invoice Amount diff --git a/erpnext/docs/current/models/accounts/shipping_rule.html b/erpnext/docs/current/models/accounts/shipping_rule.html index 8f859cbc608..beadc90ff44 100644 --- a/erpnext/docs/current/models/accounts/shipping_rule.html +++ b/erpnext/docs/current/models/accounts/shipping_rule.html @@ -413,15 +413,6 @@ Net Weight - -
  • - - -Shopping Cart Shipping Rule - -
    • - - diff --git a/erpnext/docs/current/models/hr/employee.html b/erpnext/docs/current/models/hr/employee.html index 75d2d3d498d..5b76c2b0db0 100644 --- a/erpnext/docs/current/models/hr/employee.html +++ b/erpnext/docs/current/models/hr/employee.html @@ -679,18 +679,6 @@ Cheque 45 - emergency_contact_details - - HTML - - Emergency Contact Details - - - - - - - 46 person_to_be_contacted Data @@ -702,7 +690,7 @@ Cheque - 47 + 46 relation Data @@ -714,7 +702,7 @@ Cheque - 48 + 47 emergency_phone_number Data @@ -726,7 +714,7 @@ Cheque - 49 + 48 column_break4 Column Break @@ -738,7 +726,7 @@ Cheque - 50 + 49 permanent_accommodation_type Select @@ -754,7 +742,7 @@ Owned - 51 + 50 permanent_address Small Text @@ -766,7 +754,7 @@ Owned - 52 + 51 current_accommodation_type Select @@ -782,7 +770,7 @@ Owned - 53 + 52 current_address Small Text @@ -794,7 +782,7 @@ Owned - 54 + 53 sb53 Section Break @@ -806,7 +794,7 @@ Owned - 55 + 54 bio Text Editor @@ -819,7 +807,7 @@ Owned - 56 + 55 personal_details Section Break @@ -831,7 +819,7 @@ Owned - 57 + 56 column_break5 Column Break @@ -843,7 +831,7 @@ Owned - 58 + 57 passport_number Data @@ -855,7 +843,7 @@ Owned - 59 + 58 date_of_issue Date @@ -867,7 +855,7 @@ Owned - 60 + 59 valid_upto Date @@ -879,7 +867,7 @@ Owned - 61 + 60 place_of_issue Data @@ -891,7 +879,7 @@ Owned - 62 + 61 column_break6 Column Break @@ -903,7 +891,7 @@ Owned - 63 + 62 marital_status Select @@ -921,7 +909,7 @@ Widowed - 64 + 63 blood_group Select @@ -943,7 +931,7 @@ O- - 65 + 64 family_background Small Text @@ -956,7 +944,7 @@ O- - 66 + 65 health_details Small Text @@ -969,7 +957,7 @@ O- - 67 + 66 educational_qualification Section Break @@ -981,7 +969,7 @@ O- - 68 + 67 education Table @@ -1002,7 +990,7 @@ O- - 69 + 68 previous_work_experience Section Break @@ -1016,7 +1004,7 @@ O- - 70 + 69 external_work_history Table @@ -1037,7 +1025,7 @@ O- - 71 + 70 history_in_company Section Break @@ -1051,7 +1039,7 @@ O- - 72 + 71 internal_work_history Table @@ -1072,7 +1060,7 @@ O- - 73 + 72 exit Section Break @@ -1084,7 +1072,7 @@ O- - 74 + 73 column_break7 Column Break @@ -1096,7 +1084,7 @@ O- - 75 + 74 resignation_letter_date Date @@ -1108,7 +1096,7 @@ O- - 76 + 75 relieving_date Date @@ -1120,7 +1108,7 @@ O- - 77 + 76 reason_for_leaving Data @@ -1132,7 +1120,7 @@ O- - 78 + 77 leave_encashed Select @@ -1148,7 +1136,7 @@ No - 79 + 78 encashment_date Date @@ -1160,7 +1148,7 @@ No - 80 + 79 exit_interview_details Column Break @@ -1172,7 +1160,7 @@ No - 81 + 80 held_on Date @@ -1184,7 +1172,7 @@ No - 82 + 81 reason_for_resignation Select @@ -1200,7 +1188,7 @@ Health Concerns - 83 + 82 new_workplace Data @@ -1212,7 +1200,7 @@ Health Concerns - 84 + 83 feedback Small Text diff --git a/erpnext/docs/current/models/hr/salary_slip.html b/erpnext/docs/current/models/hr/salary_slip.html index 742ee94a4a4..07b1f83c37f 100644 --- a/erpnext/docs/current/models/hr/salary_slip.html +++ b/erpnext/docs/current/models/hr/salary_slip.html @@ -366,18 +366,6 @@ 21 - html_21 - - HTML - - - - - - - - - 22 earnings Table @@ -398,7 +386,7 @@ - 23 + 22 deduction Column Break @@ -410,19 +398,7 @@ - 24 - html_24 - - HTML - - - - - - - - - 25 + 23 deductions Table @@ -443,7 +419,7 @@ - 26 + 24 totals Section Break @@ -455,7 +431,7 @@ - 27 + 25 column_break_25 Column Break @@ -467,7 +443,7 @@ - 28 + 26 column_break_26 Column Break @@ -479,7 +455,7 @@ - 29 + 27 arrear_amount Currency @@ -493,7 +469,7 @@ - 30 + 28 leave_encashment_amount Currency @@ -507,7 +483,7 @@ - 31 + 29 gross_pay Currency @@ -521,7 +497,7 @@ - 32 + 30 total_deduction Currency @@ -535,7 +511,7 @@ - 33 + 31 net_pay Currency @@ -550,7 +526,7 @@ - 34 + 32 rounded_total Currency @@ -564,7 +540,7 @@ - 35 + 33 total_in_words Data diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html index 2213e24150c..64a872b0061 100644 --- a/erpnext/docs/current/models/stock/delivery_note.html +++ b/erpnext/docs/current/models/stock/delivery_note.html @@ -1316,20 +1316,8 @@ Campaign - - 86 - per_billed - - Currency - - % Amount Billed - - - - - - 87 + 86 printing_details Section Break @@ -1341,7 +1329,7 @@ Campaign - 88 + 87 letter_head Link @@ -1362,7 +1350,7 @@ Campaign - 89 + 88 select_print_heading Link @@ -1383,7 +1371,7 @@ Campaign - 90 + 89 column_break_88 Column Break @@ -1395,7 +1383,7 @@ Campaign - 91 + 90 print_without_amount Check @@ -1407,7 +1395,7 @@ Campaign - 92 + 91 section_break_83 Section Break @@ -1419,7 +1407,7 @@ Campaign - 93 + 92 status Select @@ -1430,15 +1418,14 @@ Campaign 
     Draft
-To Bill
-Completed
+Submitted
 Cancelled
 Closed
    - 94 + 93 per_installed Percent @@ -1451,7 +1438,7 @@ Closed - 95 + 94 installation_status Select @@ -1463,7 +1450,7 @@ Closed - 96 + 95 column_break_89 Column Break @@ -1475,7 +1462,7 @@ Closed - 97 + 96 to_warehouse Link @@ -1497,7 +1484,7 @@ Closed - 98 + 97 excise_page Data @@ -1509,7 +1496,7 @@ Closed - 99 + 98 instructions Text @@ -1521,7 +1508,7 @@ Closed - 100 + 99 sales_team_section_break Section Break @@ -1535,7 +1522,7 @@ Closed - 101 + 100 sales_partner Link @@ -1556,7 +1543,7 @@ Closed - 102 + 101 column_break7 Column Break @@ -1568,7 +1555,7 @@ Closed - 103 + 102 commission_rate Float @@ -1580,7 +1567,7 @@ Closed - 104 + 103 total_commission Currency @@ -1594,7 +1581,7 @@ Closed - 105 + 104 section_break1 Section Break @@ -1606,7 +1593,7 @@ Closed - 106 + 105 sales_team Table diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html index 1c48c11e0e2..c7abefed9d4 100644 --- a/erpnext/docs/current/models/stock/delivery_note_item.html +++ b/erpnext/docs/current/models/stock/delivery_note_item.html @@ -746,20 +746,6 @@ 49 - billed_amt - - Currency - - Billed Amt - - - - 
    currency
    - - - - - 50 page_break Check diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html index 0a3cc11f245..ee9ed2768d7 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt.html +++ b/erpnext/docs/current/models/stock/purchase_receipt.html @@ -1082,8 +1082,7 @@ Yes 
     Draft
-To Bill
-Completed
+Submitted
 Cancelled
 Closed
    @@ -1158,18 +1157,6 @@ Closed 77 - per_billed - - Percent - - % Amount Billed - - - - - - - 78 company Link @@ -1190,7 +1177,7 @@ Closed - 79 + 78 fiscal_year Link @@ -1211,7 +1198,7 @@ Closed - 80 + 79 printing_settings Section Break @@ -1223,7 +1210,7 @@ Closed - 81 + 80 letter_head Link @@ -1244,7 +1231,7 @@ Closed - 82 + 81 select_print_heading Link @@ -1265,7 +1252,7 @@ Closed - 83 + 82 other_details HTML @@ -1277,7 +1264,7 @@ Closed - 84 + 83 instructions Small Text @@ -1289,7 +1276,7 @@ Closed - 85 + 84 remarks Small Text @@ -1301,7 +1288,7 @@ Closed - 86 + 85 transporter_info Section Break @@ -1315,7 +1302,7 @@ Closed - 87 + 86 transporter_name Data @@ -1327,7 +1314,7 @@ Closed - 88 + 87 column_break5 Column Break @@ -1339,7 +1326,7 @@ Closed - 89 + 88 lr_no Data @@ -1351,7 +1338,7 @@ Closed - 90 + 89 lr_date Date diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html index 1ee6b14086c..025f291cdca 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt_item.html +++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html @@ -794,18 +794,6 @@ 53 - billed_amt - - Currency - - Billed Amt - - - - - - - 54 brand Link @@ -826,7 +814,7 @@ - 55 + 54 item_group Link @@ -847,7 +835,7 @@ - 56 + 55 rm_supp_cost Currency @@ -861,7 +849,7 @@ - 57 + 56 item_tax_amount Currency @@ -875,7 +863,7 @@ - 58 + 57 landed_cost_voucher_amount Currency @@ -887,7 +875,7 @@ - 59 + 58 valuation_rate Currency @@ -901,7 +889,7 @@ - 60 + 59 item_tax_rate Small Text @@ -915,7 +903,7 @@ Used for Taxes and Charges

    - 61 + 60 page_break Check From 2076203fc1396e9f5eb847afc451c8d3f49b94e1 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 19:39:35 +0600 Subject: [PATCH 8/8] bumped to version 6.16.2 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 41a88219224..8083670d8bc 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.16.1' +__version__ = '6.16.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 766fbd7d474..7b67a8ff17f 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.16.1" +app_version = "6.16.2" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 1ffe9d440bd..d30cbdc2a22 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.16.1" +version = "6.16.2" requirements = parse_requirements("requirements.txt", session="") setup(