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: Add company field to lower deduction certificate #34914

Merged
merged 1 commit into from
Apr 25, 2023
Merged

fix: Add company field to lower deduction certificate #34914

merged 1 commit into from
Apr 25, 2023

Conversation

deepeshgarg007
Copy link
Member

@deepeshgarg007 deepeshgarg007 commented Apr 19, 2023 •
edited

image

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Apr 19, 2023
@codecov
Copy link

codecov bot commented Apr 19, 2023

Codecov Report

Merging #34914 (4c6bd00) into develop (7fabe62) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop   #34914      +/-   ##
===========================================
- Coverage    63.87%   63.86%   -0.01%     
===========================================
  Files          810      810              
  Lines        59722    59745      +23     
===========================================
+ Hits         38146    38159      +13     
- Misses       21576    21586      +10
Impacted Files Coverage Δ
...x_withholding_category/tax_withholding_category.py 85.95% <100.00%> (ø)

... and 8 files with indirect coverage changes

@deepeshgarg007 deepeshgarg007 marked this pull request as ready for review April 25, 2023 13:36
@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Apr 25, 2023
@deepeshgarg007 deepeshgarg007 merged commit b545e3d into frappe:develop Apr 25, 2023
mergify bot pushed a commit that referenced this pull request Apr 25, 2023
@deepeshgarg007 @mergify
fix: Add company field to lower deduction certificate (#34914)
cccd89e 
(cherry picked from commit b545e3d)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot mentioned this pull request Apr 25, 2023
Merged
deepeshgarg007 added a commit that referenced this pull request Apr 25, 2023
@mergify @deepeshgarg007
fix: Add company field to lower deduction certificate (#34914)
d732083 
* fix: Add company field to lower deduction certificate (#34914)

(cherry picked from commit b545e3d)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Apr 25, 2023
@frappe-bot
chore(release): Bumped to Version 14.23.0
85f3a5d 
# [14.23.0](v14.22.3...v14.23.0) (2023-04-25)

### Bug Fixes

* `PermissionError` in Work Order ([a3568c1](a3568c1))
* Add company field to lower deduction certificate ([#34914](#34914)) ([d732083](d732083))
* add item-code filter for SCR supplied-items batch-no ([7c4f83e](7c4f83e))
* add limit for get_next_stock_reco ([#34937](#34937)) ([7131ff2](7131ff2))
* added validation for extra job card ([a5fde5d](a5fde5d))
* batch qty conversion factor issue fixed in pos transaction ([#34917](#34917)) ([56ef0ba](56ef0ba))
* broken 'set exchange gain/loss' btn in payment entry ([#34940](#34940)) ([00968ba](00968ba))
* Bulk Payment Entry from PO/SO ([#34942](#34942)) ([878d747](878d747))
* click handler should not attempt indexed access of empty array ([#35013](#35013)) ([06f204a](06f204a))
* Common party JV cost center ([#35008](#35008)) ([693007a](693007a))
* duplicate reposting entries of same voucher ([aeac43c](aeac43c))
* FEC report for France accountancy  ([#34781](#34781)) ([6aabab2](6aabab2))
* filtering via batch no ([#34951](#34951)) ([3b23fc1](3b23fc1)), closes [#34950](#34950)
* Incorrect difference value in Stock and Account Value Comparison report ([e7ca833](e7ca833))
* incorrect OR condition causing timeout error ([c020789](c020789))
* internal Purchase Receipt GL Entries ([f7e436f](f7e436f))
* item not showing in the BOM ([28cd79a](28cd79a))
* pass reference_doctype in link queries (backport [#35038](#35038)) ([#35039](#35039)) ([5cc3978](5cc3978))
* Payment entry with TDS in bank reco statement ([#34961](#34961)) ([f43ea0d](f43ea0d))
* per_billed condition for Payment Entry ([#34969](#34969)) ([f9f42c7](f9f42c7))
* process_loss_percentage in BOM ([4418862](4418862))
* removed depends on for the Employee Detail section ([9d17d3f](9d17d3f))
* respect title_field from doctype to bulk transactions ([#34928](#34928)) ([29aa4a0](29aa4a0))
* set `frappe.flags.company` to call regional code accurately ([789dfd6](789dfd6))
* simplify `erpnext.get_region` ([87595bd](87595bd))
* SLA permissions (backport [#34981](#34981)) ([#34986](#34986)) ([83a1b83](83a1b83))
* stock entry type issue ([33a1608](33a1608))
* **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([2ad157b](2ad157b))
* **test:** `test_internal_pr_gl_entries` ([7740ceb](7740ceb))
* Unable to allocate advance against invoice ([#35007](#35007)) ([5045ad6](5045ad6))
* use `functools.wraps` to preserve doc signature ([2ec18eb](2ec18eb))
* use CombineDatetime instead of Timestamp in QB queries ([55da91c](55da91c))
* use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [#35031](#35031)) ([#35035](#35035)) ([5630e81](5630e81))
* Use set instead of db_set as it is called from validate ([#34967](#34967)) ([6650212](6650212))
* v14, Bank Reconcile Tools not cover case JV debit bank ([#35000](#35000)) ([82d8379](82d8379))
* validation for internal transfer entry ([a582354](a582354))
* value of depreciable assets not updating after manual depr entry [v14] ([#35010](#35010)) ([3c75e55](3c75e55))
* wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([#34726](#34726)) ([47df41f](47df41f))

### Features

* Reconcile Payments in background ([#34596](#34596)) ([5923a80](5923a80))

### Performance Improvements

* Journal Entries (backport [#34918](#34918)) ([#35054](#35054)) ([39b5147](39b5147))

### Reverts

* Revert "fix: Rate from LDC in TDS reports (#33699)" ([f44a79f](f44a79f)), closes [#33699](#33699)
@commit-lint commit-lint bot mentioned this pull request May 31, 2023
Merged
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees
No one assigned
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@deepeshgarg007