Anand Doshi 05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 ... Conflicts: accounts/doctype/account/account.py erpnext/accounts/doctype/journal_voucher/journal_voucher.py patches/patch_list.py startup/event_handlers.py		2012-10-02 14:35:20 +05:30
..
authorization_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
authorization_rule	dont save duplicate files	2012-09-25 18:20:36 +05:30
brand	moved directory structure	2012-09-24 19:13:42 +05:30
company	merged deprecate account balance	2012-10-01 11:30:00 +05:30
contact_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
country	moved directory structure	2012-09-24 19:13:42 +05:30
currency	moved directory structure	2012-09-24 19:13:42 +05:30
customer_group	dont save duplicate files	2012-09-25 18:20:36 +05:30
email_digest	added query report and cleaned up wn.ui.Dialog	2012-10-01 14:46:37 +05:30
email_settings	moved directory structure	2012-09-24 19:13:42 +05:30
features_setup	moved directory structure	2012-09-24 19:13:42 +05:30
global_defaults	merged deprecate account balance	2012-10-01 11:30:00 +05:30
item_group	moved directory structure	2012-09-24 19:13:42 +05:30
market_segment	moved directory structure	2012-09-24 19:13:42 +05:30
naming_series	moved directory structure	2012-09-24 19:13:42 +05:30
naming_series_options	moved directory structure	2012-09-24 19:13:42 +05:30
notification_control	moved directory structure	2012-09-24 19:13:42 +05:30
permission_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
price_list	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
print_heading	dont save duplicate files	2012-09-25 18:20:36 +05:30
quotation_lost_reason	moved directory structure	2012-09-24 19:13:42 +05:30
sales_browser_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
sales_partner	dont save duplicate files	2012-09-25 18:20:36 +05:30
sales_person	moved directory structure	2012-09-24 19:13:42 +05:30
series_detail	moved directory structure	2012-09-24 19:13:42 +05:30
setup_control	fixes in add user of Setup Control	2012-10-02 13:40:42 +05:30
sms_parameter	moved directory structure	2012-09-24 19:13:42 +05:30
sms_settings	moved directory structure	2012-09-24 19:13:42 +05:30
state	moved directory structure	2012-09-24 19:13:42 +05:30
supplier_type	moved directory structure	2012-09-24 19:13:42 +05:30
target_detail	moved directory structure	2012-09-24 19:13:42 +05:30
terms_and_conditions	moved directory structure	2012-09-24 19:13:42 +05:30
territory	moved directory structure	2012-09-24 19:13:42 +05:30
uom	moved directory structure	2012-09-24 19:13:42 +05:30
warehouse_type	moved directory structure	2012-09-24 19:13:42 +05:30
workflow_action_detail	moved directory structure	2012-09-24 19:13:42 +05:30
workflow_engine	dont save duplicate files	2012-09-25 18:20:36 +05:30
workflow_rule	dont save duplicate files	2012-09-25 18:20:36 +05:30
workflow_rule_detail	moved directory structure	2012-09-24 19:13:42 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30