Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,643 Commits 3 Branches 0 Tags 1 GiB
1cc46c06b0
Commit Graph

27643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NahuelOperto
4448e2d66b fix order in general ledger 2019-06-21 08:50:37 -03:00
Sahil Khan
aef77058b6 fix(BOM): set default value of include_exploded_item to 0 2019-06-21 11:37:45 +05:30
Rushabh Mehta
41721fe1c3
Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO 
fix: copy_payment_schedule_from_quot_to_SO
 2019-06-21 09:19:20 +05:30
Aditya Hase
2f4f9a2af0
Merge branch 'develop' into not_able_to_save_asset_for_manual_method_develop 2019-06-21 06:11:13 +05:30
Himanshu
c26ce5c506
Merge branch 'develop' into sla_fix 2019-06-20 23:58:08 +05:30
Himanshu Warekar
f5262c54ff Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-20 23:30:20 +05:30
Himanshu Warekar
9f19a82ec9 fix: scheduling bug if out of bussiness hours 2019-06-20 23:29:56 +05:30
Aditya Hase
9986155e8e
chore: Python 3 Tests on Travis (#18012) 
chore: Python 3 Tests on Travis
 2019-06-20 22:53:23 +05:30
rohitwaghchaure
8b7267eb60
Merge pull request #17921 from Mangesh-Khairnar/expense-claim 
feat: Tax based expense claim
 2019-06-20 22:02:52 +05:30
Aditya Hase
d4aea67517
Merge branch 'develop' into py3-2 2019-06-20 21:22:24 +05:30
Aditya Hase
8c0e65cccc
fix(test): Explicitly search for Material Request Item with Item Code (#18013) 
fix(test): Explicitly search for Material Request Item with Item Code
 2019-06-20 21:22:06 +05:30
Aditya Hase
c980143764 fix(test): Explicitly search for Material Request Item with Item Code 2019-06-20 21:15:55 +05:30
Aditya Hase
51eecd0c42 chore: Enable Flake 821 rule 2019-06-20 20:10:53 +05:30
Aditya Hase
700711c28d fix: Run script with bash 2019-06-20 20:10:53 +05:30
Aditya Hase
44da737c1b fix: Minor 2019-06-20 20:10:53 +05:30
Aditya Hase
c052ce61f7 fix: Set file permissions 755 on travis/run-tests.sh 2019-06-20 20:10:53 +05:30
Aditya Hase
bb5ca5a01f fix(py3): Convert filter to list 2019-06-20 20:10:53 +05:30
Aditya Hase
63ddff867a chore: Temporarily disable flake rule F821 2019-06-20 20:10:53 +05:30
Aditya Hase
f397acc936 fix(travis): Refactor .travis.yml 2019-06-20 20:10:53 +05:30
Aditya Hase
3fa112d8a7 feat(travis): Python 3.6 tests 2019-06-20 20:10:53 +05:30
Deepesh Garg
d11e481888
Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission 
fix: Get Accounting Dimension only if user has read permission on it
 2019-06-20 19:44:59 +05:30
rohitwaghchaure
d2061b44dd fix: could not find company all (#17978) 2019-06-20 19:13:54 +05:30
Deepesh Garg
23deb6f79b fix: Default cost center fix for delivery note item (#17990) 2019-06-20 19:11:58 +05:30
Suraj Shetty
01f56b867e fix: Return empty array to avoid failure 2019-06-20 18:07:58 +05:30
Suraj Shetty
b663966c68 fix: Use can_read API 2019-06-20 18:00:19 +05:30
Rushabh Mehta
55c7b69afb
Merge pull request #17998 from netchampfaris/app-logo-url 
fix: App logo URL
 2019-06-20 17:53:40 +05:30
Deepesh Garg
ffa4ba06ec
Merge pull request #18010 from deepeshgarg007/gst_tax_rate_fixes 
fix: GST report fixes
 2019-06-20 17:22:59 +05:30
Suraj Shetty
da629810ad fix: Get accounting dimensions only if user has access 2019-06-20 17:20:19 +05:30
deepeshgarg007
6ef38ebf34 fix: GSTR report fixes 2019-06-20 15:55:09 +05:30
deepeshgarg007
50f4fc48a5 fix: GSTR report fixes 2019-06-20 15:53:14 +05:30
deepeshgarg007
5ff830b6f4 fix: GSTR report fixes 2019-06-20 15:50:02 +05:30
deepeshgarg007
a8e49b8afd Revert "fix: GSTR-2 Report fixes" 
This reverts commit a55413cb0d3828c20ad53e54ad7abe3ca2492668.
 2019-06-20 15:26:04 +05:30
deepeshgarg007
7483cb49fe Revert "fix: GSTR-1 Report fixes" 
This reverts commit 7592e0b588ad72d3e79cd101e94102ab1c1829f0.
 2019-06-20 15:25:06 +05:30
Rushabh Mehta
5162b7457f
Merge pull request #17918 from Alchez/develop-item-code-gen 
fix(stock): Remove hardcoded validation for Item
 2019-06-20 14:21:57 +05:30
Mangesh-Khairnar
8619fc7413 fix: fetch rate only if field is empty 2019-06-20 12:02:47 +05:30
Himanshu
014dc1729d
Merge branch 'develop' into sla_fix 2019-06-20 11:36:29 +05:30
Faris Ansari
23f9b6156f
fix(Opportunity): Don't assign to Guest (#17996) 
If Opportunity is created from Website, it breaks because
the assign_to user is Guest
 2019-06-20 11:34:14 +05:30
Himanshu Warekar
a1c1f74d84 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-20 11:33:06 +05:30
Himanshu Warekar
a03aa0014e feat: update sla using custom script 2019-06-20 11:32:49 +05:30
Aditya Hase
903d5201b4
fix(tests): Do not test order of features in Location (#17983) 
fix(tests): Do not test order of features in Location
 2019-06-20 11:29:59 +05:30
Himanshu
d82175da36
Merge branch 'develop' into sla_fix 2019-06-20 10:54:01 +05:30
Himanshu Warekar
bbe84ac0ef feat: change apply_to to entity 2019-06-20 10:53:34 +05:30
Himanshu Warekar
ed50452800 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-20 10:01:05 +05:30
Himanshu Warekar
41bf0c6855 feat: filter sla based on customer in issue 2019-06-20 10:00:11 +05:30
Aditya Hase
d5cd0a05d0
fix(tests): Timesheet tests (#17982) 
fix(tests): Timesheet tests
 2019-06-20 09:40:56 +05:30
Aditya Hase
b96956f35c
Merge branch 'develop' into fix-timesheet-tests 2019-06-20 09:40:23 +05:30
Deepesh Garg
12f2096846
Merge pull request #17995 from deepeshgarg007/hsn_summary_develop 
fix: From date and to date filters in HSN wise summary of out ward supplies
 2019-06-19 21:48:15 +05:30
Suraj Shetty
b9f346fc88
Merge branch 'develop' into call-summary-dialog 2019-06-19 19:18:52 +05:30
Faris Ansari
357592f55e fix: Remove logo replace logic 2019-06-19 19:17:50 +05:30
Faris Ansari
4a1c7ddb09 fix: App logo URL 2019-06-19 19:15:37 +05:30