Bárbara Perretti 4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n ...

Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js

2013-10-16 15:09:18 -03:00

..

campaign

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

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

customer

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

2013-10-16 15:09:18 -03:00

customer_discount

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

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

industry_type

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

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

installation_note

[minor] removed prevdoc_date

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

installation_note_item

[minor] removed prevdoc_date

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

lead

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

2013-10-16 15:09:18 -03:00

opportunity

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

2013-10-16 15:09:18 -03:00

opportunity_item

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

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

quotation

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

2013-10-16 15:09:18 -03:00

quotation_item

[cleanup] [minor] removed default value 0.00

2013-08-07 15:06:51 +05:30

sales_bom

Fix translate selling/doctype/sales_bom/sales_bom.js

2013-10-15 17:54:25 -03:00

sales_bom_item

[usability] item price moved to price list

2013-09-11 13:05:24 +05:30

sales_common

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

2013-10-16 15:09:18 -03:00

sales_order

[minor] don't rollback when running all tests, fixed test cases

2013-10-15 19:52:29 +05:30

sales_order_item

[fix] [minor] removed reserved warehouse from no_copy in sales order item

2013-08-22 15:43:18 +05:30

sales_team

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

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

selling_settings

[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)

2013-08-09 15:30:11 +05:30

shopping_cart_price_list

[website] [minor] moving to framework

2013-09-10 18:29:39 +05:30

shopping_cart_settings

[fix] [minor] show missing currency message in shopping cart settings

2013-09-17 15:57:17 +05:30

shopping_cart_shipping_rule

[website] [minor] moving to framework

2013-09-10 18:29:39 +05:30

shopping_cart_taxes_and_charges_master

[website] [minor] moving to framework

2013-09-10 18:29:39 +05:30

sms_center

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

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

__init__.py

moved directory structure

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