Nabin Hait
|
690b83076d
|
Merge pull request #16377 from SaiFi0102/Item-Tax-Template-V12
feat: Tax Category and Item Tax Template (v12)
|
2019-02-02 13:51:55 +05:30 |
|
rohitwaghchaure
|
752f2f1805
|
Merge pull request #16547 from rohitwaghchaure/project_status_email_fix
fix: check open status projects for project status update
|
2019-02-02 13:06:29 +05:30 |
|
Saif Ur Rehman
|
590491779a
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
# Conflicts:
# erpnext/stock/doctype/item/item.py
|
2019-02-02 02:49:04 +05:00 |
|
Saif Ur Rehman
|
00aaa48779
|
test(Item): test_item_defaults
|
2019-02-02 02:43:44 +05:00 |
|
Saif Ur Rehman
|
1a441b267d
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-02-01 19:17:04 +05:00 |
|
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 |
|
Saurabh
|
aba611e09f
|
Merge branch 'hotfix' into project_status_email_fix
|
2019-02-01 15:01:26 +05:30 |
|
Nabin Hait
|
e1c75a9d55
|
fix: fixed salary structure assignment patch (#16546)
* fix: fixed salary structure assignment patch
* fix: patch
|
2019-02-01 12:25:40 +05:30 |
|
Nabin Hait
|
f3f4ce9b87
|
fix: Fetch data based on item group filter in item dashboard stock balance report
|
2019-02-01 12:01:19 +05:30 |
|
Rohit Waghchaure
|
a4645b6d17
|
fix: check open status projects for project status update
|
2019-02-01 11:37:22 +05:30 |
|
Raffael Meyer
|
fef07eeae2
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-01-31 22:16:26 +01:00 |
|
Sagar Vora
|
ec5faaeae6
|
Merge branch 'hotfix' into stock-balance-fix
|
2019-01-31 18:46:06 +05:30 |
|
Nabin Hait
|
9ea19b8fe1
|
fix: Fixed error on stock balance report
|
2019-01-31 15:53:25 +05:30 |
|
Sagar Vora
|
56cbfe4bb0
|
Merge branch 'master' into develop
|
2019-01-31 13:34:32 +05:30 |
|
Sagar Vora
|
7a2163ca39
|
Merge branch 'hotfix'
|
2019-01-31 13:33:07 +05:30 |
|
Sagar Vora
|
fea55fc018
|
bumped to version 11.1.3
|
2019-01-31 13:53:07 +05:50 |
|
Nabin Hait
|
a85f008f30
|
Merge pull request #16528 from adityahase/payment-request-usability
fix(accounts): fetch subscription details only if required fields are populated
|
2019-01-31 10:27:27 +05:30 |
|
Sagar Vora
|
7ea2497b9a
|
Fix salary patch (#16531)
fix: salary structure assignment patch, add .vscode to gitignore
|
2019-01-31 09:17:29 +05:30 |
|
Sagar Vora
|
76728b87ab
|
fix: value missing for selling settings - sales_update_frequency (#16530)
|
2019-01-31 08:19:38 +05:30 |
|
Sagar Vora
|
7a1c40c7c1
|
Merge branch 'master' into develop
|
2019-01-30 20:09:45 +05:30 |
|
Sagar Vora
|
38384be42b
|
Merge branch 'hotfix'
|
2019-01-30 20:09:45 +05:30 |
|
Sagar Vora
|
664e21acbf
|
bumped to version 11.1.2
|
2019-01-30 20:29:45 +05:50 |
|
Aditya Hase
|
245b73b94f
|
fix(search): Fix possible reflected XSS attack vector (#16522)
|
2019-01-30 19:56:04 +05:30 |
|
Aditya Hase
|
66833f109b
|
fix(accounts): fetch subscription details only if required fields are populated
|
2019-01-30 19:40:40 +05:30 |
|
Nabin Hait
|
78fc158b39
|
Merge pull request #16527 from nabinhait/bom-fix
fix: Default value for 'raw materials rate based on' in BOM
|
2019-01-30 18:35:49 +05:30 |
|
Saurabh
|
429996752d
|
fix: patch fixes (#16524)
|
2019-01-30 17:45:48 +05:30 |
|
Nabin Hait
|
16d7b49d73
|
fix: Default value for 'raw materials rate based on' in BOM
|
2019-01-30 17:27:08 +05:30 |
|
Saurabh
|
a342138625
|
Merge branch 'master' into develop
|
2019-01-30 12:38:58 +05:30 |
|
Saurabh
|
5fdcd91847
|
Merge branch 'hotfix'
|
2019-01-30 12:38:00 +05:30 |
|
Saurabh
|
bb2031941e
|
bumped to version 11.1.1
|
2019-01-30 13:08:00 +06:00 |
|
Nabin Hait
|
562516dcc4
|
Merge pull request #16521 from saurabh6790/add_patch_to_set_guardian_role
fix: patch to add guardian role if not exists
|
2019-01-30 12:00:00 +05:30 |
|
Saurabh
|
5c12490709
|
fix: patch to add guardian role if not exists
|
2019-01-30 11:52:53 +05:30 |
|
rohitwaghchaure
|
25e63e806c
|
fix: modified date (#16520)
|
2019-01-30 11:46:34 +05:30 |
|
Sagar Vora
|
7ddbd386a5
|
Merge branch 'master' into hotfix
|
2019-01-29 18:56:45 +05:30 |
|
Sagar Vora
|
1c44a6a0ba
|
fix: set version to 11.1.0, remove staging_version
|
2019-01-29 18:52:50 +05:30 |
|
Sagar Vora
|
605fbf4f89
|
Merge branch 'staging'
|
2019-01-29 18:51:12 +05:30 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Sagar Vora
|
3f1fb9ca7e
|
Merge branch 'staging-fixes' into staging
|
2019-01-29 18:26:34 +05:30 |
|
Sagar Vora
|
1a4cd3b66a
|
bumped to version 11.1.0
|
2019-01-29 18:46:34 +05:50 |
|
Sagar Vora
|
606bd37316
|
fix: change changelog version to 11.1.0
|
2019-01-29 17:55:46 +05:30 |
|
Sagar Vora
|
b5dda63ddd
|
fix: change changelog version to 11.1.0
|
2019-01-29 17:54:47 +05:30 |
|
Sagar Vora
|
51a27b3524
|
fix: unsaved merge conflict
|
2019-01-29 17:52:47 +05:30 |
|
Sagar Vora
|
f3cfad7595
|
Merge branch 'master' into staging-fixes
|
2019-01-29 17:20:46 +05:30 |
|
Sagar Vora
|
898977bda8
|
Merge branch 'hotfix'
|
2019-01-29 17:10:19 +05:30 |
|
Sagar Vora
|
b32d9458b5
|
bumped to version 10.1.81
|
2019-01-29 17:30:19 +05:50 |
|
Nabin Hait
|
f8e9734f16
|
Merge pull request #16514 from sagarvora/changelog
docs: changelog for v11.0.4
|
2019-01-29 16:27:07 +05:30 |
|
rohitwaghchaure
|
a95ed44d3d
|
fix: test case for fiscal year (#16516)
|
2019-01-29 16:24:53 +05:30 |
|
Nabin Hait
|
9f33c208d7
|
Update v11_0_4.md
|
2019-01-29 16:07:07 +05:30 |
|
Sagar Vora
|
bad36ef3ef
|
fix: add node_modules to gitignore (#16515)
|
2019-01-29 16:00:45 +05:30 |
|
Sagar Vora
|
7ef69b68f8
|
Update v11_0_4.md
|
2019-01-29 15:52:57 +05:30 |
|