nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,126 Commits 461 Branches 1,748 Tags
a9dcf46882acf23a3f2f1ca6581567d2aeacdb10
Commit Graph

45126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
b105ba11b8 chore: adding totals in asset reports (backport #36334) (#36335) 
chore: adding totals in asset reports (#36334)

(cherry picked from commit 5e7b05e566)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-26 22:25:39 +05:30
Deepesh Garg
faf692d344 Merge pull request #36325 from GursheenK/tds-tcs-payable-monthly-report 
fix: show TDS & TCS separately in TDS payable monthly
 2023-07-26 16:20:01 +05:30
ruthra kumar
aadd3f9e69 Merge pull request #36323 from frappe/mergify/bp/version-14-hotfix/pr-36298 
fix: show invoices name instead of object address (backport #36298)
 2023-07-26 12:20:15 +05:30
Frappe PR Bot
d9aa4057d7 chore(release): Bumped to Version 14.32.1 
## [14.32.1](https://github.com/frappe/erpnext/compare/v14.32.0...v14.32.1) (2023-07-26)

### Bug Fixes

* filter by cost center in trial balance ([a20d78a](a20d78ad9e))
v14.32.1 		2023-07-26 06:28:35 +00:00
Deepesh Garg
bc2c7fe315 Merge pull request #36326 from frappe/mergify/bp/version-14/pr-36324 
fix: filter by cost center in trial balance (#36324)
 2023-07-26 11:57:02 +05:30
Gursheen Anand
a20d78ad9e fix: filter by cost center in trial balance 
(cherry picked from commit 02428b446d)
 2023-07-26 06:25:51 +00:00
Deepesh Garg
4b49864995 Merge pull request #36324 from GursheenK/cost-center-filter-in-TB 
fix: filter by cost center in trial balance
 2023-07-26 11:55:03 +05:30
gouravengineer
e802f0c352 fix: show invoices name instead of object address 
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string

(cherry picked from commit cf93714a7c)
 2023-07-26 11:39:13 +05:30
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
Gursheen Anand
02428b446d fix: filter by cost center in trial balance 2023-07-26 11:04:46 +05:30
Gursheen Anand
479cab0336 fix: test with None conditon in PE 2023-07-26 09:56:48 +05:30
barredterra
f07b87c5eb chore(Item Group): remove redundant autoname 
(cherry picked from commit 1691eee26e)
 2023-07-26 04:15:22 +00:00
Frappe PR Bot
c4b0790003 chore(release): Bumped to Version 14.32.0 
# [14.32.0](https://github.com/frappe/erpnext/compare/v14.31.3...v14.32.0) (2023-07-26)

### Bug Fixes

* added missing option Partially Received in the status dropdown field ([4fa93b0](4fa93b05c6))
* allocation logic on 'Get Outstanding Invoices' btn in PE ([14600fa](14600fa190))
* allow both custodian and location while creating asset ([#36263](https://github.com/frappe/erpnext/issues/36263)) ([2b47f58](2b47f5815e))
* Ambiguous column error while submitting stock entry (backport [#36209](https://github.com/frappe/erpnext/issues/36209)) ([#36222](https://github.com/frappe/erpnext/issues/36222)) ([844ec58](844ec58f6b))
* apply discount on item after applying price list ([#36316](https://github.com/frappe/erpnext/issues/36316)) ([cff6e72](cff6e72838))
* apply terms validaton only in Sales/Purchase documents ([8f24292](8f24292155))
* broken overallocation validation in payment entry ([e1d31aa](e1d31aad4d))
* clear accounting dimension value when based on field changes ([1fe6d4e](1fe6d4ef1f))
* customer filter in process soa ([5938af9](5938af9c3f))
* Default fiscal year in accounting, buying and sellingcharts ([8ca3d6b](8ca3d6b7f3))
* fetch acc dimension fieldname ([542c804](542c80433d))
* FY in naming series variable for orders ([6a6a3ae](6a6a3ae3c3))
* group by in fixed asset register ([#36310](https://github.com/frappe/erpnext/issues/36310)) ([6cca18e](6cca18e168))
* Ignore permissions while submitting account closing balance record ([#35536](https://github.com/frappe/erpnext/issues/35536)) ([c2976ef](c2976ef643))
* itemised tax breakup ([6f2e639](6f2e639182))
* made item or warehouse filter mandatory (backport [#36208](https://github.com/frappe/erpnext/issues/36208)) ([#36215](https://github.com/frappe/erpnext/issues/36215)) ([57cf3c2](57cf3c28f8))
* no default email account causing reposting issue ([026f9f5](026f9f5a69))
* **regional:** set `frappe.flags.company` temporarily, where required ([73e9b38](73e9b38cda))
* set new purchase_receipt_amount on asset split ([#36272](https://github.com/frappe/erpnext/issues/36272)) ([e867fe7](e867fe77a4))
* timeout error while cancelling the Purchase Receipt ([0575005](0575005c87))
* Trial Balance report considering cancelled entries ([ca4f86d](ca4f86d5af))

### Features

* filter based on accounting dimension in profitability analysis ([ba95df2](ba95df2a74))
v14.32.0 		2023-07-26 04:10:45 +00:00
Deepesh Garg
55f553fb09 Merge pull request #36293 from frappe/version-14-hotfix 
chore: release v14
 2023-07-26 09:39:11 +05:30
Anand Baburajan
cff6e72838 fix: apply discount on item after applying price list (#36316) 2023-07-25 21:55:26 +05:30
Anand Baburajan
6cca18e168 fix: group by in fixed asset register (#36310) 2023-07-25 20:58:18 +05:30
ruthra kumar
2e5c531bbf Merge pull request #36298 from gouravengineer/show_invoice_name_instead_of_object 
fix:show invoices name instead of object address
 2023-07-25 20:38:53 +05:30
rohitwaghchaure
80e5a47ff6 Merge pull request #36300 from rohitwaghchaure/fixed-added-missing-options-partially-received 
fix: added missing option Partially Received in the status field
 2023-07-25 18:08:18 +05:30
Rohit Waghchaure
4fa93b05c6 fix: added missing option Partially Received in the status dropdown field 2023-07-25 17:22:56 +05:30
rohitwaghchaure
ab757cbd82 Merge pull request #36289 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel 
fix: timeout error while cancelling the Purchase Receipt
 2023-07-25 17:13:18 +05:30
Gursheen Anand
c3b21a6c30 chore: linting issues 2023-07-25 17:04:03 +05:30
Gursheen Anand
c9daa85985 fix: cost center filter for fetching payments 2023-07-25 16:50:46 +05:30
gouravengineer
cf93714a7c fix:show invoices name instead of object address 
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string
 2023-07-25 16:23:36 +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
Rohit Waghchaure
0575005c87 fix: timeout error while cancelling the Purchase Receipt 2023-07-25 12:00:36 +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