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.

Sign up for GitHub

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

Jump to bottom

fix: Salary Slip Label fixes #27865

Merged
merged 2 commits into from
Oct 8, 2021
Merged

fix: Salary Slip Label fixes #27865

merged 2 commits into from
Oct 8, 2021

Conversation

yadavyk
Copy link
Contributor

@yadavyk yadavyk commented Oct 8, 2021 •
edited

Description :

Heading corrections for sections :

  1. "Earning and deduction" to "Earnings and Deductions"
  2. "net pay info" to "Net Pay Info"
  3. "Loan repayment" to "Loan Repayment"

@codecov
Copy link

codecov bot commented Oct 8, 2021

Codecov Report

Merging #27865 (1f22838) into develop (5cc3ea0) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #27865      +/-   ##
===========================================
+ Coverage    54.56%   54.57%   +0.01%     
===========================================
  Files         1248     1248              
  Lines        67521    67521              
===========================================
+ Hits         36842    36851       +9     
+ Misses       30679    30670       -9
Impacted Files Coverage Δ
erpnext/education/doctype/student/student.py 73.95% <0.00%> (-3.13%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 92.59% <0.00%> (-2.47%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 45.09% <0.00%> (-1.97%) ⬇️
.../report/accounts_receivable/accounts_receivable.py 67.90% <0.00%> (-0.44%) ⬇️
erpnext/stock/doctype/serial_no/serial_no.py 78.66% <0.00%> (-0.26%) ⬇️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 76.66% <0.00%> (-0.09%) ⬇️
...stock/doctype/purchase_receipt/purchase_receipt.py 90.34% <0.00%> (ø)
erpnext/stock/get_item_details.py 79.84% <0.00%> (+0.46%) ⬆️
erpnext/selling/doctype/sales_order/sales_order.py 77.22% <0.00%> (+0.74%) ⬆️
erpnext/stock/report/stock_ledger/stock_ledger.py 80.83% <0.00%> (+0.83%) ⬆️
... and 3 more

@ruchamahabal ruchamahabal merged commit d3d4a3d into frappe:develop Oct 8, 2021
@ruchamahabal
Copy link
Member

@Mergifyio backport version-13-hotfix

mergify bot pushed a commit that referenced this pull request Oct 8, 2021
@yadavyk
fix: Salary Slip Label fixes (#27865)
52e92da 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit d3d4a3d)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/salary_slip.json
@mergify mergify bot mentioned this pull request Oct 8, 2021
Merged
@mergify
Copy link
Contributor

mergify bot commented Oct 8, 2021

Command backport version-13-hotfix: success

Backports have been created

ruchamahabal added a commit that referenced this pull request Oct 8, 2021
@mergify @yadavyk @ruchamahabal
fix: Salary Slip Label fixes (backport #27865) (#27870)
504f2f0 
* fix: Salary Slip Label fixes (#27865)

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

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/salary_slip.json

* fix: conflicts

Co-authored-by: yadavyk <32797974+yadavyk@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
@yadavyk @ruchamahabal
fix: Salary Slip Label fixes (frappe#27865)
1ab8e63 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruchamahabal ruchamahabal ruchamahabal approved these changes

@pateljannat pateljannat Awaiting requested review from pateljannat

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@yadavyk @ruchamahabal