nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-22 19:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,197 Commits 403 Branches 1,702 Tags
83cbc1bef6fb8b9302c7d6ba747d648296edd8a3
Commit Graph

45197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Shenk
83cbc1bef6 fix: Document Name link validation in Bank Reconciliation Tool (#36495) 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.

(cherry picked from commit 7ab55b1bb2)

# Conflicts:
#	erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
 2023-08-14 13:34:31 +00:00
mergify[bot]
716d5c0b98 fix: standard formula to calculate the "difference" (#36612) 
fix: standard formula to calculate the "difference" (#36612)

(cherry picked from commit 843e77e72d)

Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
 2023-08-14 18:55:16 +05:30
Gursheen Kaur Anand
90b390c2c5 feat: add voucher totals in tds payable report (#36568) 
* feat: voucher totals in tds payable monthly

* fix: naming series column in tds payable report

* fix: tds computation summary columns
 2023-08-14 18:15:21 +05:30
ViralKansodiya
b131f70ed6 fix: Button Alignment center in hero slider (#36607) 
fix: speling in CSS (Button alignment center is not working on hero slider)#36561
 2023-08-14 16:20:58 +05:30
mergify[bot]
ac0fff7e94 fix: AR/AP report based on payment terms (#36574) 
fix: AR/AP report based on payment terms (#36574)

* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms

(cherry picked from commit fbb5058531)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-14 09:46:41 +05:30
mergify[bot]
3044f46c52 fix: wrong currency on financial-statement based reports (#36524) 
fix: wrong currency on financial-statement based reports (#36524)

* add missing field options on financial_statement Total field

* format financial statement code

(cherry picked from commit ce25f9e8c9)

Co-authored-by: Naufal Afif <naufalafif58@gmail.com>
 2023-08-13 17:11:47 +05:30
Deepesh Garg
0a832bc979 Merge pull request #36609 from frappe/mergify/bp/version-14-hotfix/pr-36564 
fix: Make default sales update frequency as monthly instead of each transaction (#36564)
 2023-08-13 13:20:27 +05:30
Deepesh Garg
e5bc888798 Merge pull request #36614 from deepeshgarg007/loan_repayment_cancel_v14 
fix: Allow backdated repayment cancels for term loans
 2023-08-13 11:57:49 +05:30
ruthra kumar
9172985a9b Merge pull request #36621 from frappe/mergify/bp/version-14-hotfix/pr-36309 
fix: allocation validation blocks partial payment for SO and PO (backport #36309)
 2023-08-13 11:39:27 +05:30
Deepesh Garg
a3032910a7 chore: resolve conflicts 2023-08-13 11:37:40 +05:30
ruthra kumar
ce08f038d2 fix: validation blocks partial payment for SO and PO 
(cherry picked from commit cb2bfabb6f)
 2023-08-13 10:58:55 +05:30
ruthra kumar
df632d7ecb Merge pull request #36620 from frappe/mergify/bp/version-14-hotfix/pr-36590 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
 2023-08-13 08:48:27 +05:30
ruthra kumar
1693905703 Merge pull request #36619 from frappe/mergify/bp/version-14-hotfix/pr-36593 
chore: update permissions for Process Payment Reconciliation (backport #36593)
 2023-08-13 08:43:00 +05:30
ruthra kumar
21d3fb0625 chore: resolve merge conflict 2023-08-13 08:24:01 +05:30
ruthra kumar
c83f10f638 refactor(test): don't set po_no by default 
(cherry picked from commit 64614cd915)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2023-08-13 02:40:42 +00:00
ruthra kumar
b901cfdbe2 fix: disallow mulitple SO with same PO No 
(cherry picked from commit dbd3fdbb41)
 2023-08-13 02:40:42 +00:00
ruthra kumar
cbcdf30840 chore: update permissions for Process Payment Reconciliation 
(cherry picked from commit cd28d15292)
 2023-08-13 02:40:38 +00:00
mergify[bot]
8b13185c25 fix: fetch Stock UOM from Item if not set (backport #36606) (#36617) 
fix: fetch `Stock UOM` from Item if not set (#36606)

(cherry picked from commit 539cfd08f0)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-12 23:25:05 +05:30
Deepesh Garg
1377cf4cf1 fix: Allow backdated repayment cancels for term loans 2023-08-12 20:01:04 +05:30
Deepesh Garg
4ca1f3b9cf fix: Make default sales update frequency as monthly instead of each transaction 
(cherry picked from commit 32863b4922)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json
 2023-08-11 17:10:07 +00:00
Deepesh Garg
347c67a0f1 Merge pull request #36608 from frappe/mergify/bp/version-14-hotfix/pr-36582 
fix: Group Account total not showing in Financial Statements (#36582)
 2023-08-11 22:33:35 +05:30
Deepesh Garg
2912648151 fix: Group Account total not showing in Financial Statements 
(cherry picked from commit baf5cddd1b)
 2023-08-11 16:27:53 +00:00
mergify[bot]
63c061e5e8 fix: wrap none type rate under flt (backport #36602) (#36604) 
fix: wrap none type rate under flt (#36602)

(cherry picked from commit 627986efa1)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-11 12:55:25 +00:00
mergify[bot]
96663d7e28 chore: set default filter dates if missing (backport #36597) (#36598) 
chore: set default filter dates if missing (#36597)

(cherry picked from commit 98e82e0d99)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-11 09:19:14 +00:00
rohitwaghchaure
ee04c6d5c5 fix: allow negative stock condition for batch item (#36586) 
* fix: allow negative stock condition for batch item

* fix: test case
 2023-08-11 13:57:27 +05:30
ruthra kumar
5488785fd8 Merge pull request #36579 from frappe/mergify/bp/version-14-hotfix/pr-36573 
refactor: 'is system generated' field and better remarks in Journal Entry (backport #36573)
 2023-08-11 09:43:53 +05:30
ruthra kumar
25ac0ce1cc Merge pull request #36580 from frappe/mergify/bp/version-14-hotfix/pr-36578 
fix: unhide `uom` and `stock_uom` fields in print view (backport #36578)
 2023-08-11 09:16:07 +05:30
ruthra kumar
727a379581 chore: remove unwanted 'Reversal of ITC' and merge conflicts 2023-08-11 09:12:11 +05:30
Anand Baburajan
29181274c8 feat: daily asset depreciation method (#36587) 
* feat: daily asset depreciation method

* chore: hide depr schedule if no schedules
 2023-08-10 22:47:16 +05:30
rohitwaghchaure
2800ad39d2 fix: incorrect available qty for backdated stock reco with batch (#36581) 2023-08-10 17:22:14 +05:30
ruthra kumar
b49309c160 fix: unhide uom and stock_uom fields in print view 
(cherry picked from commit 11cd163db7)
 2023-08-10 10:18:36 +00:00
ruthra kumar
a04471024d refactor: enable 'no-copy' 
(cherry picked from commit 4ed4b0240d)
 2023-08-10 10:09:26 +00:00
ruthra kumar
9b0d30c56b refactor: set flag display condition 
(cherry picked from commit de17eaef38)
 2023-08-10 10:09:25 +00:00
ruthra kumar
00c7dbceaa refactor: add is_system_generated field to Journal Entry 
(cherry picked from commit 3997aa77d4)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-08-10 10:09:25 +00:00
ruthra kumar
5443592d84 fix: better remarks on Cr note created by Reconciliation 
(cherry picked from commit 47cb349362)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-08-10 10:09:25 +00:00
rohitwaghchaure
a864e07d4f fix: precision issue while submitting the stock entry (#36575) 
fix: precision issue while submmiting the stock entry
 2023-08-10 13:32:31 +05:30
mergify[bot]
19cfcea78e fix: don't show disabled items in Item Shortage Report (backport #36550) (#36571) 
fix: don't show disabled items in `Item Shortage Report` (#36550)

(cherry picked from commit 4a7fc1506f)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-10 11:29:20 +05:30
Ankush Menat
8083c0b59e fix: move company rename to long queue 
(cherry picked from commit 5169006085)
 2023-08-10 10:03:22 +05:30
Anand Baburajan
8abc0adb18 chore: add warning for lending separation (#36569) 2023-08-09 15:07:40 +00:00
mergify[bot]
fe41be953d perf(invoice): Faster return amount query (backport #36556) (#36557) 
perf(invoice): Faster return amount query (#36556)

perf: Faster return amount query
(cherry picked from commit b0c79a0467)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-08-09 14:07:48 +05:30
s-aga-r
c2b5417cb8 Merge pull request #36552 from frappe/mergify/bp/version-14-hotfix/pr-36551 
fix(RFQ): link to supplier portal (backport #36551)
 2023-08-09 13:55:28 +05:30
mergify[bot]
240d866ef4 fix: Debit credit difference while submitting Sales Invoice (#36523) 
* fix: Debit credit difference while submitting Sales Invoice (#36523)

* fix: Debit credit difference while submitting Sales Invoice

* test(fix): Update gl entry comparison

* test(fix): Update gl entry comparison

(cherry picked from commit 492ea3bcc8)

# Conflicts:
#	erpnext/controllers/accounts_controller.py

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-09 00:04:47 +05:30
mergify[bot]
0e87c86aab fix: payment allocation in invoice payment schedule (#36440) 
* fix: payment allocation in invoice payment schedule (#36440)

* fix: payment allocation in invoice payment schedule

* test: payment allocation for payment terms

* chore: linting issues

(cherry picked from commit edbefee10c)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-09 00:04:08 +05:30
barredterra
d273948d7a test(RFQ): get_link 
(cherry picked from commit 68ad62f7d0)
 2023-08-08 11:25:39 +00:00
barredterra
eb2f68ec98 fix(RFQ): link to supplier portal 
(cherry picked from commit fd91f2c2e0)
 2023-08-08 11:25:39 +00:00
mergify[bot]
00b9df0bc5 fix: stock reconciliation negative stock error (backport #36544) (#36549) 
fix: stock reconciliation negative stock error (#36544)

fix: stock reco negative stock error
(cherry picked from commit 0b36e7d10e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-08 16:04:52 +05:30
Anand Baburajan
cd1c175439 perf: asset depreciation entry posting (#36461) 
* perf: make post depr entries job daily_long

* perf: optimise post_depreciation_entries and make_depreciation_entry

* chore: more optimisation and dont fail all schedule dates if one date fails

* chore: don't post entries before acc_frozen_upto

* chore: using get_single_value

* refactor: destructure asset object
 2023-08-08 15:09:55 +05:30
ruthra kumar
2ca2e67812 Merge pull request #36543 from frappe/mergify/bp/version-14-hotfix/pr-36528 
refactor: use base_tax_withholding_net_total for treshold validation (backport #36528)
 2023-08-08 14:41:53 +05:30
ruthra kumar
c26a52d791 refactor: use base_tax_withholding_net_total for treshold validation (#36528) 
* refactor: use base_tax_withholding_net_total for treshold validation

* fix: only for non payment entry doctypes

(cherry picked from commit 11d5327d1b)
 2023-08-08 08:45:22 +00:00
mergify[bot]
5881960001 feat(RFQ): make sending attachments configurable (backport #36359) (#36535) 
* feat(RFQ): make sending attachments configurable (#36359)

(cherry picked from commit 8cc3df7c2c)

# Conflicts:
#	erpnext/buying/doctype/request_for_quotation/request_for_quotation.json

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-08-07 21:17:12 +05:30