Akhilesh Darjee 86894f3bbf merge conflict fixed

2014-01-27 15:42:02 +05:30

..

applicable_territory

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

authorization_control

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

authorization_rule

merge conflict fixed

2014-01-27 15:42:02 +05:30

backup_manager

Moved demo to separate app, moved patches folder

2013-12-27 17:30:24 +05:30

brand

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

company

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

contact_control

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

country

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

currency

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

currency_exchange

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

customer_group

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

email_digest

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

email_settings

Merge with 3.3.8

2013-12-26 11:07:46 +05:30

features_setup

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

global_defaults

install, web serving, session booting webnotes/wnframework#351

2013-12-12 19:12:19 +05:30

item_group

Fixes related to appifing shopping cart

2014-01-23 15:33:30 +05:30

jobs_email_settings

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

naming_series

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

notification_control

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

print_heading

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

quotation_lost_reason

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

sales_email_settings

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

sales_partner

Fixes related to appifing shopping cart

2014-01-23 15:33:30 +05:30

sales_person

merge conflict fixed

2014-01-27 15:42:02 +05:30

sms_parameter

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

sms_settings

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

supplier_type

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

target_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

terms_and_conditions

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

territory

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

uom

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

website_item_group

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30