schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Saqib Ansari
2022-03-06 13:13:50 +05:30
parent 447692d770
commit 1e418f9ecc
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -691,10 +691,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
dialog.show();
},
<<<<<<< HEAD
hold_sales_order: function(){
=======
get_ordered_qty(item, so) {
get_ordered_qty: function(item, so) {
let ordered_qty = item.ordered_qty;
if (so.packed_items) {
// calculate ordered qty based on packed items in case of product bundle
@@ -710,10 +707,9 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
}
}
return ordered_qty;
}
},
hold_sales_order(){
>>>>>>> 8005fee656 (feat: update ordered qty for packed items)
hold_sales_order: function(){
var me = this;
var d = new frappe.ui.Dialog({
title: __('Reason for Hold'),

3
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -921,8 +921,6 @@ class TestSalesOrder(ERPNextTestCase):
self.assertEqual(purchase_orders[0].supplier, '_Test Supplier')
self.assertEqual(purchase_orders[1].supplier, '_Test Supplier 1')
<<<<<<< HEAD
=======
def test_product_bundles_in_so_are_replaced_with_bundle_items_in_po(self):
"""
Tests if the the Product Bundles in the Items table of Sales Orders are replaced with
@@ -991,7 +989,6 @@ class TestSalesOrder(ERPNextTestCase):
self.assertEqual(so.packed_items[0].ordered_qty, 2)
self.assertEqual(so.packed_items[1].ordered_qty, 2)
>>>>>>> 8e3f1e306d (test: po updates packed item's ordered_qty)
def test_reserved_qty_for_closing_so(self):
bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
fields=["reserved_qty"])