Commit Graph

45052 Commits

Author SHA1 Message Date
Gursheen Anand
619b0feb5f fix: show tds & tcs separately 2023-07-26 11:35:02 +05:30
Gursheen Anand
32fea643cd feat: add party type filter 2023-07-26 11:34:27 +05:30
Deepesh Garg
82f05bf11a Merge pull request #36292 from frappe/mergify/bp/version-14-hotfix/pr-36107
feat: filtering based on accounting dimensions in profitability analysis (backport #36107)
2023-07-25 15:18:23 +05:30
Gursheen Anand
542c80433d fix: fetch acc dimension fieldname
(cherry picked from commit 1c5c310f5a)
2023-07-25 08:59:30 +00:00
Gursheen Anand
1fe6d4ef1f fix: clear accounting dimension value when based on field changes
(cherry picked from commit 21c993a7b3)
2023-07-25 08:59:30 +00:00
Gursheen Anand
ba95df2a74 feat: filter based on accounting dimension in profitability analysis
(cherry picked from commit dd8c3d5462)
2023-07-25 08:59:29 +00:00
Deepesh Garg
dc69f47aab Merge pull request #36286 from resilient-tech/fix-itemised-tax-breakup
fix: Correct Tax Breakup for different tax rates for same hsn code (#36235)
2023-07-25 14:22:34 +05:30
DaizyModi
6f2e639182 fix: itemised tax breakup 2023-07-25 11:44:48 +05:30
Deepesh Garg
ed0d0d8e8e Merge pull request #36282 from frappe/mergify/bp/version-14-hotfix/pr-36278
fix(regional): set `frappe.flags.company` temporarily, where required (#36278)
2023-07-24 20:57:05 +05:30
rohitwaghchaure
4c35942c2d Merge pull request #36265 from frappe/mergify/bp/version-14-hotfix/pr-36259
fix: no default email account causing reposting issue (backport #36259)
2023-07-24 20:02:30 +05:30
Sagar Vora
73e9b38cda fix(regional): set frappe.flags.company temporarily, where required
(cherry picked from commit 4205f564a0)
2023-07-24 14:05:34 +00:00
Anand Baburajan
e867fe77a4 fix: set new purchase_receipt_amount on asset split (#36272) 2023-07-24 18:50:16 +05:30
Deepesh Garg
6948acbb69 Merge pull request #36275 from frappe/mergify/bp/version-14-hotfix/pr-36274
fix: customer filter in process soa (#36274)
2023-07-24 17:36:19 +05:30
Gursheen Anand
5938af9c3f fix: customer filter in process soa
(cherry picked from commit 34d7fb388d)
2023-07-24 12:03:04 +00:00
Deepesh Garg
c575c88ab9 Merge pull request #36258 from frappe/mergify/bp/version-14-hotfix/pr-36251
fix: unresponsive sales invoice form (#36251)
2023-07-24 17:32:36 +05:30
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