nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Debug travis

Browse Source
This commit is contained in:
Deepesh Garg
2020-12-28 13:32:10 +05:30
parent a0f6381d6e
commit 73cef56df7
2 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -1771,82 +1771,82 @@ class TestSalesInvoice(unittest.TestCase):
self.assertEqual(target_doc.company, "_Test Company 1") self.assertEqual(target_doc.company, "_Test Company 1")
self.assertEqual(target_doc.supplier, "_Test Internal Supplier") self.assertEqual(target_doc.supplier, "_Test Internal Supplier")
# def test_internal_transfer_gl_entry(self): def test_internal_transfer_gl_entry(self):
# ## Create internal transfer account ## Create internal transfer account
# account = create_account(account_name="Unrealized Profit", account = create_account(account_name="Unrealized Profit",
# parent_account="Current Liabilities - TCP1", company="_Test Company with perpetual inventory") parent_account="Current Liabilities - TCP1", company="_Test Company with perpetual inventory")
# frappe.db.set_value('Company', '_Test Company with perpetual inventory', frappe.db.set_value('Company', '_Test Company with perpetual inventory',
# 'unrealized_profit_loss_account', account) 'unrealized_profit_loss_account', account)
# customer = create_internal_customer("_Test Internal Customer 2", "_Test Company with perpetual inventory", customer = create_internal_customer("_Test Internal Customer 2", "_Test Company with perpetual inventory",
# "_Test Company with perpetual inventory") "_Test Company with perpetual inventory")
# create_internal_supplier("_Test Internal Supplier 2", "_Test Company with perpetual inventory", create_internal_supplier("_Test Internal Supplier 2", "_Test Company with perpetual inventory",
# "_Test Company with perpetual inventory") "_Test Company with perpetual inventory")
# si = create_sales_invoice( si = create_sales_invoice(
# company = "_Test Company with perpetual inventory", company = "_Test Company with perpetual inventory",
# customer = customer, customer = customer,
# debit_to = "Debtors - TCP1", debit_to = "Debtors - TCP1",
# warehouse = "Stores - TCP1", warehouse = "Stores - TCP1",
# income_account = "Sales - TCP1", income_account = "Sales - TCP1",
# expense_account = "Cost of Goods Sold - TCP1", expense_account = "Cost of Goods Sold - TCP1",
# cost_center = "Main - TCP1", cost_center = "Main - TCP1",
# currency = "INR", currency = "INR",
# do_not_save = 1 do_not_save = 1
# ) )
# si.selling_price_list = "_Test Price List Rest of the World" si.selling_price_list = "_Test Price List Rest of the World"
# si.update_stock = 1 si.update_stock = 1
# si.items[0].target_warehouse = 'Work In Progress - TCP1' si.items[0].target_warehouse = 'Work In Progress - TCP1'
# add_taxes(si) add_taxes(si)
# si.save() si.save()
# rate = 0.0 rate = 0.0
# for d in si.get('items'): for d in si.get('items'):
# rate = get_incoming_rate({ rate = get_incoming_rate({
# "item_code": d.item_code, "item_code": d.item_code,
# "warehouse": d.warehouse, "warehouse": d.warehouse,
# "posting_date": si.posting_date, "posting_date": si.posting_date,
# "posting_time": si.posting_time, "posting_time": si.posting_time,
# "qty": -1 * flt(d.get('stock_qty')), "qty": -1 * flt(d.get('stock_qty')),
# "serial_no": d.serial_no, "serial_no": d.serial_no,
# "company": si.company, "company": si.company,
# "voucher_type": 'Sales Invoice', "voucher_type": 'Sales Invoice',
# "voucher_no": si.name, "voucher_no": si.name,
# "allow_zero_valuation": d.get("allow_zero_valuation") "allow_zero_valuation": d.get("allow_zero_valuation")
# }, raise_error_if_no_rate=False) }, raise_error_if_no_rate=False)
# rate = flt(rate, 2) rate = flt(rate, 2)
# si.submit() si.submit()
# target_doc = make_inter_company_transaction("Sales Invoice", si.name) target_doc = make_inter_company_transaction("Sales Invoice", si.name)
# target_doc.company = '_Test Company with perpetual inventory' target_doc.company = '_Test Company with perpetual inventory'
# target_doc.items[0].warehouse = 'Finished Goods - TCP1' target_doc.items[0].warehouse = 'Finished Goods - TCP1'
# add_taxes(target_doc) add_taxes(target_doc)
# target_doc.save() target_doc.save()
# target_doc.submit() target_doc.submit()
# tax_amount = flt(rate * (12/100), 2) tax_amount = flt(rate * (12/100), 2)
# si_gl_entries = [ si_gl_entries = [
# ["_Test Account Excise Duty - TCP1", 0.0, tax_amount, nowdate()], ["_Test Account Excise Duty - TCP1", 0.0, tax_amount, nowdate()],
# ["Unrealized Profit - TCP1", tax_amount, 0.0, nowdate()] ["Unrealized Profit - TCP1", tax_amount, 0.0, nowdate()]
# ] ]
# check_gl_entries(self, si.name, si_gl_entries, add_days(nowdate(), -1)) check_gl_entries(self, si.name, si_gl_entries, add_days(nowdate(), -1))
# pi_gl_entries = [ pi_gl_entries = [
# ["_Test Account Excise Duty - TCP1", tax_amount , 0.0, nowdate()], ["_Test Account Excise Duty - TCP1", tax_amount , 0.0, nowdate()],
# ["Unrealized Profit - TCP1", 0.0, tax_amount, nowdate()] ["Unrealized Profit - TCP1", 0.0, tax_amount, nowdate()]
# ] ]
# # Sale and Purchase both should be at valuation rate # Sale and Purchase both should be at valuation rate
# self.assertEqual(si.items[0].rate, rate) self.assertEqual(si.items[0].rate, rate)
# self.assertEqual(target_doc.items[0].rate, rate) self.assertEqual(target_doc.items[0].rate, rate)
# check_gl_entries(self, target_doc.name, pi_gl_entries, add_days(nowdate(), -1)) check_gl_entries(self, target_doc.name, pi_gl_entries, add_days(nowdate(), -1))
def test_eway_bill_json(self): def test_eway_bill_json(self):
si = make_sales_invoice_for_ewaybill() si = make_sales_invoice_for_ewaybill()

