Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,658 Commits 3 Branches 0 Tags 1 GiB
11c155e6ce
Commit Graph

36658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anurag Mishra
11c155e6ce
feat: Employee Grievance (#25705) (#26162) 
* feat: Employee Grievance

* feat: link to desk and automatic unsuspend

* test: Employee Grievance

* fix: Sider and Translation

* fix: sider

* fix: formatting

* feat: changes requested

* feat: Employee Grievance

* feat: link to desk and automatic unsuspend

* test: Employee Grievance

* fix: Sider and Translation

* fix: sider

* fix: formatting

* feat: changes requested

* fix: patch test and sider issue

* fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances

- show pay cut and suspension buttons only if Employee Resposible is set

- some label changes

* feat: added subject field for more context

- set title for documents

- added list view settings

- refactor suspend and unsuspend functions

- add submit and cancel perms for system and hr managers

- fix tests

* fix: sider issues

* fix: removed suspension and paycut

* fix:sider

* fix: test

* fix: test

* fix: resolved Conflicts

* fix: sider

* fix: remove debugging print statements

* fix: validation message

* fix: unnecessary comma

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-06-23 12:13:32 +05:30
Deepesh Garg
e8817f97d6
Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width 
fix: Changed profitability analysis report width
 2021-06-23 11:36:43 +05:30
Saqib
5a824cad81
fix: cannot cancel payment entry if linked with invoices (#26075) 2021-06-23 11:02:05 +05:30
Deepesh Garg
dc6e4f12c6
Merge pull request #26076 from nextchamp-saqib/export-round-off-fix 
fix(e-invoicing): IRN generation for export invoices with round off
 2021-06-22 20:45:24 +05:30
Noah Jacob
ce72d0c2c1
fix: fixed rounding off ordered percent to 100 in condition (#26148) 2021-06-22 17:54:16 +05:30
Subin Tom
a446d61e10 fix: Changed profitability analysis report width 2021-06-22 16:51:15 +05:30
Subin Tom
e3a697c582
fix: disable sales order cancellation if linked to draft invoice (#26104) 2021-06-22 16:27:53 +05:30
Subin Tom
943b46a759
fix: sql syntax error in get_project_name method (#26145) 2021-06-22 14:26:36 +05:30
Marica
c6939f37d4
Merge pull request #26140 from marination/product-weightage-develop 
fix: Sort website products by weightage mentioned in Item master
 2021-06-22 11:45:28 +05:30
marination
c212d7fafd fix: Sort website products by weightage mentioned in Item master 2021-06-22 11:20:23 +05:30
rohitwaghchaure
82adb4f16e
Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop 
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
 2021-06-21 22:36:03 +05:30
rohitwaghchaure
40d7e45a34
Merge pull request #26128 from rohitwaghchaure/fix-rate-not-able-to-change-develop 
fix: rate not able to change in purchase order
 2021-06-21 15:37:32 +05:30
Rohit Waghchaure
01faa9ca11 fix: rate not able to change in purchase order 2021-06-21 14:56:38 +05:30
Nabin Hait
27f0495156 Merge branch 'version-13' into develop 2021-06-21 11:28:58 +05:30
Nabin Hait
6495a4d2ed Merge branch 'version-13-pre-release' into version-13 2021-06-21 11:28:57 +05:30
Nabin Hait
94484d7766 bumped to version 13.5.1 2021-06-21 11:48:57 +05:50
Nabin Hait
9cab26b7bf
Merge pull request #26123 from nextchamp-saqib/pos-change-gl-fix-pre-release 
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
 2021-06-21 11:27:59 +05:30
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template (#25999) 2021-06-21 11:24:45 +05:30
Ankush
7dae0fbe95
fix: status indicator for delivery notes (bp #26062) 
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.

This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
 2021-06-21 11:19:47 +05:30
Saqib
d8d3e536e0
Merge branch 'develop' into export-round-off-fix 2021-06-21 10:52:12 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096) 2021-06-21 10:48:50 +05:30
Saqib Ansari
99531a35e0 fix(pos): unsupported operand type -= for 'float' and 'NoneType' 2021-06-21 10:47:23 +05:30
rohitwaghchaure
1d3b66eefe
Merge pull request #26119 from rohitwaghchaure/develop-sub-contract-enhancemnet 
feat: subcontract code refactor and enhancement
 2021-06-20 16:21:44 +05:30
Rohit Waghchaure
f0dfea1d47 fix: test case for Project Profitability report 2021-06-20 15:31:25 +05:30
Rohit Waghchaure
e5fb23972a fix: available qty for consumption 2021-06-20 15:28:25 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8 fix: code cleanup and convert public method to private for subcontracting class 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
d755b29943 fix: toggle consumed qty field based on condition 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
21b58ef045 fix: semgrep error 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Rohit Waghchaure
9e616b09a2 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-20 15:17:20 +05:30
rohitwaghchaure
1c846c5be7
Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix 
fix: time out while submitting the stock transactions with more than 50 Items
 2021-06-19 18:51:47 +05:30
Rohit Waghchaure
4d81d45a0e fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 16:15:08 +05:30
Deepesh Garg
52992b345f
Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary 
fix: Sanctioned loan amount limit check
 2021-06-18 23:30:54 +05:30
Deepesh Garg
22e75725ea fix: Sanctioned loan amount limit check 2021-06-18 17:25:37 +05:30
Ankush
4e88dcf956
fix: auto unlink warehouse from item on delete (#26073) (#26101) 
* fix: auto unlink warehouse from item on delete

* fix: sider

* refactor: use delete_doc

* test: add test for unlinking warehouse from item

* refactor: add msgprint to inform user of unlink

* refactor: cleanup and reuse extant functions

* fix: don't delete row, update table

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-06-18 14:48:30 +05:30
Ankush
584fe32900
fix: escaped warehouse value for sql query (bp #26049) 
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-06-18 14:47:30 +05:30
rohitwaghchaure
e43df63978
Merge pull request #26099 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco-develop 
fix: timeout while cancelling stock reconciliation
 2021-06-18 11:31:00 +05:30
Saqib
5633834ef7
Merge branch 'develop' into export-round-off-fix 2021-06-18 11:25:21 +05:30
Rohit Waghchaure
7fc50ba460 fix: timeout while cancelling stock reconciliation 2021-06-18 10:45:53 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing 2021-06-17 20:43:23 +05:30
Suraj Shetty
e8e4841e5e ci: Build frappe assets 
- Build frappe assets since it is used for print views
 2021-06-17 20:23:18 +05:30
Deepesh Garg
1c1e25da45
Merge pull request #25896 from buff0k/patch-3 
fix: Correct South Africa VAT Rate
 2021-06-17 18:27:00 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3 2021-06-17 18:26:42 +05:30
Deepesh Garg
1c58d79142
Merge pull request #26077 from nemesis189/fixed-label-rate-of-purchase-invoice-item 
fix: removed extra space from label rate
 2021-06-17 17:18:52 +05:30
Suraj Shetty
00332d1834 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-17 09:47:16 +05:30
Subin Tom
c03a947e98 fix: removed extra space from label rate 2021-06-16 19:47:55 +05:30
Saqib Ansari
2be7e90e78 fix(e-invoicing): IRN generation for export invoices with round off 2021-06-16 19:00:34 +05:30
Afshan
d5c172590f
fix(pos): pos loyalty card alignment (#26050) 2021-06-16 14:28:03 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class (#26064) 2021-06-16 11:14:40 +05:30