Saurabh 59798b4e88 resolved merge conflict

2018-06-20 15:23:25 +05:30

..

authorization_control

resolved merge conflict

2018-06-20 15:23:25 +05:30

authorization_rule

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

brand

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

company

HRA tax exemption Indian regional (#14520)

2018-06-14 17:56:16 +05:30

currency_exchange

Fix currency exchange tests (#14356)

2018-06-05 14:16:10 +05:30

customer_group

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

email_digest

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

global_defaults

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

item_group

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

naming_series

Fixed merge conflict

2018-03-23 16:20:27 +05:30

party_type

Refactor party type (#13831)

2018-05-16 11:02:26 +05:30

print_heading

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

quotation_lost_reason

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

sales_partner

patch for sales partner type field

2018-06-11 14:53:25 +05:30

sales_person

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

setup_progress

[progress] R/W permission for all roles (#10866)

2017-09-21 12:02:18 +05:30

setup_progress_action

Progress fixes (#10710)

2017-09-13 18:41:01 +05:30

supplier_group

[ Fixes ] v11 Tree based doctype testing (#14419)

2018-06-08 14:33:15 +05:30

target_detail

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

terms_and_conditions

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

territory

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

uom

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

uom_conversion_factor

[Enhancement] UOM Conversion Factors (#13853)

2018-06-06 09:44:46 +05:30

website_item_group

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

__init__.py

moved modules inside erpnext folder

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