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

Merge branch 'version-13-hotfix' into supplier_defaults_v13hf

Browse Source
This commit is contained in:
rohitwaghchaure
2021-08-24 12:28:16 +05:30
committed by GitHub
parent 449c58d809 b932b3f252
commit 5320f3e5ea
1460 changed files with 10857 additions and 6772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/buying_settings/buying_settings.js
View File

@@ -28,4 +28,4 @@ frappe.tour['Buying Settings'] = [
title: "Purchase Receipt Required for Purchase Invoice Creation",
description: __("If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master.")
}
];
];

3
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -565,6 +565,7 @@
"fieldname": "scan_barcode",
"fieldtype": "Data",
"label": "Scan Barcode",
"options": "Barcode",
"show_days": 1,
"show_seconds": 1
},
@@ -1378,7 +1379,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2021-05-30 15:17:53.663648",
"modified": "2021-08-17 20:16:12.737743",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

12
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -447,10 +447,11 @@ def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions
target.flags.ignore_permissions = ignore_permissions
set_missing_values(source, target)
#Get the advance paid Journal Entries in Purchase Invoice Advance
if target.get("allocate_advances_automatically"):
target.set_advances()
target.set_payment_schedule()
def update_item(obj, target, source_parent):
target.amount = flt(obj.amount) - flt(obj.billed_amt)
target.base_amount = target.amount * flt(source_parent.conversion_rate)
@@ -470,6 +471,7 @@ def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions
"party_account_currency": "party_account_currency",
"supplier_warehouse":"supplier_warehouse"
},
"field_no_map" : ["payment_terms_template"],
"validation": {
"docstatus": ["=", 1],
}
@@ -489,12 +491,6 @@ def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions
},
}
if frappe.get_single("Accounts Settings").automatically_fetch_payment_terms == 1:
fields["Payment Schedule"] = {
"doctype": "Payment Schedule",
"add_if_empty": True
}
doc = get_mapped_doc("Purchase Order", source_name, fields,
target_doc, postprocess, ignore_permissions=ignore_permissions)
@@ -639,4 +635,4 @@ def add_items_in_ste(ste_doc, row, qty, po_details, batch_no=None):
'item_code': row.item_details['rm_item_code'],
'subcontracted_item': row.item_details['main_item_code'],
'serial_no': '\n'.join(row.serial_no) if row.serial_no else ''
})
})

2
erpnext/buying/doctype/purchase_order/regional/india.js
View File

@@ -1,3 +1,3 @@
{% include "erpnext/regional/india/taxes.js" %}
erpnext.setup_auto_gst_taxation('Purchase Order');
erpnext.setup_auto_gst_taxation('Purchase Order');

