CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,911 Commits 423 Branches 1,723 Tags
44f509f989d8f4af4d5273a4e705ae6731934981
Commit Graph

44911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
rohitwaghchaure
7c092a6b5f Merge pull request #36065 from frappe/mergify/bp/version-14-hotfix/pr-36063 
fix: Delivery Note return valuation (backport #36063)
 2023-07-10 18:18:57 +05:30
mergify[bot]
ebf3c0173e feat: Closing balance for period closing and reporting (#34257) 
* feat: Introduce opening entry for reporting

(cherry picked from commit 9739d8b52a)

* feat: Introduce opening entry for reporting

(cherry picked from commit b44a19bd1a)

* fix: Add patches to create accounting dimension in Closing Balance

(cherry picked from commit 36c08d0835)

* feat: Cascade closing balances on PCV submit

(cherry picked from commit c3f39c3f32)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
#	erpnext/patches.txt

* feat: Add views in standard filter

(cherry picked from commit e18336ebe7)

* chore: Rewrite query using query builder

(cherry picked from commit 7fa7d6b5e4)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

* feat: Add validations against period closing voucher

(cherry picked from commit f92c63fb10)

* fix: Order by issue in aggregation query

(cherry picked from commit 6607c8bd82)

* fix: Add patch to update closing balances

(cherry picked from commit a663df376c)

* fix: Closing balance entries for period closing voucher

(cherry picked from commit 436fc03eda)

* fix: Update patch to generate closing balance entries

(cherry picked from commit 95c9aafda9)

# Conflicts:
#	erpnext/patches.txt

* perf: Apply closing balance in Trial Balance report

(cherry picked from commit e5f603c9d9)

# Conflicts:
#	erpnext/accounts/report/trial_balance/trial_balance.py

* chore: Minor fixes

(cherry picked from commit c089c4156c)

# Conflicts:
#	erpnext/patches.txt

* fix: Aggregation with previous closing balance

(cherry picked from commit 4a2046dfb6)

# Conflicts:
#	erpnext/patches.txt

* test: Add static posting dates to tests

(cherry picked from commit 310f71c313)

* chore: Add index to period closing voucher column

(cherry picked from commit 5dabc98ba5)

* chore: rename Closing Balance to Account Closing Balance

(cherry picked from commit 3249a79f07)

* test: Add test case for closing balance

(cherry picked from commit f0267feca8)

* chore: Use account closing balance in set gl entries

(cherry picked from commit 0157fa15eb)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Update patch

(cherry picked from commit 76775a3e49)

* fix: Account sub query

(cherry picked from commit 7f11373b58)

* chore: Simplify query

(cherry picked from commit 00fe3042b2)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

* chore: Add missing validations

(cherry picked from commit 0aadb680eb)

* chore: Remove unnecessary list comprehension

(cherry picked from commit 44053db010)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Ignore opening entries if PCV posted

(cherry picked from commit f9397a87ac)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Don't validate if no GL Entry exists

(cherry picked from commit 528ab503f2)

* chore: Fix Typo

(cherry picked from commit 3fd95200da)

* fix: Validation for cancelation

(cherry picked from commit 30eb6c8512)

* fix: Partial trial balance view

(cherry picked from commit b7dcf27b01)

* fix: CS financial statement param

(cherry picked from commit f8cff09129)

* chore: Improve validation message

(cherry picked from commit 8ce1da111e)

* chore: Resolve conflicts

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-10 18:04:45 +05:30
Rohit Waghchaure
296f312e7f fix: Delivery Note return valuation 
(cherry picked from commit 6a10ae662c)
 2023-07-10 12:19:37 +00:00
rohitwaghchaure
16943ac248 Merge pull request #36057 from frappe/mergify/bp/version-14-hotfix/pr-36001 
fix: accepted warehouse and rejected warehouse can't be same (backport #36001)
 2023-07-10 17:48:29 +05:30
mergify[bot]
573183cff5 fix: deferred accounting entries on accounts frozen (#35978) 
* fix: deferred accounting entries on accounts frozen (#35978)

* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen

(cherry picked from commit 674af15696)

# Conflicts:
#	erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py

* chore: resolve conflicts

* fix: test for deferred accounting

* chore: Linting Issues

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-10 17:31:17 +05:30
rohitwaghchaure
e55a264e57 fix: conflicts 2023-07-10 17:14:25 +05:30
rohitwaghchaure
79f9785d15 fix: conflicts 2023-07-10 17:13:55 +05:30
rohitwaghchaure
a178e6693c fix: conflicts 2023-07-10 17:13:23 +05:30
rohitwaghchaure
6459c28316 fix: conflicts 2023-07-10 17:12:41 +05:30
mergify[bot]
3e711e888d fix: precision causing outstanding issue on partly paid invoices (#36030) 
fix: precision causing outstanding issue on partly paid invoices (#36030)

* fix: precision causing outstanding issue on partly paid invoices

* chore: linters

(cherry picked from commit 5c820ecc20)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-07-10 16:49:22 +05:30
mergify[bot]
04b1d459eb fix: labels and translations (#35963) 
fix: labels and translations (#35963)

fix: labels and translations
* fix: Vietnamese translation of customer
* fix: Vietnamese translation of bill

(cherry picked from commit 46fe9ac5cd)

Co-authored-by: aioaccount <92444849+aioaccount@users.noreply.github.com>
 2023-07-10 16:19:36 +05:30
ruthra kumar
3c563b8cea Merge pull request #35994 from frappe/mergify/bp/version-14-hotfix/pr-35397 
fix: incorrect TCS amount while customer has advance payment (backport #35397)
 2023-07-10 16:18:47 +05:30
ruthra kumar
4fa3f96121 chore: fix failing test case 2023-07-10 15:48:56 +05:30
ruthra kumar
681d48a7f9 Merge pull request #36053 from frappe/mergify/bp/version-14-hotfix/pr-36051 
feat: Provision to auto create Exchange Rate Revaluation (backport #36051)
 2023-07-10 15:36:16 +05:30
ruthra kumar
881476b4fb chore: fix merge conflict 2023-07-10 15:09:37 +05:30
Rohit Waghchaure
5d77e3ce05 fix: accepted warehouse and rejected warehouse can't be same 
(cherry picked from commit d618aaef32)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 2023-07-10 08:26:13 +00:00
Anand Baburajan
0f9a6ee70a chore: add asset depr posting error in error log (#36052) 2023-07-10 13:45:56 +05:30
ruthra kumar
862c5145c1 refactor: submit and make JV through background job 
(cherry picked from commit 4f51c5a433)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
 2023-07-10 07:31:19 +00:00
ruthra kumar
e0fbf0c042 refactor: checkbox for enabling auto ERR creation 
(cherry picked from commit 6644311c8b)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
 2023-07-10 07:31:19 +00:00
mergify[bot]
e443e6c02a fix: Vietnamese translation of "Company" (#35887) 
fix: Vietnamese translation of "Company" (#35887)

fix: Vietnamese translation of "Company"
(cherry picked from commit ef7fd7548c)

Co-authored-by: aioaccount <92444849+aioaccount@users.noreply.github.com>
 2023-07-09 20:34:26 +05:30
mergify[bot]
b7b864e68c fix: German translations (#35990) 
fix: German translations (#35990)

* fix: add missing German translation

* fix: wrong German translation

(cherry picked from commit 353d765140)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-09 20:18:22 +05:30
mergify[bot]
29ac533af4 fix:bank reconciliation tool variable issue (#36022) 
fix: bank reconciliation tool variable issue (#36022)

fix: bank reconciliation tool variable issue (#36022)
(cherry picked from commit 828e647019)

Co-authored-by: Navin Balaji <54995833+navinbalaji@users.noreply.github.com>
 2023-07-09 20:17:54 +05:30
Deepesh Garg
2deb1edec1 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-35397 2023-07-09 14:12:59 +05:30
mergify[bot]
5102d0c3f7 fix: Share ledger showing cancelled docs (#35993) 
fix: Share ledger showing cancelled docs (#35993)

(cherry picked from commit 0a17c78a36)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-05 21:39:38 +05:30
mergify[bot]
d80b0aa157 fix(Payment Entry): compare rounded amount (#36011) 
fix(Payment Entry): compare rounded amount (#36011)

(cherry picked from commit 4badac8e9e)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-05 21:38:30 +05:30
Anand Baburajan
937e1fb024 fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004) 2023-07-04 19:06:58 +05:30
Sagar Vora
dfd4ef178e Merge pull request #36002 from frappe/mergify/bp/version-14-hotfix/pr-36000 2023-07-04 17:42:51 +05:30
Sagar Vora
47c6d9099b feat(accounts): standardize additional columns implementation for sales/purchase reports (#36000) 
(cherry picked from commit 30e4052a76)
 2023-07-04 12:12:34 +00:00
mergify[bot]
13f3ebf915 fix: Netherlands - Grootboekschema COA structure (#35991) 
fix: Netherlands - Grootboekschema COA structure (#35991)

fix: Netherlands - Grootboekschema coa structure
(cherry picked from commit 2f169575e9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-04 16:22:17 +05:30
ruthra kumar
2a4bbf34b4 fix: incorrect TCS amount while customer has advance payment (#35397) 
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation

(cherry picked from commit dcbd7d5f1f)
 2023-07-04 16:21:54 +05:30
ruthra kumar
ae4a8c8788 Merge pull request #35981 from frappe/mergify/bp/version-14-hotfix/pr-35868 
fix: incorrect outstanding and total amount in reference table of payment entry (backport #35868)
 2023-07-04 08:09:05 +05:30
ruthra kumar
3d1942571d test: test reference details response 
(cherry picked from commit 9655d78642)
 2023-07-03 15:33:20 +00:00
ruthra kumar
2e2c23aa0f fix: get base grand total while pulling reference details in PE 
(cherry picked from commit 9e73af891d)
 2023-07-03 15:33:20 +00:00
mergify[bot]
c330f47680 fix: Update no copy for received_qty field (#35965) 
* fix: Update no copy for received_qty field (#35965)

(cherry picked from commit 5448859254)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-03 16:38:08 +05:30
mergify[bot]
a974091678 feat: add method for ordered quantity in supplier scorecard (backport #35930) (#35968) 
feat: add method for ordered quantity in supplier scorecard (#35930)

fix: add method for getting ordered quantity in the supplier scorecard variable.

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
(cherry picked from commit e05b33a6c2)

Co-authored-by: Vishnu  VS <Vishnuviswambaran2002@gmail.com>
 2023-07-03 10:23:36 +05:30
rohitwaghchaure
c3eab84e37 Merge pull request #35955 from rohitwaghchaure/fixed-incorrect-valuation-rate 
fix: incorrect reposting causing stock adjustment entry
 2023-07-02 08:22:16 +05:30
Rohit Waghchaure
c0c693d8b0 fix: reposting has not changed valuation rate 2023-07-01 23:50:27 +05:30
mergify[bot]
a485e4e802 fix: Expense Account filter in Sales Invoice (#35944) 
fix: Expense Account filter in Sales Invoice (#35944)

(cherry picked from commit d54f52474a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-01 18:13:46 +05:30
mergify[bot]
8de1d8663f fix: project filtering based on company in P&L Report (#35943) 
* fix: project filtering in P&L Report

(cherry picked from commit 904ca746a6)

* fix: show projects with no company value set

(cherry picked from commit ce252a0d45)

* fix: make company field mandatory in project doctype

(cherry picked from commit 84d4888f5f)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2023-07-01 10:42:33 +05:30
mergify[bot]
6f50ad685e feat: allow the partial return of components against SCO (backport #35935) (#35938) 
* fix: don't update SCO status to closed until full return

(cherry picked from commit 2f6d56dd62)

* fix: reduce return qty while calculating transferred qty

(cherry picked from commit 2a60884abc)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-06-29 22:16:53 +05:30
mergify[bot]
a880bdec5e chore: update translations (#35905) 
chore: update translations

chore: update translations
(cherry picked from commit 1d1103f39c)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-06-29 13:30:29 +05:30
Deepesh Garg
5a9bd3bac6 Merge pull request #35926 from frappe/mergify/bp/version-14-hotfix/pr-35904 
feat: add voucher-wise balance report for unequal dr/cr GL entries (backport #35904)
 2023-06-29 09:45:22 +05:30
Gursheen Anand
646440fd55 fix: remove debug flag from sql 
(cherry picked from commit 6b9f9f9b0e)
 2023-06-29 03:38:17 +00:00
Gursheen Anand
684290233f feat: add voucher-wise balance report logic 
(cherry picked from commit 5d726ef037)
 2023-06-29 03:38:17 +00:00
Anand Baburajan
e16c14863b fix: asset movement (#35918) 
fix: asset movement fixes
 2023-06-28 20:15:40 +05:30
Anand Baburajan
33ee01174b perf: improve item wise register reports (#35908) 2023-06-28 09:49:30 +05:30