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

Merge branch 'version-13-beta-pre-release' into version-13-beta

Browse Source
This commit is contained in:
Saurabh 2021-01-02 19:59:56 +05:30
commit adb8bbe958
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '13.0.0-beta.8'
__version__ = '13.0.0-beta.9'
def get_default_company(user=None):
'''Get default company for user'''

2
erpnext/regional/india/e_invoice/utils.py
View File

@ -88,7 +88,7 @@ def get_party_details(address_name):
gstin = address.get('gstin')
gstin_details = get_gstin_details(gstin)
legal_name = gstin_details.get('LegalName')
legal_name = gstin_details.get('LegalName') or gstin_details.get('TradeName')
location = gstin_details.get('AddrLoc') or address.get('city')
state_code = gstin_details.get('StateCode')
pincode = gstin_details.get('AddrPncd')

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

@ -512,7 +512,7 @@ class StockEntry(StockController):
bom_items = self.get_bom_raw_materials(finished_item_qty)
outgoing_items_cost = sum([flt(row.qty)*flt(row.rate) for row in bom_items.values()])
return flt(outgoing_items_cost - scrap_items_cost)
return flt((outgoing_items_cost - scrap_items_cost) / finished_item_qty)
def distribute_additional_costs(self):
# If no incoming items, set additional costs blank
@ -699,7 +699,7 @@ class StockEntry(StockController):
# SLE for target warehouse
self.get_sle_for_target_warehouse(sl_entries, finished_item_row)
# reverse sl entries if cancel
if self.docstatus == 2:
sl_entries.reverse()
@ -727,9 +727,9 @@ class StockEntry(StockController):
sle.dependant_sle_voucher_detail_no = d.name
elif finished_item_row and (finished_item_row.item_code != d.item_code or finished_item_row.t_warehouse != d.s_warehouse):
sle.dependant_sle_voucher_detail_no = finished_item_row.name
sl_entries.append(sle)
def get_sle_for_target_warehouse(self, sl_entries, finished_item_row):
for d in self.get('items'):
if cstr(d.t_warehouse):