Anand Doshi a5d19955d1 Merge branch 'master' of github.com:webnotes/erpnext into webshop ...

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt

2013-04-24 11:48:28 +05:30

..

authorization_control

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

authorization_rule

Adding German translation

2013-02-27 17:36:23 +01:00

backup_manager

[backup manager] [fixes] show erroneous files in error email message

2013-04-23 17:07:52 +05:30

brand

removed in dialog from activity type

2013-03-28 11:49:00 +05:30

company

[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation

2013-04-17 18:02:52 +05:30

contact_control

webshop login, logout

2013-03-19 11:12:22 +05:30

country

Adding German translation

2013-02-27 17:36:23 +01:00

currency

Adding German translation

2013-02-27 17:36:23 +01:00

customer_group

Adding German translation

2013-02-27 17:36:23 +01:00

email_digest

[email digest] [sender] sender should be the automail id specified in Email Settings

2013-04-17 15:10:08 +05:30

email_settings

fixes in purchase invoice

2013-03-26 12:13:14 +05:30

features_setup

Adding German translation

2013-02-27 17:36:23 +01:00

global_defaults

aii fixes

2013-03-29 16:42:33 +05:30

item_group

[files] [patch] dropped file_list property and moved links to

2013-04-10 11:08:50 +05:30

jobs_email_settings

Adding German translation

2013-02-27 17:36:23 +01:00

market_segment

Adding German translation

2013-02-27 17:36:23 +01:00

naming_series

Adding German translation

2013-02-27 17:36:23 +01:00

naming_series_options

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

notification_control

Adding German translation

2013-02-27 17:36:23 +01:00

permission_control/locale

Adding German translation

2013-02-27 17:36:23 +01:00

price_list

[files] [patch] dropped file_list property and moved links to

2013-04-10 11:08:50 +05:30

print_heading

Adding German translation

2013-02-27 17:36:23 +01:00

quotation_lost_reason

Adding German translation

2013-02-27 17:36:23 +01:00

sales_browser_control

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

sales_email_settings

Adding German translation

2013-02-27 17:36:23 +01:00

sales_partner

Adding German translation

2013-02-27 17:36:23 +01:00

sales_person

aii: gl_entries for sales invoice

2013-03-11 16:32:33 +05:30

series_detail

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

setup_control

fix to blog and wnf backup does not backup files

2013-03-08 11:56:52 +05:30

sms_parameter

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

sms_settings

Adding German translation

2013-02-27 17:36:23 +01:00

state

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

supplier_type

Adding German translation

2013-02-27 17:36:23 +01:00

target_detail

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

terms_and_conditions

Adding German translation

2013-02-27 17:36:23 +01:00

territory

Adding German translation

2013-02-27 17:36:23 +01:00

uom

Adding German translation

2013-02-27 17:36:23 +01:00

warehouse_type

Adding German translation

2013-02-27 17:36:23 +01:00

workflow_action_detail

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

workflow_engine

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

workflow_rule

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

workflow_rule_detail

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

__init__.py

moved directory structure

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