Anand Doshi 7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi ...

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py

2013-10-15 12:18:46 +05:30

..

batch

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

bin

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-02 16:52:52 +05:30

delivery_note

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

delivery_note_item

[minor] removed prevdoc_date

2013-10-10 17:08:19 +05:30

delivery_note_packing_item

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

item

[material request] Added feature to pull items from BOM

2013-10-11 14:34:46 +05:30

item_customer_detail

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

item_quality_inspection_parameter

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

item_reorder

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

item_supplier

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

item_tax

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

item_website_specification

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

landed_cost_item

[minor] [cleanup] Landed cost wizard

2013-09-02 18:10:36 +05:30

landed_cost_purchase_receipt

[minor] [cleanup] Landed cost wizard

2013-09-02 18:10:36 +05:30

landed_cost_wizard

Merged master into wsgi

2013-10-10 16:04:40 +05:30

material_request

[material request] Added feature to pull items from BOM

2013-10-11 14:34:46 +05:30

material_request_item

[material request] Added feature to pull items from BOM

2013-10-11 14:34:46 +05:30

packing_slip

[fix] [minor] _round function - implement round halfs to nearest even number

2013-08-19 19:58:23 +05:30

packing_slip_item

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

purchase_receipt

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

purchase_receipt_item

[minor] removed prevdoc_date

2013-10-10 17:08:19 +05:30

sales_bom

Merge branch 'master' of github.com:webnotes/erpnext into responsive

2013-06-26 14:07:29 +05:30

sales_bom_item

Merge branch 'master' of github.com:webnotes/erpnext into responsive

2013-06-26 14:07:29 +05:30

serial_no

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

stock_entry

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

stock_entry_detail

[fix] [minor] auto accounting for stock transactions

2013-08-29 18:19:37 +05:30

stock_ledger

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-09-25 19:55:41 +05:30

stock_ledger_entry

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

stock_reconciliation

[minor] fixes in stock balance report, bin uom and sle is_cancelled

2013-10-02 16:29:45 +05:30

stock_settings

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

stock_uom_replace_utility

mass replace sql with webnotes.conn.sql

2013-09-18 12:20:53 +05:30

uom_conversion_detail

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

warehouse

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

warehouse_user

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30