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

fix: misleading "Set Default X" fields after saving #28798

Merged
merged 3 commits into from
Dec 9, 2021

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Dec 8, 2021

Source/Reference: ISS-21-22-09054

Issue(s): Purchase Receipt

Problem:

  • When populating the "Accepted Warehouse" field it adds that warehouse as the default warehouse on all the item rows. This is helpful because often the same warehouse for all the items received. But if the user changes the warehouse for an item. In that case, this field becomes confusing as it is holding another warehouse.

Proposed Solution:

  • If all warehouses in the child table(Items) are not matching the "default warehouse" field then set its value to None.
Images/GIF

Before:

https://user-images.githubusercontent.com/63660334/144282361-d6e8ef46-ae48-42ed-a86c-8136cf993b45.gif

After:

https://user-images.githubusercontent.com/25903035/130674996-a6d891e4-4220-4574-87fc-5b32bca6992a.png

Closes: #28644

Affected doctypes:

  • Purchase Invoice
  • Sales Invoice
  • Sales Order
  • Purchase Order
  • Stock Entry
  • Purchase Receipt
  • Delivery Note
  • Material request

@ankush ankush added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Dec 9, 2021
@codecov
Copy link

codecov bot commented Dec 9, 2021

Codecov Report

Merging #28798 (90a8f09) into develop (96a019e) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #28798      +/-   ##
===========================================
- Coverage    55.22%   55.22%   -0.01%     
===========================================
  Files         1122     1122              
  Lines        66782    66810      +28     
===========================================
+ Hits         36879    36893      +14     
- Misses       29903    29917      +14     
Impacted Files Coverage Δ
...ounts/doctype/purchase_invoice/purchase_invoice.py 81.48% <100.00%> (+0.08%) ⬆️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 78.11% <100.00%> (+0.01%) ⬆️
...xt/buying/doctype/purchase_order/purchase_order.py 78.37% <100.00%> (+0.06%) ⬆️
erpnext/selling/doctype/sales_order/sales_order.py 77.58% <100.00%> (+0.04%) ⬆️
...pnext/stock/doctype/delivery_note/delivery_note.py 65.64% <100.00%> (+0.09%) ⬆️
...stock/doctype/material_request/material_request.py 70.32% <100.00%> (+0.21%) ⬆️
...stock/doctype/purchase_receipt/purchase_receipt.py 90.37% <100.00%> (+0.07%) ⬆️
erpnext/stock/doctype/stock_entry/stock_entry.py 79.98% <100.00%> (+0.03%) ⬆️
erpnext/utilities/transaction_base.py 75.40% <100.00%> (+1.49%) ⬆️
...tch_item_expiry_status/batch_item_expiry_status.py 69.23% <0.00%> (-25.00%) ⬇️
... and 29 more

@ankush ankush merged commit 6485ac4 into frappe:develop Dec 9, 2021
mergify bot pushed a commit that referenced this pull request Dec 9, 2021
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 6485ac4)
ankush pushed a commit that referenced this pull request Dec 9, 2021
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 6485ac4)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
@rtdany10
Copy link
Contributor

rtdany10 commented Dec 9, 2021

image

Issue arising from https://github.com/frappe/erpnext/blob/develop/erpnext/selling/doctype/sales_order/sales_order.py#L66

