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

[minor] fixed stock entry and demo

Browse Source
This commit is contained in:
Anand Doshi 2013-10-28 19:59:09 +05:30
parent 494a216193
commit fec52b5a8f
6 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accounts/doctype/pos_setting/test_pos_setting.py
View File

@ -6,7 +6,6 @@ test_records = [
"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",

3
manufacturing/doctype/bom/bom.py
View File

@ -409,7 +409,8 @@ def get_bom_items_as_dict(bom, qty=1, fetch_exploded=1):
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,

1
stock/doctype/stock_entry/stock_entry.py
View File

@ -553,7 +553,6 @@ class DocType(StockController):
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]

49
utilities/demo/demo_docs/Item_Price.csv Normal file
View File

@ -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,,
1 Data Import Template
2 Table: Item Price
3
4
5 Notes:
6 Please do not change the template headings.
7 First data column must be blank.
8 If you are uploading new records, leave the "name"" (ID) column blank."
9 If you are uploading new records, "Naming Series"" becomes mandatory if present."
10 Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.
11 For updating, you can update only selective columns.
12 You can only upload upto 5000 records in one go. (may be less in some cases)
13
14 DocType: Item Price
15 Column Labels: ID Price List Item Code Rate Valid for Buying or Selling? Item Name Item Description
16 Column Name: name price_list item_code ref_rate buying_or_selling item_name item_description
17 Mandatory: Yes Yes Yes Yes No No No
18 Type: Data (text) Link Link Currency Select Data Text
19 Info: Valid Price List Valid Item One of: Selling, Buying
20 Start entering data below this line
21 Standard Buying Base Bearing Plate 15 Buying
22 Standard Buying Base Plate 20 Buying
23 Standard Buying Bearing Block 10 Buying
24 Standard Buying Bearing Collar 20 Buying
25 Standard Buying Bearing Pipe 15 Buying
26 Standard Buying Blade Rib 10 Buying
27 Standard Buying Disc Collars 74 Buying
28 Standard Buying External Disc 45 Buying
29 Standard Buying Internal Disc 33 Buying
30 Standard Buying Shaft 30 Buying
31 Standard Buying Stand 40 Buying
32 Standard Buying Upper Bearing Plate 50 Buying
33 Standard Buying Wing Sheet 22 Buying
34 Standard Selling Wind Turbine 21 Selling
35 Standard Selling Wind Mill A Series 28 Selling
36 Standard Selling Wind MIll C Series 14 Selling
37 Standard Selling Base Bearing Plate 28 Selling
38 Standard Selling Base Plate 21 Selling
39 Standard Selling Bearing Block 14 Selling
40 Standard Selling Bearing Collar 103.6 Selling
41 Standard Selling Bearing Pipe 63 Selling
42 Standard Selling Blade Rib 46.2 Selling
43 Standard Selling Disc Collars 42 Selling
44 Standard Selling External Disc 56 Selling
45 Standard Selling Internal Disc 70 Selling
46 Standard Selling Shaft 340 Selling
47 Standard Selling Stand 400 Selling
48 Standard Selling Upper Bearing Plate 300 Selling
49 Standard Selling Wing Sheet 30.8 Selling

49
utilities/demo/demo_docs/Price_List.csv
View File

@ -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
1 Data Import Template
2 Table: Price List
3
4
5 Notes:
6 Please do not change the template headings.
7 First data column must be blank.
8 If you are uploading new records, leave the "name" (ID) column blank.
9 If you are uploading new records, "Naming Series" becomes mandatory, if present.
10 Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.
11 For updating, you can update only selective columns.
12 You can only upload upto 5000 records in one go. (may be less in some cases)
13
14 DocType: Price List ~ For Territory valid_for_territories ~ Item Price item_prices
15 Column Labels: ID Price List Name Currency Valid for Buying or Selling? ID Territory ID Item Code Rate
16 Column Name: name price_list_name currency buying_or_selling ~ name territory ~ name item_code ref_rate
17 Mandatory: Yes Yes Yes Yes Yes Yes Yes Yes Yes
18 Type: Data (text) Data Link Select Data Link Data Link Currency
19 Info: Valid Currency One of: Buying, Selling Leave blank for new records Valid Territory Leave blank for new records Valid Item
20 Start entering data below this line
21 Standard Buying Standard Buying USD Buying United States Base Bearing Plate 15
22 Base Plate 20
23 Bearing Block 10
24 Bearing Collar 20
25 Bearing Pipe 15
26 Blade Rib 10
27 Disc Collars 74
28 External Disc 45
29 Internal Disc 33
30 Shaft 30
31 Stand 40
32 Upper Bearing Plate 50
33 Wing Sheet 22
34 Standard Selling Standard Selling USD Selling United States Wind Turbine 21
35 Wind Mill A Series 28
36 Wind MIll C Series 14
37 Base Bearing Plate 28
38 Base Plate 21
39 Bearing Block 14
40 Bearing Collar 103.6
41 Bearing Pipe 63
42 Blade Rib 46.2
43 Disc Collars 42
44 External Disc 56
45 Internal Disc 70
46 Shaft 340
47 Stand 400
48 Upper Bearing Plate 300
49 Wing Sheet 30.8

2
utilities/demo/make_demo.py
View File

@ -396,7 +396,7 @@ def make_items():
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"])