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

35953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
1f025a84f5 ci: Update frappe branch 2021-05-12 18:14:22 +05:30
Suraj Shetty
b76ebb3f4b fix: Use frappe.safe_eval instead of eval 2021-05-11 10:59:16 +05:30
Suraj Shetty
042118aafd ci: Use only 3 containers for now 2021-05-11 10:09:06 +05:30
Suraj Shetty
6408367285 ci: Add test orchestrator URL 2021-05-10 23:48:37 +05:30
Suraj Shetty
b3fadebb41 style: Fix sider issues 2021-05-10 20:49:07 +05:30
Suraj Shetty
c90c4cb102
Merge branch 'develop' into parallel-distributed-testing 2021-05-10 20:38:13 +05:30
Suraj Shetty
a13c453c69 test: Fix a case where test used to fail due to holiday list 
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
 2021-05-10 20:33:47 +05:30
Suraj Shetty
404e7d07c5 test: Fix permission error 2021-05-10 18:39:09 +05:30
Suraj Shetty
018ccc2b6d test: Fix test name 
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
 2021-05-10 18:01:53 +05:30
Suraj Shetty
4d6d5f4d89 test: Fix valuation rate for raw materials 2021-05-10 17:37:44 +05:30
Suraj Shetty
a132de42ca fix: allow_zero_valuation_rate for rejected qty 2021-05-10 17:25:21 +05:30
Suraj Shetty
5ce2da8bed fix: Pass ORCHESTRATOR_URL via secrets 2021-05-10 16:13:43 +05:30
dependabot-preview[bot]
b0e77cbd89
chore(deps): [security] bump lodash from 4.17.19 to 4.17.21 (#25619) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-05-10 11:19:19 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Suraj Shetty
dfb8aa017d ci: Check limits 2021-05-09 14:38:54 +05:30
Suraj Shetty
2ac27d774d test: Fix test dependency 2021-05-09 14:38:28 +05:30
Suraj Shetty
7044bcfaab ci: Try parallel testing with orchestrator 2021-05-09 11:29:00 +05:30
Suraj Shetty
142ec9e99e test: Pass ConflictingTaxRule during tax rule test 2021-05-08 19:03:53 +05:30
Suraj Shetty
d27e70a67a ci: Fix coveralls 2021-05-08 16:02:40 +05:30
Suraj Shetty
622bf077e7 ci: Disble failfast temporarily 2021-05-08 13:51:34 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
Suraj Shetty
ccf6249bfb chore: Debug 2021-05-08 00:05:48 +05:30
Suraj Shetty
490aed2a16 chore: Debug 2021-05-08 00:04:34 +05:30
Syed Mujeer Hashmi
bcf3f3dd29
fix: Monthly Attendance Sheet Summarized view (#24976) 
* fix: Monthly Attendance Sheet Summarized view

This fixes the count of different leave types in the monthly
attendance sheet summarized view.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Avoid using raw sql query

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-05-07 13:34:21 +05:30
HENRY Florian
3ecd7ac4c7
fix: Add french chart accounts with account number (#25009) 
* fix: Add french chart accounts with account number

* fix actual franch plan
 2021-05-07 13:33:12 +05:30
Shariq Ansari
ad3edc83ec
fix: Render timesheet template on timer field (#25565) 
* fix: Render timesheet template on timer field

* fix: sider fix
 2021-05-07 12:25:40 +05:30
Nikhil Ponnuru
ef9f126cb2
fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions (#25599) 
Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-07 10:06:29 +05:30
Suraj Shetty
5117cbc08c ci: Enable coveralls 2021-05-07 00:32:00 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Nabin Hait
ec2ba6bc1f Merge branch 'version-13-pre-release' into version-13 2021-05-06 19:18:17 +05:30
Nabin Hait
ae18efaa0a bumped to version 13.2.1 2021-05-06 19:38:17 +05:50
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Suraj Shetty
c702408f99 chore: Remove unnecessary print statements 2021-05-06 18:37:45 +05:30
Suraj Shetty
bdf8c528f1 test: Fix dependencies 2021-05-06 18:37:14 +05:30
Anurag Mishra
80c5c866db
Revert "fix: default value for Templates (#25591)" (#25608) 
This reverts commit 60f3e9ee29.
 2021-05-06 17:45:58 +05:30
Suraj Shetty
c5430afe2d test: Fix test_dependencies 2021-05-06 17:44:26 +05:30
Saqib
92cefd5655
feat(pos): ability to retry on pos closing failure (#25604) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:03:16 +05:30
Deepesh Garg
daf6c124a9 fix: Check if payment schedule exists 2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723 fix: Check if payment schedule exits before updating label 2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85 fix: function call to update payment schedule labels 2021-05-06 16:46:47 +05:30
Suraj Shetty
5f7546d876 chore: Debug 2021-05-06 15:13:09 +05:30
Suraj Shetty
af4af7737f chore: Debug 2021-05-06 13:05:03 +05:30
Suraj Shetty
c981969446 test: Fix dependency 2021-05-06 13:04:12 +05:30
Anurag Mishra
60f3e9ee29
fix: default value for Templates (#25591) 2021-05-05 13:23:42 +05:30
Anurag Mishra
1a923e2361
Merge pull request #25576 from Anurag810/Employee-Referrals-ui-fix 
fix: created new section for Referral details
 2021-05-05 12:57:35 +05:30
Anurag Mishra
ca9599da51
Merge branch 'develop' into Employee-Referrals-ui-fix 2021-05-05 12:57:17 +05:30
rohitwaghchaure
1a0d303e72
Merge pull request #25586 from rohitwaghchaure/increased-timeout-of-stoc-reconciliation 
fix: stock reconciliation getting time out error during submission
 2021-05-05 10:17:46 +05:30
Rohit Waghchaure
c432766a70 fix: stock reconciliation getting time out error during submission 2021-05-05 10:16:21 +05:30
Deepesh Garg
71c9c4f48f
Merge pull request #25580 from ceefour/ceefour/period-closing-voucher-25572 
fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)
 2021-05-04 22:19:45 +05:30
Hendy Irawan
05f9df6c10 fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled) 
Fixed #25572 Period Closing Voucher incorrect journal entry amount for
Income/Expenses Accounts containing canceled transactions.
 2021-05-04 13:32:16 +00:00