nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-03 15:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,179 Commits 417 Branches 1,708 Tags
cbcdf308405f8e1612a0de6d2f2f8a42c2de6de0
Commit Graph

45179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
mergify[bot]
9c108a8ef7 fix: enqueue submit/cancel action for stock entry having more than 50 line items (backport #36532) (#36536) 
fix: enqueue submit/cancel action for stock entry having more than 50 line items (#36532)

(cherry picked from commit ecba6ee183)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-07 21:03:36 +05:30
mergify[bot]
5b04708164 fix: stock entry decimal issue (backport #36530) (#36533) 
fix: stock entry decimal issue (#36530)

(cherry picked from commit 28dfc88789)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-07 19:11:19 +05:30
ruthra kumar
d76c2c5738 Merge pull request #36521 from frappe/mergify/bp/version-14-hotfix/pr-36485 
feat: ledger comparison report (backport #36485)
 2023-08-07 11:52:28 +05:30
ruthra kumar
07f235cf7d feat: ledger comparison report (#36485) 
* feat: Accounting Ledger comparison report

* chore: barebones methods

* chore: working state

* chore: refactor internal logic

* chore: working multi select filter on Account

* chore: working voucher no filter

* chore: remove debugging statements

* chore: report with currency symbol

* chore: working start and end date filter

* test: basic report function

* refactor(test): test all filters

(cherry picked from commit b86747c9d4)
 2023-08-07 06:00:24 +00:00
Ankush Menat
7adad4272a perf: defer holiday list imports 
Only used for configuring but loaded whenever
get_doc("holiday list", ...) is done

(cherry picked from commit 2eea90a873)
 2023-08-07 10:09:49 +05:30
mergify[bot]
f9981d1ff3 fix: use correct lang separator for frappe (backport #36519) (#36520) 
* fix: use correct lang separator for frappe

(cherry picked from commit 0218ca538f)

* perf: defer babel import

Only required when configuring but will get loaded everywhere

(cherry picked from commit f574ac11ea)

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-08-07 10:08:59 +05:30
Anand Baburajan
2d7d86039a chore: don't merge asset capitalization gl entries (#36514) 2023-08-06 23:34:02 +05:30
mergify[bot]
bdfbccd38e fix: get incoming rate instead of BOM rate (backport #36496) (#36506) 
* fix: get incoming rate instead of BOM rate (#36496)

* fix: get incoming rate instead of BOM rate

* test: add test case for SCR rm rate

(cherry picked from commit 758b31d895)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-06 14:51:23 +05:30
mergify[bot]
a234b8932e fix: Tax withholding against order via Payment Entry (#36493) 
fix: Tax withholding against order via Payment Entry (#36493)

* fix: Tax withholding against order via Payment Entry

* test: Add test case

* fix: Nonetype exceptions

(cherry picked from commit 93767eb7fc)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-05 22:58:55 +05:30
mergify[bot]
2216875bd6 fix: Lower deduction certificate for multi-company (#36491) 
fix: Lower deduction certificate for multi-company (#36491)

(cherry picked from commit 96035b87d5)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-05 22:44:10 +05:30
mergify[bot]
67393694de fix(accounts): Translate columns in AP/AR report (#36503) 
fix(accounts): Translate columns in AP/AR report (#36503)

(cherry picked from commit 559d914c0b)

Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com>
 2023-08-05 22:43:44 +05:30
mergify[bot]
0d7a4b6ff6 fix(ux): add Ordered Qty column in Get Items From > MR (backport #36486) (#36505) 
fix(ux): add `Ordered Qty` column in Get Items From > MR (#36486)

(cherry picked from commit e179499764)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-05 19:31:55 +05:30
Deepesh Garg
e0fb398be1 Merge pull request #36488 from frappe/mergify/bp/version-14-hotfix/pr-36333 
fix: AP report does not show expense claim payables (#36333)
 2023-08-04 17:52:52 +05:30
mergify[bot]
cf2a3e2fc5 Contact Doctype don't have any field job_title. (#36156) 
fix: Contact Doctype doesn't have any field called `job_title`

fix: Contact Doctype doesn't have any field called `job_title`
(cherry picked from commit 49be740736)

Co-authored-by: Sumit Jain <59503001+sumitjain236@users.noreply.github.com>
 2023-08-04 17:52:29 +05:30
Gursheen Anand
a79b30e45f refactor: future payments query 
(cherry picked from commit f5761e7965)
 2023-08-04 12:14:04 +00:00
Gursheen Anand
769d7d7554 fix: AP and AR summary 
(cherry picked from commit e355dea4b5)
 2023-08-04 12:14:03 +00:00
Gursheen Anand
674dba8cd7 fix: fetch ple for all party types 
(cherry picked from commit fd5c4e0a64)
 2023-08-04 12:14:03 +00:00
Gursheen Anand
1ca9aca0d5 fix: fetch ple with party type employee in AP 
(cherry picked from commit c47a37c3ab)
 2023-08-04 12:14:02 +00:00