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

pr and pi gl entries

Browse Source
This commit is contained in:
nabinhait 2014-07-30 14:24:24 +05:30 committed by Nabin Hait
parent 98e7dcfe2c
commit 8ca3189f07
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -275,6 +275,7 @@ class PurchaseInvoice(BuyingController):
cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed") stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
gl_entries = [] gl_entries = []
@ -331,13 +332,13 @@ class PurchaseInvoice(BuyingController):
if auto_accounting_for_stock and item.item_code in stock_items and item.item_tax_amount: if auto_accounting_for_stock and item.item_code in stock_items and item.item_tax_amount:
# Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt # Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt
stock_rbnb_booked_in_pr = None negative_expense_booked_in_pi = None
if item.purchase_receipt: if item.purchase_receipt:
stock_rbnb_booked_in_pr = frappe.db.sql("""select name from `tabGL Entry` negative_expense_booked_in_pi = frappe.db.sql("""select name from `tabGL Entry`
where voucher_type='Purchase Receipt' and voucher_no=%s and account=%s""", where voucher_type='Purchase Receipt' and voucher_no=%s and account=%s""",
(item.purchase_receipt, stock_received_but_not_billed)) (item.purchase_receipt, expenses_included_in_valuation))
if stock_rbnb_booked_in_pr: if not negative_expense_booked_in_pi:
gl_entries.append( gl_entries.append(
self.get_gl_dict({ self.get_gl_dict({
"account": stock_received_but_not_billed, "account": stock_received_but_not_billed,
@ -353,7 +354,6 @@ class PurchaseInvoice(BuyingController):
if negative_expense_to_be_booked and valuation_tax: if negative_expense_to_be_booked and valuation_tax:
# credit valuation tax amount in "Expenses Included In Valuation" # credit valuation tax amount in "Expenses Included In Valuation"
# this will balance out valuation amount included in cost of goods sold # this will balance out valuation amount included in cost of goods sold
expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
total_valuation_amount = sum(valuation_tax.values()) total_valuation_amount = sum(valuation_tax.values())
amount_including_divisional_loss = negative_expense_to_be_booked amount_including_divisional_loss = negative_expense_to_be_booked

8
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -37,7 +37,7 @@ class PurchaseReceipt(BuyingController):
def onload(self): def onload(self):
billed_qty = frappe.db.sql("""select sum(ifnull(qty, 0)) from `tabPurchase Invoice Item` billed_qty = frappe.db.sql("""select sum(ifnull(qty, 0)) from `tabPurchase Invoice Item`
where purchase_receipt=%s""", self.name) where purchase_receipt=%s and docstatus=1""", self.name)
if billed_qty: if billed_qty:
total_qty = sum((item.qty for item in self.get("purchase_receipt_details"))) total_qty = sum((item.qty for item in self.get("purchase_receipt_details")))
self.get("__onload").billing_complete = (billed_qty[0][0] == total_qty) self.get("__onload").billing_complete = (billed_qty[0][0] == total_qty)
@ -358,12 +358,12 @@ class PurchaseReceipt(BuyingController):
# and charges added via Landed Cost Voucher, # and charges added via Landed Cost Voucher,
# post valuation related charges on "Stock Received But Not Billed" # post valuation related charges on "Stock Received But Not Billed"
stock_rbnb_booked_in_pi = frappe.db.sql("""select name from `tabPurchase Invoice Item` pi negative_expense_booked_in_pi = frappe.db.sql("""select name from `tabPurchase Invoice Item` pi
where docstatus = 1 and purchase_receipt=%s where docstatus = 1 and purchase_receipt=%s
and exists(select name from `tabGL Entry` where voucher_type='Purchase Invoice' and exists(select name from `tabGL Entry` where voucher_type='Purchase Invoice'
and voucher_no=pi.parent and account=%s)""", (self.name, stock_rbnb)) and voucher_no=pi.parent and account=%s)""", (self.name, expenses_included_in_valuation))
if stock_rbnb_booked_in_pi: if negative_expense_booked_in_pi:
expenses_included_in_valuation = stock_rbnb expenses_included_in_valuation = stock_rbnb
against_account = ", ".join([d.account for d in gl_entries if flt(d.debit) > 0]) against_account = ", ".join([d.account for d in gl_entries if flt(d.debit) > 0])