Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2013-07-30 14:51:08 +05:30
commit d2cb598b6b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/gl_entry/gl_entry.py
View File

@ -151,7 +151,7 @@ class DocType:
balance = webnotes.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry` balance = webnotes.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry`
where account = %s and ifnull(is_cancelled, 'No') = 'No'""", self.doc.account) where account = %s and ifnull(is_cancelled, 'No') = 'No'""", self.doc.account)
balance = account["debit_or_credit"] == "Debit" and \ balance = account["debit_or_credit"] == "Debit" and \
balance[0][0] or -1*balance[0][0] flt(balance[0][0]) or -1*flt(balance[0][0])
if flt(balance) < 0: if flt(balance) < 0:
msgprint(_("Negative balance is not allowed for account ") + self.doc.account, msgprint(_("Negative balance is not allowed for account ") + self.doc.account,

6
buying/doctype/purchase_common/purchase_common.py
View File

@ -76,7 +76,11 @@ class DocType(BuyingController):
elif is_submit == 1: elif is_submit == 1:
# even if this transaction is the latest one, it should be submitted # even if this transaction is the latest one, it should be submitted
# for it to be considered for latest purchase rate # for it to be considered for latest purchase rate
last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor) if flt(d.conversion_factor):
last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor)
else:
msgprint(_("Row ") + cstr(d.idx) + ": " +
_("UOM Conversion Factor is mandatory"), raise_exception=1)
# update last purchsae rate # update last purchsae rate
if last_purchase_rate: if last_purchase_rate:

7
selling/doctype/sales_order/sales_order.py
View File

@ -375,7 +375,7 @@ def make_delivery_note(source_name, target_doclist=None):
target.amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate) target.amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)
target.export_amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate) target.export_amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)
target.qty = flt(obj.qty) - flt(obj.delivered_qty) target.qty = flt(obj.qty) - flt(obj.delivered_qty)
doclist = get_mapped_doclist("Sales Order", source_name, { doclist = get_mapped_doclist("Sales Order", source_name, {
"Sales Order": { "Sales Order": {
"doctype": "Delivery Note", "doctype": "Delivery Note",
@ -396,7 +396,8 @@ def make_delivery_note(source_name, target_doclist=None):
"parenttype": "prevdoc_doctype", "parenttype": "prevdoc_doctype",
"reserved_warehouse": "warehouse" "reserved_warehouse": "warehouse"
}, },
"postprocess": update_item "postprocess": update_item,
"condition": lambda doc: doc.delivered_qty < doc.qty
}, },
"Sales Taxes and Charges": { "Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges", "doctype": "Sales Taxes and Charges",
@ -416,7 +417,7 @@ def make_sales_invoice(source_name, target_doclist=None):
target.export_amount = flt(obj.export_amount) - flt(obj.billed_amt) target.export_amount = flt(obj.export_amount) - flt(obj.billed_amt)
target.amount = target.export_amount * flt(source_parent.conversion_rate) target.amount = target.export_amount * flt(source_parent.conversion_rate)
target.qty = obj.export_rate and target.export_amount / flt(obj.export_rate) or obj.qty target.qty = obj.export_rate and target.export_amount / flt(obj.export_rate) or obj.qty
doclist = get_mapped_doclist("Sales Order", source_name, { doclist = get_mapped_doclist("Sales Order", source_name, {
"Sales Order": { "Sales Order": {
"doctype": "Sales Invoice", "doctype": "Sales Invoice",

2
stock/doctype/stock_entry/stock_entry.py
View File

@ -554,7 +554,7 @@ class DocType(StockController):
`tabBOM Item`, `tabItem` `tabBOM Item`, `tabItem`
where where
`tabBOM Item`.parent = %s and `tabBOM Item`.parent = %s and
`tabBOM Item`.item_code = tabItem.name `tabBOM Item`.item_code = tabItem.name and
`tabBOM Item`.docstatus < 2 `tabBOM Item`.docstatus < 2
group by item_code""", (qty, self.doc.bom_no), as_dict=1) group by item_code""", (qty, self.doc.bom_no), as_dict=1)