37
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@@ -484,6 +484,9 @@ class TestPurchaseOrder(unittest.TestCase):
def test_make_purchase_invoice_with_terms(self):
from erpnext.selling.doctype.sales_order.test_sales_order import automatically_fetch_payment_terms, compare_payment_schedules
automatically_fetch_payment_terms()
po = create_purchase_order(do_not_save=True)
self.assertRaises(frappe.ValidationError, make_pi_from_po, po.name)
@@ -509,6 +512,7 @@ class TestPurchaseOrder(unittest.TestCase):
self.assertEqual(getdate(pi.payment_schedule[0].due_date), getdate(po.transaction_date))
self.assertEqual(pi.payment_schedule[1].payment_amount, 2500.0)
self.assertEqual(getdate(pi.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30))
automatically_fetch_payment_terms(enable=0)
def test_subcontracting(self):
po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes")
@@ -632,14 +636,18 @@ class TestPurchaseOrder(unittest.TestCase):
else:
raise Exception
def test_terms_does_not_copy(self):
po = create_purchase_order()
self.assertTrue(po.get('payment_schedule'))
def test_terms_are_not_copied_if_automatically_fetch_payment_terms_is_unchecked(self):
po = create_purchase_order(do_not_save=1)
po.payment_terms_template = '_Test Payment Term Template'
po.save()
po.submit()
frappe.db.set_value('Company', '_Test Company', 'payment_terms', '_Test Payment Term Template 1')
pi = make_pi_from_po(po.name)
pi.save()
self.assertFalse(pi.get('payment_schedule'))
self.assertEqual(pi.get('payment_terms_template'), '_Test Payment Term Template 1')
frappe.db.set_value('Company', '_Test Company', 'payment_terms', '')
def test_terms_copied(self):
po = create_purchase_order(do_not_save=1)
@@ -968,8 +976,27 @@ class TestPurchaseOrder(unittest.TestCase):
# To test if the PO does NOT have a Blanket Order
self.assertEqual(po_doc.items[0].blanket_order, None)
def test_payment_terms_are_fetched_when_creating_purchase_invoice(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_terms_template
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.selling.doctype.sales_order.test_sales_order import automatically_fetch_payment_terms, compare_payment_schedules
automatically_fetch_payment_terms()
po = create_purchase_order(qty=10, rate=100, do_not_save=1)
create_payment_terms_template()
po.payment_terms_template = 'Test Receivable Template'
po.submit()
pi = make_purchase_invoice(qty=10, rate=100, do_not_save=1)
pi.items[0].purchase_order = po.name
pi.items[0].po_detail = po.items[0].name
pi.insert()
# self.assertEqual(po.payment_terms_template, pi.payment_terms_template)
compare_payment_schedules(self, po, pi)
automatically_fetch_payment_terms(enable=0)
def make_pr_against_po(po, received_qty=0):
pr = make_purchase_receipt(po)

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order.js
View File

@@ -77,4 +77,4 @@ QUnit.test("test: purchase order", function(assert) {
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_get_items.js
View File

@@ -58,4 +58,4 @@ QUnit.test("test: purchase order with get items", function(assert) {
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_discount_on_grand_total.js
View File

@@ -44,4 +44,4 @@ QUnit.test("test: purchase order with discount on grand total", function(assert)
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_item_wise_discount.js
View File

@@ -41,4 +41,4 @@ QUnit.test("test: purchase order with item wise discount", function(assert) {
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_multi_uom.js
View File

@@ -36,4 +36,4 @@ QUnit.test("test: purchase order with multi UOM", function(assert) {
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_shipping_rule.js
View File

@@ -40,4 +40,4 @@ QUnit.test("test: purchase order with shipping rule", function(assert) {
() => frappe.timeout(0.3),
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js
View File

@@ -41,4 +41,4 @@ QUnit.test("test: purchase order with taxes and charges", function(assert) {
() => frappe.timeout(0.3),
() => done()
]);
});
});

2
erpnext/buying/doctype/purchase_order_item/purchase_order_item.py
View File

@@ -10,4 +10,4 @@ class PurchaseOrderItem(Document):
pass
def on_doctype_update():
frappe.db.add_index("Purchase Order Item", ["item_code", "warehouse"])
frappe.db.add_index("Purchase Order Item", ["item_code", "warehouse"])

2
erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py
View File

@@ -7,4 +7,4 @@ import frappe
from frappe.model.document import Document
class PurchaseOrderItemSupplied(Document):
pass
pass

2
erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py
View File

@@ -7,4 +7,4 @@ import frappe
from frappe.model.document import Document
class PurchaseReceiptItemSupplied(Document):
pass
pass

2
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@@ -425,4 +425,4 @@ def get_rfq_containing_supplier(doctype, txt, searchfield, start, page_len, filt
.format(filters.get("supplier"), filters.get("company"), conditions),
{"page_len": page_len, "start": start}, as_dict=1)
return rfq_data
return rfq_data

2
erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
View File

@@ -10,4 +10,4 @@ def get_data():
'items': ['Supplier Quotation']
},
]
}
}

2
erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation.js
View File

@@ -73,4 +73,4 @@ QUnit.test("test: request_for_quotation", function(assert) {
() => frappe.click_button('Close'),
() => done()
]);
});
});

2
erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation_for_status.js
View File

@@ -125,4 +125,4 @@ QUnit.test("Test: Request for Quotation", function (assert) {
},
() => done()
]);
});
});

2
erpnext/buying/doctype/supplier/regional/india.js
View File

@@ -1,3 +1,3 @@
{% include "erpnext/regional/india/party.js" %}
erpnext.setup_gst_reminder_button('Supplier');
erpnext.setup_gst_reminder_button('Supplier');

2
erpnext/buying/doctype/supplier/test_supplier.js
View File

@@ -74,4 +74,4 @@ QUnit.test("test: supplier", function(assert) {
},
() => done()
]);
});
});

2
erpnext/buying/doctype/supplier_item_group/supplier_item_group.py
View File

@@ -15,4 +15,4 @@ class SupplierItemGroup(Document):
'item_group': self.item_group
})
if exists:
frappe.throw(_("Item Group has already been linked to this supplier."))
frappe.throw(_("Item Group has already been linked to this supplier."))

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@@ -166,4 +166,4 @@ def set_expired_status():
`tabSupplier Quotation` SET `status` = 'Expired'
WHERE
`status` not in ('Cancelled', 'Stopped') AND `valid_till` < %s
""", (nowdate()))
""", (nowdate()))

2
erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation.js
View File

@@ -71,4 +71,4 @@ QUnit.test("test: supplier quotation", function(assert) {
() => done()
]);
});
});

2
erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation_for_item_wise_discount.js
View File

