Shiloh/brotherton-erpnext
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext
History
Saif Ur Rehman 398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
2019-01-18 17:33:19 +05:00
..
accounts
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
agriculture
…
assets
Fix: merge conflict
2019-01-18 10:15:47 +05:30
buying
test: test_party_details_tax_category
2019-01-12 19:07:39 +05:00
change_log
…
commands
…
config
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
controllers
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
crm
fix(Codacy): Deleted unused imports and files
2019-01-02 13:24:12 +05:30
demo
fix(demo): Look for "Total" instead of "'Total'" in report results
2019-01-07 23:01:40 +05:30
domains
…
education
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
erpnext_integrations
…
healthcare
Merge branch 'staging-fixes' into pr_staging_fixes
2018-11-26 20:25:34 +05:30
hotels
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
hr
Fix: merge conflict
2019-01-18 10:15:47 +05:30
hub
…
hub_node
…
maintenance
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
manufacturing
Merge pull request #16358 from adityahase/naming-series
2019-01-18 10:55:30 +05:30
non_profit
…
patches
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
portal
…
projects
Fix: merge conflict
2019-01-18 10:15:47 +05:30
public
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
quality_management
fix: Qms icon color and label fix (#16293)
2019-01-14 14:36:54 +05:30
regional
Fix: merge conflict
2019-01-18 10:15:47 +05:30
restaurant
…
selling
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
setup
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
shopping_cart
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
2019-01-10 04:23:40 +05:00
startup
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
stock
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00
support
…
templates
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
tests
…
translations
[Translation] Updated Translations
2018-12-24 11:57:19 +02:00
utilities
Merge branch 'staging' into develop
2019-01-05 09:11:15 +00:00
www
…
__init__.py
Fix: merge conflict
2019-01-18 10:15:47 +05:30
exceptions.py
…
hooks.py
Merge pull request #16358 from adityahase/naming-series
2019-01-18 10:55:30 +05:30
modules.txt
Quality Management System (#15893)
2018-12-25 17:42:31 +05:30
patches.txt
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
2019-01-18 17:33:19 +05:00