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

45137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anand Baburajan
2b47f5815e fix: allow both custodian and location while creating asset (#36263) 2023-07-24 15:51:16 +05:30
Rohit Waghchaure
026f9f5a69 fix: no default email account causing reposting issue 
(cherry picked from commit efb51526a9)
 2023-07-24 09:34:09 +00:00
ruthra kumar
b849f6c4d6 Merge pull request #36252 from frappe/mergify/bp/version-14-hotfix/pr-36241 
fix: multiple fixes on payment terms based issues in payment entry (backport #36241)
 2023-07-24 14:49:55 +05:30
ruthra kumar
8f24292155 fix: apply terms validaton only in Sales/Purchase documents 2023-07-24 14:13:57 +05:30
ruthra kumar
bf948243a6 refactor: refresh table once after loop ends 
(cherry picked from commit d048365da3)
 2023-07-24 08:31:57 +00:00
ruthra kumar
690b52622d refactor: handle references without any template and payment_term 
(cherry picked from commit ec7558b9e0)
 2023-07-24 07:06:34 +00:00
ruthra kumar
14600fa190 fix: allocation logic on 'Get Outstanding Invoices' btn in PE 
1. fixed broken `payment_term` filter in Payment References section
2. Throw error if user fails to select 'Payment Term' for an invoice
with 'Payment Term based allocation' enabled.

(cherry picked from commit 662ccd467c)
 2023-07-24 07:06:34 +00:00
ruthra kumar
3d661709fa Merge pull request #36237 from frappe/mergify/bp/version-14-hotfix/pr-36206 
test: overallocation validation in payment entry (backport #36206)
 2023-07-22 11:23:11 +05:30
ruthra kumar
25301881c9 chore(test): enable multi-currency party for testing 
(cherry picked from commit 93246043ec)
 2023-07-22 05:12:13 +00:00
ruthra kumar
bc7ab2f787 chore: validation on multi-currency tran on company curtency account 
(cherry picked from commit 8f9ef4ef5b)
 2023-07-22 05:12:12 +00:00
ruthra kumar
602f0769c4 chore: use flt for currency 
(cherry picked from commit 5b37919574)
 2023-07-22 05:12:12 +00:00
ruthra kumar
f3295a9f59 chore: test more scenarios 
(cherry picked from commit 6b4a81ee48)
 2023-07-22 05:12:12 +00:00
ruthra kumar
2f4d8e1e94 test: overallocation validation in payment entry 
(cherry picked from commit e7e3853f81)
 2023-07-22 05:12:11 +00:00
Deepesh Garg
62bc75a917 Merge branch 'version-14' of https://github.com/frappe/erpnext into version-14-hotfix 2023-07-21 16:14:23 +05:30
Deepesh Garg
51f7e6e648 Merge pull request #36231 from frappe/mergify/bp/version-14-hotfix/pr-36229 
fix: FY in naming series variable for orders (backport #36229)
 2023-07-21 16:06:58 +05:30
Deepesh Garg
6a6a3ae3c3 fix: FY in naming series variable for orders 
(cherry picked from commit 7a7d32db81)
 2023-07-21 10:36:30 +00:00
Deepesh Garg
ae494b8ee8 Merge pull request #36226 from frappe/mergify/bp/version-14-hotfix/pr-35536 
fix: Ignore permissions while submitting account closing balance record (#35536)
 2023-07-21 12:47:14 +05:30
Nabin Hait
c2976ef643 fix: Ignore permissions while submitting account closing balance record (#35536) 
(cherry picked from commit f11d9b019d)
 2023-07-21 05:26:15 +00:00
mergify[bot]
844ec58f6b fix: Ambiguous column error while submitting stock entry (backport #36209) (#36222) 
fix: Ambiguous column error while submitting stock entry

Stock Entry Type=Manufacture

request.js:457 Traceback (most recent call last):
  File "apps/frappe/frappe/app.py", line 94, in application
    response = frappe.api.handle()
  File "apps/frappe/frappe/api.py", line 54, in handle
    return frappe.handler.handle()
  File "apps/frappe/frappe/handler.py", line 47, in handle
    data = execute_cmd(cmd)
  File "apps/frappe/frappe/handler.py", line 85, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "apps/frappe/frappe/__init__.py", line 1610, in call
    return fn(*args, **newargs)
  File "apps/frappe/frappe/desk/form/save.py", line 28, in savedocs
    doc.save()
  File "apps/frappe/frappe/model/document.py", line 305, in save
    return self._save(*args, **kwargs)
  File "apps/frappe/frappe/model/document.py", line 327, in _save
    return self.insert()
  File "apps/frappe/frappe/model/document.py", line 259, in insert
    self.run_before_save_methods()
  File "apps/frappe/frappe/model/document.py", line 1045, in run_before_save_methods
    self.run_method("validate")
  File "apps/frappe/frappe/model/document.py", line 914, in run_method
    out = Document.hook(fn)(self, *args, **kwargs)
  File "apps/frappe/frappe/model/document.py", line 1264, in composer
    return composed(self, method, *args, **kwargs)
  File "apps/frappe/frappe/model/document.py", line 1246, in runner
    add_to_return_value(self, fn(self, *args, **kwargs))
  File "apps/frappe/frappe/model/document.py", line 911, in fn
    return method_object(*args, **kwargs)
  File "apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py", line 122, in validate
    self.validate_qty()
  File "apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py", line 433, in validate_qty
    transferred_materials = frappe.db.sql(
  File "apps/frappe/frappe/database/database.py", line 220, in sql
    self._cursor.execute(query, values)
  File "env/lib/python3.10/site-packages/pymysql/cursors.py", line 158, in execute
    result = self._query(query)
  File "env/lib/python3.10/site-packages/pymysql/cursors.py", line 325, in _query
    conn.query(q)
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 549, in query
    self._affected_rows = self._read_query_result(unbuffered=unbuffered)
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 779, in _read_query_result
    result.read()
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 1157, in read
    first_packet = self.connection._read_packet()
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 729, in _read_packet
    packet.raise_for_error()
  File "env/lib/python3.10/site-packages/pymysql/protocol.py", line 221, in raise_for_error
    err.raise_mysql_exception(self._data)
  File "env/lib/python3.10/site-packages/pymysql/err.py", line 143, in raise_mysql_exception
    raise errorclass(errno, errval)
pymysql.err.OperationalError: (1052, "Column 'qty' in field list is ambiguous")

(cherry picked from commit c21fd45883)

Co-authored-by: MohsinAli <mmatiyailol@gmail.com>
 2023-07-20 20:15:36 +05:30
Frappe PR Bot
bafb79db50 chore(release): Bumped to Version 14.31.3 
## [14.31.3](https://github.com/frappe/erpnext/compare/v14.31.2...v14.31.3) (2023-07-20)

### Bug Fixes

* Trial Balance report considering cancelled entries ([c5e30f5](c5e30f5336))
v14.31.3 		2023-07-20 14:42:49 +00:00
Deepesh Garg
1d108ec224 Merge pull request #36219 from frappe/mergify/bp/version-14/pr-36217 
fix: Trial Balance report considering canceled entries (#36214)
 2023-07-20 20:11:12 +05:30
mergify[bot]
57cf3c28f8 fix: made item or warehouse filter mandatory (backport #36208) (#36215) 
fix: made item or warehouse filter mandatory

(cherry picked from commit 16498627ce)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-07-20 20:11:05 +05:30
Deepesh Garg
c5e30f5336 fix: Trial Balance report considering cancelled entries 
(cherry picked from commit fd58bbff6b)
(cherry picked from commit ca4f86d5af)
 2023-07-20 13:28:40 +00:00
Deepesh Garg
4cfecdc66b Merge pull request #36217 from frappe/mergify/bp/version-14-hotfix/pr-36214 
fix: Trial Balance report considering cancelled entries (#36214)
 2023-07-20 18:57:55 +05:30
Deepesh Garg
ca4f86d5af fix: Trial Balance report considering cancelled entries 
(cherry picked from commit fd58bbff6b)
 2023-07-20 13:18:53 +00:00
Frappe PR Bot
d6168ca979 chore(release): Bumped to Version 14.31.2 
## [14.31.2](https://github.com/frappe/erpnext/compare/v14.31.1...v14.31.2) (2023-07-19)

### Bug Fixes

* Default fiscal year in accounting, buying and sellingcharts ([ceea8be](ceea8be483))
v14.31.2 		2023-07-19 08:10:33 +00:00
Deepesh Garg
78a2333109 Merge pull request #36191 from frappe/mergify/bp/version-14/pr-36190 
fix: Default fiscal year in accounting, buying and selling charts (#36189)
 2023-07-19 13:38:57 +05:30
Deepesh Garg
ceea8be483 fix: Default fiscal year in accounting, buying and sellingcharts 
(cherry picked from commit 3759a41b83)
(cherry picked from commit 8ca3d6b7f3)
 2023-07-19 08:02:18 +00:00
Deepesh Garg
bd82ae523d Merge pull request #36190 from frappe/mergify/bp/version-14-hotfix/pr-36189 
fix: Default fiscal year in accounting, buying and selling charts (backport #36189)
 2023-07-19 13:31:49 +05:30
Deepesh Garg
8ca3d6b7f3 fix: Default fiscal year in accounting, buying and sellingcharts 
(cherry picked from commit 3759a41b83)
 2023-07-19 07:58:59 +00:00
Frappe PR Bot
388bbca492 chore(release): Bumped to Version 14.31.1 
## [14.31.1](https://github.com/frappe/erpnext/compare/v14.31.0...v14.31.1) (2023-07-19)

### Bug Fixes

* broken overallocation validation in payment entry ([ff0b51e](ff0b51ecdb))
v14.31.1 		2023-07-19 05:42:32 +00:00
ruthra kumar
1641630d70 Merge pull request #36185 from frappe/mergify/bp/version-14/pr-36181 
fix: broken overallocation validation in payment entry (backport #36181)
 2023-07-19 11:10:57 +05:30
ruthra kumar
61456ec45d Merge pull request #36184 from frappe/mergify/bp/version-14-hotfix/pr-36181 
fix: broken overallocation validation in payment entry (backport #36181)
 2023-07-19 11:10:41 +05:30
ruthra kumar
dd25c83c30 refactor: payment term outstanding in party account currency 
(cherry picked from commit ee83f94bb0)
 2023-07-19 05:17:40 +00:00
ruthra kumar
ff0b51ecdb fix: broken overallocation validation in payment entry 
In a multi term payment schedule, overallocation logic broke. Fixing
it using individual term outstanding amount in references. this should
work for the simple, one term payment schedule as well

(cherry picked from commit f8d4b19cb9)
 2023-07-19 05:17:39 +00:00
ruthra kumar
fcafff7ebe refactor: payment term outstanding in party account currency 
(cherry picked from commit ee83f94bb0)
 2023-07-19 05:17:22 +00:00
ruthra kumar
e1d31aad4d fix: broken overallocation validation in payment entry 
In a multi term payment schedule, overallocation logic broke. Fixing
it using individual term outstanding amount in references. this should
work for the simple, one term payment schedule as well

(cherry picked from commit f8d4b19cb9)
 2023-07-19 05:17:22 +00:00
Frappe PR Bot
22a19e4b6e chore(release): Bumped to Version 14.31.0 
# [14.31.0](https://github.com/frappe/erpnext/compare/v14.30.7...v14.31.0) (2023-07-18)

### Bug Fixes

* `TypeError` while creating WO from PP (backport [#36136](https://github.com/frappe/erpnext/issues/36136)) ([#36137](https://github.com/frappe/erpnext/issues/36137)) ([dd51010](dd5101056d))
* Account balance patch and query fixes ([#36117](https://github.com/frappe/erpnext/issues/36117)) ([0147754](0147754273))
* Accounts closing balance patch ([#36113](https://github.com/frappe/erpnext/issues/36113)) ([cf29156](cf29156139))
* allow manual asset receipt mov from nowhere ([#36093](https://github.com/frappe/erpnext/issues/36093)) ([4aaa1a1](4aaa1a15d7))
* Ambiguous column error while submitting stock entry ([#36058](https://github.com/frappe/erpnext/issues/36058)) ([a3a052b](a3a052bb51))
* circular dependency during reposting causing timeout error ([2c21404](2c21404813))
* get_dimension with_cost_center_and_project=false is not working ([#35974](https://github.com/frappe/erpnext/issues/35974)) ([42c93a1](42c93a1f00))
* Handle multi-company in patch ([#36127](https://github.com/frappe/erpnext/issues/36127)) ([e7f5754](e7f57542ab))
* improve "Update Items" modal ([#36105](https://github.com/frappe/erpnext/issues/36105)) ([b86571d](b86571d9d4))
* incorrect Balance Qty in the stock ledger for the item with Serial and Batch no ([373b868](373b868c1d))
* incorrect Reserved Qty for Production Plan in BIN for multi-uom case ([2f632d0](2f632d031a))
* Opening balance in TB report ([#36171](https://github.com/frappe/erpnext/issues/36171)) ([313ad7a](313ad7ae89))
* Opening entries showing up incorrectly in TB report ([#36135](https://github.com/frappe/erpnext/issues/36135)) ([d10e5e6](d10e5e666b))
* Remove current fiscal year from Global Defaults ([#35960](https://github.com/frappe/erpnext/issues/35960)) ([b877fa6](b877fa60db))
* Trailing opening entries in Accounts closing balance ([#36175](https://github.com/frappe/erpnext/issues/36175)) ([8a607db](8a607db493))
* validate docs in closed accounting period on save ([#36157](https://github.com/frappe/erpnext/issues/36157)) ([5985e02](5985e02574))

### Features

* add local holidays ([#36116](https://github.com/frappe/erpnext/issues/36116)) ([94caf7f](94caf7f5a8))
* add project filter in reports importing financial statements js file ([#36097](https://github.com/frappe/erpnext/issues/36097)) ([63e26e3](63e26e39d4))

### Performance Improvements

* index in `Item` and `Item Variant Attribute` (backport [#36133](https://github.com/frappe/erpnext/issues/36133)) ([#36144](https://github.com/frappe/erpnext/issues/36144)) ([6198983](619898350a))
* send SLA doctypes in boot ([adb6918](adb6918834))
v14.31.0 		2023-07-18 13:59:37 +00:00
Deepesh Garg
b0f5c02d74 Merge pull request #36176 from frappe/version-14-hotfix 
chore: release v14
 2023-07-18 19:27:44 +05:30
Deepesh Garg
0805a8e19c Merge branch 'version-14' into version-14-hotfix 2023-07-18 17:51:19 +05:30
Anand Baburajan
5985e02574 fix: validate docs in closed accounting period on save (#36157) 2023-07-18 16:40:06 +05:30
mergify[bot]
8a607db493 fix: Trailing opening entries in Accounts closing balance (#36175) 
fix: Trailing opening entries in Accounts closing balance (#36175)

(cherry picked from commit fbea61bbc6)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-18 15:20:11 +05:30
Frappe PR Bot
cdd5f992f6 chore(release): Bumped to Version 14.30.7 
## [14.30.7](https://github.com/frappe/erpnext/compare/v14.30.6...v14.30.7) (2023-07-18)

### Bug Fixes

* incorrect Reserved Qty for Production Plan in BIN for multi-uom case ([bcf7d87](bcf7d87b61))
v14.30.7 		2023-07-18 09:46:15 +00:00
rohitwaghchaure
9171f0cd9d Merge pull request #36174 from frappe/mergify/bp/version-14/pr-36162 
fix: incorrect Reserved Qty for Production Plan in BIN for the multi-uom case (backport #36162)
 2023-07-18 15:12:19 +05:30
mergify[bot]
ea66f18032 refactor: Leave Application should not be in hook.py (backport #36008) (#36158) 
Co-authored-by: Kitti U. @ Ecosoft <kittiu@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-07-18 14:26:47 +05:30
mergify[bot]
313ad7ae89 fix: Opening balance in TB report (#36171) 
fix: Opening balance in TB report (#36171)

(cherry picked from commit cfae52a40a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-18 14:20:28 +05:30
Rohit Waghchaure
bcf7d87b61 fix: incorrect Reserved Qty for Production Plan in BIN for multi-uom case 
(cherry picked from commit 2f632d031a)
 2023-07-18 08:29:02 +00:00
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