Anand Doshi 4543884021 Merge branch 'edge' of github.com:webnotes/erpnext into webshop ...

Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt

2013-05-23 15:22:47 +05:30

..

doctype

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

2013-05-23 15:22:47 +05:30

DocType Mapper

removed project related doctype mapper

2012-12-27 15:14:27 +05:30

locale

Adding German translation

2013-02-27 17:36:23 +01:00

page

[report] sales partners commission

2013-05-06 12:46:07 +05:30

Print Format

website: made order and ticket listing

2013-03-22 12:45:44 +05:30

report

[report] monthly salary register

2013-05-10 18:41:58 +05:30

search_criteria

[script report] purchase register in new style

2013-04-30 17:22:43 +05:30

__init__.py

[accounts] [feature] added default_cash_account in company and gets set in Journal Voucher

2013-03-25 15:44:36 +05:30

general_ledger.py

remove cancelled entries from grid report when fetching data based on modified

2013-03-07 15:35:36 +05:30

utils.py

aii fixes

2013-03-29 16:42:33 +05:30