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

..

authorization_control

mass replace sql with webnotes.conn.sql

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

authorization_rule

mass replace sql with webnotes.conn.sql

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

backup_manager

[minor] fixes after merge with master

2013-10-10 18:44:26 +05:30

brand

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

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

company

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

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

contact_control

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

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

country

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

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

currency

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

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

currency_exchange

[usability] item price moved to price list

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

customer_group

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

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

email_digest

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

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

email_settings

remove sql =

2013-09-18 11:10:59 +05:30

features_setup

[pos] pos view first commit

2013-08-22 17:26:43 +05:30

for_territory

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

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

global_defaults

[fix] default float precision = 3, changed description of float precision in global defaults [issue] webnotes/erpnext#712

2013-08-06 13:33:42 +05:30

item_group

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

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

item_price

[fix] [pos] hide custom buttons in pos view

2013-09-13 17:37:23 +05:30

jobs_email_settings

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

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

naming_series

mass replace sql with webnotes.conn.sql

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

notification_control

mass replace sql with webnotes.conn.sql

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

price_list

[minor] [fix] price list table

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

print_heading

remove sql =

2013-09-18 11:10:59 +05:30

quotation_lost_reason

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

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

sales_email_settings

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

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

sales_partner

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

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

sales_person

Fix translate sales_person.js

2013-10-04 17:41:33 -03:00

sms_parameter

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

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

sms_settings

[minor] label changed in sms settings

2013-09-10 17:20:42 +05:30

supplier_type

Fix translate supplier_type.js

2013-10-15 18:15:29 -03:00

target_detail

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

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

terms_and_conditions

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

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

territory

Fix translate setup/doctype/territory/territory.js

2013-10-15 18:14:50 -03:00

uom

[minor] fixes to form layouts

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

website_item_group

[fix] [minor] [website]

2013-09-17 15:28:58 +05:30

__init__.py

moved directory structure

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