nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3804 from nabinhait/fix1

Browse Source 
Fixes
This commit is contained in:
Nabin Hait
2015-08-05 19:04:41 +05:30
parent ed3a6cf748 1648605950
commit 65d8de36d0
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
View File

@@ -92,13 +92,13 @@ def get_charts_for_country(country):
with open(os.path.join(path, fname), "r") as f: with open(os.path.join(path, fname), "r") as f:
_get_chart_name(f.read()) _get_chart_name(f.read())
countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros", # countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros",
"Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger", # "Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger",
"Replica of Democratic Congo", "Senegal", "Chad", "Togo"] # "Replica of Democratic Congo", "Senegal", "Chad", "Togo"]
#
if country in countries_use_OHADA_system: # if country in countries_use_OHADA_system:
with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f: # with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f:
_get_chart_name(f.read()) # _get_chart_name(f.read())
if len(charts) != 1: if len(charts) != 1:
charts.append("Standard") charts.append("Standard")

8
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@@ -152,7 +152,9 @@ $.extend(cur_frm.cscript, {
method: "erpnext.manufacturing.doctype.production_order.production_order.get_item_details", method: "erpnext.manufacturing.doctype.production_order.production_order.get_item_details",
args: { item: doc.production_item }, args: { item: doc.production_item },
callback: function(r) { callback: function(r) {
cur_frm.set_value(r.message); $.each(["description", "stock_uom", "bom_no"], function(i, field) {
cur_frm.set_value(field, r.message[field]);
});
} }
}); });
}, },
@@ -187,8 +189,8 @@ $.extend(cur_frm.cscript, {
bom_no: function() { bom_no: function() {
return this.frm.call({ return this.frm.call({
doc: this.frm.doc, doc: this.frm.doc,
method: "set_production_order_operations" method: "set_production_order_operations"
}); });
}, },