Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request
fix: incorrect party type in payment request
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index ab811d8..c3f95fa 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -201,7 +201,7 @@
"fieldname": "reference_type",
"fieldtype": "Select",
"label": "Reference Type",
- "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting"
+ "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees"
},
{
"fieldname": "reference_name",
@@ -281,4 +281,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
index 9903048..df77ad8 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"creation": "2018-10-25 10:02:48.656165",
"doctype": "DocType",
"editable_grid": 1,
@@ -23,48 +24,41 @@
},
{
"default": "0",
- "depends_on": "eval:doc.enabled==1",
+ "depends_on": "enabled",
"fieldname": "automatic_sync",
"fieldtype": "Check",
"label": "Synchronize all accounts every hour"
},
{
- "depends_on": "eval:doc.enabled==1",
"fieldname": "plaid_client_id",
"fieldtype": "Data",
"in_list_view": 1,
- "label": "Plaid Client ID",
- "reqd": 1
+ "label": "Plaid Client ID"
},
{
- "depends_on": "eval:doc.enabled==1",
"fieldname": "plaid_secret",
"fieldtype": "Password",
"in_list_view": 1,
- "label": "Plaid Secret",
- "reqd": 1
+ "label": "Plaid Secret"
},
{
- "depends_on": "eval:doc.enabled==1",
"fieldname": "plaid_public_key",
"fieldtype": "Data",
"in_list_view": 1,
- "label": "Plaid Public Key",
- "reqd": 1
+ "label": "Plaid Public Key"
},
{
- "depends_on": "eval:doc.enabled==1",
"fieldname": "plaid_env",
"fieldtype": "Data",
"in_list_view": 1,
- "label": "Plaid Environment",
- "reqd": 1
+ "label": "Plaid Environment"
},
{
"fieldname": "column_break_2",
"fieldtype": "Column Break"
},
{
+ "depends_on": "enabled",
"fieldname": "section_break_4",
"fieldtype": "Section Break"
},
@@ -74,7 +68,8 @@
}
],
"issingle": 1,
- "modified": "2019-08-13 17:00:06.939422",
+ "links": [],
+ "modified": "2020-01-05 10:00:22.137832",
"modified_by": "Administrator",
"module": "ERPNext Integrations",
"name": "Plaid Settings",
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index af8e132..3503e7c 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"allow_guest_to_view": 1,
"allow_import": 1,
"allow_rename": 1,
@@ -569,6 +570,7 @@
{
"default": "0.00",
"depends_on": "is_stock_item",
+ "description": "Minimum quantity should be as per Stock UOM",
"fieldname": "min_order_qty",
"fieldtype": "Float",
"label": "Minimum Order Qty",
@@ -1041,8 +1043,9 @@
"icon": "fa fa-tag",
"idx": 2,
"image_field": "image",
+ "links": [],
"max_attachments": 1,
- "modified": "2019-12-13 12:15:56.197246",
+ "modified": "2020-01-02 19:13:59.295963",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 01d54de..1c9d4c0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -103,9 +103,8 @@
if self.work_order and self.purpose == "Material Consumption for Manufacture":
self.validate_work_order_status()
- else:
- self.update_work_order()
+ self.update_work_order()
self.update_stock_ledger()
self.make_gl_entries_on_cancel()
self.update_cost_in_project()
@@ -479,10 +478,16 @@
def set_basic_rate_for_finished_goods(self, raw_material_cost, scrap_material_cost):
if self.purpose in ["Manufacture", "Repack"]:
for d in self.get("items"):
- if d.transfer_qty and (d.bom_no or d.t_warehouse) and (getattr(self, "pro_doc", frappe._dict()).scrap_warehouse != d.t_warehouse):
+ if (d.transfer_qty and (d.bom_no or d.t_warehouse) and raw_material_cost
+ and (getattr(self, "pro_doc", frappe._dict()).scrap_warehouse != d.t_warehouse)):
d.basic_rate = flt((raw_material_cost - scrap_material_cost) / flt(d.transfer_qty), d.precision("basic_rate"))
d.basic_amount = flt((raw_material_cost - scrap_material_cost), d.precision("basic_amount"))
+ if (not d.basic_rate and self.work_order and
+ frappe.db.get_single_value("Manufacturing Settings", "material_consumption")):
+ d.basic_rate = get_valuation_rate_for_finished_good_entry(self.work_order) or 0
+ d.basic_amount = d.basic_rate * d.qty
+
def distribute_additional_costs(self):
if self.purpose == "Material Issue":
self.additional_costs = []
@@ -833,7 +838,6 @@
(self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
and frappe.db.get_single_value("Manufacturing Settings", "material_consumption")== 1):
self.get_unconsumed_raw_materials()
-
else:
if not self.fg_completed_qty:
frappe.throw(_("Manufacturing Quantity is mandatory"))
@@ -1152,20 +1156,17 @@
se_child.s_warehouse = item_dict[d].get("from_warehouse")
se_child.t_warehouse = item_dict[d].get("to_warehouse")
se_child.item_code = item_dict[d].get('item_code') or cstr(d)
- se_child.item_name = item_dict[d]["item_name"]
- se_child.description = item_dict[d]["description"]
se_child.uom = item_dict[d]["uom"] if item_dict[d].get("uom") else stock_uom
se_child.stock_uom = stock_uom
se_child.qty = flt(item_dict[d]["qty"], se_child.precision("qty"))
- se_child.expense_account = item_dict[d].get("expense_account")
se_child.cost_center = item_dict[d].get("cost_center") or cost_center
se_child.allow_alternative_item = item_dict[d].get("allow_alternative_item", 0)
se_child.subcontracted_item = item_dict[d].get("main_item_code")
- se_child.original_item = item_dict[d].get("original_item")
- se_child.po_detail = item_dict[d].get("po_detail")
- if item_dict[d].get("idx"):
- se_child.idx = item_dict[d].get("idx")
+ for field in ["idx", "po_detail", "original_item",
+ "expense_account", "description", "item_name"]:
+ if item_dict[d].get(field):
+ se_child.set(field, item_dict[d].get(field))
if se_child.s_warehouse==None:
se_child.s_warehouse = self.from_warehouse
@@ -1470,6 +1471,24 @@
return used_alternative_items
+def get_valuation_rate_for_finished_good_entry(work_order):
+ work_order_qty = flt(frappe.get_cached_value("Work Order",
+ work_order, 'material_transferred_for_manufacturing'))
+
+ field = "(SUM(total_outgoing_value) / %s) as valuation_rate" % (work_order_qty)
+
+ stock_data = frappe.get_all("Stock Entry",
+ fields = field,
+ filters = {
+ "docstatus": 1,
+ "purpose": "Material Transfer for Manufacture",
+ "work_order": work_order
+ }
+ )
+
+ if stock_data:
+ return stock_data[0].valuation_rate
+
@frappe.whitelist()
def get_uom_details(item_code, uom, qty):
"""Returns dict `{"conversion_factor": [value], "transfer_qty": qty * [value]}`
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 69a4b94..b100f45 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -212,7 +212,7 @@
def get_serialized_values(self, sle):
incoming_rate = flt(sle.incoming_rate)
actual_qty = flt(sle.actual_qty)
- serial_no = cstr(sle.serial_no).split("\n")
+ serial_nos = cstr(sle.serial_no).split("\n")
if incoming_rate < 0:
# wrong incoming rate
@@ -224,9 +224,8 @@
elif actual_qty < 0:
# In case of delivery/stock issue, get average purchase rate
# of serial nos of current entry
- stock_value_change = -1 * flt(frappe.get_all("Serial No",
- fields=["sum(purchase_rate)"],
- filters = {'name': ('in', serial_no)}, as_list=1)[0][0])
+ outgoing_value = self.get_incoming_value_for_serial_nos(sle, serial_nos)
+ stock_value_change = -1 * outgoing_value
new_stock_qty = self.qty_after_transaction + actual_qty
@@ -244,6 +243,36 @@
sle.voucher_type, sle.voucher_no, self.allow_zero_rate,
currency=erpnext.get_company_currency(sle.company))
+ def get_incoming_value_for_serial_nos(self, sle, serial_nos):
+ # get rate from serial nos within same company
+ all_serial_nos = frappe.get_all("Serial No",
+ fields=["purchase_rate", "name", "company"],
+ filters = {'name': ('in', serial_nos)})
+
+ incoming_values = sum([flt(d.purchase_rate) for d in all_serial_nos if d.company==sle.company])
+
+ # Get rate for serial nos which has been transferred to other company
+ invalid_serial_nos = [d.name for d in all_serial_nos if d.company!=sle.company]
+ for serial_no in invalid_serial_nos:
+ incoming_rate = frappe.db.sql("""
+ select incoming_rate
+ from `tabStock Ledger Entry`
+ where
+ company = %s
+ and actual_qty > 0
+ and (serial_no = %s
+ or serial_no like %s
+ or serial_no like %s
+ or serial_no like %s
+ )
+ order by posting_date desc
+ limit 1
+ """, (sle.company, serial_no, serial_no+'\n%', '%\n'+serial_no, '%\n'+serial_no+'\n%'))
+
+ incoming_values += flt(incoming_rate[0][0]) if incoming_rate else 0
+
+ return incoming_values
+
def get_moving_average_values(self, sle):
actual_qty = flt(sle.actual_qty)
new_stock_qty = flt(self.qty_after_transaction) + actual_qty