@@ -31,4 +31,4 @@ QUnit.test("test: supplier quotation with item wise discount", function(assert){
() => frappe.timeout(0.3),
() => done()
]);
});
});

2
erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation_for_taxes_and_charges.js
View File

@@ -34,4 +34,4 @@ QUnit.test("test: supplier quotation with taxes and charges", function(assert) {
() => frappe.timeout(0.3),
() => done()
]);
});
});

2
erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
View File

@@ -93,5 +93,3 @@ var loadAllStandings = function(frm) {
}
});
};

2
erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py
View File

@@ -13,4 +13,4 @@ def get_data():
'items': ['Supplier Scorecard Period']
}
]
}
}

1
erpnext/buying/doctype/supplier_scorecard/test_supplier_scorecard.py
View File

@@ -128,4 +128,3 @@ valid_scorecard = [
"weighting_function":"{total_score} * max( 0, min ( 1 , (12 - {period_number}) / 12) )"
}
]

2
erpnext/buying/doctype/supplier_scorecard_criteria/test_supplier_scorecard_criteria.py
View File

@@ -72,4 +72,4 @@ test_bad_criteria = [
"criteria_name":"Fake Criteria 3",
"max_score":100.0
},
]
]

1
erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
View File

@@ -109,4 +109,3 @@ def make_supplier_scorecard(source_name, target_doc=None):
}, target_doc, post_process, ignore_permissions=True)
return doc

2
erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.py
View File

@@ -26,4 +26,4 @@ def get_standings_list():
`tabSupplier Scorecard Standing` scs""",
{}, as_dict=1)
return standings
return standings

2
erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py
View File

@@ -493,4 +493,4 @@ def get_rfq_response_days(scorecard):
total_sq_days = 0
return total_sq_days
return total_sq_days

2
erpnext/buying/doctype/supplier_scorecard_variable/test_supplier_scorecard_variable.py
View File

@@ -54,4 +54,4 @@ test_bad_variables = [
"variable_label":"Fake Variable 1",
"path":"get_fake_variable1"
},
]
]

2
erpnext/buying/print_format/drop_shipping_format/drop_shipping_format.json
View File

@@ -13,6 +13,6 @@
"name": "Drop Shipping Format",
"owner": "Administrator",
"print_format_builder": 0,
"print_format_type": "Server",
"print_format_type": "Jinja",
"standard": "Yes"
}

2
erpnext/buying/report/procurement_tracker/procurement_tracker.py
View File

@@ -296,4 +296,4 @@ def get_po_entries(conditions):
{conditions}
GROUP BY
parent.name, child.item_code
""".format(conditions=conditions), as_dict=1) #nosec
""".format(conditions=conditions), as_dict=1) #nosec

2
erpnext/buying/report/procurement_tracker/test_procurement_tracker.py
View File

@@ -68,4 +68,4 @@ class TestProcurementTracker(unittest.TestCase):
"actual_delivery_date": date_obj
}
return expected_data
return expected_data

1
erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
View File

@@ -268,4 +268,3 @@ def get_columns(filters):
])
return columns

2
erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
View File

@@ -5,4 +5,4 @@ frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
frappe.query_reports["Purchase Order Trends"] = {
filters: erpnext.get_purchase_trends_filters()
}
});
});

2
erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
View File

@@ -55,4 +55,4 @@ def get_chart_data(data, conditions, filters):
"lineOptions": {
"regionFill": 1
}
}
}

2
erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py
View File

@@ -149,4 +149,4 @@ def get_columns():
"fieldtype": "Float",
"width": 110
}
]
]

2
erpnext/buying/report/subcontracted_item_to_be_received/test_subcontracted_item_to_be_received.py
View File

@@ -33,4 +33,4 @@ def make_purchase_receipt_against_po(po, quantity=5):
pr.items[0].qty = quantity
pr.supplier_warehouse = '_Test Warehouse 1 - _TC'
pr.insert()
pr.submit()
pr.submit()

2
erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py
View File

@@ -94,4 +94,4 @@ def get_po_items_to_supply(filters):
["Purchase Order", "transaction_date", ">=", filters.from_date],
["Purchase Order", "docstatus", "=", 1]
]
)
)

2
erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html
View File

@@ -129,4 +129,4 @@
<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>
<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>

2
erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js
View File

@@ -174,4 +174,4 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
});
dialog.show();
}
}
}

2
erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
View File

@@ -263,4 +263,4 @@ def get_message():
&nbsp;&nbsp;
<span class="indicator red">
Expires today / Already Expired
</span>"""
</span>"""

1
erpnext/buying/utils.py
View File

@@ -102,4 +102,3 @@ def get_linked_material_requests(items):
mr_list.append(material_request)
return mr_list