Merge pull request #39578 from deepeshgarg007/fix_ci

fix: apply no copy on source docs
This commit is contained in:
Deepesh Garg 2024-01-26 19:25:22 +05:30 committed by GitHub
commit 4173203382
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 7 deletions

View File

@ -1253,6 +1253,7 @@
"fieldtype": "Select",
"in_standard_filter": 1,
"label": "Status",
"no_copy": 1,
"options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nPartly Paid\nUnpaid\nOverdue\nCancelled\nInternal Transfer",
"print_hide": 1
},
@ -1612,7 +1613,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
"modified": "2023-11-29 15:35:44.697496",
"modified": "2024-01-26 10:46:00.469053",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",

View File

@ -1597,8 +1597,8 @@ def create_delivery_note(**args):
{
"item_code": args.item or args.item_code or "_Test Item",
"warehouse": args.warehouse or "_Test Warehouse - _TC",
"qty": args.qty if args.get("qty") is not None else 1,
"rate": args.rate if args.get("rate") is not None else 100,
"qty": args.get("qty", 1),
"rate": args.get("rate", 100),
"conversion_factor": 1.0,
"serial_and_batch_bundle": bundle_id,
"allow_zero_valuation_rate": args.allow_zero_valuation_rate or 1,

View File

@ -21,9 +21,7 @@ from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle
get_serial_nos_from_bundle,
make_serial_batch_bundle,
)
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
from erpnext.stock.stock_ledger import SerialNoExistsInFutureTransaction
class TestPurchaseReceipt(FrappeTestCase):
@ -735,7 +733,6 @@ class TestPurchaseReceipt(FrappeTestCase):
po.cancel()
def test_serial_no_against_purchase_receipt(self):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
item_code = "Test Manual Created Serial No"
if not frappe.db.exists("Item", item_code):
@ -1020,6 +1017,11 @@ class TestPurchaseReceipt(FrappeTestCase):
def test_stock_transfer_from_purchase_receipt_with_valuation(self):
from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
create_stock_reconciliation,
)
from erpnext.stock.get_item_details import get_valuation_rate
from erpnext.stock.utils import get_stock_balance
prepare_data_for_internal_transfer()
@ -1034,6 +1036,22 @@ class TestPurchaseReceipt(FrappeTestCase):
company="_Test Company with perpetual inventory",
)
if (
get_valuation_rate(
pr1.items[0].item_code, "_Test Company with perpetual inventory", warehouse="Stores - TCP1"
)
!= 50
):
balance = get_stock_balance(item_code=pr1.items[0].item_code, warehouse="Stores - TCP1")
create_stock_reconciliation(
item_code=pr1.items[0].item_code,
company="_Test Company with perpetual inventory",
warehouse="Stores - TCP1",
qty=balance,
rate=50,
do_not_save=True,
)
customer = "_Test Internal Customer 2"
company = "_Test Company with perpetual inventory"
@ -1071,7 +1089,8 @@ class TestPurchaseReceipt(FrappeTestCase):
sl_entries = get_sl_entries("Purchase Receipt", pr.name)
expected_gle = [
["Stock In Hand - TCP1", 272.5, 0.0],
["Stock In Hand - TCP1", 250.0, 0.0],
["Cost of Goods Sold - TCP1", 22.5, 0.0],
["_Test Account Stock In Hand - TCP1", 0.0, 250.0],
["_Test Account Shipping Charges - TCP1", 0.0, 22.5],
]