CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,071 Commits 424 Branches 1,723 Tags
6260241c55b570d2e514bcf14b338bfd9b7c66ce
Commit Graph

46071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
db46987d4b refactor: replace with new method in purchase invoice 
(cherry picked from commit 7e94a1c51b)
 2023-08-14 04:51:37 +00:00
ruthra kumar
44110860b4 test: different scenarios for exchange booking 
(cherry picked from commit 5e1cd1f227)
 2023-08-14 04:51:37 +00:00
ruthra kumar
c06a6bfc09 refactor: book exchange gain/loss through journal 
(cherry picked from commit 81cd7873d3)
 2023-08-14 04:51:37 +00:00
mergify[bot]
ac0fff7e94 fix: AR/AP report based on payment terms (#36574) 
fix: AR/AP report based on payment terms (#36574)

* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms

(cherry picked from commit fbb5058531)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-14 09:46:41 +05:30
mergify[bot]
3044f46c52 fix: wrong currency on financial-statement based reports (#36524) 
fix: wrong currency on financial-statement based reports (#36524)

* add missing field options on financial_statement Total field

* format financial statement code

(cherry picked from commit ce25f9e8c9)

Co-authored-by: Naufal Afif <naufalafif58@gmail.com>
 2023-08-13 17:11:47 +05:30
Deepesh Garg
0a832bc979 Merge pull request #36609 from frappe/mergify/bp/version-14-hotfix/pr-36564 
fix: Make default sales update frequency as monthly instead of each transaction (#36564)
 2023-08-13 13:20:27 +05:30
Deepesh Garg
e5bc888798 Merge pull request #36614 from deepeshgarg007/loan_repayment_cancel_v14 
fix: Allow backdated repayment cancels for term loans
 2023-08-13 11:57:49 +05:30
ruthra kumar
9172985a9b Merge pull request #36621 from frappe/mergify/bp/version-14-hotfix/pr-36309 
fix: allocation validation blocks partial payment for SO and PO (backport #36309)
 2023-08-13 11:39:27 +05:30
Deepesh Garg
a3032910a7 chore: resolve conflicts 2023-08-13 11:37:40 +05:30
ruthra kumar
ce08f038d2 fix: validation blocks partial payment for SO and PO 
(cherry picked from commit cb2bfabb6f)
 2023-08-13 10:58:55 +05:30
ruthra kumar
df632d7ecb Merge pull request #36620 from frappe/mergify/bp/version-14-hotfix/pr-36590 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
 2023-08-13 08:48:27 +05:30
ruthra kumar
1693905703 Merge pull request #36619 from frappe/mergify/bp/version-14-hotfix/pr-36593 
chore: update permissions for Process Payment Reconciliation (backport #36593)
 2023-08-13 08:43:00 +05:30
ruthra kumar
21d3fb0625 chore: resolve merge conflict 2023-08-13 08:24:01 +05:30
ruthra kumar
c83f10f638 refactor(test): don't set po_no by default 
(cherry picked from commit 64614cd915)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2023-08-13 02:40:42 +00:00
ruthra kumar
b901cfdbe2 fix: disallow mulitple SO with same PO No 
(cherry picked from commit dbd3fdbb41)
 2023-08-13 02:40:42 +00:00
ruthra kumar
cbcdf30840 chore: update permissions for Process Payment Reconciliation 
(cherry picked from commit cd28d15292)
 2023-08-13 02:40:38 +00:00
mergify[bot]
8b13185c25 fix: fetch Stock UOM from Item if not set (backport #36606) (#36617) 
fix: fetch `Stock UOM` from Item if not set (#36606)

(cherry picked from commit 539cfd08f0)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-12 23:25:05 +05:30
Deepesh Garg
1377cf4cf1 fix: Allow backdated repayment cancels for term loans 2023-08-12 20:01:04 +05:30
Deepesh Garg
4ca1f3b9cf fix: Make default sales update frequency as monthly instead of each transaction 
(cherry picked from commit 32863b4922)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json
 2023-08-11 17:10:07 +00:00
Deepesh Garg
347c67a0f1 Merge pull request #36608 from frappe/mergify/bp/version-14-hotfix/pr-36582 
fix: Group Account total not showing in Financial Statements (#36582)
 2023-08-11 22:33:35 +05:30
Deepesh Garg
2912648151 fix: Group Account total not showing in Financial Statements 
(cherry picked from commit baf5cddd1b)
 2023-08-11 16:27:53 +00:00
Frappe PR Bot
ddcf555486 chore(release): Bumped to Version 14.34.3 
## [14.34.3](https://github.com/frappe/erpnext/compare/v14.34.2...v14.34.3) (2023-08-11)

### Bug Fixes

* wrap none type rate under flt (backport [#36602](https://github.com/frappe/erpnext/issues/36602)) (backport [#36604](https://github.com/frappe/erpnext/issues/36604)) ([#36605](https://github.com/frappe/erpnext/issues/36605)) ([e4e1f03](e4e1f03bac))
v14.34.3 		2023-08-11 13:28:22 +00:00
mergify[bot]
e4e1f03bac fix: wrap none type rate under flt (backport #36602) (backport #36604) (#36605) 
fix: wrap none type rate under flt (backport #36602) (#36604)

fix: wrap none type rate under flt (#36602)

(cherry picked from commit 627986efa1)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 63c061e5e8)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-08-11 18:56:29 +05:30
mergify[bot]
63c061e5e8 fix: wrap none type rate under flt (backport #36602) (#36604) 
fix: wrap none type rate under flt (#36602)

(cherry picked from commit 627986efa1)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-11 12:55:25 +00:00
mergify[bot]
96663d7e28 chore: set default filter dates if missing (backport #36597) (#36598) 
chore: set default filter dates if missing (#36597)

(cherry picked from commit 98e82e0d99)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-11 09:19:14 +00:00
rohitwaghchaure
ee04c6d5c5 fix: allow negative stock condition for batch item (#36586) 
* fix: allow negative stock condition for batch item

* fix: test case
 2023-08-11 13:57:27 +05:30
ruthra kumar
a4d6e0092c Merge pull request #36594 from frappe/mergify/bp/version-14/pr-36593 
chore: update permissions for Process Payment Reconciliation (backport #36593)
 2023-08-11 12:14:48 +05:30
ruthra kumar
9821f90350 chore: update permissions for Process Payment Reconciliation 
(cherry picked from commit cd28d15292)
 2023-08-11 06:14:34 +00:00
ruthra kumar
5488785fd8 Merge pull request #36579 from frappe/mergify/bp/version-14-hotfix/pr-36573 
refactor: 'is system generated' field and better remarks in Journal Entry (backport #36573)
 2023-08-11 09:43:53 +05:30
ruthra kumar
25ac0ce1cc Merge pull request #36580 from frappe/mergify/bp/version-14-hotfix/pr-36578 
fix: unhide `uom` and `stock_uom` fields in print view (backport #36578)
 2023-08-11 09:16:07 +05:30
ruthra kumar
727a379581 chore: remove unwanted 'Reversal of ITC' and merge conflicts 2023-08-11 09:12:11 +05:30
Anand Baburajan
29181274c8 feat: daily asset depreciation method (#36587) 
* feat: daily asset depreciation method

* chore: hide depr schedule if no schedules
 2023-08-10 22:47:16 +05:30
Frappe PR Bot
35450d7bd9 chore(release): Bumped to Version 14.34.2 
## [14.34.2](https://github.com/frappe/erpnext/compare/v14.34.1...v14.34.2) (2023-08-10)

### Bug Fixes

* incorrect available qty for backdated stock reco with batch (backport [#36581](https://github.com/frappe/erpnext/issues/36581)) ([#36585](https://github.com/frappe/erpnext/issues/36585)) ([bb112ec](bb112eca05))
v14.34.2 		2023-08-10 12:28:54 +00:00
mergify[bot]
bb112eca05 fix: incorrect available qty for backdated stock reco with batch (backport #36581) (#36585) 
fix: incorrect available qty for backdated stock reco with batch (#36581)

(cherry picked from commit 2800ad39d2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-10 17:57:17 +05:30
rohitwaghchaure
2800ad39d2 fix: incorrect available qty for backdated stock reco with batch (#36581) 2023-08-10 17:22:14 +05:30
ruthra kumar
b49309c160 fix: unhide uom and stock_uom fields in print view 
(cherry picked from commit 11cd163db7)
 2023-08-10 10:18:36 +00:00
ruthra kumar
a04471024d refactor: enable 'no-copy' 
(cherry picked from commit 4ed4b0240d)
 2023-08-10 10:09:26 +00:00
ruthra kumar
9b0d30c56b refactor: set flag display condition 
(cherry picked from commit de17eaef38)
 2023-08-10 10:09:25 +00:00
ruthra kumar
00c7dbceaa refactor: add is_system_generated field to Journal Entry 
(cherry picked from commit 3997aa77d4)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-08-10 10:09:25 +00:00
ruthra kumar
5443592d84 fix: better remarks on Cr note created by Reconciliation 
(cherry picked from commit 47cb349362)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-08-10 10:09:25 +00:00
Frappe PR Bot
10e25972e1 chore(release): Bumped to Version 14.34.1 
## [14.34.1](https://github.com/frappe/erpnext/compare/v14.34.0...v14.34.1) (2023-08-10)

### Bug Fixes

* precision issue while submitting the stock entry (backport [#36575](https://github.com/frappe/erpnext/issues/36575)) ([#36576](https://github.com/frappe/erpnext/issues/36576)) ([d6ebd1b](d6ebd1b6f8))
v14.34.1 		2023-08-10 08:06:21 +00:00
mergify[bot]
d6ebd1b6f8 fix: precision issue while submitting the stock entry (backport #36575) (#36576) 
fix: precision issue while submitting the stock entry (#36575)

fix: precision issue while submmiting the stock entry
(cherry picked from commit a864e07d4f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-10 13:34:36 +05:30
rohitwaghchaure
a864e07d4f fix: precision issue while submitting the stock entry (#36575) 
fix: precision issue while submmiting the stock entry
 2023-08-10 13:32:31 +05:30
mergify[bot]
19cfcea78e fix: don't show disabled items in Item Shortage Report (backport #36550) (#36571) 
fix: don't show disabled items in `Item Shortage Report` (#36550)

(cherry picked from commit 4a7fc1506f)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-10 11:29:20 +05:30
Ankush Menat
8083c0b59e fix: move company rename to long queue 
(cherry picked from commit 5169006085)
 2023-08-10 10:03:22 +05:30
Anand Baburajan
8abc0adb18 chore: add warning for lending separation (#36569) 2023-08-09 15:07:40 +00:00
mergify[bot]
fe41be953d perf(invoice): Faster return amount query (backport #36556) (#36557) 
perf(invoice): Faster return amount query (#36556)

perf: Faster return amount query
(cherry picked from commit b0c79a0467)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-08-09 14:07:48 +05:30
s-aga-r
c2b5417cb8 Merge pull request #36552 from frappe/mergify/bp/version-14-hotfix/pr-36551 
fix(RFQ): link to supplier portal (backport #36551)
 2023-08-09 13:55:28 +05:30
Frappe PR Bot
259f3422d5 chore(release): Bumped to Version 14.34.0 
# [14.34.0](https://github.com/frappe/erpnext/compare/v14.33.2...v14.34.0) (2023-08-09)

### Bug Fixes

* **accounts:** Translate columns in AP/AR report ([#36503](https://github.com/frappe/erpnext/issues/36503)) ([6739369](67393694de))
* AP and AR summary ([769d7d7](769d7d7554))
* check root type only when not none ([46bb309](46bb309b8a))
* cross connect delivery note and sales invoice ([#36183](https://github.com/frappe/erpnext/issues/36183)) ([8501a11](8501a1182a))
* Debit credit difference while submitting Sales Invoice ([#36523](https://github.com/frappe/erpnext/issues/36523)) ([240d866](240d866ef4))
* don't allow negative rate (backport [#36027](https://github.com/frappe/erpnext/issues/36027)) ([#36465](https://github.com/frappe/erpnext/issues/36465)) ([caa4f33](caa4f33169))
* enqueue submit/cancel action for stock entry having more than 50 line items (backport [#36532](https://github.com/frappe/erpnext/issues/36532)) ([#36536](https://github.com/frappe/erpnext/issues/36536)) ([9c108a8](9c108a8ef7))
* fetch ple for all party types ([674dba8](674dba8cd7))
* fetch ple with party type employee in AP ([1ca9aca](1ca9aca0d5))
* Fix query for financial statement report ([d1590f2](d1590f266b))
* get incoming rate instead of BOM rate (backport [#36496](https://github.com/frappe/erpnext/issues/36496)) ([#36506](https://github.com/frappe/erpnext/issues/36506)) ([bdfbccd](bdfbccd38e))
* handle None value in payment_term_outstanding ([b033b3b](b033b3b0d6))
* Lower deduction certificate for multi-company ([#36491](https://github.com/frappe/erpnext/issues/36491)) ([2216875](2216875bd6))
* payment allocation in invoice payment schedule ([#36440](https://github.com/frappe/erpnext/issues/36440)) ([0e87c86](0e87c86aab))
* search not working for so in the Production Plan ([#36459](https://github.com/frappe/erpnext/issues/36459)) ([8c57d56](8c57d56240))
* serial no not able to reject for the internal transfer ([#36467](https://github.com/frappe/erpnext/issues/36467)) ([c1819a4](c1819a4b21))
* stock entry decimal issue (backport [#36530](https://github.com/frappe/erpnext/issues/36530)) ([#36533](https://github.com/frappe/erpnext/issues/36533)) ([5b04708](5b04708164))
* stock reconciliation negative stock error (backport [#36544](https://github.com/frappe/erpnext/issues/36544)) ([#36549](https://github.com/frappe/erpnext/issues/36549)) ([00b9df0](00b9df0bc5))
* Tax withholding against order via Payment Entry ([#36493](https://github.com/frappe/erpnext/issues/36493)) ([a234b89](a234b8932e))
* use correct lang separator for frappe (backport [#36519](https://github.com/frappe/erpnext/issues/36519)) ([#36520](https://github.com/frappe/erpnext/issues/36520)) ([f9981d1](f9981d1ff3))
* **ux:** add `Ordered Qty` column in Get Items From > MR (backport [#36486](https://github.com/frappe/erpnext/issues/36486)) ([#36505](https://github.com/frappe/erpnext/issues/36505)) ([0d7a4b6](0d7a4b6ff6))

### Features

* ledger comparison report ([#36485](https://github.com/frappe/erpnext/issues/36485)) ([07f235c](07f235cf7d))
* **RFQ:** make sending attachments configurable (backport [#36359](https://github.com/frappe/erpnext/issues/36359)) ([#36535](https://github.com/frappe/erpnext/issues/36535)) ([5881960](5881960001))

### Performance Improvements

* asset depreciation entry posting ([#36461](https://github.com/frappe/erpnext/issues/36461)) ([cd1c175](cd1c175439))
* defer holiday list imports ([7adad42](7adad4272a))
v14.34.0 		2023-08-09 03:06:43 +00:00
Deepesh Garg
4f0bb5e643 Merge pull request #36546 from frappe/version-14-hotfix 
chore: release v14
 2023-08-09 08:35:06 +05:30