Saif Ur Rehman c8b61007b0 Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults ...

# Conflicts:
#	erpnext/setup/doctype/brand/brand.json
#	erpnext/stock/get_item_details.py

2019-02-01 17:05:46 +05:00

..

authorization_control

resolved merge conflict

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

authorization_rule

fix: Disable rounded total field's value honours docfield's default value

2019-01-21 18:50:50 +05:30

brand

Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults

2019-02-01 17:05:46 +05:00

company

Merge pull request #16490 from nabinhait/gst_settings_perm

2019-01-29 11:27:18 +05:30

currency_exchange

Fix currency exchange tests (#14356)

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

customer_group

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

email_digest

fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320)

2018-09-05 17:18:59 +05:30

global_defaults

[Feature] Route optimization for Delivery Trip stops (#15566)

2018-11-08 11:57:05 +05:30

item_group

Merge branch 'staging-fixes' into Quality-inspection-fix

2019-01-16 17:52:30 +05:30

naming_series

Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered (#15514)

2018-09-27 15:48:04 +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

Defaults in Item Group (#14874)

2018-07-17 18:01:44 +05:30

sales_person

fix: modified date (#16520)

2019-01-30 11:46:34 +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

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

target_detail

chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)

2019-01-07 18:19:30 +05:30

terms_and_conditions

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

territory

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

uom

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

uom_conversion_factor

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +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