Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: employee initial work history updated when transfer is performed #27768

Merged
merged 7 commits into from
Oct 21, 2021

Conversation

mohammedyusufshaikh
Copy link
Contributor

@mohammedyusufshaikh mohammedyusufshaikh commented Oct 4, 2021

Before this feature when an employee was transferred their initially work history was not updated in the internal work history table only the new transfer details were updated in the table so it was an issue to track their previous details

So after this feature the initial history as well as the new transfer details all this will be updated in the employee internal work history table.

Lets take and example of a sample employee detail
Screenshot 2021-10-04 at 1 32 47 PM

Before this feature was added and a transfer would be performed only the recent transfer details would be shown
Screenshot 2021-10-04 at 1 36 56 PM

After this feature is added both the previous and and recent history will be show
Screenshot 2021-10-04 at 1 35 07 PM

no-docs

@codecov
Copy link

codecov bot commented Oct 4, 2021

Codecov Report

Merging #27768 (1a5801a) into develop (830fa60) will increase coverage by 0.20%.
The diff coverage is 89.65%.

@@             Coverage Diff             @@
##           develop   #27768      +/-   ##
===========================================
+ Coverage    54.26%   54.47%   +0.20%     
===========================================
  Files         1255     1255              
  Lines        67831    67866      +35     
===========================================
+ Hits         36810    36970     +160     
+ Misses       31021    30896     -125     
Impacted Files Coverage Δ
...r/doctype/employee_promotion/employee_promotion.py 85.00% <66.66%> (ø)
erpnext/hr/utils.py 74.29% <90.90%> (+1.49%) ⬆️
.../hr/doctype/employee_transfer/employee_transfer.py 79.59% <100.00%> (+12.24%) ⬆️
...ctype/accounting_dimension/accounting_dimension.py 64.34% <0.00%> (-1.56%) ⬇️
...e/period_closing_voucher/period_closing_voucher.py 88.23% <0.00%> (-1.48%) ⬇️
...next/accounts/doctype/subscription/subscription.py 82.02% <0.00%> (-0.57%) ⬇️
erpnext/selling/doctype/sales_order/sales_order.py 76.39% <0.00%> (-0.38%) ⬇️
erpnext/stock/stock_ledger.py 85.71% <0.00%> (-0.37%) ⬇️
...stock/doctype/purchase_receipt/purchase_receipt.py 90.34% <0.00%> (ø)
erpnext/portal/product_configurator/utils.py 33.46% <0.00%> (+0.40%) ⬆️
... and 18 more

@ruchamahabal ruchamahabal self-assigned this Oct 14, 2021
erpnext/hr/utils.py Outdated Show resolved Hide resolved
erpnext/hr/utils.py Outdated Show resolved Hide resolved
erpnext/hr/utils.py Outdated Show resolved Hide resolved
erpnext/hr/utils.py Show resolved Hide resolved
erpnext/hr/utils.py Outdated Show resolved Hide resolved
@ruchamahabal ruchamahabal merged commit 03bfc77 into frappe:develop Oct 21, 2021
@ruchamahabal
Copy link
Member

@Mergifyio backport version-13-hotfix

mergify bot pushed a commit that referenced this pull request Oct 21, 2021
#27768)

* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 03bfc77)
@mergify
Copy link
Contributor

mergify bot commented Oct 21, 2021

backport version-13-hotfix

✅ Backports have been created

ruchamahabal pushed a commit that referenced this pull request Oct 21, 2021
#27768) (#28045)

* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 03bfc77)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
frappe#27768) (frappe#28045)

* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 03bfc77)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Aug 3, 2022
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Aug 8, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/utils.py

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
github-actions bot pushed a commit to fproldan/erpnext that referenced this pull request Aug 8, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/utils.py

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Aug 8, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Aug 8, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Sep 7, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Sep 7, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/utils.py

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>

Co-authored-by: Francisco Roldán <franciscoproldan@gmail.com>
Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Sep 7, 2022
* feat(manufacturing): add link field for  quality inspection template on operation

(cherry picked from commit 281a9cc)

* feat: provision to have limited parameters for in-process quality inspection

(cherry picked from commit 6c45f8b)

* refactor: use fetch from property for qi template on job card

(cherry picked from commit 467324c)

* perf: skip get_pricing_rules if no pricing rule exists

(cherry picked from commit a500252)

* perf: fetch mode of payments data in single query

(cherry picked from commit 7b691be)

* perf: get total company stock only for purchase order

(cherry picked from commit eb3aae8)

* perf: skip insertion of stock ledger entry

(cherry picked from commit c7fc609)

* fix: undo changes to allow negative stock flag

(cherry picked from commit 7bafa11)

* fix: sider

(cherry picked from commit ac381d2)

* fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946)

(cherry picked from commit d72709d)

* fix: TDS round off not working from second transaction

(cherry picked from commit ca00672)

* fix: TDS round off not working from second transaction

(cherry picked from commit b7a0853)

* fix: Update receivable/payable account on company change (backport frappe#28057)

* fix: changes in schedules gets overwritten on save

(cherry picked from commit af1b9e1)

* fix: Fetch thumbnail from Item master instead of regenerating

(cherry picked from commit 94177c0)

* fix: re-run patch

- Patch will just fetch thumbnails if website items are created, else it will create new website items

(cherry picked from commit 11c498d)

* fix: Get db values as dict when checking for thumbnail in existing web item

(cherry picked from commit 46a5a83)

* fix: Check if thumbnail column exists in case of table trimming

(cherry picked from commit ac8014e)

* fix: Move thumbnail updation to different patch

- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup

(cherry picked from commit 348a961)

* fix: Serial Nos not set in the row after scanning in popup

- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57d)

* fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056)

* fix: show full item name in search widget (backport frappe#28283)

* fix: Avoid automatic customer creation on website user login

(cherry picked from commit d824a90)

* fix: Sider, Linter

- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)

* fix: Merge conflicts with e-commerce

* fix: POS Closing Entry without linked invoices (backport frappe#28042)

* fix: update production plan status (backport frappe#27567)

* refactor: shows opening balance from filtered from_date (backport frappe#26877)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* chore: Add comment above fix for future reference

(cherry picked from commit 48886ee)

* fix: Autoemail report not showing dynamic report filters

(cherry picked from commit 3a6894f)

* Update employee_leave_balance.py

fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f784)

* fix: Make status filter in Fixed Asset Register optional (backport frappe#28126)

* fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136)

* v.13.14.1

* feat: employee initial work history updated when transfer is performed (backport frappe#27768)

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>

Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants