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

36924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
3da0541000 fix: Accouting Dimensions for payroll entry accrual Journal Entry 2021-06-24 10:18:36 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI (#25837) 2021-06-24 10:09:02 +05:30
Deepesh Garg
3007c9900b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension 2021-06-23 23:06:15 +05:30
Deepesh Garg
7e006496dd fix: Check if item tax template exists 2021-06-23 22:52:51 +05:30
Deepesh Garg
c9c1d10435 fix: Make item tax templates optional 2021-06-23 22:47:29 +05:30
Deepesh Garg
1f7b95f390 fix: User is not able to change item tax template 2021-06-23 20:56:27 +05:30
marination
078826d510 fix: Sider 2021-06-23 20:12:59 +05:30
marination
f913e0dd05 fix: Consider Table Multiselect fields in Query engine 
- Since table multiselect fields were not handled, the query tried searching for this child field in item master
- This broke the query
- On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks
 2021-06-23 20:06:11 +05:30
Noah Jacob
b4b6288596 fix: fetches correct preferred shipping address 2021-06-23 17:05:44 +05:30
rohitwaghchaure
b4863bfa50
Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report 
feat: Incorrect valuation rate report for serialized items
 2021-06-23 16:52:51 +05:30
marination
1b9b72d12e fix: Filters did not consider Website Item Group 2021-06-23 16:03:24 +05:30
marination
d802d73973 fix: Consider Website Item Groups in Item group page product listing 
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2021-06-23 14:24:13 +05:30
Jannat Patel
9ec0ded28f
fix: Staffing plan vacancies data type issue (#25941) 
* fix: staffing plan vacancies data type issue

* fix: translation issue

* fix: removed greater than 0 condition
 2021-06-23 14:05:10 +05:30
Jannat Patel
da66cefefc
fix: staffing plan vacancies data type issue (#25936) 
* fix: staffing plan vacancies data type issue

* fix: translation issue

* fix: removed greater than 0 condition

* fix: sider

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-06-23 14:04:48 +05:30
Anurag Mishra
d021db1cb1
fix: Training event (#26164) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-06-23 12:59:43 +05:30
Jannat Patel
44815393b3
fix: job applicant link issue (#25934) 2021-06-23 12:28:02 +05:30
Jannat Patel
0354ec6363
fix: job applicant link issue (#25933) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-06-23 12:27:45 +05:30
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
Anurag Mishra
fc98abece9
feat: Employee Grievance (#25705) 
* 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>
 2021-06-23 11:21:38 +05:30
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix 2021-06-23 11:02:48 +05:30
Saqib
5a824cad81
fix: cannot cancel payment entry if linked with invoices (#26075) 2021-06-23 11:02:05 +05:30
Saqib
08c269510e
Merge branch 'develop' into pos-fixes-9 2021-06-23 10:15:07 +05:30
Saqib Ansari
75ce023170 fix: hide images from cart & details 2021-06-22 21:18:44 +05:30
Saqib Ansari
3b225b13e8 refactor(pos): use pos invoice item name as unique identifier 2021-06-22 21:18:20 +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
Deepesh Garg
7b0d86ead5 fix: Do not show received amount after tax for internal tarnsfers 2021-06-22 20:38:35 +05:30
Deepesh Garg
2af8c171c1 fix: Taxes on Internal Transfer payment entry 2021-06-22 19:48:08 +05:30
Noah Jacob
ce72d0c2c1
fix: fixed rounding off ordered percent to 100 in condition (#26148) 2021-06-22 17:54:16 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition (#26152) 2021-06-22 17:53:53 +05:30
Subin Tom
a446d61e10 fix: Changed profitability analysis report width 2021-06-22 16:51:15 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice (#26125) 2021-06-22 16:28:58 +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
889140fd8c
fix: sql syntax error in get_project_name method (#26147) 2021-06-22 16:26:19 +05:30
Subin Tom
943b46a759
fix: sql syntax error in get_project_name method (#26145) 2021-06-22 14:26:36 +05:30
Deepesh Garg
cfdda21dd2 fix: Export invoices not visible in GSTR-1 report 2021-06-22 13:03:22 +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
Dany Robert
884dd9764b
Merge branch 'develop' into patch-4 2021-06-22 11:18:17 +05:30
Marica
9f15ebe711
Merge pull request #26134 from marination/product-weightage 
fix: Sort website products by weightage mentioned in Item master
 2021-06-22 11:16:20 +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
marination
f97206b3cb fix: Sort website products by weightage mentioned in Item master 2021-06-21 19:38:37 +05:30
rohitwaghchaure
6a07869e55
Update production_plan.js 2021-06-21 15:41:30 +05:30
Rohit Waghchaure
00c05108b2 fix: allow to select group warehouse while downloading materials from production plan 2021-06-21 15:39:49 +05:30
rohitwaghchaure
d6eacf556d
Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse 
fix: allow to select group warehouse while downloading materials from production plan
 2021-06-21 15:39:13 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js 2021-06-21 15:38:44 +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
Rohit Waghchaure
773aabae44 fix: allow to select group warehouse while downloading materials from production plan 2021-06-21 14:54:27 +05:30
rohitwaghchaure
3956f82e7c
Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change 
fix: rate not able to change in purchase order
 2021-06-21 13:40:29 +05:30