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

feat: add Company Contact Person in selling transactions #44362

Merged
merged 1 commit into from
Nov 27, 2024

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Nov 26, 2024

German e-invoicing requires a company contact on Sales Invoices. I'm think this is also a valid requirement for other sales transactions and other countries.

This PR adds a link field Company Contact Person to Quotation, Sales Order, Sales Invoice, POS Invoice and Delivery Note. A related query is added and applied via sales_common.js.

company_contact_person

Note: there are some changes (e.g. "UTM Medium" fields, payment_url, formatting of import statements) which were not intended but auto-generated. Kindly ignore, since they seem to be harmless.

no-docs

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 26, 2024
@barredterra barredterra added backport version-14-hotfix backport to version 14 backport version-15-hotfix and removed needs-tests This PR needs automated unit-tests. labels Nov 26, 2024
@ruthra-kumar ruthra-kumar self-assigned this Nov 27, 2024
@barredterra barredterra merged commit f6776c7 into frappe:develop Nov 27, 2024
26 of 27 checks passed
@barredterra barredterra deleted the selling-company-contact branch November 27, 2024 14:52
mergify bot pushed a commit that referenced this pull request Nov 27, 2024
(cherry picked from commit f6776c7)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/selling/doctype/quotation/quotation.py
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note/delivery_note.py
mergify bot pushed a commit that referenced this pull request Nov 27, 2024
(cherry picked from commit f6776c7)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/public/js/utils/sales_common.js
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation/quotation.py
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note/delivery_note.py
barredterra added a commit that referenced this pull request Nov 27, 2024
…4362) (#44397)

* feat: add Company Contact Person in selling transactions (#44362)

(cherry picked from commit f6776c7)

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <[email protected]>
barredterra added a commit that referenced this pull request Nov 27, 2024
…4362) (#44398)

* feat: add Company Contact Person in selling transactions (#44362)

(cherry picked from commit f6776c7)

* chore: resolve merge conflicts

---------

Co-authored-by: Raffael Meyer <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Dec 4, 2024
# [14.78.0](v14.77.3...v14.78.0) (2024-12-04)

### Bug Fixes

* Add filter for `outstanding_amount` to fetch open PRs ([7e847f2](7e847f2))
* Add translation for showing mandatory fields in error msg ([de5b253](de5b253))
* added fieldname to avoid fieldname to translate ([d7caa8d](d7caa8d))
* Added translation for `Account` column ([2061c7c](2061c7c))
* adjusted incoming rate for zero rated item in purchase receipt ([d7583e3](d7583e3))
* correct buying amount for product bundel ([91f6393](91f6393))
* Dashboard for `Payment Request` ([c911a70](c911a70))
* Data Should be Computed in Backend to Maintain Consistent Behaviour ([#44195](#44195)) ([8529eb4](8529eb4))
* handle multi currency in common party journal entry ([bed6dab](bed6dab))
* incorrect Gross Margin on project ([#44461](#44461)) ([5533592](5533592))
* remove queries ([7d724d7](7d724d7))
* show "Send SMS" only when enabled (backport [#43941](#43941)) ([#43969](#43969)) ([9ae04df](9ae04df))
* source warehouse not set in required items of WO (backport [#44426](#44426)) ([#44433](#44433)) ([cbce4e7](cbce4e7))
* Translate `Party Account` column label ([c4103d2](c4103d2))
* typeerror on transaction.js ([147eb04](147eb04))

### Features

* add Company Contact Person in selling transactions (backport [#44362](#44362)) ([#44397](#44397)) ([78ab44c](78ab44c))

### Performance Improvements

* cache product bundle items at document level ([#44440](#44440)) ([df0dac5](df0dac5))
* reduce queries during transaction save ([f884cf8](f884cf8))

### Reverts

* remove default `Payment Request` indicator color ([9baaaca](9baaaca))
frappe-pr-bot pushed a commit that referenced this pull request Dec 4, 2024
# [15.45.0](v15.44.0...v15.45.0) (2024-12-04)

### Bug Fixes

* Add filter for `outstanding_amount` to fetch open PRs ([5999a8e](5999a8e))
* Add translation for showing mandatory fields in error msg ([0e1f5ff](0e1f5ff))
* added fieldname to avoid fieldname to translate ([17c2734](17c2734))
* Added translation for `Account` column ([eb4a485](eb4a485))
* adjusted incoming rate for zero rated item in purchase receipt ([435280d](435280d))
* always set sales incoming rate for internal transfers ([05795af](05795af))
* calculate submitted payment entry as paid amount ([ebdacc0](ebdacc0))
* correct buying amount for product bundel ([f165e17](f165e17))
* Dashboard for `Payment Request` ([0d67c62](0d67c62))
* Data Should be Computed in Backend to Maintain Consistent Behaviour ([#44195](#44195)) ([8ab9fc7](8ab9fc7))
* do not validate stock during inward (backport [#44417](#44417)) ([#44427](#44427)) ([e607795](e607795))
* handle multi currency in common party journal entry ([c8e2c9a](c8e2c9a))
* incorrect Gross Margin on project (backport [#44461](#44461)) ([#44468](#44468)) ([0a9c92f](0a9c92f))
* IndexError in Asset Depreciation Ledger when query result is empty ([c3bc724](c3bc724))
* link cash flow rows and fix summary linking ([633be8d](633be8d))
* move validate_total_debit_and_credit from validate to on_submit in Journal Entry ([63de576](63de576))
* number format in the message (backport [#44435](#44435)) ([#44438](#44438)) ([579d8e2](579d8e2))
* precision calculation causing 0.1 discrepancy (backport [#44431](#44431)) ([#44436](#44436)) ([0d41c23](0d41c23))
* remove queries ([ea57f2b](ea57f2b))
* SABB print for packed items (backport [#44413](#44413)) ([#44428](#44428)) ([0e39aa3](0e39aa3))
* set correct unallocated amount in Payment Entry ([#43958](#43958)) ([ae93f7f](ae93f7f))
* show "Send SMS" only when enabled (backport [#43941](#43941)) ([#43970](#43970)) ([0fbc60a](0fbc60a))
* source warehouse not set in required items of WO (backport [#44426](#44426)) ([#44434](#44434)) ([c81b5e3](c81b5e3))
* Translate `Party Account` column label ([fdda864](fdda864))
* typeerror on transaction.js ([173d60f](173d60f))

### Features

* add Company Contact Person in selling transactions (backport [#44362](#44362)) ([#44398](#44398)) ([70b5b08](70b5b08))
* **Dunning:** separate tab "Address & Contact" ([#44363](#44363)) ([e0cb5f9](e0cb5f9))

### Performance Improvements

* cache product bundle items at document level ([#44440](#44440)) ([1f97979](1f97979))
* reduce queries during transaction save ([48059a7](48059a7))

### Reverts

* remove default `Payment Request` indicator color ([9c4b581](9c4b581))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants