nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 04:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,712 Commits 457 Branches 1,744 Tags
fca70e3d033f0b60d5decd5fa0a80a97b13255e4
Commit Graph

46712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
3d243a7fa5 fix: only check for delinked PLEs 
(cherry picked from commit 146c5b3e16)
 2024-02-23 07:10:03 +00:00
Gursheen Anand
08459cef4a fix: delete PLE containing invoice in against 
(cherry picked from commit c1e1fd8829)
 2024-02-23 07:10:02 +00:00
ruthra kumar
05a9f766bc Merge pull request #40057 from frappe/mergify/bp/version-14-hotfix/pr-40011 
fix: Ledger entries for Cr/Dr notes with POS Payments (backport #40011)
 2024-02-23 06:20:46 +05:30
ruthra kumar
6eb7a18591 Merge pull request #40055 from frappe/mergify/bp/version-14-hotfix/pr-39831 
fix: remove cancelled payment entry from Payment Period Based On Invoice Date (backport #39831)
 2024-02-23 06:20:06 +05:30
ruthra kumar
9e9486d5ab refactor: skip popup for POS invoices 
(cherry picked from commit 3634c4c284)
 2024-02-23 00:33:09 +00:00
ruthra kumar
a9791c85c7 test: ledger entries of Cr Note of POS Invoice 
(cherry picked from commit 4288713abe)
 2024-02-23 00:33:09 +00:00
ruthra kumar
e5098c521b fix: Cr/Dr notes with POS Payments 
(cherry picked from commit 68a23730f3)
 2024-02-23 00:33:08 +00:00
Nihantra C. Patel
a1c0c2359f fix: remove cancelled payment entry from PPBOID report 
(cherry picked from commit 186cc3d748)
 2024-02-23 00:30:49 +00:00
Nihantra C. Patel
2fc490a5d7 fix: remove cancelled payment entry from Payment Period Based On Invoice Date 
(cherry picked from commit a2a8a8f2e0)
 2024-02-23 00:30:48 +00:00
ruthra kumar
9630dc7b88 Merge pull request #40048 from frappe/mergify/bp/version-14-hotfix/pr-39828 
fix: translate Sales Pipeline Analytics report (backport #39828)
 2024-02-22 20:47:16 +05:30
Nihantra C. Patel
3c170b9805 fix: translatable columns in Sales Pipeline Analytics report 
(cherry picked from commit c5050c935b)
 2024-02-22 14:54:51 +00:00
Frappe PR Bot
95197c0532 chore(release): Bumped to Version 14.63.3 
## [14.63.3](https://github.com/frappe/erpnext/compare/v14.63.2...v14.63.3) (2024-02-22)

### Bug Fixes

* communication_date in party dashboards (backport [#40005](https://github.com/frappe/erpnext/issues/40005)) (backport [#40020](https://github.com/frappe/erpnext/issues/40020)) ([#40044](https://github.com/frappe/erpnext/issues/40044)) ([23e32b9](23e32b9b33))
v14.63.3 		2024-02-22 13:01:09 +00:00
mergify[bot]
23e32b9b33 fix: communication_date in party dashboards (backport #40005) (backport #40020) (#40044) 
fix: communication_date in party dashboards (backport #40005) (#40020)

fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff717)

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
(cherry picked from commit b364fe7047)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-02-22 18:29:56 +05:30
Frappe PR Bot
0653f6854b chore(release): Bumped to Version 14.63.2 
## [14.63.2](https://github.com/frappe/erpnext/compare/v14.63.1...v14.63.2) (2024-02-22)

### Bug Fixes

* Webpages not working without login ([a40e410](a40e410519))
v14.63.2 		2024-02-22 11:58:43 +00:00
rohitwaghchaure
ee125d5dd8 Merge pull request #40045 from frappe/mergify/bp/version-14/pr-40041 
fix: Webpages not working without login (backport #40041)
 2024-02-22 17:27:27 +05:30
Rohit Waghchaure
a40e410519 fix: Webpages not working without login 
(cherry picked from commit d6fad08d20)
 2024-02-22 11:22:20 +00:00
rohitwaghchaure
9d723df9b2 Merge pull request #40041 from rohitwaghchaure/fixed-not-able-to-view-pages 
fix: Webpages not working without login
 2024-02-22 16:51:25 +05:30
Rohit Waghchaure
d6fad08d20 fix: Webpages not working without login 2024-02-22 16:24:30 +05:30
mergify[bot]
b364fe7047 fix: communication_date in party dashboards (backport #40005) (#40020) 
fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff717)

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2024-02-22 16:20:15 +05:30
SherinKR
8b3c809cb6 fix: account validation error on bank account after editing existing bank account 2024-02-22 15:56:58 +05:30
Frappe PR Bot
315d4dec90 chore(release): Bumped to Version 14.63.1 
## [14.63.1](https://github.com/frappe/erpnext/compare/v14.63.0...v14.63.1) (2024-02-22)

### Bug Fixes

* negative stock error while making stock reconciliation (backport [#40016](https://github.com/frappe/erpnext/issues/40016)) ([#40025](https://github.com/frappe/erpnext/issues/40025)) ([7355fce](7355fce75e))
v14.63.1 		2024-02-22 08:18:35 +00:00
rohitwaghchaure
c826b5ce6c Merge pull request #40034 from frappe/mergify/bp/version-14/pr-40025 
fix: negative stock error while making stock reconciliation (backport #40016) (backport #40025)
 2024-02-22 13:46:44 +05:30
mergify[bot]
7355fce75e fix: negative stock error while making stock reconciliation (backport #40016) (#40025) 
* fix: negative stock error while making stock reconciliation (#40016)

fix: negative stock error while making stock reco
(cherry picked from commit da184d709b)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

* chore: fix conflicts

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 865cba406f)
 2024-02-22 07:49:51 +00:00
mergify[bot]
2a2f314821 fix: timesheet per billed state edge case (backport #40010) (#40028) 
fix: timesheet per billed state edge case (#40010)

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db2c9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-02-22 12:29:56 +05:30
mergify[bot]
865cba406f fix: negative stock error while making stock reconciliation (backport #40016) (#40025) 
* fix: negative stock error while making stock reconciliation (#40016)

fix: negative stock error while making stock reco
(cherry picked from commit da184d709b)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

* chore: fix conflicts

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 11:39:48 +05:30
mergify[bot]
079ba7670c fix: incorrect item name in MR (backport #40018) (#40023) 
fix: incorrect item name in MR (#40018)

(cherry picked from commit 864d7ae04c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 09:50:33 +05:30
rohitwaghchaure
97b665b043 Merge pull request #40000 from frappe/mergify/bp/version-14-hotfix/pr-39998 
fix: Completed Work Orders report not working (backport #39998)
 2024-02-21 17:44:32 +05:30
Rohit Waghchaure
c8e1409b80 fix: Completed Work Orders report not working 
(cherry picked from commit 11f4cb914a)
 2024-02-21 11:20:43 +00:00
Nabin Hait
13a663c6cb Merge pull request #39971 from nabinhait/asset-movement-deletion-issue 
fix: Delete linked asset movement record on cancellation of purchase receipt/invoice
 2024-02-21 11:14:31 +05:30
Frappe PR Bot
8ab75560d5 chore(release): Bumped to Version 14.63.0 
# [14.63.0](https://github.com/frappe/erpnext/compare/v14.62.4...v14.63.0) (2024-02-21)

### Bug Fixes

* 'NoneType' object is not iterable (backport [#39977](https://github.com/frappe/erpnext/issues/39977)) ([#39980](https://github.com/frappe/erpnext/issues/39980)) ([8e71665](8e71665e4f))
* Adjust amount in last row due to rounding ([963ddac](963ddac528))
* **Bank Transaction:** precision for `(un)allocated_amount` ([cea0e1f](cea0e1fb91)), closes [#39926](https://github.com/frappe/erpnext/issues/39926)
* fetch company terms ([83bf286](83bf28616e))
* group node in warehouse filter in Item-wise Sales Register ([4921b03](4921b038bd))
* **Issue:** create communication ([8deaba8](8deaba8def))
* linter issue ([a4fbea3](a4fbea3722))
* linter issue ([abceb1b](abceb1b611))
* linter issues ([e99485b](e99485bfa7))
* no need call for company method in sales invoice js ([45a0494](45a0494318))
* On cancelation of capitalization, reverse depreciation entry only if journal entry exists ([5b9905f](5b9905f27a))
* party item code in Blanket Order ([ee9a51f](ee9a51f93f))
* reconciliation issue due to notation difference ([dcf19c3](dcf19c3ed9))
* show active bom in the dropdown while making stock entry and MR (backport [#39974](https://github.com/frappe/erpnext/issues/39974)) ([#39975](https://github.com/frappe/erpnext/issues/39975)) ([385b08d](385b08dc50))
* typeerror 'Item Group' filter on Purchase Register ([b1a4249](b1a4249041))
* update_dimension is required and not need party account method ([5eaa11b](5eaa11b9e8))
* webpages are not showing ([#39988](https://github.com/frappe/erpnext/issues/39988)) ([64099b0](64099b0bf7))

### Features

* New financial views - Growth and margin views for P&L and balance sheet ([d913ec5](d913ec52db))
v14.63.0 		2024-02-21 05:30:04 +00:00
rohitwaghchaure
7561de1f4e Merge pull request #39978 from frappe/version-14-hotfix 
chore: release v14
 2024-02-21 10:58:47 +05:30
rohitwaghchaure
64099b0bf7 fix: webpages are not showing (#39988) 2024-02-21 09:26:58 +05:30
Nabin Hait
ea1a0b3a28 fix: linter issue 2024-02-21 08:43:10 +05:30
Nabin Hait
46cd929d00 fix: Delete orphaned asset movement item records 2024-02-20 18:36:23 +05:30
Nabin Hait
46762ead05 Merge pull request #39982 from nabinhait/asset-capitalization-cancel 
fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists
 2024-02-20 18:30:14 +05:30
Nabin Hait
5b9905f27a fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists 2024-02-20 17:54:58 +05:30
mergify[bot]
8e71665e4f fix: 'NoneType' object is not iterable (backport #39977) (#39980) 
fix: 'NoneType' object is not iterable (#39977)

(cherry picked from commit 8e7d47b3a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 15:53:20 +05:30
mergify[bot]
385b08dc50 fix: show active bom in the dropdown while making stock entry and MR (backport #39974) (#39975) 
fix: show active bom in the dropdown while making stock entry and MR (#39974)

(cherry picked from commit 133f8bd92a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 13:13:35 +05:30
Nabin Hait
c53ced1224 Merge pull request #39874 from nabinhait/depreciation-last-row-adjustment 
fix: Adjust amount in last row due to rounding
 2024-02-20 13:13:02 +05:30
Nabin Hait
a4fbea3722 fix: linter issue 2024-02-20 12:31:34 +05:30
Nabin Hait
e99485bfa7 fix: linter issues 2024-02-20 12:24:36 +05:30
Nabin Hait
963ddac528 fix: Adjust amount in last row due to rounding 2024-02-20 12:24:36 +05:30
Nabin Hait
11bddc14bb fix: Delete linked asset movement record on cancellation of purchase receipt/invoice 2024-02-20 12:23:16 +05:30
Nabin Hait
947f138ea4 Merge pull request #39973 from nabinhait/linter-issue-1 
Linter issue
 2024-02-20 12:22:47 +05:30
Nabin Hait
abceb1b611 fix: linter issue 2024-02-20 12:21:12 +05:30
Nitali Mittal
d913ec52db feat: New financial views - Growth and margin views for P&L and balance sheet 
feat: New financial views - Growth and margin views for P&L and balance sheet
 2024-02-19 16:36:23 +05:30
ruthra kumar
e337a55a0b Merge pull request #39954 from frappe/mergify/bp/version-14-hotfix/pr-39914 
refactor: add total row if only one party is being filtered (backport #39914)
 2024-02-19 09:16:27 +05:30
ruthra kumar
310f338d9b Merge pull request #39952 from frappe/mergify/bp/version-14-hotfix/pr-39942 
fix: group node in warehouse filter in Item-wise Sales Register (backport #39942)
 2024-02-19 09:15:49 +05:30
ruthra kumar
b0c2d41ecb Merge pull request #39832 from ruthra-kumar/convert_latest_check_sql_to_qb 
fix: reconciliation issue due to notation difference
 2024-02-19 08:37:59 +05:30
ruthra kumar
241507a87f refactor: add total row if only one party is being filtered 
(cherry picked from commit b1dfa2537b)
 2024-02-19 02:56:40 +00:00