CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 09:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,137 Commits 423 Branches 1,720 Tags
67393694de3ee4f37e40c8fe1e3a9963acc0ed8b
Commit Graph

45137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Frappe PR Bot
9ec3087af8 chore(release): Bumped to Version 14.30.6 
## [14.30.6](https://github.com/frappe/erpnext/compare/v14.30.5...v14.30.6) (2023-07-14)

### Bug Fixes

* Opening entries showing up incorrectly in TB report ([#36135](https://github.com/frappe/erpnext/issues/36135)) ([8e48c4e](8e48c4ee3e))
v14.30.6 		2023-07-14 14:37:01 +00:00
mergify[bot]
8e48c4ee3e 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 (#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>
(cherry picked from commit d10e5e666b)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-07-14 20:05:40 +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
Frappe PR Bot
ed8217d309 chore(release): Bumped to Version 14.30.5 
## [14.30.5](https://github.com/frappe/erpnext/compare/v14.30.4...v14.30.5) (2023-07-14)

### Bug Fixes

* `TypeError` while creating WO from PP (backport [#36136](https://github.com/frappe/erpnext/issues/36136)) (backport [#36137](https://github.com/frappe/erpnext/issues/36137)) ([#36138](https://github.com/frappe/erpnext/issues/36138)) ([c3acdcf](c3acdcf3ac))
v14.30.5 		2023-07-14 12:50:49 +00:00
mergify[bot]
c3acdcf3ac fix: TypeError while creating WO from PP (backport #36136) (backport #36137) (#36138) 
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>
(cherry picked from commit dd5101056d)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-07-14 18:10:16 +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
Frappe PR Bot
d420eeb884 chore(release): Bumped to Version 14.30.4 
## [14.30.4](https://github.com/frappe/erpnext/compare/v14.30.3...v14.30.4) (2023-07-14)

### Bug Fixes

* Handle multi-company in patch ([#36127](https://github.com/frappe/erpnext/issues/36127)) ([43d6cc0](43d6cc087e))
v14.30.4 		2023-07-14 10:43:22 +00:00
mergify[bot]
43d6cc087e fix: Handle multi-company in patch (#36127) 
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>
(cherry picked from commit e7f57542ab)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-07-14 16:02:32 +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
Frappe PR Bot
2f2b45bd6d chore(release): Bumped to Version 14.30.3 
## [14.30.3](https://github.com/frappe/erpnext/compare/v14.30.2...v14.30.3) (2023-07-14)

### Bug Fixes

* Account balance patch and query fixes ([#36117](https://github.com/frappe/erpnext/issues/36117)) ([495a8a9](495a8a9ce1))
v14.30.3 		2023-07-14 05:53:54 +00:00
mergify[bot]
495a8a9ce1 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>
(cherry picked from commit 0147754273)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-07-14 11:21:59 +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
Frappe PR Bot
1d9c28ec5e chore(release): Bumped to Version 14.30.2 
## [14.30.2](https://github.com/frappe/erpnext/compare/v14.30.1...v14.30.2) (2023-07-13)

### Bug Fixes

* Accounts closing balance patch ([#36113](https://github.com/frappe/erpnext/issues/36113)) ([49f28b0](49f28b0dbb))
v14.30.2 		2023-07-13 10:52:30 +00:00
mergify[bot]
49f28b0dbb fix: Accounts closing balance patch (#36113) 
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>
(cherry picked from commit cf29156139)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-07-13 16:17:04 +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
Frappe PR Bot
d43cf0eca4 chore(release): Bumped to Version 14.30.1 
## [14.30.1](https://github.com/frappe/erpnext/compare/v14.30.0...v14.30.1) (2023-07-11)

### Bug Fixes

* circular dependency during reposting causing timeout error ([026c608](026c6085cc))
v14.30.1 		2023-07-11 14:13:02 +00:00
rohitwaghchaure
a5a41f7347 Merge pull request #36091 from frappe/mergify/bp/version-14/pr-36089 
fix: circular dependency during reposting causing timeout error (backport #36088) (backport #36089)
 2023-07-11 19:41:35 +05:30
Rohit Waghchaure
026c6085cc fix: circular dependency during reposting causing timeout error 
(cherry picked from commit c16a5814d4)
(cherry picked from commit 2c21404813)
 2023-07-11 13:41:40 +00:00
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
Frappe PR Bot
2b72d143ca chore(release): Bumped to Version 14.30.0 
# [14.30.0](https://github.com/frappe/erpnext/compare/v14.29.2...v14.30.0) (2023-07-11)

### Bug Fixes

* accepted warehouse and rejected warehouse can't be same ([5d77e3c](5d77e3ce05))
* also check on_hold ([#35910](https://github.com/frappe/erpnext/issues/35910)) ([59b3277](59b3277696))
* conflicts ([e55a264](e55a264e57))
* conflicts ([79f9785](79f9785d15))
* conflicts ([a178e66](a178e6693c))
* conflicts ([6459c28](6459c28316))
* deferred accounting entries on accounts frozen ([#35978](https://github.com/frappe/erpnext/issues/35978)) ([573183c](573183cff5))
* Delivery Note return valuation ([296f312](296f312e7f))
* German translations ([#35990](https://github.com/frappe/erpnext/issues/35990)) ([b7b864e](b7b864e68c))
* incorrect status in MR created from PP (backport [#36085](https://github.com/frappe/erpnext/issues/36085)) ([#36086](https://github.com/frappe/erpnext/issues/36086)) ([6dc7a19](6dc7a192ab))
* incorrect TCS amount while customer has advance payment ([#35397](https://github.com/frappe/erpnext/issues/35397)) ([2a4bbf3](2a4bbf34b4))
* labels and translations ([#35963](https://github.com/frappe/erpnext/issues/35963)) ([04b1d45](04b1d459eb))
* Opening balance in presentation currency in Trial Balance report ([#36036](https://github.com/frappe/erpnext/issues/36036)) ([39e38bf](39e38bf083))
* payment entry `voucher_type` error ([#35779](https://github.com/frappe/erpnext/issues/35779)) ([f3af0b2](f3af0b2d2e))
* **Payment Entry:** compare rounded amount ([#36011](https://github.com/frappe/erpnext/issues/36011)) ([d80b0aa](d80b0aa157))
* possible type error on ERR creation ([0569899](0569899499))
* precision causing outstanding issue on partly paid invoices ([#36030](https://github.com/frappe/erpnext/issues/36030)) ([3e711e8](3e711e888d))
* Share ledger showing cancelled docs ([#35993](https://github.com/frappe/erpnext/issues/35993)) ([5102d0c](5102d0c3f7))
* Validate for missing expense account ([#36078](https://github.com/frappe/erpnext/issues/36078)) ([f4f886c](f4f886c7d1))
* Vietnamese translation of "Company" ([#35887](https://github.com/frappe/erpnext/issues/35887)) ([e443e6c](e443e6c02a))

### Features

* Closing balance for period closing and reporting ([#34257](https://github.com/frappe/erpnext/issues/34257)) ([ebf3c01](ebf3c0173e))
v14.30.0 		2023-07-11 12:51:51 +00:00
Deepesh Garg
078383f086 Merge pull request #36082 from frappe/version-14-hotfix 
chore: release v14
 2023-07-11 18:20:08 +05:30
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