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: Supplier Quotation fields #37963

Merged
merged 1 commit into from
Nov 9, 2023
Merged

fix: Supplier Quotation fields #37963

merged 1 commit into from
Nov 9, 2023

Conversation

vishakhdesai
Copy link
Contributor

Fields added for following Doctypes (required for : resilient-tech/india-compliance#1206) :

  • Request For Quotation:
  1. Company Billing Address
  2. Billing Address Details
  • Supplier Quotation:
  1. Shipping Address
  2. Shipping Address Details
  3. Company Billing Address
  4. Billing Address Details

image
image

@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. labels Nov 7, 2023
@codecov Codecov
Copy link

codecov bot commented Nov 8, 2023

Codecov Report

Merging #37963 (800caa9) into develop (a9d9118) will decrease coverage by 0.01%.
Report is 48 commits behind head on develop.
The diff coverage is 83.20%.

@@             Coverage Diff             @@
##           develop   #37963      +/-   ##
===========================================
- Coverage    67.41%   67.41%   -0.01%     
===========================================
  Files          755      755              
  Lines        60290    60312      +22     
===========================================
+ Hits         40646    40658      +12     
- Misses       19644    19654      +10
Files Coverage Δ
...xt/accounts/doctype/sales_invoice/sales_invoice.py 83.91% <100.00%> (ø)
erpnext/accounts/party.py 81.02% <100.00%> (ø)
erpnext/accounts/utils.py 73.16% <100.00%> (ø)
...ext/manufacturing/doctype/work_order/work_order.py 80.66% <100.00%> (ø)
...pnext/stock/doctype/delivery_note/delivery_note.py 81.22% <100.00%> (ø)
...stock_reservation_entry/stock_reservation_entry.py 83.01% <100.00%> (ø)
...ounts/doctype/bank_transaction/auto_match_party.py 91.83% <83.33%> (ø)
...cturing/doctype/production_plan/production_plan.py 84.40% <94.44%> (ø)
erpnext/stock/doctype/bin/bin.py 96.20% <93.75%> (ø)
erpnext/assets/doctype/asset/depreciation.py 83.68% <50.00%> (ø)
... and 1 more

... and 3 files with indirect coverage changes

@deepeshgarg007 deepeshgarg007 merged commit c2bda2c into frappe:develop Nov 9, 2023
13 checks passed
mergify bot pushed a commit that referenced this pull request Nov 20, 2023
@vishakhdesai @mergify
fix: Supplier Quotation fields (#37963)
883eaee 
(cherry picked from commit c2bda2c)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@mergify mergify bot mentioned this pull request Nov 20, 2023
Merged
mergify bot pushed a commit that referenced this pull request Nov 20, 2023
@vishakhdesai @mergify
fix: Supplier Quotation fields (#37963)
aef955c 
(cherry picked from commit c2bda2c)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@mergify mergify bot mentioned this pull request Nov 20, 2023
Merged
sagarvora added a commit that referenced this pull request Nov 20, 2023
@sagarvora
Merge pull request #38198 from frappe/mergify/bp/version-14-hotfix/pr…
b7e74b4 
…-37963

fix: Supplier Quotation fields (backport #37963)
sagarvora added a commit that referenced this pull request Nov 20, 2023
@sagarvora
Merge pull request #38199 from frappe/mergify/bp/version-15-hotfix/pr…
7622a27 
…-37963

fix: Supplier Quotation fields (backport #37963)
frappe-pr-bot pushed a commit that referenced this pull request Nov 21, 2023
@frappe-bot
chore(release): Bumped to Version 15.3.0
33869a2 
# [15.3.0](v15.2.0...v15.3.0) (2023-11-21)

### Bug Fixes

* attributes were mandatory for manufacturers ([00b9c23](00b9c23))
* issue occured when creating supplier with contact details ([aaccfeb](aaccfeb))
* overallocation on Payment with PO/SO ([337707b](337707b))
* pass check permission in render_address ([a420e13](a420e13))
* payment entry rounding error ([384d6b5](384d6b5))
* set asset's valuation_rate according to asset quantity (backport [#38254](#38254)) ([#38256](#38256)) ([c60aaa7](c60aaa7))
* set default asset quantity as 1 [dev] (backport [#38223](#38223)) ([#38226](#38226)) ([99bf63e](99bf63e))
* Suppier name was not taken when creating address from supplier ([2b94489](2b94489))
* Supplier Quotation fields ([#37963](#37963)) ([aef955c](aef955c))
* test case for rounded total with cash disc ([eab18e6](eab18e6))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](#38134)) ([#38153](#38153)) ([5b7b431](5b7b431))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting  (backport [#38239](#38239)) ([#38241](#38241)) ([1f2f5d8](1f2f5d8))
* TypeError in Subcontracting Receipt (backport [#38200](#38200)) ([#38208](#38208)) ([3f57a7e](3f57a7e))
* update modified timestamp ([a492e57](a492e57))
* **ux:** `Task` creation from `Timesheet` (backport [#38207](#38207)) ([#38211](#38211)) ([e272041](e272041))
* valuation rate for FG item for subcontracting receipt (backport [#38244](#38244)) ([#38245](#38245)) ([ed7b845](ed7b845))
* valuation rate in report Item Prices ([#38161](#38161)) ([f71234e](f71234e))
* wrong round off and rounded total ([70eccf7](70eccf7))

### Features

* add `Supplier Delivery Note` field in SCR (backport [#38127](#38127)) ([#38156](#38156)) ([b89a4a7](b89a4a7))
* Add accounting dimensions to Supplier Quotation ([7d4ac7e](7d4ac7e))
frappe-pr-bot pushed a commit that referenced this pull request Nov 22, 2023
@frappe-bot
chore(release): Bumped to Version 14.49.0
7392f9c 
# [14.49.0](v14.48.1...v14.49.0) (2023-11-22)

### Bug Fixes

* add revaluation journal filter in Payable report ([d0698b3](d0698b3))
* attributes were mandatory for manufacturers ([430980a](430980a))
* duplicate field in `Closing Stock Balance` ([#38105](#38105)) ([1f16c47](1f16c47))
* incorrect incoming rate for serial and batch items in standalone debit note ([#38121](#38121)) ([9a34518](9a34518))
* pass check permission in render_address ([1ccd5e4](1ccd5e4))
* payment entry rounding error ([49735bc](49735bc))
* remove ESS role when not mapped to employee (backport [#37867](#37867)) ([#38132](#38132)) ([bc01007](bc01007))
* round `unreconciled_amount` before asserting ([392ee2e](392ee2e))
* set asset's valuation_rate according to asset quantity (backport [#38254](#38254)) ([#38255](#38255)) ([00def82](00def82))
* set default asset quantity as 1 [v14] ([#38224](#38224)) ([3daf6f8](3daf6f8))
* show party values when naming by is not naming series ([dd76695](dd76695))
* Supplier Quotation fields ([#37963](#37963)) ([883eaee](883eaee))
* test case for rounded total with cash disc ([9b5185a](9b5185a))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](#38134)) ([#38152](#38152)) ([c7c751e](c7c751e))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting  (backport [#38239](#38239)) ([#38240](#38240)) ([e08f114](e08f114))
* update modified timestamp ([2849e0d](2849e0d))
* valuation rate in report Item Prices ([#38161](#38161)) ([a70696e](a70696e))
* wrong round off and rounded total ([296433a](296433a))

### Features

* add `Supplier Delivery Note` field in SCR (backport [#38127](#38127)) ([#38155](#38155)) ([8d4a19c](8d4a19c))
* Add accounting dimensions to Supplier Quotation ([51e33e1](51e33e1))
* virtual parent doctype ([8dbf2ce](8dbf2ce))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007

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

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

Successfully merging this pull request may close these issues.
3 participants
@vishakhdesai @sagarvora @deepeshgarg007