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

Merge branch 'develop' into refactor/buying/reports

Browse Source
This commit is contained in:
Sagar Sharma 2022-10-12 13:29:50 +05:30 committed by GitHub
commit 0af385d73f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/item/item.py
View File

@ -232,10 +232,10 @@ class Item(Document):
def clear_retain_sample(self):
if not self.has_batch_no:
self.retain_sample = None
self.retain_sample = False
if not self.retain_sample:
self.sample_quantity = None
self.sample_quantity = 0
def add_default_uom_in_conversion_factor_table(self):
if not self.is_new() and self.has_value_changed("stock_uom"):

4
erpnext/stock/doctype/item/test_item.py
View File

@ -717,8 +717,8 @@ class TestItem(FrappeTestCase):
item.has_batch_no = None
item.save()
self.assertEqual(item.retain_sample, None)
self.assertEqual(item.sample_quantity, None)
self.assertEqual(item.retain_sample, False)
self.assertEqual(item.sample_quantity, 0)
item.delete()
def consume_item_code_with_differet_stock_transactions(