[minor] fixed stock entry and demo
diff --git a/accounts/doctype/pos_setting/test_pos_setting.py b/accounts/doctype/pos_setting/test_pos_setting.py
index 579a75e..8d02c57 100644
--- a/accounts/doctype/pos_setting/test_pos_setting.py
+++ b/accounts/doctype/pos_setting/test_pos_setting.py
@@ -6,7 +6,6 @@
"doctype": "POS Setting",
"name": "_Test POS Setting",
"currency": "INR",
- "conversion_rate": 1.0,
"selling_price_list": "_Test Price List",
"company": "_Test Company",
"warehouse": "_Test Warehouse - _TC",
diff --git a/manufacturing/doctype/bom/bom.py b/manufacturing/doctype/bom/bom.py
index 785851d..ac8c842 100644
--- a/manufacturing/doctype/bom/bom.py
+++ b/manufacturing/doctype/bom/bom.py
@@ -409,7 +409,8 @@
item_dict = {}
query = """select
- bom_item.item_code,
+ bom_item.item_code,
+ item.item_name,
ifnull(sum(bom_item.qty_consumed_per_unit),0) * %(qty)s as qty,
item.description,
item.stock_uom,
diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py
index 2cdccbc..26759af 100644
--- a/stock/doctype/stock_entry/stock_entry.py
+++ b/stock/doctype/stock_entry/stock_entry.py
@@ -553,7 +553,6 @@
return issued_item_qty
def add_to_stock_entry_detail(self, item_dict, bom_no=None, idx=None):
- webnotes.errprint([])
if not idx: idx = 1
expense_account, cost_center = webnotes.conn.get_values("Company", self.doc.company, \
["default_expense_account", "cost_center"])[0]
diff --git a/utilities/demo/demo_docs/Item_Price.csv b/utilities/demo/demo_docs/Item_Price.csv
new file mode 100644
index 0000000..d70b7b3
--- /dev/null
+++ b/utilities/demo/demo_docs/Item_Price.csv
@@ -0,0 +1,49 @@
+Data Import Template,,,,,,,
+Table:,Item Price,,,,,,
+,,,,,,,
+,,,,,,,
+Notes:,,,,,,,
+Please do not change the template headings.,,,,,,,
+First data column must be blank.,,,,,,,
+"If you are uploading new records, leave the ""name"""" (ID) column blank.""",,,,,,,
+"If you are uploading new records, ""Naming Series"""" becomes mandatory"," if present.""",,,,,,
+Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.,,,,,,,
+"For updating, you can update only selective columns.",,,,,,,
+You can only upload upto 5000 records in one go. (may be less in some cases),,,,,,,
+,,,,,,,
+DocType:,Item Price,,,,,,
+Column Labels:,ID,Price List,Item Code,Rate,Valid for Buying or Selling?,Item Name,Item Description
+Column Name:,name,price_list,item_code,ref_rate,buying_or_selling,item_name,item_description
+Mandatory:,Yes,Yes,Yes,Yes,No,No,No
+Type:,Data (text),Link,Link,Currency,Select,Data,Text
+Info:,,Valid Price List,Valid Item,,"One of: Selling, Buying",,
+Start entering data below this line,,,,,,,
+,,Standard Buying,Base Bearing Plate,15,Buying,,
+,,Standard Buying,Base Plate,20,Buying,,
+,,Standard Buying,Bearing Block,10,Buying,,
+,,Standard Buying,Bearing Collar,20,Buying,,
+,,Standard Buying,Bearing Pipe,15,Buying,,
+,,Standard Buying,Blade Rib,10,Buying,,
+,,Standard Buying,Disc Collars,74,Buying,,
+,,Standard Buying,External Disc,45,Buying,,
+,,Standard Buying,Internal Disc,33,Buying,,
+,,Standard Buying,Shaft,30,Buying,,
+,,Standard Buying,Stand,40,Buying,,
+,,Standard Buying,Upper Bearing Plate,50,Buying,,
+,,Standard Buying,Wing Sheet,22,Buying,,
+,,Standard Selling,Wind Turbine,21,Selling,,
+,,Standard Selling,Wind Mill A Series,28,Selling,,
+,,Standard Selling,Wind MIll C Series,14,Selling,,
+,,Standard Selling,Base Bearing Plate,28,Selling,,
+,,Standard Selling,Base Plate,21,Selling,,
+,,Standard Selling,Bearing Block,14,Selling,,
+,,Standard Selling,Bearing Collar,103.6,Selling,,
+,,Standard Selling,Bearing Pipe,63,Selling,,
+,,Standard Selling,Blade Rib,46.2,Selling,,
+,,Standard Selling,Disc Collars,42,Selling,,
+,,Standard Selling,External Disc,56,Selling,,
+,,Standard Selling,Internal Disc,70,Selling,,
+,,Standard Selling,Shaft,340,Selling,,
+,,Standard Selling,Stand,400,Selling,,
+,,Standard Selling,Upper Bearing Plate,300,Selling,,
+,,Standard Selling,Wing Sheet,30.8,Selling,,
\ No newline at end of file
diff --git a/utilities/demo/demo_docs/Price_List.csv b/utilities/demo/demo_docs/Price_List.csv
deleted file mode 100644
index fb41239..0000000
--- a/utilities/demo/demo_docs/Price_List.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-Data Import Template,,,,,,,,,,,
-Table:,Price List,,,,,,,,,,
-,,,,,,,,,,,
-,,,,,,,,,,,
-Notes:,,,,,,,,,,,
-Please do not change the template headings.,,,,,,,,,,,
-First data column must be blank.,,,,,,,,,,,
-"If you are uploading new records, leave the ""name"" (ID) column blank.",,,,,,,,,,,
-"If you are uploading new records, ""Naming Series"" becomes mandatory, if present.",,,,,,,,,,,
-Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.,,,,,,,,,,,
-"For updating, you can update only selective columns.",,,,,,,,,,,
-You can only upload upto 5000 records in one go. (may be less in some cases),,,,,,,,,,,
-,,,,,,,,,,,
-DocType:,Price List,,,,~,For Territory,valid_for_territories,~,Item Price,item_prices,
-Column Labels:,ID,Price List Name,Currency,Valid for Buying or Selling?,,ID,Territory,,ID,Item Code,Rate
-Column Name:,name,price_list_name,currency,buying_or_selling,~,name,territory,~,name,item_code,ref_rate
-Mandatory:,Yes,Yes,Yes,Yes,,Yes,Yes,,Yes,Yes,Yes
-Type:,Data (text),Data,Link,Select,,Data,Link,,Data,Link,Currency
-Info:,,,Valid Currency,"One of: Buying, Selling",,Leave blank for new records,Valid Territory,,Leave blank for new records,Valid Item,
-Start entering data below this line,,,,,,,,,,,
-,Standard Buying,Standard Buying,USD,Buying,,,United States,,,Base Bearing Plate,15
-,,,,,,,,,,Base Plate,20
-,,,,,,,,,,Bearing Block,10
-,,,,,,,,,,Bearing Collar,20
-,,,,,,,,,,Bearing Pipe,15
-,,,,,,,,,,Blade Rib,10
-,,,,,,,,,,Disc Collars,74
-,,,,,,,,,,External Disc,45
-,,,,,,,,,,Internal Disc,33
-,,,,,,,,,,Shaft,30
-,,,,,,,,,,Stand,40
-,,,,,,,,,,Upper Bearing Plate,50
-,,,,,,,,,,Wing Sheet,22
-,Standard Selling,Standard Selling,USD,Selling,,,United States,,,Wind Turbine,21
-,,,,,,,,,,Wind Mill A Series,28
-,,,,,,,,,,Wind MIll C Series,14
-,,,,,,,,,,Base Bearing Plate,28
-,,,,,,,,,,Base Plate,21
-,,,,,,,,,,Bearing Block,14
-,,,,,,,,,,Bearing Collar,103.6
-,,,,,,,,,,Bearing Pipe,63
-,,,,,,,,,,Blade Rib,46.2
-,,,,,,,,,,Disc Collars,42
-,,,,,,,,,,External Disc,56
-,,,,,,,,,,Internal Disc,70
-,,,,,,,,,,Shaft,340
-,,,,,,,,,,Stand,400
-,,,,,,,,,,Upper Bearing Plate,300
-,,,,,,,,,,Wing Sheet,30.8
diff --git a/utilities/demo/make_demo.py b/utilities/demo/make_demo.py
index 21da30b..be42395 100644
--- a/utilities/demo/make_demo.py
+++ b/utilities/demo/make_demo.py
@@ -396,7 +396,7 @@
import_data("BOM", submit=True)
def make_price_lists():
- import_data("Price_List", overwrite=True)
+ import_data("Item_Price", overwrite=True)
def make_customers_suppliers_contacts():
import_data(["Customer", "Supplier", "Contact", "Address", "Lead"])