Traceback:

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 66, in application
    response = frappe.api.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/api.py", line 54, in handle
    return frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 31, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 67, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1220, in call
    return fn(*args, **newargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/desk/form/save.py", line 20, in savedocs
    doc.save()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 282, in save
    return self._save(*args, **kwargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 304, in _save
    self.insert()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 235, in insert
    self.run_before_save_methods()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 969, in run_before_save_methods
    self.run_method("validate")
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 866, in run_method
    out = Document.hook(fn)(self, *args, **kwargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 1163, in composer
    return composed(self, method, *args, **kwargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 1146, in runner
    add_to_return_value(self, fn(self, *args, **kwargs))
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 860, in <lambda>
    fn = lambda self, *args, **kwargs: getattr(self, method)(*args, **kwargs)
  File "/home/frappe/frappe-bench/apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py", line 66, in validate
    self.reset_default_field_value("set_warehouse", "items", "warehouse")
AttributeError: 'SalesOrder' object has no attribute 'reset_default_field_value'

@ankush @s-aga-r

@ankush
Copy link
Member

ankush commented Dec 9, 2021

can't reproduce locally.... all tests are also passing (validate method runs in all 😅 )

can you share version and commit id of erpnext?

ref:

def reset_default_field_value(self, default_field: str, child_table: str, child_table_field: str):
""" Reset "Set default X" fields on forms to avoid confusion.
example:
doc = {
"set_from_warehouse": "Warehouse A",
"items": [{"from_warehouse": "warehouse B"}, {"from_warehouse": "warehouse A"}],
}
Since this has dissimilar values in child table, the default field will be erased.
doc.reset_default_field_value("set_from_warehouse", "items", "from_warehouse")
"""
child_table_values = set()
for row in self.get(child_table):
child_table_values.add(row.get(child_table_field))
if len(child_table_values) > 1:
self.set(default_field, None)
else:
self.set(default_field, list(child_table_values)[0])
this code might be missing for you for some reason.

@rtdany10
Copy link
Contributor

rtdany10 commented Dec 9, 2021

I'm on a fork, and the code seems to be present there and on my dev machine.
https://github.com/rtdany10/erpnext/blob/ledger-merger/erpnext/utilities/transaction_base.py#L165

Weird.

@rtdany10
Copy link
Contributor

rtdany10 commented Dec 9, 2021

I'm so sorry. I updated via git pull instead of bench update.
A simple bench clear-cache and restart fixed it. Sorry again 😅

@s-aga-r s-aga-r deleted the bug-fix/purchase-receipt/warehouse branch December 10, 2021 04:30
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
@marination
Copy link
Collaborator

marination commented Jan 11, 2022

This is kinda problematic in Manufacture entry cases where some rows will have Target Warehouse as None because only one row is a Finished Good. But users still want to have Source and Target warehouse at the top for reference.
@ankush @s-aga-r

@ankush
Copy link
Member

ankush commented Jan 11, 2022

@marination yeah, the simplest solution could be to ignore None/unset values?

Also, avoid applying this on target warehouse in case of manufacture entry (because of scrap)

@s-aga-r s-aga-r added bug and removed squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. backport version-13-hotfix labels Sep 21, 2022
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 16, 2022
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

# Conflicts:
#	erpnext/regional/india/utils.py

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

# Conflicts:
#	erpnext/regional/india/utils.py

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Apr 17, 2023
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

# Conflicts:
#	erpnext/regional/india/utils.py

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Apr 17, 2023
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Apr 17, 2023
* feat: added QI link in Job Card Dashboard (backport frappe#28643)

* feat: Show Zero Values filter in consolidated financial statement

(cherry picked from commit 9610086)

* fix: ensure that reposting is finished before freezing stock/account

(cherry picked from commit d37541d)

* test: stock frozen validation

(cherry picked from commit 75bc404)

* fix: incorrect outgoing rates when material_consumption enabled

(cherry picked from commit 7f3e6d1)

* test: added tests for manufacture stock entry when material_consumption is enabled

(cherry picked from commit 35346de)

* fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: Paid showing in AR/AP report

* fix: Better Error logging fordeferred revenue/expense booking

(cherry picked from commit 67a001d)

* fix: Commit joural entries

(cherry picked from commit 0ba4fce)

* fix: Log error before throwing exception

(cherry picked from commit 3c64e20)

* fix: mapping to maintenance visit gets erased (backport frappe#28917)

* fix: ignore mandatory fields while creating WO from SO (backport frappe#28772)

* refactor: map serial from schedule if only one (backport frappe#28745)

* fix: TDS Monthly payable report (backport frappe#28764)

* fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792)

* fix: misleading "Set Default X" fields after saving (backport frappe#28798)

* fix: Fix depreciation_amount calculation

(cherry picked from commit 22cc8d2)

* fix: Create Depreciation Schedules properly for existing Assets

(cherry picked from commit 5c3d4ca)

* fix: Modify has_pro_rata() to include existing assets

(cherry picked from commit de00200)

* fix: Test if depreciation schedules are set up properly for existing assets

(cherry picked from commit 774ac85)

* fix: Remove unnecessary variable

(cherry picked from commit 828769c)

* fix: conflicts

* fix: conflicts

* feat: Add Serial No field

(cherry picked from commit 1aed8c4)

* fix: Rename item to item_code

(cherry picked from commit abb5355)

* feat: Add 'Add Serial No' button in the Stock Items table

(cherry picked from commit 4668bb4)

* fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair

(cherry picked from commit 1393f97)

* fix: Replace 'item' with 'item_code' in tests

(cherry picked from commit c9e79ef)

* fix: Create stock item

(cherry picked from commit eea80b6)

* fix: Create setUpClass

(cherry picked from commit efac7b0)

* fix: Add test for consumption of serialized Assets

(cherry picked from commit 6b75d14)

* fix: Remove unused import

(cherry picked from commit b28f137)

* fix: Change order of import statements

(cherry picked from commit c94f1ed)

* Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb82)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

All "set default value" fields are sort of confusing
4 participants