Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext
History
Saif Ur Rehman e62bd893c5 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
2019-03-08 01:29:39 +05:00
..
accounts
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
2019-03-08 01:29:39 +05:00
agriculture
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
assets
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
buying
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
change_log
fix: change changelog version to 11.1.0
2019-01-29 17:55:46 +05:30
commands
…
config
fix: Removed shortcuts from desktop.py
2019-03-05 17:17:10 +05:30
controllers
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
crm
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
demo
BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk
2019-02-26 14:30:38 +05:30
domains
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
education
Merge branch 'master' into develop
2019-01-30 12:38:58 +05:30
erpnext_integrations
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
healthcare
fix: fix item field for clinical procedure template
2019-02-12 11:38:27 +05:30
hotels
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
hr
Salary Component can be equal to zero
2019-03-05 17:44:07 +05:30
hub
…
hub_node
feat(marketplace): featured Items for sellers
2019-02-12 15:12:23 +05:30
maintenance
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
manufacturing
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
non_profit
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
patches
fix(patch): update customization options if completed is not present
2019-03-07 13:03:40 +05:30
portal
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
projects
fix(patch): update customization options if completed is not present
2019-03-07 13:03:40 +05:30
public
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
quality_management
fix: Qms icon color and label fix (#16293)
2019-01-14 14:36:54 +05:30
regional
fix: Delete GL entry for supplier before creating new one
2019-03-04 13:25:39 +05:30
restaurant
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
selling
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
setup
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
2019-03-08 01:29:39 +05:00
shopping_cart
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-24 23:40:16 +05:00
startup
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
stock
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
2019-03-08 01:29:39 +05:00
support
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
templates
fix(tests): add test for bulk complete / cancellation of project
2019-02-26 14:30:38 +05:30
tests
style: Remove unused imports
2019-01-23 00:28:37 +05:30
translations
[Translation] Updated Translations
2018-12-24 11:57:19 +02:00
utilities
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
www
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
__init__.py
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
exceptions.py
…
hooks.py
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
modules.txt
Quality Management System (#15893)
2018-12-25 17:42:31 +05:30
patches.txt
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00