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

..

account

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

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

accounts_settings

[minor] perpetual inventory fix

2013-09-24 15:16:01 +05:30

bank_reconciliation

mass replace sql with webnotes.conn.sql

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

bank_reconciliation_detail

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

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

budget_detail

[cleanup] [minor] deprecated budget control and rewritten budget related code

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

budget_distribution

[cleanup] [minor] budget code cleaned up with testcases

2013-08-23 10:46:41 +05:30

budget_distribution_detail

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

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

c_form

[rename] Naming Series is now Document Numbering Series and updated translations

2013-08-08 16:00:40 +05:30

c_form_invoice_detail

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

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

cost_center

Fix translate Cost_center.js

2013-09-30 14:36:00 -03:00

fiscal_year

Fix translate Fiscal_year.js

2013-09-30 14:33:13 -03:00

gl_entry

Merged master into wsgi

2013-10-10 16:04:40 +05:30

journal_voucher

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

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

journal_voucher_detail

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

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

mis_control

mass replace sql with webnotes.conn.sql

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

mode_of_payment

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

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

payment_to_invoice_matching_tool

Fix translate payment_to_invoice_matching_tool.js

2013-09-30 15:13:24 -03:00

payment_to_invoice_matching_tool_detail

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

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

period_closing_voucher

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

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

pos_setting

[cleanup] [minor] removed conversion rate from pos setting

2013-10-15 11:16:38 +05:30

purchase_invoice

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

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

purchase_invoice_advance

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

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

purchase_invoice_item

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

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

purchase_taxes_and_charges

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

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

purchase_taxes_and_charges_master

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

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

sales_invoice

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

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

sales_invoice_advance

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

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

sales_invoice_item

[fix] [minor] auto accounting for stock transactions

2013-08-29 18:19:37 +05:30

sales_taxes_and_charges

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

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

sales_taxes_and_charges_master

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

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

shipping_rule

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

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

shipping_rule_condition

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

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

__init__.py

moved directory structure

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