nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,160 Commits 404 Branches 1,700 Tags
8083c0b59e3e371a39f18280edd092e985e5d0cd
Commit Graph

45160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Deepesh Garg
8e8e59cecb Merge pull request #36484 from frappe/mergify/bp/version-14-hotfix/pr-36458 
test: balance sheet report  (backport #36458)
 2023-08-04 10:59:11 +05:30
Gursheen Anand
47d0e76999 test: balance sheet report 
(cherry picked from commit 002bf77314)
 2023-08-04 04:26:17 +00:00
Gursheen Anand
46bb309b8a fix: check root type only when not none 
(cherry picked from commit cd98be6088)
 2023-08-04 04:26:17 +00:00
mergify[bot]
dfd356a174 chore: better cost center validation for assets (backport #36477) (#36479) 
chore: better cost center validation for assets (#36477)

(cherry picked from commit 38a612c62e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-03 17:18:56 +05:30
rohitwaghchaure
c1819a4b21 fix: serial no not able to reject for the internal transfer (#36467) 2023-08-03 12:19:25 +05:30
mergify[bot]
caa4f33169 fix: don't allow negative rate (backport #36027) (#36465) 
* fix: don't allow negative rates (#36027)

* fix: don't allow negative rate

* test: don't allow negative rate

* fix: only check for -rate on items child table

(cherry picked from commit dedf24b86d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* chore: resolve merge conflict

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-08-02 17:13:22 +05:30
ruthra kumar
e6dca0668c Merge pull request #36464 from frappe/mergify/bp/version-14-hotfix/pr-36455 
fix: handle None value in payment_term_outstanding (backport #36455)
 2023-08-02 16:54:38 +05:30
Husam Hammad
b033b3b0d6 fix: handle None value in payment_term_outstanding 
* Fix payment entry bug: Handle None value in payment_term_outstanding

* fix: Handle None value in payment_term_outstanding V2

fix linting issue

(cherry picked from commit 27ebf14f9d)
 2023-08-02 10:59:43 +00:00
rohitwaghchaure
8c57d56240 fix: search not working for so in the Production Plan (#36459) 
fix: search not working for so
 2023-08-02 12:47:12 +05:30
Anand Baburajan
8501a1182a fix: cross connect delivery note and sales invoice (#36183) 
* fix: cross connect delivery note and sales invoice

* chore: remove unnecessary non_standard_fieldname
 2023-08-02 09:07:04 +05:30
Deepesh Garg
fb32120e36 Merge pull request #36454 from frappe/mergify/bp/version-14-hotfix/pr-36450 
fix: Fix query for financial statement report (backport #36450)
 2023-08-01 23:39:44 +05:30
Corentin Flr
d1590f266b fix: Fix query for financial statement report 
(cherry picked from commit bd3fc7c434)
 2023-08-01 18:07:16 +00:00
ruthra kumar
e8f24b8b4e Merge pull request #36437 from frappe/mergify/bp/version-14-hotfix/pr-36349 
fix: overallocation validation misfire on normal invoices (backport #36349)
 2023-08-01 15:55:42 +05:30
ruthra kumar
fcda6818ed Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36349 2023-08-01 15:08:06 +05:30
ruthra kumar
f748eb74f1 Merge pull request #36367 from frappe/mergify/bp/version-14-hotfix/pr-36126 
fix: incorrect `idx` on Journals after reconciliation (backport #36126)
 2023-08-01 15:07:23 +05:30
ruthra kumar
5f677b9629 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36126 2023-08-01 14:38:52 +05:30
ruthra kumar
d34f1c1776 Merge pull request #36439 from ruthra-kumar/merge_conflict_in_sr_sp_csv 
chore: remove merge conflict
 2023-08-01 14:31:11 +05:30
ruthra kumar
2dee97aa70 chore: remove merge conflict 
remove merge conflict in sr-SP.csv
 2023-08-01 14:18:14 +05:30
ruthra kumar
5ac7dca2ec Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36126 2023-08-01 13:53:39 +05:30