Commit Graph

44862 Commits

Author SHA1 Message Date
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
mergify[bot]
21336f1a2c ci: use multiple python version in patch test (#35846)
ci: use multiple python version in patch test

(cherry picked from commit 56e81ada56)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-06-23 12:39:47 +05:30
rohitwaghchaure
888118e3e1 Merge pull request #35852 from frappe/mergify/bp/version-14-hotfix/pr-35842
fix: multiple Work Orders against same production plan (backport #35842)
2023-06-23 10:34:50 +05:30
Anand Baburajan
42d09448ee fix: show non-depreciable assets in fixed asset register (#35858)
fix: show non-depr assets in fixed asset register
2023-06-23 08:21:32 +05:30
Anand Baburajan
69780da099 chore: asset scrap and restore fixes [v14] (#35851)
chore: better err msg on cancelling JE for asset scrap and allow restoring non-depr assets
2023-06-22 22:22:18 +05:30
Rohit Waghchaure
8ddfc34c30 fix: multiple Work Orders agaist same production plan
(cherry picked from commit 80fffbd64b)
2023-06-22 16:42:13 +00:00
Anand Baburajan
fb823b53d1 fix: asset capitalization (#35832)
* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization
2023-06-22 17:14:24 +05:30
ruthra kumar
0138595000 Merge pull request #35838 from frappe/mergify/bp/version-14-hotfix/pr-35837
refactor: increase precision for current exc rate in Exchange Rate Revaluation (backport #35837)
2023-06-22 14:11:58 +05:30
ruthra kumar
e44783a3c5 refactor: increase precision for current exc rate in ERR
(cherry picked from commit b4db25dd18)
2023-06-22 08:10:41 +00:00
rohitwaghchaure
85ad34672c Merge pull request #35824 from frappe/mergify/bp/version-14-hotfix/pr-35611
fix: don't allow to make reposting entry for closing stock balance period (backport #35611)
2023-06-22 12:03:59 +05:30
ruthra kumar
41f1c11e85 Merge pull request #35834 from frappe/mergify/bp/version-14-hotfix/pr-35825
fix: multiple fixes in reconciliation tools (backport #35825)
2023-06-22 11:54:35 +05:30
ruthra kumar
cacb0f6fde fix: incorrect cost center error in bank reconciliation
(cherry picked from commit 41b9e92868)
2023-06-22 05:57:51 +00:00
ruthra kumar
200ddbf66c fix: no permission for accounts settings on payment reconciliation
(cherry picked from commit ad758b8d85)
2023-06-22 05:57:51 +00:00
mergify[bot]
20f2bef55f fix: issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport #35821) (#35827)
Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (#35821)

* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry

* chore: remove unnecessary line break

* chore: formatting

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 000ebe4479)

Co-authored-by: saeedkola <mohammedsaeedk@gmail.com>
2023-06-21 15:37:21 +05:30
Rohit Waghchaure
e68b08817e fix: don't allow to make reposting entry for closing stock balance period
(cherry picked from commit 96c5c7b1df)
2023-06-21 08:46:30 +00:00
rohitwaghchaure
4e1b2c6f8d Merge branch 'version-14' into version-14-hotfix 2023-06-20 19:41:56 +05:30
rohitwaghchaure
c669dba691 Merge pull request #35813 from frappe/mergify/bp/version-14-hotfix/pr-35810
fix: stock error for service item (backport #35810)
2023-06-20 17:49:32 +05:30
rohitwaghchaure
8c183741bd Merge pull request #35812 from frappe/mergify/bp/version-14-hotfix/pr-35809
fix: key error while checking the stock balance report (backport #35809)
2023-06-20 17:30:51 +05:30
Rohit Waghchaure
2bbea63de1 fix: stock error for service item
(cherry picked from commit 32965f1af9)
2023-06-20 11:51:27 +00:00
Rohit Waghchaure
baf014fc61 fix: keyerror while checking the stock balance report
(cherry picked from commit a627d2a38c)
2023-06-20 11:32:06 +00:00
rohitwaghchaure
95e3dc9b81 Merge pull request #35805 from rohitwaghchaure/fixed-address-issue-from-e-cart
fix: Duplicate addresses are creating while using the E-commerce
2023-06-20 15:43:58 +05:30
Rohit Waghchaure
703e4f4f5d fix: Duplicate addresses are creating while using the E-commerce 2023-06-20 14:50:40 +05:30
ruthra kumar
bf2ebce6f4 Merge pull request #35803 from frappe/mergify/bp/version-14-hotfix/pr-35794
fix: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account (backport #35794)
2023-06-20 14:49:06 +05:30
ruthra kumar
65d24ea9ea refactor: higher precision for rounding loss and allow '0'
(cherry picked from commit 6694175a51)
2023-06-20 14:02:45 +05:30
ruthra kumar
6c9c3426f8 refactor: allow '0' rounding allowance
(cherry picked from commit 4567474418)
2023-06-20 14:02:40 +05:30
ruthra kumar
146d41ee81 refactor: allow higher precision for new exchange rate
(cherry picked from commit 9d04af9ecc)
2023-06-20 08:29:53 +00:00
ruthra kumar
7da461b862 fix: for zero bal accounts, dr/cr only on currency that has balance
(cherry picked from commit 1b33afd699)
2023-06-20 08:29:53 +00:00
mergify[bot]
8b57ecd8ef fix: date and finance book fixes in fixed asset register (backport #35751) (#35799)
* fix: date and finance book fixes in fixed asset register (#35751)

* fix: handle finance books properly and show all assets by default in fixed asset register

* chore: rename value to depr amount

* chore: get asset value for correct fb properly

* chore: rename include_default_book_entries to include_default_book_assets

(cherry picked from commit 0d12588583)

# Conflicts:
#	erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

* chore: resolving conflicts and renaming entries to assets

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-20 12:52:18 +05:30
rohitwaghchaure
7d010adcd4 Merge pull request #35786 from rohitwaghchaure/fixed-work-order-serial-no-issue
fix: work order serial no issue
2023-06-20 12:13:17 +05:30
Rohit Waghchaure
4af0a9b192 fix: test case 2023-06-20 11:42:02 +05:30
mergify[bot]
3bac2a88bd perf: index purpose in Stock Entry (backport #35782) (#35783)
perf: index `purpose` in `Stock Entry`

(cherry picked from commit 4f941ac5c0)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-06-19 22:22:50 +05:30
Rohit Waghchaure
50a8907e8c fix: work order serial no issue 2023-06-19 21:29:34 +05:30
mergify[bot]
42e25d4cdf fix: fix get outstanding invoices btn and add get outstanding orders btn (backport #35776) (#35787)
fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776)

* fix: fix get outstanding invoices btn and add get outstanding orders btn

* chore: remove unnecessary arg

(cherry picked from commit c1da3ddbbf)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-19 20:17:56 +05:30