Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove duplicate keys from dictionaries

Browse Source
This commit is contained in:
Ankush Menat 2021-04-17 14:57:57 +05:30
parent 75e13f7bb6
commit dedf2c1b61
No known key found for this signature in database
GPG Key ID: 8EA82E09BBD13AAF
7 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -46,7 +46,6 @@ class SalesInvoice(SellingController):
'target_parent_dt': 'Sales Order', 'target_parent_dt': 'Sales Order',
'target_parent_field': 'per_billed', 'target_parent_field': 'per_billed',
'source_field': 'amount', 'source_field': 'amount',
'join_field': 'so_detail',
'percent_join_field': 'sales_order', 'percent_join_field': 'sales_order',
'status_field': 'billing_status', 'status_field': 'billing_status',
'keyword': 'Billed', 'keyword': 'Billed',

1
erpnext/controllers/stock_controller.py
View File

@ -117,7 +117,6 @@ class StockController(AccountsController):
"account": expense_account, "account": expense_account,
"against": warehouse_account[sle.warehouse]["account"], "against": warehouse_account[sle.warehouse]["account"],
"cost_center": item_row.cost_center, "cost_center": item_row.cost_center,
"project": item_row.project or self.get('project'),
"remarks": self.get("remarks") or "Accounting Entry for Stock", "remarks": self.get("remarks") or "Accounting Entry for Stock",
"credit": flt(sle.stock_value_difference, precision), "credit": flt(sle.stock_value_difference, precision),
"project": item_row.get("project") or self.get("project"), "project": item_row.get("project") or self.get("project"),

4
erpnext/manufacturing/dashboard_fixtures.py
View File

@ -43,7 +43,6 @@ def get_charts():
return [{ return [{
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"based_on": "modified", "based_on": "modified",
"time_interval": "Yearly",
"chart_type": "Sum", "chart_type": "Sum",
"chart_name": _("Produced Quantity"), "chart_name": _("Produced Quantity"),
"name": "Produced Quantity", "name": "Produced Quantity",
@ -60,7 +59,6 @@ def get_charts():
}, { }, {
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"based_on": "creation", "based_on": "creation",
"time_interval": "Yearly",
"chart_type": "Sum", "chart_type": "Sum",
"chart_name": _("Completed Operation"), "chart_name": _("Completed Operation"),
"name": "Completed Operation", "name": "Completed Operation",
@ -238,4 +236,4 @@ def get_number_cards():
"label": _("Monthly Quality Inspections"), "label": _("Monthly Quality Inspections"),
"show_percentage_stats": 1, "show_percentage_stats": 1,
"stats_time_interval": "Weekly" "stats_time_interval": "Weekly"
}] }]

1
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@ -561,7 +561,6 @@ def get_material_request_items(row, sales_order, company,
'item_name': row.item_name, 'item_name': row.item_name,
'quantity': required_qty, 'quantity': required_qty,
'required_bom_qty': total_qty, 'required_bom_qty': total_qty,
'description': row.description,
'stock_uom': row.get("stock_uom"), 'stock_uom': row.get("stock_uom"),
'warehouse': warehouse or row.get('source_warehouse') \ 'warehouse': warehouse or row.get('source_warehouse') \
or row.get('default_warehouse') or item_group_defaults.get("default_warehouse"), or row.get('default_warehouse') or item_group_defaults.get("default_warehouse"),

2
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -561,7 +561,7 @@ def get_json(filters, report_name, data):
fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year) fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year)
gst_json = {"gstin": "", "version": "GST2.2.9", gst_json = {"version": "GST2.2.9",
"hash": "hash", "gstin": gstin, "fp": fp} "hash": "hash", "gstin": gstin, "fp": fp}
res = {} res = {}

2
erpnext/stock/get_item_details.py
View File

@ -309,8 +309,6 @@ def get_basic_details(args, item, overwrite_warehouse=True):
"update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0, "update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0,
"delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0, "delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0,
"is_fixed_asset": item.is_fixed_asset, "is_fixed_asset": item.is_fixed_asset,
"weight_per_unit":item.weight_per_unit,
"weight_uom":item.weight_uom,
"last_purchase_rate": item.last_purchase_rate if args.get("doctype") in ["Purchase Order"] else 0, "last_purchase_rate": item.last_purchase_rate if args.get("doctype") in ["Purchase Order"] else 0,
"transaction_date": args.get("transaction_date"), "transaction_date": args.get("transaction_date"),
"against_blanket_order": args.get("against_blanket_order"), "against_blanket_order": args.get("against_blanket_order"),

1
erpnext/utilities/activation.py
View File

@ -18,7 +18,6 @@ def get_level():
"Delivery Note": 5, "Delivery Note": 5,
"Employee": 3, "Employee": 3,
"Instructor": 5, "Instructor": 5,
"Instructor": 5,
"Issue": 5, "Issue": 5,
"Item": 5, "Item": 5,
"Journal Entry": 3, "Journal Entry": 3,