fix: sum of components in salary register #28237
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #28237 +/- ##
===========================================
+ Coverage 55.22% 55.25% +0.02%
===========================================
Files 1117 1117
Lines 66496 66496
===========================================
+ Hits 36725 36744 +19
+ Misses 29771 29752 -19
|
ruchamahabal
reviewed
Nov 9, 2021
ruchamahabal
approved these changes
Nov 9, 2021
|
@Mergifyio backport version-13-hotfix |
mergify bot
pushed a commit
that referenced
this pull request
Nov 9, 2021
* fix: sum of components in salary register * fix: sum of deduction components Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 17acb08)
✅ Backports have been created
|
ruchamahabal
pushed a commit
that referenced
this pull request
Nov 9, 2021
* fix: sum of components in salary register * fix: sum of deduction components Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 17acb08) Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
conncampbell
pushed a commit
to conncampbell/erpnext
that referenced
this pull request
Jan 9, 2022
* fix: sum of components in salary register * fix: sum of deduction components Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Aug 29, 2022
ValentinaPruvost
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
github-actions bot
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Oct 18, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Oct 18, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
ValentinaPruvost
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Dec 15, 2022
* perf(minor): general ledger report (backport frappe#27987) * fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193) * 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 make naming series mandatory for items (backport frappe#28394) * fix: Work order creation from sales order (backport frappe#28388) * fix: currency wise pricing rule not working (cherry picked from commit 43aeb54) * fix: remove item-item group name validation (backport frappe#28392) * fix: Default party account getting overriden in invoices (cherry picked from commit 8864857) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * fix: Dispatch address details not displayed in v13 * fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348) * fix: performance to submit the JV (cherry picked from commit 7472760) * fix: Pricing Rule not created against the Promotional Scheme (cherry picked from commit d82910b) * fix: sum of components in salary register (backport frappe#28237) * fix: auto update price list rate * fix: Pull Items that are in JC in Stock Entry against JC - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit 3da0302) * test: Stock Entry from JC correctness (items mapping and qty) (cherry picked from commit 0aa237f) * fix: Partial Trabsfers against JC - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup (cherry picked from commit e8d0c25) * fix: (travis) Production Plan Summary Report breaks if no WO - `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead - accomodate production plan items that dont have WO/PO against them as well (blank values) - added some None value handling to avoid AttributeError (cherry picked from commit 1eb3ca2) * fix: Server side test - make `tests_that_skip_setup` a tuple (added comma) - remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing - transfer_material_against = "Job Card" while making BOM with mulitple operations (cherry picked from commit bb561ba) * fix: `test_job_card_partial_material_transfer` test - Use a specific BOM for JC tests - Utility to create said BOM - Sider: unused variable (cherry picked from commit a5f8274) Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: Francisco Roldán <franciscoproldan@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue and Steps to Replicate:
Note that the salary structure Family Allocation is shown twice. Once from salary structure and other from additional Salary.
Now go to Salary Register Report. The family Allocation component does not represent the complete amount.