Anand Doshi 05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 ...

Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py

2012-10-02 14:35:20 +05:30

..

batch

moved directory structure

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

bin

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

2012-09-26 12:24:28 +05:30

delivery_note

dont save duplicate files

2012-09-25 18:20:36 +05:30

delivery_note_item

moved directory structure

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

delivery_note_packing_item

moved directory structure

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

item

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

2012-10-02 14:35:20 +05:30

item_customer_detail

moved directory structure

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

item_price

moved directory structure

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

item_quality_inspection_parameter

moved directory structure

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

item_supplier

moved directory structure

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

item_tax

moved directory structure

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

landed_cost_item

moved directory structure

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

landed_cost_master

moved directory structure

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

landed_cost_master_detail

moved directory structure

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

landed_cost_purchase_receipt

moved directory structure

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

landed_cost_wizard

moved directory structure

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

packing_slip

moved directory structure

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

packing_slip_item

moved directory structure

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

purchase_receipt

dont save duplicate files

2012-09-25 18:20:36 +05:30

purchase_receipt_item

moved directory structure

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

sales_and_purchase_return_tool

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

2012-10-02 14:35:20 +05:30

sales_bom

moved directory structure

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

sales_bom_item

moved directory structure

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

serial_no

moved directory structure

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

stock_entry

dont save duplicate files

2012-09-25 18:20:36 +05:30

stock_entry_detail

moved directory structure

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

stock_ledger

dont save duplicate files

2012-09-25 18:20:36 +05:30

stock_ledger_entry

moved directory structure

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

stock_reconciliation

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

2012-09-28 12:36:22 +05:30

stock_uom_replace_utility

dont save duplicate files

2012-09-25 18:20:36 +05:30

uom_conversion_detail

moved directory structure

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

valuation_control

moved directory structure

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

warehouse

dont save duplicate files

2012-09-25 18:20:36 +05:30

__init__.py

moved directory structure

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