Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext
History
Saif Ur Rehman d5c7410ad1 Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
#	erpnext/selling/doctype/sales_order/sales_order.json
2019-01-24 23:34:16 +05:00
..
accounts
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
agriculture
Doctypes in domains that are in beta are now restricted to that domain
2018-11-04 08:39:52 -05:00
assets
fixes asset category field as link type and read only
2019-01-15 16:26:58 +05:30
buying
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
change_log
Email alert renamed to Notification (#14618)
2018-06-21 09:17:52 +05:30
commands
…
config
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-06 04:43:13 +05:00
controllers
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
crm
fix(dead-code): Remove .py files (#16462)
2019-01-23 07:57:08 +05:30
demo
fix(pos-profile): Cleanup Form for POS Profile (#16208)
2018-12-14 14:19:14 +05:30
domains
[fix] Healthcare field and desktop icon (#15638)
2018-10-10 14:44:36 +05:30
education
fix: remove paid_amount and modify query
2018-12-17 16:47:17 +05:30
erpnext_integrations
[Feature] ERPNext Quickbooks Migrator (#15718)
2018-10-17 17:50:00 +05:30
healthcare
Merge branch 'staging-fixes' into pr_staging_fixes
2018-11-26 20:25:34 +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: Project update status code and design refactored
2019-01-17 19:21:44 +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(dead-code): Remove .py files (#16462)
2019-01-23 07:57:08 +05:30
non_profit
Doctypes in domains that are in beta are now restricted to that domain
2018-11-04 08:39:52 -05:00
patches
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
portal
Fixed merge conflict
2018-08-29 13:34:58 +05:30
projects
fix(projects): None type handling while updating tasks
2019-01-23 10:43:00 +05:30
public
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
regional
Merge branch 'master' into staging-fixes
2019-01-23 08:08:55 +00:00
restaurant
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
selling
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
setup
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
shopping_cart
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
startup
style: Remove unused imports
2019-01-23 00:28:37 +05:30
stock
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00
support
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
templates
style: Remove unused imports
2019-01-23 00:28:37 +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
[Fix] Not able to delete department
2019-01-01 14:06:40 +05:30
www
style: Remove unused imports
2019-01-23 00:28:37 +05:30
__init__.py
Merge branch 'master' into staging-fixes
2019-01-23 08:08:55 +00:00
exceptions.py
…
hooks.py
bumped to version 11.0.3-beta.37
2019-01-23 08:12:19 +00:00
modules.txt
Re-add Hub Node module
2018-09-12 16:36:10 +05:30
patches.txt
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
2019-01-24 23:34:16 +05:00