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

Conflicts:
	selling/doctype/sales_order/sales_order.txt

2013-06-18 18:30:41 +05:30

..

campaign

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

customer

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

industry_type

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

installation_note

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

installation_note_item

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

lead

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

opportunity

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

opportunity_item

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

quotation

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

quotation_item

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

sales_common

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

sales_order

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

2013-06-18 18:30:41 +05:30

sales_order_item

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

sales_team

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

sms_center

[translations/build] deleted translation files (to be built on demand)

2013-06-17 11:56:41 +05:30

__init__.py

moved directory structure

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