nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,397 Commits 403 Branches 1,702 Tags
451cc7bc12cbbd6fb17afac05bf3871116d6415b
Commit Graph

45397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RitvikSardana
451cc7bc12 fix: added ignore_user_permissions to parent field of tree doctypes 
(cherry picked from commit de433d8626)
 2023-09-04 07:17:07 +00:00
mergify[bot]
11e67c7dc0 refactor: remove Recalculate Rate from SCR Item (backport #36929) (#36931) 
* refactor: remove `Recalculate Rate` from SCR Item (#36929)

(cherry picked from commit cd8ddae7c5)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-03 19:05:05 +05:30
mergify[bot]
5c8bee0a95 fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (backport #36892) (#36928) 
fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (#36892)

fix: when create doc from item dashboard defaut uom is not correctly selected
(cherry picked from commit 24e1144de5)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2023-09-03 16:38:44 +05:30
ruthra kumar
553ff11de6 Merge pull request #36925 from frappe/mergify/bp/version-14-hotfix/pr-36911 
fix: deduplicate gain/loss JE creation for journals as payment (backport #36911)
 2023-09-03 10:56:36 +05:30
ruthra kumar
5523bc5081 chore: resolve merge conflict 2023-09-03 10:28:58 +05:30
ruthra kumar
c8d81cc52d test: cost center inheritance from payment 
(cherry picked from commit 0366928db5)
 2023-09-03 04:44:17 +00:00
ruthra kumar
d24c8b1bbc refactor: use payment's CC for gain/loss if company default is unset 
(cherry picked from commit d6a3b9a5c7)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-09-03 04:44:16 +00:00
ruthra kumar
7fd96d0116 test: extend test to cancellation 
(cherry picked from commit 79fa562004)
 2023-09-03 04:44:15 +00:00
ruthra kumar
475750302b test: deduplicate gain/loss JE on reconciling journals against inv 
(cherry picked from commit cb6da6ec59)
 2023-09-03 04:44:14 +00:00
ruthra kumar
9168b3b0e8 fix: deduplicate gain/loss JE creation for journals as payment 
(cherry picked from commit 79c6f0165b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2023-09-03 04:44:13 +00:00
Anand Baburajan
0ff1546b9b chore: patch to correct asset values if je has workflow [v14] (#36915) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:32:16 +05:30
mergify[bot]
345c6084e5 feat(RFQ): optionally send document print (#36363) 
feat(RFQ): optionally send document print (#36363)
 2023-09-02 17:53:08 +05:30
Deepesh Garg
3820953022 Merge pull request #36917 from frappe/mergify/bp/version-14-hotfix/pr-36900 
fix: reduce threshold for background job in PCV (#36900)
 2023-09-02 17:46:44 +05:30
Deepesh Garg
78051e7f0f Merge pull request #36918 from frappe/mergify/bp/version-14-hotfix/pr-36908 
fix: only show "Unreconcile" if reconciled (#36908)
 2023-09-02 17:46:27 +05:30
barredterra
61752ac2b4 fix: only show "Unreconcile" if reconciled 
(cherry picked from commit 91e574609f)
 2023-09-02 11:43:12 +00:00
Gursheen Anand
5a226a8395 fix: reduce threshold for bg job fn 
(cherry picked from commit b6e6f2ef8d)
 2023-09-02 11:42:08 +00:00
ruthra kumar
543e4c87ea Merge pull request #36912 from frappe/mergify/bp/version-14-hotfix/pr-36859 
fix: account payable currency and value (backport #36859)
 2023-09-02 14:38:27 +05:30
Deepesh Garg
0a0b94e1cb Merge pull request #36884 from Nihantra-Patel/fiscal_year_trends_reports 
fix: Set the default filter in All Trends Report
 2023-09-02 14:37:14 +05:30
RitvikSardana
98c26403c1 fix: account payable currency and value (#36859) 
* fix: account payable currency and value

* fix: added party_type and party in accounts payable report

* chore: code cleanup

* fix: customer group test case failure

* fix: added test case of the issue

* fix: filter toggle for party_type

* fix: filter toggle for party_type

* chore: fix typo

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit e599f75a51)
 2023-09-02 07:39:33 +00:00
Deepesh Garg
d19716142e Merge pull request #36904 from frappe/mergify/bp/version-14-hotfix/pr-36889 
fix: fetch currency in discount accounting SI (#36889)
 2023-09-01 22:51:35 +05:30
ruthra kumar
83e3402fea Merge pull request #36907 from frappe/mergify/bp/version-14-hotfix/pr-36899 
fix: difference amount calculation logic in Payment Entry UI (backport #36899)
 2023-09-01 17:50:22 +05:30
ruthra kumar
9bc2b419e3 fix: difference amount in UI should not be calculated 
(cherry picked from commit a7e0709ae8)
 2023-09-01 12:09:21 +00:00
ruthra kumar
b9a5d54e03 Merge pull request #36894 from frappe/mergify/bp/version-14-hotfix/pr-36888 
fix: calcuate received/paid amount on exchange rate change in Payment Entry (backport #36888)
 2023-09-01 17:37:41 +05:30
Gursheen Anand
a8b58800bb fix: fetch discount amount for gle in base currency 
(cherry picked from commit 112cfe6dfa)
 2023-09-01 09:42:52 +00:00
ruthra kumar
0a632660e0 fix: calcuate received/paid amount on rate change in PE 
(cherry picked from commit 64d835374b)
 2023-08-31 15:36:44 +00:00
Nihantra C. Patel
132957f59e fix: Set the default filter in All Trends Report 2023-08-31 13:38:42 +05:30
Nihantra C. Patel
420536ca52 fix: Set the default filter in All Trends Report 2023-08-31 13:37:30 +05:30
mergify[bot]
22247cfa17 fix: added valuation field type (Float/Currency) in the filter (backport #36866) (#36868) 
fix: added valuation field type (Float/Currency) in the filter (#36866)

(cherry picked from commit dea802dc41)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-29 16:57:59 +05:30
mergify[bot]
d2091cc22c fix: create entries for only PR items present in LCV (#36852) 
fix: create entries for only PR items present in LCV (#36852)

* fix: check if item code exists in lcv before creating gle

* refactor: use qb to fetch lcv items

(cherry picked from commit 26e8b8f959)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-08-29 11:01:40 +05:30
mergify[bot]
9789b7bdef fix: error in report when data is not available to load chart in report (backport #36842) (#36853) 
fix: error in report when data is not available to load chart in report (#36842)

(cherry picked from commit 3a2933db4d)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-08-28 18:17:50 +05:30
ruthra kumar
e8d7d30682 Merge pull request #36847 from frappe/mergify/bp/version-14-hotfix/pr-36844 
fix: allocation error on partial payment against sales order (backport #36844)
 2023-08-28 15:43:30 +05:30
ruthra kumar
05f657e690 test: assert rounded amount is calculated 
(cherry picked from commit 2fdbe82835)
 2023-08-28 09:42:41 +00:00
ruthra kumar
0350c69856 test: allocation err misfire on Sales Order 
(cherry picked from commit 67a0969b78)
 2023-08-28 09:42:40 +00:00
ruthra kumar
adc87f16a3 fix: fetch rounded total while pulling reference details on SO 
(cherry picked from commit 714b8289c1)
 2023-08-28 09:42:40 +00:00
mergify[bot]
bd41cb221b fix: Asset Category filter is not working in asset depreciation(#36806) 
fix: Asset Category filter is not working in asset depreciation

fix: Asset Category filter is not working in asset depreciation and balances

Co-authored-by: ubuntu <viralkansodiya167@gmail.com>
(cherry picked from commit 388a42ec7e)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-08-28 11:53:11 +05:30
ruthra kumar
7a5b454e97 Merge pull request #36832 from frappe/mergify/bp/version-14-hotfix/pr-36830 
test: Exchange Rate Revaluation functions and its impact on ledger (backport #36830)
 2023-08-27 16:05:03 +05:30
ruthra kumar
256c3c81a4 test: Exchange Rate Revaluation functions and its impact on ledger 
(cherry picked from commit d40504b973)
 2023-08-27 09:41:12 +00:00
mergify[bot]
9b2a84f259 chore: update fr translation for Naming Series (#36785) 
* chore: update fr translation for Naming Series (#36785)

* chore: update fr translation for Naming Series

* chore: update fr translation

* chore: update fr translation

* chore: update fr translation

(cherry picked from commit e462edc628)

# Conflicts:
#	erpnext/translations/fr.csv

* chore: resolve conflicts

---------

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-26 19:29:57 +05:30
mergify[bot]
c07548a612 fix: missing company flag for regional fn (#36791) 
fix: missing company flag for regional fn (#36791)

* fix: missing company flag for regional fn

(cherry picked from commit 9bc5952dd5)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-08-26 19:29:15 +05:30
Gourav Saini
0f98cc85e9 fix: Allow to make return against sales invoice which has closed sales order 
fix: Allow to make return against sales invoice which has closed sales order
 2023-08-26 18:04:01 +05:30
Deepesh Garg
aad91c02f3 Merge pull request #36815 from GursheenK/v_14_tax_withholding_jvs_with_no_partytype 
fix: fetch JVs in tax withholding report with no party type
 2023-08-25 19:41:31 +05:30
ruthra kumar
587283e787 Merge pull request #36822 from frappe/mergify/bp/version-14-hotfix/pr-36821 
test: use mixin and increase coverage in receivable report (backport #36821)
 2023-08-25 18:46:13 +05:30
ruthra kumar
78b0a52d41 test: increase coverage in ar/ap report 
(cherry picked from commit ce81ffd844)
 2023-08-25 12:42:23 +00:00
ruthra kumar
c4d338a59b refactor(test): make use of mixin in ar/ap report tests 
(cherry picked from commit bb7bed4c1a)
 2023-08-25 12:42:22 +00:00
Gursheen Anand
bc6bd81f87 fix: fetch JVs in tax withholding report without party values 2023-08-25 15:05:26 +05:30
ViralKansodiya
fd4159423d fix: error listindexoutofrange when save a production plan (#36807) 
fix: error listindexoutof range when save a production plan
 2023-08-25 13:43:53 +05:30
Deepesh Garg
95a6e1d855 Merge pull request #36809 from frappe/mergify/bp/version-14-hotfix/pr-36799 
fix: Tax withholding reversal on Debit Notes (#36799)
 2023-08-25 09:41:07 +05:30
Deepesh Garg
e8dc63c89c fix: Tax withholding reversal on Debit Notes 
(cherry picked from commit 6d9cebfee9)
 2023-08-24 14:02:32 +00:00
mergify[bot]
6edfcf4de8 fix: SCR return status (backport #36793) (#36796) 
fix: SCR return status (#36793)

(cherry picked from commit 723563c167)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-24 10:42:59 +05:30
mergify[bot]
4fa07777e9 feat(MR): Project and Cost Center in Connections (backport #36794) (#36795) 
feat(MR): Project and Cost Center in Connections (#36794)

(cherry picked from commit 54ffe41b54)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-08-24 10:15:05 +05:30