32
erpnext/stock/stock_ledger.py
View File

@@ -376,19 +376,19 @@ class update_entries_after(object):
d.db_update() d.db_update()
def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate): def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate):
if frappe.db.get_value(sle.voucher_type, sle.voucher_no, 'is_internal_customer'): # if frappe.db.get_value(sle.voucher_type, sle.voucher_no, 'is_internal_customer'):
frappe.db.set_value(sle.voucher_type + " Item", sle.voucher_detail_no, "rate", outgoing_rate) # frappe.db.set_value(sle.voucher_type + " Item", sle.voucher_detail_no, "rate", outgoing_rate)
update_taxes_and_totals(sle.voucher_type, sle.voucher_no, outgoing_rate) # update_taxes_and_totals(sle.voucher_type, sle.voucher_no, outgoing_rate)
purchase_doctype = 'Purchase Invoice' if sle.voucher_type == 'Sales Invoice' else 'Purchase Receipt' # purchase_doctype = 'Purchase Invoice' if sle.voucher_type == 'Sales Invoice' else 'Purchase Receipt'
ref_doc_field = frappe.scrub(sle.voucher_type + ' Item') # ref_doc_field = frappe.scrub(sle.voucher_type + ' Item')
reference_field = 'inter_company_invoice_reference' if purchase_doctype == 'Purchase Invoice' else 'inter_company_reference' # reference_field = 'inter_company_invoice_reference' if purchase_doctype == 'Purchase Invoice' else 'inter_company_reference'
purchase_document_list = frappe.db.get_all(purchase_doctype, {reference_field: sle.voucher_no}, ['name']) # purchase_document_list = frappe.db.get_all(purchase_doctype, {reference_field: sle.voucher_no}, ['name'])
for d in purchase_document_list: # for d in purchase_document_list:
frappe.db.set_value(purchase_doctype + ' Item', {ref_doc_field: sle.voucher_detail_no}, 'rate', outgoing_rate) # frappe.db.set_value(purchase_doctype + ' Item', {ref_doc_field: sle.voucher_detail_no}, 'rate', outgoing_rate)
update_taxes_and_totals(purchase_doctype, d.name, outgoing_rate) # update_taxes_and_totals(purchase_doctype, d.name, outgoing_rate)
# Update item's incoming rate on transaction # Update item's incoming rate on transaction
item_code = frappe.db.get_value(sle.voucher_type + " Item", sle.voucher_detail_no, "item_code") item_code = frappe.db.get_value(sle.voucher_type + " Item", sle.voucher_detail_no, "item_code")
@@ -658,12 +658,12 @@ class update_entries_after(object):
bin_doc.flags.via_stock_ledger_entry = True bin_doc.flags.via_stock_ledger_entry = True
bin_doc.save(ignore_permissions=True) bin_doc.save(ignore_permissions=True)
def update_taxes_and_totals(doctype, docname, rate): # def update_taxes_and_totals(doctype, docname, rate):
ref_doc = frappe.get_doc(doctype, docname) # ref_doc = frappe.get_doc(doctype, docname)
ref_doc.calculate_taxes_and_totals() # ref_doc.calculate_taxes_and_totals()
ref_doc.db_update() # ref_doc.db_update()
for d in ref_doc.items: # for d in ref_doc.items:
d.db_update() # d.db_update()
def get_previous_sle(args, for_update=False): def get_previous_sle(args, for_update=False):
""" """