nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2430 from nabinhait/fix1

Browse Source 
Multiple minor fixes
This commit is contained in:
Nabin Hait
2014-11-24 18:21:37 +05:30
parent e7fb957415 b74ae7aa31
commit 0676cf6d3f
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -247,7 +247,7 @@ def make_purchase_invoice(source_name, target_doc=None):
def update_item(obj, target, source_parent): def update_item(obj, target, source_parent):
target.amount = flt(obj.amount) - flt(obj.billed_amt) target.amount = flt(obj.amount) - flt(obj.billed_amt)
target.base_amount = target.amount * flt(source_parent.conversion_rate) target.base_amount = target.amount * flt(source_parent.conversion_rate)
target.qty = target.amount / flt(obj.rate) if flt(obj.rate) else flt(obj.qty) target.qty = target.amount / flt(obj.rate) if (flt(obj.rate) and flt(obj.billed_amt)) else flt(obj.qty)
doc = get_mapped_doc("Purchase Order", source_name, { doc = get_mapped_doc("Purchase Order", source_name, {
"Purchase Order": { "Purchase Order": {

4
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@@ -156,7 +156,7 @@ class SalarySlip(TransactionBase):
/ cint(self.total_days_in_month), 2) / cint(self.total_days_in_month), 2)
elif not self.payment_days: elif not self.payment_days:
d.e_modified_amount = 0 d.e_modified_amount = 0
else: elif not d.e_modified_amount:
d.e_modified_amount = d.e_amount d.e_modified_amount = d.e_amount
self.gross_pay += flt(d.e_modified_amount) self.gross_pay += flt(d.e_modified_amount)
@@ -168,7 +168,7 @@ class SalarySlip(TransactionBase):
/ cint(self.total_days_in_month), 2) / cint(self.total_days_in_month), 2)
elif not self.payment_days: elif not self.payment_days:
d.d_modified_amount = 0 d.d_modified_amount = 0
else: elif not d.d_modified_amount:
d.d_modified_amount = d.d_amount d.d_modified_amount = d.d_amount
self.total_deduction += flt(d.d_modified_amount) self.total_deduction += flt(d.d_modified_amount)

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -329,7 +329,7 @@ def make_sales_invoice(source_name, target_doc=None):
def update_item(source, target, source_parent): def update_item(source, target, source_parent):
target.amount = flt(source.amount) - flt(source.billed_amt) target.amount = flt(source.amount) - flt(source.billed_amt)
target.base_amount = target.amount * flt(source_parent.conversion_rate) target.base_amount = target.amount * flt(source_parent.conversion_rate)
target.qty = source.rate and target.amount / flt(source.rate) or source.qty target.qty = target.amount / flt(source.rate) if (source.rate and source.billed_amt) else source.qty
doclist = get_mapped_doc("Sales Order", source_name, { doclist = get_mapped_doc("Sales Order", source_name, {
"Sales Order": { "Sales Order": {

11
erpnext/setup/page/setup_wizard/setup_wizard.js
View File

@@ -59,15 +59,18 @@ frappe.pages['setup-wizard'].onload = function(wrapper) {
title: __("Select Your Language"), title: __("Select Your Language"),
icon: "icon-globe", icon: "icon-globe",
fields: [ fields: [
{"fieldname": "language", "label": __("Language"), "fieldtype": "Select", {
"fieldname": "language", "label": __("Language"), "fieldtype": "Select",
options: ["english", "العربية", "deutsch", "ελληνικά", "español", "français", "हिंदी", "hrvatski", options: ["english", "العربية", "deutsch", "ελληνικά", "español", "français", "हिंदी", "hrvatski",
"italiano", "nederlands", "polski", "português brasileiro", "português", "српски", "தமிழ்", "italiano", "nederlands", "polski", "português brasileiro", "português", "српски", "தமிழ்",
"ไทย", "中国（简体）", "中國（繁體）"], reqd:1}, "ไทย", "中国（简体）", "中國（繁體）"],
reqd:1, "default": "english"
},
], ],
help: __("Welcome to ERPNext. Please select your language to begin the Setup Wizard."), help: __("Welcome to ERPNext. Please select your language to begin the Setup Wizard."),
onload: function(slide) { onload: function(slide) {
slide.get_input("language").on("change", function() { slide.get_input("language").on("change", function() {
var lang = $(this).val(); var lang = $(this).val() || "english";
frappe._messages = {}; frappe._messages = {};
frappe.call({ frappe.call({
method: "erpnext.setup.page.setup_wizard.setup_wizard.load_messages", method: "erpnext.setup.page.setup_wizard.setup_wizard.load_messages",

3
erpnext/stock/doctype/serial_no/serial_no.py
View File

@@ -253,8 +253,9 @@ def update_serial_nos(sle, item_det):
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
serial_nos = [] serial_nos = []
for i in xrange(cint(sle.actual_qty)): for i in xrange(cint(sle.actual_qty)):
serial_nos.append(make_autoname(item_det.serial_no_series)) serial_nos.append(make_autoname(item_det.serial_no_series, "Serial No"))
frappe.db.set(sle, "serial_no", "\n".join(serial_nos)) frappe.db.set(sle, "serial_no", "\n".join(serial_nos))
validate_serial_no(sle, item_det)
if sle.serial_no: if sle.serial_no:
serial_nos = get_serial_nos(sle.serial_no) serial_nos = get_serial_nos(sle.serial_no)