ruthra kumar
|
8f2fd5dec9
|
test: payment against JE reconciliation with different rates
(cherry picked from commit fe84558b77)
|
2024-04-05 05:03:56 +00:00 |
|
ruthra kumar
|
09cda60bdf
|
fix: use reference type name to update exc rate
(cherry picked from commit c15690e475)
|
2024-04-05 05:03:56 +00:00 |
|
Nabin Hait
|
81081663c4
|
Merge pull request #40826 from frappe/mergify/bp/version-14-hotfix/pr-40584
fix: show currency symbol in base currency in fixed asset register report (backport #40584)
|
2024-04-02 18:29:58 +05:30 |
|
rohitwaghchaure
|
2f66542d71
|
Merge pull request #40824 from rohitwaghchaure/fixed-remove-enqueue-submit-cancel
chore: remove enqueue submit and cancel from the stock entry
|
2024-04-02 16:34:57 +05:30 |
|
Rohit Waghchaure
|
abc0294cbf
|
chore: remove enqueue submit and cancel from stock entry
|
2024-04-02 16:10:28 +05:30 |
|
Nabin Hait
|
515f933362
|
fix: linter issues
(cherry picked from commit 21a40a2236)
|
2024-04-02 10:27:57 +00:00 |
|
Nabin Hait
|
cfe5f009f6
|
fix: show currency symbol in base currency in fixed asset register report
(cherry picked from commit 8b6220efd8)
|
2024-04-02 10:27:56 +00:00 |
|
ruthra kumar
|
cf74f8312e
|
Merge pull request #40803 from frappe/mergify/bp/version-14-hotfix/pr-40181
fix: show future payments consider allocated sales returns (backport #40181)
|
2024-04-01 14:13:59 +05:30 |
|
Devin Slauenwhite
|
803ed904a9
|
fix: show future payments allocated sales returns is considered as payment
(cherry picked from commit 3381d0d945)
|
2024-04-01 07:34:41 +00:00 |
|
Devin Slauenwhite
|
72db656054
|
test: show future payments allocated sales returns is considered as payment
(cherry picked from commit daaa00bd4a)
|
2024-04-01 07:34:40 +00:00 |
|
rohitwaghchaure
|
44b72e7fc8
|
Merge pull request #40737 from frappe/mergify/bp/version-14-hotfix/pr-40731
fix: markdown to text editor set for supplier quotation (backport #40731)
|
2024-03-31 21:14:38 +05:30 |
|
rohitwaghchaure
|
31017774f6
|
chore: fix conflicts
|
2024-03-31 11:42:05 +05:30 |
|
rohitwaghchaure
|
9b8bb4d6a2
|
chore: fix conflicts
|
2024-03-31 11:41:44 +05:30 |
|
mergify[bot]
|
ceac42dfaa
|
fix: Warehouse linked company name in multicompany setup (backport #40779) (#40780)
fix: Warehouse linked company name in multicompany setup (#40779)
(cherry picked from commit 679aea607b)
Co-authored-by: jeshani <56191568+jeshani@users.noreply.github.com>
|
2024-03-30 10:18:16 +05:30 |
|
ruthra kumar
|
998cc0a966
|
Merge pull request #40668 from frappe/mergify/bp/version-14-hotfix/pr-40634
refactor: better pop up message for Internal Customer validation (backport #40634)
|
2024-03-29 13:50:35 +05:30 |
|
ruthra kumar
|
e722c9a34a
|
Merge pull request #40766 from frappe/mergify/bp/version-14-hotfix/pr-40758
fix: payment_order_status should be no_copy (backport #40758)
|
2024-03-29 13:49:08 +05:30 |
|
Ashish Shah
|
8dff18eab4
|
fix: payment_order_status should be no_copy
payment_order_status should be no_copy
(cherry picked from commit adee2ba541)
|
2024-03-29 07:57:03 +00:00 |
|
ruthra kumar
|
7363884ab3
|
Merge pull request #40762 from frappe/mergify/bp/version-14-hotfix/pr-40760
fix: cost center shouldn't update debit/credit in Exc gain/loss JV (backport #40760)
|
2024-03-29 11:47:05 +05:30 |
|
ruthra kumar
|
f66b53b2c1
|
fix: cost center shouldn't update debit/credit in Exc gain/loss JV
(cherry picked from commit 398d3022ef)
|
2024-03-29 06:13:47 +00:00 |
|
ruthra kumar
|
bb35c334c0
|
Merge pull request #40744 from frappe/mergify/bp/version-14-hotfix/pr-40739
refactor: use sql to clear comments (backport #40739)
|
2024-03-28 19:42:02 +05:30 |
|
ruthra kumar
|
4d6fad26f3
|
refactor: use sql to clear comments
(cherry picked from commit 1f46c1530e)
|
2024-03-28 12:12:12 +00:00 |
|
Nihantra Patel
|
b5629d2d4e
|
fix: markdown to text editor set for supplier quotation
(cherry picked from commit 9828d34b19)
# Conflicts:
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
|
2024-03-28 07:16:11 +00:00 |
|
rohitwaghchaure
|
b1105fb0ab
|
Merge pull request #40721 from frappe/mergify/bp/version-14-hotfix/pr-40718
fix: do not fetch received items in purchase receipt (backport #40718)
|
2024-03-27 23:01:12 +05:30 |
|
Rohit Waghchaure
|
e778d7e690
|
fix: do not fetch received items in purchase receipt
(cherry picked from commit 5bff434902)
|
2024-03-27 17:11:25 +00:00 |
|
rohitwaghchaure
|
e947d65cb2
|
Merge pull request #40710 from frappe/mergify/bp/version-14-hotfix/pr-40708
fix: Priority not copied from project template (backport #40708)
|
2024-03-27 16:17:57 +05:30 |
|
Rohit Waghchaure
|
4f4470b9d2
|
fix: Priority not copied from project template
(cherry picked from commit 33fd7b8a1f)
|
2024-03-27 10:18:21 +00:00 |
|
rohitwaghchaure
|
4a1cd943bd
|
Merge pull request #40687 from frappe/mergify/bp/version-14-hotfix/pr-40684
fix: incorrect total qty in job card (backport #40684)
|
2024-03-26 19:54:15 +05:30 |
|
Rohit Waghchaure
|
fb252ec29a
|
fix: incorrect total qty in job card
(cherry picked from commit c3546cf8e2)
|
2024-03-26 14:03:40 +00:00 |
|
Wolfram Schmidt
|
2834d25ce3
|
refactor: better pop message for Internal Customer validation
-added more meaningful description to message when using "internal Customer" scenario
(cherry picked from commit b132892b25)
|
2024-03-26 09:55:04 +05:30 |
|
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 |
|