CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,162 Commits 416 Branches 1,718 Tags
229075048bd17d945da6ef2b8af71f500db7e8ea
Commit Graph

46162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
229075048b feat(RFQ): special properties in print preview (backport #38725) (#38726) 
feat: RFQ print preview

(cherry picked from commit 27f05145ae)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-12-14 00:10:58 +05:30
mergify[bot]
0d49dd3648 Revert "fix(ux): don't update qty blindly" (backport #38728) (#38729) 
Revert "fix(ux): don't update qty blindly" (#38728)

(cherry picked from commit 6851c5042f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-13 23:16:26 +05:30
Anand Baburajan
753a1b511d fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38697) 
fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
 2023-12-12 20:53:44 +05:30
ruthra kumar
6715dd6167 Merge pull request #38677 from frappe/mergify/bp/version-14-hotfix/pr-38673 
fix: typo in unittest (backport #38673)
 2023-12-12 17:35:16 +05:30
ruthra kumar
a061798a6f Merge pull request #38686 from frappe/mergify/bp/version-14-hotfix/pr-38685 
refactor: add `get_list` for virtual child doctypes (backport #38685)
 2023-12-12 15:24:56 +05:30
ruthra kumar
fa79a7cdab refactor: add get_list for virtual child doctypes 
(cherry picked from commit 15c90551b6)
 2023-12-12 14:51:41 +05:30
ruthra kumar
6884aac2a0 Merge pull request #38683 from frappe/mergify/bp/version-14-hotfix/pr-38679 
refactor(test): repost utility deletion flag test (backport #38679)
 2023-12-12 13:33:17 +05:30
ruthra kumar
e61a12b4cb refactor(test): update repost settings before test case 
(cherry picked from commit acb6e8e120)
 2023-12-12 07:16:49 +00:00
ruthra kumar
4542a12787 refactor: increase limit and remove explicit call to start_repost 
(cherry picked from commit ccff588563)
 2023-12-12 07:16:49 +00:00
ruthra kumar
f0408c89ce refactor: remove explicit commit on repost 
(cherry picked from commit a97b3db749)
 2023-12-12 07:16:48 +00:00
ruthra kumar
7c080bd60c refactor(test): repost utility deletion flag test 
(cherry picked from commit cc15f695b4)
 2023-12-12 07:16:48 +00:00
Raffael Meyer
c87a3c7793 fix: typo in unittest (#38673) 
(cherry picked from commit 6ad298adfc)
 2023-12-12 04:26:10 +00:00
Deepesh Garg
7813efad35 Revert "refactor: bank transaction (backport #38182)" (#38653) 
Revert "refactor: bank transaction (#38182)"

This reverts commit a4b5fc8100.
 2023-12-10 16:29:27 +05:30
mergify[bot]
29cd474f44 fix(ux): don't update qty blindly (backport #38608) (#38638) 
fix(ux): don't update qty blindly

(cherry picked from commit 0156339f34)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-08 17:59:46 +05:30
Anand Baburajan
008400d287 fix: calc monthly_repayment_amount correctly in regenerate_repayment_schedule (#38636) 2023-12-08 16:34:29 +05:30
Shariq Ansari
4b9d9c0df4 Merge pull request #38626 from frappe/mergify/bp/version-14-hotfix/pr-38623 
fix: format only if searched text contain link value text (backport #38623)
 2023-12-07 20:51:16 +05:30
Shariq Ansari
b28deaae2c fix: format only if searched text contain link value text 
(cherry picked from commit 08ed3cd313)
 2023-12-07 15:17:48 +00:00
Ankush Menat
4e6b8ead8f chore: remove unused cache=True 
(cherry picked from commit 6a47a2ceaf)
 2023-12-06 20:55:35 +05:30
mergify[bot]
c2a137f0fb feat: add employee number to client user bootinfo (backport #38477) (#38602) 
feat: add employee number to client user bootinfo (#38477)

(cherry picked from commit 525f656cc1)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-12-06 20:55:06 +05:30
Deepesh Garg
f6fcb7ee26 Merge pull request #38571 from frappe/mergify/bp/version-14-hotfix/pr-38556 
fix(minor): financial statements period end date (#38556)
 2023-12-06 13:45:45 +05:30
Deepesh Garg
8d4c38f6b9 Merge branch 'version-14' into version-14-hotfix 2023-12-05 22:01:50 +05:30
mergify[bot]
01b2a1ffeb fix: consider the Valuation Method while picking incorrect SLE (backport #38592) (#38594) 
* fix: incorrect SLE for `Moving Average` valuation method

(cherry picked from commit 8beec58670)

* feat: add `Valuation Method` column in `Stock Ledger Variance` report

(cherry picked from commit 16c297c2ec)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 18:13:59 +05:30
ruthra kumar
b858d1ceeb Merge pull request #38585 from frappe/mergify/bp/version-14-hotfix/pr-38580 
fix: sql error while filtering on finance book in GL (backport #38580)
 2023-12-05 15:07:07 +05:30
Sherin KR
14b908f8ab fix: validate finance_books table length in asset (#38584) 2023-12-05 14:44:59 +05:30
ruthra kumar
25ec1fce61 fix: sql error while filtering on finance book in GL 
(cherry picked from commit b1d9f3132d)
 2023-12-05 09:11:39 +00:00
mergify[bot]
70965efd94 fix: incorrect material request quantity in Production Plan (backport #38566) (#38578) 
fix: incorrect material request quantity in Production Plan (#38566)

(cherry picked from commit aaa9036eca)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-05 14:24:54 +05:30
Karol Walczysko
9f43e9e668 Fix: Asset JS fieldname depreciation_schedule to schedules in make_schedules_editable function. (#38583) 
Fix fieldname depreciation_schedule to schedules

Renames the depreciation_schedule fieldname to schedules in the make_schedules_editable function.
 2023-12-05 14:22:23 +05:30
ruthra kumar
47ef075759 Merge pull request #38576 from frappe/mergify/bp/version-14-hotfix/pr-38570 
refactor: ignore unreconcile doc on PI cancel/delete (backport #38570)
 2023-12-05 13:52:22 +05:30
ruthra kumar
4544727654 refactor: ingore on JE cancel as well 
(cherry picked from commit 1a5d56977e)
 2023-12-05 13:32:10 +05:30
mergify[bot]
6c89f351f4 feat: Company filter in Stock Ledger Variance report (backport #38553) (#38573) 
feat: `Company` filter in `Stock Ledger Variance` report

(cherry picked from commit fb3421fcce)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 12:33:14 +05:30
ruthra kumar
35c06fabc5 refactor: ignore unreconcile doc on PI cancel/delete 
(cherry picked from commit 4ca84eadb6)
 2023-12-05 06:34:13 +00:00
Gursheen Anand
cbe15e159a fix: limit end date to current date 
(cherry picked from commit ab6e92aae1)
 2023-12-05 05:54:12 +00:00
Shariq Ansari
3411814ee3 Merge pull request #38563 from frappe/mergify/bp/version-14-hotfix/pr-38562 
fix: get dynamic link with parenttype contact (backport #38562)
 2023-12-04 19:22:28 +05:30
Shariq Ansari
12d3cda2d9 fix: get dynamic link with parenttype contact 
(cherry picked from commit 3d7ad71b22)
 2023-12-04 13:51:13 +00:00
ruthra kumar
efc6a8a044 Merge pull request #38546 from frappe/mergify/bp/version-14-hotfix/pr-38283 
chore: move reconciliation cleanup patch to pre-model sync (backport #38283)
 2023-12-04 14:33:44 +05:30
ruthra kumar
0d913a6401 Merge pull request #38549 from frappe/mergify/bp/version-14-hotfix/pr-38475 
fix: incorrect customer outstanding amount (backport #38475)
 2023-12-04 13:58:16 +05:30
ruthra kumar
2e3a860a46 chore: resolve conflict 2023-12-04 13:43:41 +05:30
NIYAZ RAZAK
c07723d49d fix: incorrect customer outstanding amount (#38475) 
* fix: incorrect customer outstanding amount

* chore: resolve linting error

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 3df1d75bdd)
 2023-12-04 08:10:42 +00:00
ruthra kumar
7551ba3851 chore: move reconciliation cleanup patch to pre-model 
(cherry picked from commit f258ab5e98)

# Conflicts:
#	erpnext/patches.txt
 2023-12-04 07:33:38 +00:00
ruthra kumar
67f149ee06 Merge pull request #38541 from frappe/mergify/bp/version-14-hotfix/pr-38148 
refactor: convert Payment Reconciliation to virtual doctype (backport #38148)
 2023-12-04 13:01:49 +05:30
ruthra kumar
d27e588672 chore: resolve conflicts 2023-12-04 12:21:19 +05:30
mergify[bot]
2e333e6802 fix: don't show non-stock items in Stock Analytics report (backport #38543) (#38544) 
* fix(ux): stock-item filter for Item Code field

(cherry picked from commit ccdcb7dfcc)

* fix: don't show non-stock items in Stock Analytics report

(cherry picked from commit 01aadbef85)

* fix: `linter`

(cherry picked from commit 15fff84bb5)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-04 12:18:31 +05:30
ruthra kumar
59773acdd2 chore: clear singles table and reconciliation related tables 
(cherry picked from commit f31002636b)

# Conflicts:
#	erpnext/patches.txt
 2023-12-04 06:31:05 +00:00
ruthra kumar
454d789232 chore: remove reconciliation defaults from patch 
(cherry picked from commit b5dd0c8630)

# Conflicts:
#	erpnext/patches.txt
 2023-12-04 06:31:04 +00:00
ruthra kumar
c349c89ae3 refactor: virtual doctype methods 
(cherry picked from commit 9c7b19e0b7)
 2023-12-04 06:31:04 +00:00
ruthra kumar
36dc7bd55e refactor: convert payment reconciliation tool to virtual doctype 
(cherry picked from commit 3a51a3f37e)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
 2023-12-04 06:31:03 +00:00
ruthra kumar
5a8bf7bf7d Merge pull request #38539 from frappe/mergify/bp/version-14-hotfix/pr-38220 
fix: exclude `invoice_doctypes` from party advance (backport #38220)
 2023-12-04 11:19:24 +05:30
Dany Robert
1042d4cfeb fix: exclude invoice_doctypes from party advance 
(cherry picked from commit f34ffc2062)
 2023-12-04 05:31:28 +00:00
mergify[bot]
9f23b7e46f fix: use predefined onload property load_after_mapping (backport #38209) (#38518) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
fix: use predefined onload property `load_after_mapping` (#38209)
 2023-12-04 09:52:16 +05:30
mergify[bot]
b7fe163de5 fix: SO ordered qty on PO item removal (#38378) 
* fix: SO ordered qty on PO item removal (#38378)

* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 9087e1443e)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-12-04 09:35:51 +05:30