Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext
History
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
..
accounts
fix(accounts): fetch subscription details only if required fields are populated
2019-01-30 19:40:40 +05:30
agriculture
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
assets
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
buying
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
change_log
fix: change changelog version to 11.1.0
2019-01-29 17:55:46 +05:30
commands
…
config
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
controllers
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
crm
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
demo
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
domains
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
education
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
erpnext_integrations
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
healthcare
Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2
2019-01-29 11:52:55 +05:30
hotels
Doctypes in domains that are in beta are now restricted to that domain
2018-11-04 08:39:52 -05:00
hr
Fix salary patch (#16531)
2019-01-31 09:17:29 +05:30
hub
…
hub_node
style: Remove unused imports
2019-01-23 00:28:37 +05:30
maintenance
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
manufacturing
fix: Default value for 'raw materials rate based on' in BOM
2019-01-30 17:27:08 +05:30
non_profit
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
patches
fix: patch fixes (#16524)
2019-01-30 17:45:48 +05:30
portal
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
projects
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
public
Merge branch 'staging-fixes' into pos_issue
2019-01-29 11:29:41 +05:30
regional
Merge pull request #16490 from nabinhait/gst_settings_perm
2019-01-29 11:27:18 +05:30
restaurant
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
selling
Merge branch 'staging-fixes' into pos_issue
2019-01-29 11:29:41 +05:30
setup
Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults
2019-02-01 17:05:46 +05:00
shopping_cart
style: Remove unused imports
2019-01-23 00:28:37 +05:30
startup
style: Remove unused imports
2019-01-23 00:28:37 +05:30
stock
Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults
2019-02-01 17:05:46 +05:00
support
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
templates
fix(search): Fix possible reflected XSS attack vector (#16522)
2019-01-30 19:56:04 +05:30
tests
style: Remove unused imports
2019-01-23 00:28:37 +05:30
translations
[Translation] Updated Translations (#15414)
2018-09-17 16:54:30 +05:30
utilities
Merge pull request #16449 from scmmishra/remove-foundation
2019-01-29 11:20:23 +05:30
www
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
__init__.py
bumped to version 11.1.3
2019-01-31 13:53:07 +05:50
exceptions.py
…
hooks.py
fix: set version to 11.1.0, remove staging_version
2019-01-29 18:52:50 +05:30
modules.txt
Re-add Hub Node module
2018-09-12 16:36:10 +05:30
patches.txt
fix: patch to add guardian role if not exists
2019-01-30 11:52:53 +05:30