CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,907 Commits 423 Branches 1,723 Tags
v14.29.0
Commit Graph

44907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
f360bdcbf6 chore(release): Bumped to Version 14.29.0 
# [14.29.0](https://github.com/frappe/erpnext/compare/v14.28.1...v14.29.0) (2023-07-05)

### Bug Fixes

* Expense Account filter in Sales Invoice ([#35944](https://github.com/frappe/erpnext/issues/35944)) ([a485e4e](a485e4e802))
* get base grand total while pulling reference details in PE ([2e2c23a](2e2c23aa0f))
* handle loan_repayment's posting_date datetime in bank_clearance_summary report ([#36004](https://github.com/frappe/erpnext/issues/36004)) ([937e1fb](937e1fb024))
* Netherlands - Grootboekschema COA structure ([#35991](https://github.com/frappe/erpnext/issues/35991)) ([13f3ebf](13f3ebf915))
* project filtering based on company in P&L Report ([#35943](https://github.com/frappe/erpnext/issues/35943)) ([8de1d86](8de1d8663f))
* remove debug flag from sql ([646440f](646440fd55))
* reposting has not changed valuation rate ([c0c693d](c0c693d8b0))
* Update no copy for received_qty field ([#35965](https://github.com/frappe/erpnext/issues/35965)) ([c330f47](c330f47680))

### Features

* **accounts:** standardize additional columns implementation for sales/purchase reports ([#36000](https://github.com/frappe/erpnext/issues/36000)) ([47c6d90](47c6d9099b))
* add method for ordered quantity in supplier scorecard (backport [#35930](https://github.com/frappe/erpnext/issues/35930)) ([#35968](https://github.com/frappe/erpnext/issues/35968)) ([a974091](a974091678))
* add voucher-wise balance report logic ([6842902](684290233f))
* allow the partial return of components against SCO (backport [#35935](https://github.com/frappe/erpnext/issues/35935)) ([#35938](https://github.com/frappe/erpnext/issues/35938)) ([6f50ad6](6f50ad685e))
v14.29.0 		2023-07-05 09:48:12 +00:00
Deepesh Garg
4fa412fe3f Merge pull request #35996 from frappe/version-14-hotfix 
chore: release v14
 2023-07-05 15:16:47 +05:30
Anand Baburajan
937e1fb024 fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004) 2023-07-04 19:06:58 +05:30
Sagar Vora
dfd4ef178e Merge pull request #36002 from frappe/mergify/bp/version-14-hotfix/pr-36000 2023-07-04 17:42:51 +05:30
Sagar Vora
47c6d9099b feat(accounts): standardize additional columns implementation for sales/purchase reports (#36000) 
(cherry picked from commit 30e4052a76)
 2023-07-04 12:12:34 +00:00
mergify[bot]
13f3ebf915 fix: Netherlands - Grootboekschema COA structure (#35991) 
fix: Netherlands - Grootboekschema COA structure (#35991)

fix: Netherlands - Grootboekschema coa structure
(cherry picked from commit 2f169575e9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-04 16:22:17 +05:30
ruthra kumar
ae4a8c8788 Merge pull request #35981 from frappe/mergify/bp/version-14-hotfix/pr-35868 
fix: incorrect outstanding and total amount in reference table of payment entry (backport #35868)
 2023-07-04 08:09:05 +05:30
ruthra kumar
3d1942571d test: test reference details response 
(cherry picked from commit 9655d78642)
 2023-07-03 15:33:20 +00:00
ruthra kumar
2e2c23aa0f fix: get base grand total while pulling reference details in PE 
(cherry picked from commit 9e73af891d)
 2023-07-03 15:33:20 +00:00
mergify[bot]
c330f47680 fix: Update no copy for received_qty field (#35965) 
* fix: Update no copy for received_qty field (#35965)

(cherry picked from commit 5448859254)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-03 16:38:08 +05:30
mergify[bot]
a974091678 feat: add method for ordered quantity in supplier scorecard (backport #35930) (#35968) 
feat: add method for ordered quantity in supplier scorecard (#35930)

fix: add method for getting ordered quantity in the supplier scorecard variable.

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
(cherry picked from commit e05b33a6c2)

Co-authored-by: Vishnu  VS <Vishnuviswambaran2002@gmail.com>
 2023-07-03 10:23:36 +05:30
Frappe PR Bot
87c0417e22 chore(release): Bumped to Version 14.28.1 
## [14.28.1](https://github.com/frappe/erpnext/compare/v14.28.0...v14.28.1) (2023-07-02)

### Bug Fixes

* reposting has not changed valuation rate ([cec3cde](cec3cdec66))
v14.28.1 		2023-07-02 05:49:11 +00:00
rohitwaghchaure
dbae36ece3 Merge pull request #35962 from frappe/mergify/bp/version-14/pr-35955 
fix: incorrect reposting causing stock adjustment entry (backport #35955)
 2023-07-02 11:17:48 +05:30
Rohit Waghchaure
cec3cdec66 fix: reposting has not changed valuation rate 
(cherry picked from commit c0c693d8b0)
 2023-07-02 05:18:37 +00:00
rohitwaghchaure
c3eab84e37 Merge pull request #35955 from rohitwaghchaure/fixed-incorrect-valuation-rate 
fix: incorrect reposting causing stock adjustment entry
 2023-07-02 08:22:16 +05:30
Rohit Waghchaure
c0c693d8b0 fix: reposting has not changed valuation rate 2023-07-01 23:50:27 +05:30
mergify[bot]
a485e4e802 fix: Expense Account filter in Sales Invoice (#35944) 
fix: Expense Account filter in Sales Invoice (#35944)

(cherry picked from commit d54f52474a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-01 18:13:46 +05:30
mergify[bot]
8de1d8663f fix: project filtering based on company in P&L Report (#35943) 
* fix: project filtering in P&L Report

(cherry picked from commit 904ca746a6)

* fix: show projects with no company value set

(cherry picked from commit ce252a0d45)

* fix: make company field mandatory in project doctype

(cherry picked from commit 84d4888f5f)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2023-07-01 10:42:33 +05:30
mergify[bot]
6f50ad685e feat: allow the partial return of components against SCO (backport #35935) (#35938) 
* fix: don't update SCO status to closed until full return

(cherry picked from commit 2f6d56dd62)

* fix: reduce return qty while calculating transferred qty

(cherry picked from commit 2a60884abc)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-06-29 22:16:53 +05:30
mergify[bot]
a880bdec5e chore: update translations (#35905) 
chore: update translations

chore: update translations
(cherry picked from commit 1d1103f39c)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-06-29 13:30:29 +05:30
Deepesh Garg
5a9bd3bac6 Merge pull request #35926 from frappe/mergify/bp/version-14-hotfix/pr-35904 
feat: add voucher-wise balance report for unequal dr/cr GL entries (backport #35904)
 2023-06-29 09:45:22 +05:30
Gursheen Anand
646440fd55 fix: remove debug flag from sql 
(cherry picked from commit 6b9f9f9b0e)
 2023-06-29 03:38:17 +00:00
Gursheen Anand
684290233f feat: add voucher-wise balance report logic 
(cherry picked from commit 5d726ef037)
 2023-06-29 03:38:17 +00:00
Frappe PR Bot
29ea5cfc21 chore(release): Bumped to Version 14.28.0 
# [14.28.0](https://github.com/frappe/erpnext/compare/v14.27.14...v14.28.0) (2023-06-28)

### Bug Fixes

* asset capitalization ([#35832](https://github.com/frappe/erpnext/issues/35832)) ([fb823b5](fb823b53d1))
* asset movement ([#35918](https://github.com/frappe/erpnext/issues/35918)) ([e16c148](e16c14863b))
* delivery trip driver is only required on submit (backport [#35876](https://github.com/frappe/erpnext/issues/35876)) ([#35893](https://github.com/frappe/erpnext/issues/35893)) ([fc051d1](fc051d143c))
* don't allow to make reposting entry for closing stock balance period ([e68b088](e68b08817e))
* filter parent warehouses not showing (backport [#35897](https://github.com/frappe/erpnext/issues/35897)) ([#35899](https://github.com/frappe/erpnext/issues/35899)) ([87ba196](87ba196473))
* incorrect cost center error in bank reconciliation ([cacb0f6](cacb0f6fde))
* issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport [#35821](https://github.com/frappe/erpnext/issues/35821)) ([#35827](https://github.com/frappe/erpnext/issues/35827)) ([20f2bef](20f2bef55f))
* make credit note and debit note exclusive ([#35781](https://github.com/frappe/erpnext/issues/35781)) ([fafb46e](fafb46eebd))
* multiple Work Orders agaist same production plan ([8ddfc34](8ddfc34c30))
* no permission for accounts settings on payment reconciliation ([200ddbf](200ddbf66c))
* Payment Term must be mandatory if `Allocate Payment based on ..` is checked ([#35798](https://github.com/frappe/erpnext/issues/35798)) ([3dd3935](3dd3935e76))
* POS Closing Entry load all invoices with one request on save ([#35819](https://github.com/frappe/erpnext/issues/35819)) ([8ecca2a](8ecca2a1cf))
* reconcile invoice against credit note. ([#35604](https://github.com/frappe/erpnext/issues/35604)) ([5c388a1](5c388a132f))
* Remove special treatment for P&L Accounts ([#35602](https://github.com/frappe/erpnext/issues/35602)) ([b023448](b0234489ca))
* Set Asset cost center default as PR or PI Item Cost Center while auto creating ([#35844](https://github.com/frappe/erpnext/issues/35844)) ([4a7d75b](4a7d75b5cc))
* show non-depreciable assets in fixed asset register ([#35858](https://github.com/frappe/erpnext/issues/35858)) ([42d0944](42d09448ee))
* TDS amount calculation post LDC breach ([851b887](851b8871b2))
* use correct fieldname for purchase receipt column in item_wise_purchase_register report ([#35828](https://github.com/frappe/erpnext/issues/35828)) ([8f13b48](8f13b484a9))
* **ux:** PO Get Items From Open Material Requests (backport [#35894](https://github.com/frappe/erpnext/issues/35894)) ([#35895](https://github.com/frappe/erpnext/issues/35895)) ([2ef2057](2ef2057f44))

### Features

* Auto set Party in Bank Transaction ([#34675](https://github.com/frappe/erpnext/issues/34675)) ([d53b197](d53b197896))
* Provision to send Accounts Receivable Reports using Process SOA ([#35789](https://github.com/frappe/erpnext/issues/35789)) ([21d560c](21d560cd19)), closes [#35707](https://github.com/frappe/erpnext/issues/35707)

### Performance Improvements

* improve item wise register reports ([#35908](https://github.com/frappe/erpnext/issues/35908)) ([33ee011](33ee01174b))
v14.28.0 		2023-06-28 16:04:31 +00:00
Deepesh Garg
eb1081664a Merge pull request #35901 from frappe/version-14-hotfix 
chore: release v14
 2023-06-28 21:33:03 +05:30
Frappe PR Bot
5b27642880 chore(release): Bumped to Version 14.27.14 
## [14.27.14](https://github.com/frappe/erpnext/compare/v14.27.13...v14.27.14) (2023-06-28)

### Bug Fixes

* asset movement ([#35918](https://github.com/frappe/erpnext/issues/35918)) ([4f9c28c](4f9c28cd22))
v14.27.14 		2023-06-28 15:26:36 +00:00
Anand Baburajan
973611a356 Merge pull request #35922 from frappe/mergify/bp/version-14/pr-35918 
fix: asset movement (backport #35918)
 2023-06-28 20:54:05 +05:30
Anand Baburajan
4f9c28cd22 fix: asset movement (#35918) 
fix: asset movement fixes
(cherry picked from commit e16c14863b)
 2023-06-28 14:46:23 +00:00
Anand Baburajan
e16c14863b fix: asset movement (#35918) 
fix: asset movement fixes
 2023-06-28 20:15:40 +05:30
Frappe PR Bot
e1a5a7006f chore(release): Bumped to Version 14.27.13 
## [14.27.13](https://github.com/frappe/erpnext/compare/v14.27.12...v14.27.13) (2023-06-28)

### Performance Improvements

* improve item wise register reports ([#35908](https://github.com/frappe/erpnext/issues/35908)) ([189954e](189954eaf1))
v14.27.13 		2023-06-28 04:56:35 +00:00
Anand Baburajan
93940f30b7 Merge pull request #35913 from frappe/mergify/bp/version-14/pr-35908 
perf: improve item wise register reports (backport #35908)
 2023-06-28 10:24:42 +05:30
Anand Baburajan
189954eaf1 perf: improve item wise register reports (#35908) 
(cherry picked from commit 33ee01174b)
 2023-06-28 04:21:39 +00:00
Anand Baburajan
33ee01174b perf: improve item wise register reports (#35908) 2023-06-28 09:49:30 +05:30
mergify[bot]
87ba196473 fix: filter parent warehouses not showing (backport #35897) (#35899) 
fix: filter parent warehouses not showing (#35897)

(cherry picked from commit af418d2342)

Co-authored-by: HLD <hanglaoda@hotmail.com>
 2023-06-27 14:19:57 +05:30
Deepesh Garg
017729d545 Merge pull request #35890 from frappe/mergify/bp/version-14-hotfix/pr-35886 
fix: TDS amount calculation post LDC breach (backport #35886)
 2023-06-27 13:11:47 +05:30
mergify[bot]
2ef2057f44 fix(ux): PO Get Items From Open Material Requests (backport #35894) (#35895) 
fix(ux): PO Get Items From Open Material Requests

(cherry picked from commit 3a00bf83d6)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-06-27 12:30:23 +05:30
Deepesh Garg
04fdaaffbd Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-35886 2023-06-27 12:02:30 +05:30
mergify[bot]
fc051d143c fix: delivery trip driver is only required on submit (backport #35876) (#35893) 
fix: delivery trip driver is only required on submit (#35876)

This allows drafting trips and stops without yet deciding on the
assignable driver which, in real life, may well be decided on after
preparing and planning the trip.

(cherry picked from commit 742df8a25e)

Co-authored-by: David Arnold <david.arnold@iohk.io>
 2023-06-27 11:38:44 +05:30
Deepesh Garg
851b8871b2 fix: TDS amount calculation post LDC breach 
(cherry picked from commit 1f9ef6c48f)
 2023-06-27 04:10:06 +00:00
ruthra kumar
3ed42e180c Merge pull request #35883 from frappe/mergify/bp/version-14-hotfix/pr-35882 
refactor: simplify exchange logic on cr/dr note reconciliation (backport #35882)
 2023-06-26 20:29:53 +05:30
ruthra kumar
3ca4f24d21 refactor: simplify exchange logic on cr/dr note reconciliation 
(cherry picked from commit af75f6cea7)
 2023-06-26 12:04:02 +00:00
mergify[bot]
21d560cd19 feat: Provision to send Accounts Receivable Reports using Process SOA (#35789) 
* feat: Provision to send Accounts Receivable Reports using Process Statement of Accounts

Issue #35707

(cherry picked from commit b3d565c91f)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

* fix: add patch for setting default value of report field

(cherry picked from commit 555c126eb9)

# Conflicts:
#	erpnext/patches.txt

* fix: modify patch

(cherry picked from commit cde82bc0cc)

* chore: update typo in patch

(cherry picked from commit 4de7a4c571)

* chore: Resolve conflicts

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-25 16:21:18 +05:30
saeedkola
4a7d75b5cc fix: Set Asset cost center default as PR or PI Item Cost Center while auto creating (#35844) 
* fix: Set Asset cost center default as PR or PI Item Cost Center while auto creating

* chore: Linting Issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-24 19:58:31 +05:30
mergify[bot]
8f13b484a9 fix: use correct fieldname for purchase receipt column in item_wise_purchase_register report (#35828) 
fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report

(cherry picked from commit dcfc86e3af)

Co-authored-by: phot0n <ritwikpuri5678@gmail.com>
 2023-06-24 19:57:13 +05:30
mergify[bot]
8ecca2a1cf fix: POS Closing Entry load all invoices with one request on save (#35819) 
fix: POS Closing Entry load all invoices with one request on save (#35819)

fix: load all invoices with one request
(cherry picked from commit 1e20016059)

Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
 2023-06-24 18:58:13 +05:30
mergify[bot]
fafb46eebd fix: make credit note and debit note exclusive (#35781) 
* fix: make credit note and debit note exclusive (#35781)

(cherry picked from commit 4fbff20954)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* chore: resolve conflicts

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-24 12:30:40 +05:30
Marica
d53b197896 feat: Auto set Party in Bank Transaction (#34675) 
* feat: Party auto-matcher from Bank Transaction data

- Created Bank Party Mapper
- Created class to auto match by account/iban or party name/description(fuzzy)
- Automatch and set in transaction or create mapper
- `rapidfuzz` introduced

* chore: Single query with or filter to search Party Mapper by name/desc

* feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder)

* fix: Don't set description as key in Mapper doc if matched by description

- Description is volatile and will keep changing
- It will lead to multiple Bank Party Mapper docs for the same party that will never be referenced again
- Parts of the descripton keep changing which is why it will never match a mapper record
- If matched by desc, dont create mapper record.

* feat: Manually Update/Correct Party in Bank Transaction

- On updating bank trans.n party after submit, the corresponding mapper doc will be updated too
- The mapper doc in turn will update all linked bank transactions that do not have this updated value
- Added Bank Party Mapper hidden link in Bank Transaction
- Rename field in BPM to `Party Name` as it does not hold description data
- If a BT matches with a BPM record, link that record in the BT

* chore: Perform automatch on submit

- misc: Clearer naming

* chore: Make auto matching party configurable

- Checkbox in Accounts settings "Enable Automatic Party Matching"
- Check before invoking automatching methods
- misc: Remove TODO comments

* fix: Match by both Account No and IBAN & other cleanups

- A BT could have both account and iban, and a Supplier could have only IBAN set
- In this case, matching by either (only account) gives no match
- Match by Account OR IBAN, use `or_filters`
- If matched, set both account no. and IBAN in Bank Party Mapper

- Explain AutoMatchParty
- Add type hints to return values
- Use `set_value` to set values in BT after matching since its an after submit event

* test: Match by Account No, IBAN, Party Name, Desc and match correction

* fix: Remove bank details fields from Shareholder

* fix: Use existing bank fields to match by bank account no/IBAN

- Remove newly added fields in Party doctypes to store bank details
- Use Bank Account's fields to match against account no/iban
- For employee, if Bank Account does not exist, find in Employee doctype against account no/iban

* fix: Tests

* feat: Optional Fuzzy Matching & Skip Matches for multiple similar matches

- Fuzzy matching can be enabled optionally in the settings
- If a query gets multiple matches with the same score, do not set a party as it is an extremely close call
- misc: Add 'cancelled' status to Bank transaction
- Test for skipping matching with extremely close matches

* chore: Remove Bank Party Mapper implementation

- Matching by Acc No/IBAN can easily happen with Bank Accounts. It's not a tedious query
- Historical lookups for  Party Name/Desc match are very tricky. The user could have manually set a match and we would not know. Also this leaves the Bank Party Mapper only useful for Party Name/Desc lookups, which feels excessive.
- We want to reduce the number of places the same data is stored and reduce confusion
- The Party Name/Desc will optionally happen fuzzily, or not at all
- There will be no Mapper lookups

* chore: Remove instances of `bank_party_mapper` and use `new_doc`
 2023-06-24 12:30:08 +05:30
mergify[bot]
3dd3935e76 fix: Payment Term must be mandatory if Allocate Payment based on .. is checked (#35798) 
fix: Payment Term must be mandatory if `Allocate Payment based on ..` is checked (#35798)

- Front and Back end validation of condition
- Fix test to accomodate fix

(cherry picked from commit 2868baebab)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-06-24 12:29:26 +05:30
mergify[bot]
5c388a132f fix: reconcile invoice against credit note. (#35604) 
* test: reconcile credit against invoice

(cherry picked from commit f68ab3dfff)

* fix: missing attribute error

(cherry picked from commit 7973951c37)

* fix: reconcile invoice against credit note

(cherry picked from commit 54935438e1)

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2023-06-24 12:28:43 +05:30
mergify[bot]
b0234489ca fix: Remove special treatment for P&L Accounts (#35602) 
fix: Remove special treatment for P&L Accounts

(cherry picked from commit 0bd4de4504)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-23 15:55:51 +05:30