nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 20:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,975 Commits 437 Branches 1,739 Tags
a5f398474aae91c55d2642759302b38c4dca2b48
Commit Graph

44975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
a5f398474a Merge pull request #36169 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-entry 
fix: incorrect Balance qty in the stock ledger
 2023-07-17 22:44:44 +05:30
Rohit Waghchaure
373b868c1d fix: incorrect Balance Qty in the stock ledger for the item with Serial and Batch no 2023-07-17 21:07:32 +05:30
rohitwaghchaure
665898a579 Merge pull request #36162 from rohitwaghchaure/fixed-incorrect-reserved-qty-for-production-plan 
fix: incorrect Reserved Qty for Production Plan in BIN for the multi-uom case
 2023-07-17 20:40:25 +05:30
Rohit Waghchaure
2f632d031a fix: incorrect Reserved Qty for Production Plan in BIN for multi-uom case 2023-07-17 17:14:59 +05:30
Sagar Vora
ab3671a13b Merge pull request #36164 from frappe/mergify/bp/version-14-hotfix/pr-36163 2023-07-17 15:47:19 +05:30
Sagar Vora
30cbc682b4 chore: use consistent quotes 
(cherry picked from commit bccb718cc2)
 2023-07-17 10:17:00 +00:00
mergify[bot]
b877fa60db fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults (#35960)

* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser

(cherry picked from commit 6270607c6d)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.py
#	erpnext/patches.txt
#	erpnext/public/js/utils.js

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-17 11:52:37 +05:30
mergify[bot]
c7a97cfb31 chore: add validation for account type of party type and account (#36141) 
chore: add validation for account type of party type and account (#36141)

chore: add validation to check if account type of party type and account match
(cherry picked from commit 305c37917f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-17 11:35:32 +05:30
Ankush Menat
413a8a41f0 Merge pull request #36152 from frappe/mergify/bp/version-14-hotfix/pr-36150 
perf: send SLA doctypes in boot (backport #36150)
 2023-07-16 13:00:28 +05:30
Ankush Menat
adb6918834 perf: send SLA doctypes in boot 
This request is fired on every load, data rarely if ever changes though.

(cherry picked from commit bd9ef74ef7)
 2023-07-16 07:01:32 +00:00
mergify[bot]
619898350a perf: index in Item and Item Variant Attribute (backport #36133) (#36144) 
* perf: index `variant_of` and `attribute` in `Item Variant Attribute`

(cherry picked from commit e4128a5c91)

* perf: index `disabled` in `Item`

(cherry picked from commit 04400eb2e4)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-15 10:11:17 +05:30
mergify[bot]
68d35b08f6 refactor: Batch Item Expiry Status report (backport #36106) (#36111) 
refactor: `Batch Item Expiry Status` report (#36106)

(cherry picked from commit 5f307f92e0)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-15 10:10:19 +05:30
mergify[bot]
94caf7f5a8 feat: add local holidays (#36116) 
* feat: add local holidays

(cherry picked from commit aa18b25a71)

* test(Holiday List): weekly off and local holidays

(cherry picked from commit fd23bd0434)

* feat(Holiday List): display localized country name

(cherry picked from commit 4888d75e72)

* fix: German translations of Holiday List

(cherry picked from commit 509061f05b)

# Conflicts:
#	erpnext/translations/de.csv

* fix(Holiday List): use current user's language

For consistency with "weekly off" descriptions

(cherry picked from commit 8271a39cdb)

* fix(Holiday List): allow empty value

(cherry picked from commit 8aff5a1dab)

* refactor(Holiday List): use autocomplete fieldtype

(cherry picked from commit dab9688410)

* chore: resolve merge conflicts

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-07-14 20:37:48 +05:30
mergify[bot]
d10e5e666b fix: Opening entries showing up incorrectly in TB report (#36135) 
fix: Opening entries showing up incorrectly in TB report (#36135)

* fix: Opening entries showing up incorrectly in TB report

* chore: Linting Issue

(cherry picked from commit 297c7e833c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 18:46:28 +05:30
mergify[bot]
dd5101056d fix: TypeError while creating WO from PP (backport #36136) (#36137) 
fix: `TypeError` while creating WO from PP (#36136)

(cherry picked from commit 8f5b94f5fd)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-14 18:03:53 +05:30
mergify[bot]
e7f57542ab fix: Handle multi-company in patch (#36127) 
* fix: Handle multi-company in patch (#36127)

fix: Handle multi-compnay in patch
(cherry picked from commit ac9ad8ec36)

* chore: re trigger patch

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 15:59:57 +05:30
mergify[bot]
42c93a1f00 fix: get_dimension with_cost_center_and_project=false is not working (#35974) 
fix: get_dimension with_cost_center_and_project=false is not working (#35974)

* fix: get_dimension with_cost_center_and_project=false is not working.

with_cost_center_and_project is no python str, and it always evaluated as True, despite JS call it with false

* chore: Linting Issues

---------

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

Co-authored-by: Kitti U. @ Ecosoft <kittiu@gmail.com>
 2023-07-14 13:04:07 +05:30
mergify[bot]
b86571d9d4 fix: improve "Update Items" modal (#36105) 
fix: improve "Update Items" modal (#36105)

* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view

(cherry picked from commit d5fe1432f8)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-14 13:03:26 +05:30
Ankush Menat
b167bffd22 ci: fix repo name in relase notes workflow 
[skip ci]

(cherry picked from commit b5f6a1cc20)
 2023-07-14 12:05:49 +05:30
mergify[bot]
0147754273 fix: Account balance patch and query fixes (#36117) 
* fix: Account balance patch and query fixes (#36117)

(cherry picked from commit b4bd978791)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 10:41:18 +05:30
mergify[bot]
cf29156139 fix: Accounts closing balance patch (#36113) 
fix: Accounts closing balance patch (#36113)

(cherry picked from commit d631c7dffa)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-13 16:13:23 +05:30
mergify[bot]
63e26e39d4 feat: add project filter in reports importing financial statements js file (#36097) 
feat: add project filter in reports importing financial statements js file (#36097)

feat: add project filter in financial statements js file
(cherry picked from commit 596a14e34f)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-07-12 19:16:10 +05:30
mergify[bot]
a3a052bb51 fix: Ambiguous column error while submitting stock entry (#36058) 
fix: Ambiguous column error while submitting stock entry (#36058)
 2023-07-12 13:23:07 +05:30
mergify[bot]
ea807f8d9a ci: regen release notes with GH API (backport #36098) (#36099) 
ci: regen release notes with GH API (#36098)

[skip ci]

(cherry picked from commit 0340bfc90d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-12 12:18:31 +05:30
Anand Baburajan
4aaa1a15d7 fix: allow manual asset receipt mov from nowhere (#36093) 2023-07-11 23:21:37 +05:30
rohitwaghchaure
64406a631f Merge pull request #36089 from frappe/mergify/bp/version-14-hotfix/pr-36088 
fix: circular dependency during reposting causing timeout error (backport #36088)
 2023-07-11 19:09:54 +05:30
Rohit Waghchaure
2c21404813 fix: circular dependency during reposting causing timeout error 
(cherry picked from commit c16a5814d4)
 2023-07-11 12:59:55 +00:00
mergify[bot]
6dc7a192ab fix: incorrect status in MR created from PP (backport #36085) (#36086) 
fix: incorrect status in MR created from PP (#36085)

(cherry picked from commit be5881280f)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-11 17:31:06 +05:30
Deepesh Garg
a76285b349 Merge branch 'version-14' into version-14-hotfix 2023-07-11 16:14:57 +05:30
mergify[bot]
f4f886c7d1 fix: Validate for missing expense account (#36078) 
fix: Validate for missing expense account (#36078)

* fix: Validate for missing expense account

* fix: Validate for missing expense account

(cherry picked from commit ce9164ec69)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-11 13:38:13 +05:30
ruthra kumar
7925fc7130 Merge pull request #36077 from frappe/mergify/bp/version-14-hotfix/pr-36076 
fix: possible type error on ERR creation (backport #36076)
 2023-07-11 11:12:24 +05:30
ruthra kumar
0569899499 fix: possible type error on ERR creation 
(cherry picked from commit 176966daab)
 2023-07-11 05:08:28 +00:00
mergify[bot]
44f509f989 refactor(Payment Entry): translatable strings (#36017) 
* refactor(Payment Entry): translatable strings (#36017)

* refactor(Payment Entry): translatable strings

* fix: German translations

(cherry picked from commit af28f95c60)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/translations/de.csv

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-10 21:01:44 +05:30
mergify[bot]
f3af0b2d2e fix: payment entry voucher_type error (#35779) 
fix: payment entry `voucher_type` error (#35779)

* fix: payment entry `voucher_type` error

* chore: linters

(cherry picked from commit 361a357088)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-07-10 20:52:36 +05:30
mergify[bot]
59b3277696 fix: also check on_hold (#35910) 
fix: also check on_hold (#35910)

(cherry picked from commit 5aa02b8571)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-07-10 20:34:32 +05:30
Frappe PR Bot
a299092337 chore(release): Bumped to Version 14.29.2 
## [14.29.2](https://github.com/frappe/erpnext/compare/v14.29.1...v14.29.2) (2023-07-10)

### Bug Fixes

* Delivery Note return valuation ([8c041eb](8c041eb424))
v14.29.2 		2023-07-10 14:10:51 +00:00
rohitwaghchaure
db809cb066 Merge pull request #36066 from frappe/mergify/bp/version-14/pr-36065 
fix: Delivery Note return valuation (backport #36063) (backport #36065)
 2023-07-10 19:39:19 +05:30
mergify[bot]
39e38bf083 fix: Opening balance in presentation currency in Trial Balance report (#36036) 
fix: Opening balance in presentation currency in Trial Balance report (#36036)

(cherry picked from commit 4d07e20b05)

# Conflicts:
#	erpnext/accounts/report/trial_balance/trial_balance.py

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-10 19:26:32 +05:30
Rohit Waghchaure
8c041eb424 fix: Delivery Note return valuation 
(cherry picked from commit 6a10ae662c)
(cherry picked from commit 296f312e7f)
 2023-07-10 12:50:08 +00:00
rohitwaghchaure
7c092a6b5f Merge pull request #36065 from frappe/mergify/bp/version-14-hotfix/pr-36063 
fix: Delivery Note return valuation (backport #36063)
 2023-07-10 18:18:57 +05:30
mergify[bot]
ebf3c0173e feat: Closing balance for period closing and reporting (#34257) 
* feat: Introduce opening entry for reporting

(cherry picked from commit 9739d8b52a)

* feat: Introduce opening entry for reporting

(cherry picked from commit b44a19bd1a)

* fix: Add patches to create accounting dimension in Closing Balance

(cherry picked from commit 36c08d0835)

* feat: Cascade closing balances on PCV submit

(cherry picked from commit c3f39c3f32)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
#	erpnext/patches.txt

* feat: Add views in standard filter

(cherry picked from commit e18336ebe7)

* chore: Rewrite query using query builder

(cherry picked from commit 7fa7d6b5e4)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

* feat: Add validations against period closing voucher

(cherry picked from commit f92c63fb10)

* fix: Order by issue in aggregation query

(cherry picked from commit 6607c8bd82)

* fix: Add patch to update closing balances

(cherry picked from commit a663df376c)

* fix: Closing balance entries for period closing voucher

(cherry picked from commit 436fc03eda)

* fix: Update patch to generate closing balance entries

(cherry picked from commit 95c9aafda9)

# Conflicts:
#	erpnext/patches.txt

* perf: Apply closing balance in Trial Balance report

(cherry picked from commit e5f603c9d9)

# Conflicts:
#	erpnext/accounts/report/trial_balance/trial_balance.py

* chore: Minor fixes

(cherry picked from commit c089c4156c)

# Conflicts:
#	erpnext/patches.txt

* fix: Aggregation with previous closing balance

(cherry picked from commit 4a2046dfb6)

# Conflicts:
#	erpnext/patches.txt

* test: Add static posting dates to tests

(cherry picked from commit 310f71c313)

* chore: Add index to period closing voucher column

(cherry picked from commit 5dabc98ba5)

* chore: rename Closing Balance to Account Closing Balance

(cherry picked from commit 3249a79f07)

* test: Add test case for closing balance

(cherry picked from commit f0267feca8)

* chore: Use account closing balance in set gl entries

(cherry picked from commit 0157fa15eb)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Update patch

(cherry picked from commit 76775a3e49)

* fix: Account sub query

(cherry picked from commit 7f11373b58)

* chore: Simplify query

(cherry picked from commit 00fe3042b2)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

* chore: Add missing validations

(cherry picked from commit 0aadb680eb)

* chore: Remove unnecessary list comprehension

(cherry picked from commit 44053db010)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Ignore opening entries if PCV posted

(cherry picked from commit f9397a87ac)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Don't validate if no GL Entry exists

(cherry picked from commit 528ab503f2)

* chore: Fix Typo

(cherry picked from commit 3fd95200da)

* fix: Validation for cancelation

(cherry picked from commit 30eb6c8512)

* fix: Partial trial balance view

(cherry picked from commit b7dcf27b01)

* fix: CS financial statement param

(cherry picked from commit f8cff09129)

* chore: Improve validation message

(cherry picked from commit 8ce1da111e)

* chore: Resolve conflicts

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-10 18:04:45 +05:30
Rohit Waghchaure
296f312e7f fix: Delivery Note return valuation 
(cherry picked from commit 6a10ae662c)
 2023-07-10 12:19:37 +00:00
rohitwaghchaure
16943ac248 Merge pull request #36057 from frappe/mergify/bp/version-14-hotfix/pr-36001 
fix: accepted warehouse and rejected warehouse can't be same (backport #36001)
 2023-07-10 17:48:29 +05:30
mergify[bot]
573183cff5 fix: deferred accounting entries on accounts frozen (#35978) 
* fix: deferred accounting entries on accounts frozen (#35978)

* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen

(cherry picked from commit 674af15696)

# Conflicts:
#	erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py

* chore: resolve conflicts

* fix: test for deferred accounting

* chore: Linting Issues

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-10 17:31:17 +05:30
rohitwaghchaure
e55a264e57 fix: conflicts 2023-07-10 17:14:25 +05:30
rohitwaghchaure
79f9785d15 fix: conflicts 2023-07-10 17:13:55 +05:30
rohitwaghchaure
a178e6693c fix: conflicts 2023-07-10 17:13:23 +05:30
rohitwaghchaure
6459c28316 fix: conflicts 2023-07-10 17:12:41 +05:30
mergify[bot]
3e711e888d fix: precision causing outstanding issue on partly paid invoices (#36030) 
fix: precision causing outstanding issue on partly paid invoices (#36030)

* fix: precision causing outstanding issue on partly paid invoices

* chore: linters

(cherry picked from commit 5c820ecc20)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-07-10 16:49:22 +05:30
mergify[bot]
04b1d459eb fix: labels and translations (#35963) 
fix: labels and translations (#35963)

fix: labels and translations
* fix: Vietnamese translation of customer
* fix: Vietnamese translation of bill

(cherry picked from commit 46fe9ac5cd)

Co-authored-by: aioaccount <92444849+aioaccount@users.noreply.github.com>
 2023-07-10 16:19:36 +05:30