Commit Graph

46953 Commits

Author SHA1 Message Date
Deepesh Garg
208a46fbe4 Merge pull request #40505 from frappe/mergify/bp/version-14-hotfix/pr-40503
fix: achieved targets for territory / partners bpv15 (#40503)
2024-03-26 09:03:14 +05:30
Deepesh Garg
2723e1f614 Merge pull request #40652 from frappe/mergify/bp/version-14-hotfix/pr-40640
fix: Add default finance book check-in P&L statement (#40640)
2024-03-25 17:08:57 +05:30
Deepesh Garg
4485121255 fix: Add default finance book check in P&L statement
(cherry picked from commit 5be3417fdf)
2024-03-25 09:14:41 +00:00
ruthra kumar
0ec1a88748 Merge pull request #40625 from frappe/mergify/bp/version-14-hotfix/pr-40622
refactor: reset update_outstanding_for_self flag for old records (backport #40622)
2024-03-24 16:24:37 +05:30
rohitwaghchaure
91400e1371 Merge pull request #40628 from frappe/mergify/bp/version-14-hotfix/pr-40017
fix: remove microsecond from posting datetime (backport #40017)
2024-03-23 18:39:04 +05:30
mergify[bot]
39711df27c Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-40503 2024-03-23 09:10:52 +00:00
Deepesh Garg
03eb4d77ce Merge pull request #40514 from mmdanny89/email-point-of-sale
fix: pass empty string email content of pos invoice
2024-03-23 14:39:58 +05:30
rohitwaghchaure
c3f9338430 fix: remove microsecond from posting datetime (#40017)
(cherry picked from commit 0b04d04da3)
2024-03-23 03:07:37 +00:00
ruthra kumar
dbb4391f1e refactor: hide on print formats
(cherry picked from commit fdcdc8a56e)
2024-03-22 14:54:03 +00:00
ruthra kumar
22cec21c6f refactor: reset flag for old records
(cherry picked from commit a88bf8419e)
2024-03-22 14:54:03 +00:00
ruthra kumar
ab7f80625b Merge pull request #40615 from frappe/mergify/bp/version-14-hotfix/pr-38496
feat: utility to debug financial reports - Bisect Accounting Statements (backport #38496)
2024-03-22 16:23:22 +05:30
rohitwaghchaure
a4ddc4ee1b Merge pull request #40036 from frappe/mergify/bp/version-14-hotfix/pr-39800
perf: new column Posting Datetime in SLE to optimize stock ledger related queries (backport #39800)
2024-03-22 16:06:53 +05:30
rohitwaghchaure
07929d20aa Merge pull request #40618 from frappe/mergify/bp/version-14-hotfix/pr-40616
fix: rate reset to zero (backport #40616)
2024-03-22 15:41:07 +05:30
Rohit Waghchaure
2f839fbf6d fix: rate reset to zero
(cherry picked from commit 6821baa850)
2024-03-22 09:50:51 +00:00
ruthra kumar
9f3b6d21c3 chore: resolve JS linter issue 2024-03-22 14:42:57 +05:30
ruthra kumar
4eb1fbfe42 chore: resolve linter issues
(cherry picked from commit 0890b414b1)
2024-03-22 08:51:33 +00:00
ruthra kumar
3a38aacc30 refactor: cache results
(cherry picked from commit 14c8c8c33d)
2024-03-22 08:51:33 +00:00
ruthra kumar
48bfb9d315 refactor: flag to differentiate generated and default values
(cherry picked from commit 0925706d5e)
2024-03-22 08:51:33 +00:00
ruthra kumar
5d90b0fd1d refactor: save results in node
(cherry picked from commit ca14ae8f1b)
2024-03-22 08:51:32 +00:00
ruthra kumar
3cab242e9f chore: restrict only to administrator and type info
(cherry picked from commit 90c6d4dc85)
2024-03-22 08:51:32 +00:00
ruthra kumar
54e7f303e9 chore: change data type for summary fields
(cherry picked from commit 228aa1a244)
2024-03-22 08:51:32 +00:00
ruthra kumar
cd0a7fed41 refactor: adding labels to important section
(cherry picked from commit 993e2bfbf9)
2024-03-22 08:51:32 +00:00
ruthra kumar
84609abd65 chore: UI cleanup
(cherry picked from commit ea3071db66)
2024-03-22 08:51:31 +00:00
ruthra kumar
a76d19fe8f chore: add screen freeze on wait
(cherry picked from commit 395299803f)
2024-03-22 08:51:31 +00:00
ruthra kumar
ebea0fd203 chore: code cleanup
(cherry picked from commit 5e2d21c033)
2024-03-22 08:51:31 +00:00
ruthra kumar
f9c30968bf chore: hide internal variables section
(cherry picked from commit c4c3090f46)
2024-03-22 08:51:31 +00:00
ruthra kumar
a9a510547e chore: rename btree and remove debugging statements
(cherry picked from commit 6492019383)
2024-03-22 08:51:31 +00:00
ruthra kumar
c2f6f9d37f chore: hide internal fields and better painting logic for heatmap
(cherry picked from commit f6831fba13)
2024-03-22 08:51:30 +00:00
ruthra kumar
9d5c010071 refactor: working heatmap
(cherry picked from commit 16db6c2f47)
2024-03-22 08:51:30 +00:00
ruthra kumar
3cfc778bdb chore: hide some internal fields
(cherry picked from commit bd3dc6482e)
2024-03-22 08:51:30 +00:00
ruthra kumar
f06014afc3 refactor: calculate summary on tree navigation
(cherry picked from commit f7b7b2b438)
2024-03-22 08:51:30 +00:00
ruthra kumar
bee5744309 refactor: use DB to store tree and state
(cherry picked from commit 99fbd8ad18)
2024-03-22 08:51:30 +00:00
ruthra kumar
bc1f25b897 chore: use doctype as btree
(cherry picked from commit 9d20256366)
2024-03-22 08:51:30 +00:00
ruthra kumar
6afb6ff4df feat: nodes doctype
(cherry picked from commit 85f2a6dd54)
2024-03-22 08:51:29 +00:00
ruthra kumar
609ecbe804 chore: remove unwanted code
(cherry picked from commit de2eba0d98)
2024-03-22 08:51:29 +00:00
ruthra kumar
674d822985 refactor: add basic navigation
1. remove unnecessary columns
2. added basic tree navigation

(cherry picked from commit 705ef4f5a3)
2024-03-22 08:51:29 +00:00
ruthra kumar
66fae6466f refactor: ability to build and load tree from DB
(cherry picked from commit b2dde55f2c)
2024-03-22 08:51:29 +00:00
ruthra kumar
81f456bdc7 refactor: introduce node class
(cherry picked from commit d53b34c0ce)
2024-03-22 08:51:29 +00:00
ruthra kumar
a177137d6d refactor: more buttons
(cherry picked from commit a427029151)
2024-03-22 08:51:28 +00:00
ruthra kumar
d81be8d855 refactor: date validation
(cherry picked from commit 2de3e6ce6d)
2024-03-22 08:51:28 +00:00
ruthra kumar
0399acdc8e refactor: support for BFS and DFS
(cherry picked from commit 03a38ed025)
2024-03-22 08:51:28 +00:00
ruthra kumar
50963d9ad5 refactor: simplify DFS
(cherry picked from commit 26503a205f)
2024-03-22 08:51:28 +00:00
ruthra kumar
1639974948 refactor: Depth First Search(DFS)
(cherry picked from commit 5a25c80f2e)
2024-03-22 08:51:28 +00:00
ruthra kumar
57ec0d6b41 refactor: some logic
(cherry picked from commit 4c8a8c3bcd)
2024-03-22 08:51:27 +00:00
ruthra kumar
5ad3918232 feat: bisect doctype
(cherry picked from commit decdbd2782)
2024-03-22 08:51:27 +00:00
ruthra kumar
9e15ecfe34 refactor: primitive summary for p&l and balance sheet
(cherry picked from commit eb4c476490)
2024-03-22 08:51:27 +00:00
ruthra kumar
da17496e3d Merge pull request #40607 from frappe/mergify/bp/version-14-hotfix/pr-40520
fix: permissions during bulk transaction logs (backport #40520)
2024-03-22 10:33:49 +05:30
David
99faafb5be fix: permissions during bulk transaction logs
(cherry picked from commit 49dd4c1ef3)
2024-03-22 04:38:17 +00:00
ruthra kumar
6d39a7890e Merge pull request #40596 from frappe/mergify/bp/version-14-hotfix/pr-40386
fix: wrong buying amount if delivered and billed qty varies (backport #40386)
2024-03-22 09:04:26 +05:30
mergify[bot]
390d3a6a9f perf: add in some indexes (backport #40590) (#40604)
* perf: add in some indexes (#40590)

`Sales Invoice Item.purchase_order`
`Delivery Note Item.purchase_order`

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 1cd38c860a)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

* chore: `conflicts`

* chore: `conflicts`

---------

Co-authored-by: Akhil Narang <me@akhilnarang.dev>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-03-22 08:51:33 +05:30