nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/github-issue/32559

Browse Source
This commit is contained in:
Sagar Sharma
2022-10-12 13:28:35 +05:30
committed by GitHub
parent 7da32c7db3 43037d893d
commit d2755c0106
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/server-tests-mariadb.yml vendored
View File

@@ -120,7 +120,7 @@ jobs:
FRAPPE_BRANCH: ${{ github.event.inputs.branch }} FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
- name: Run Tests - name: Run Tests
run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator --with-coverage run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --with-coverage --total-builds 4 --build-number ${{ matrix.container }}'
env: env:
TYPE: server TYPE: server
CI_BUILD_ID: ${{ github.run_id }} CI_BUILD_ID: ${{ github.run_id }}

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

@@ -232,10 +232,10 @@ class Item(Document):
def clear_retain_sample(self): def clear_retain_sample(self):
if not self.has_batch_no: if not self.has_batch_no:
self.retain_sample = None self.retain_sample = False
if not self.retain_sample: if not self.retain_sample:
self.sample_quantity = None self.sample_quantity = 0
def add_default_uom_in_conversion_factor_table(self): def add_default_uom_in_conversion_factor_table(self):
if not self.is_new() and self.has_value_changed("stock_uom"): 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.has_batch_no = None
item.save() item.save()
self.assertEqual(item.retain_sample, None) self.assertEqual(item.retain_sample, False)
self.assertEqual(item.sample_quantity, None) self.assertEqual(item.sample_quantity, 0)
item.delete() item.delete()
def consume_item_code_with_differet_stock_transactions( def consume_item_code_with_differet_stock_transactions(