Rohit Waghchaure
|
59e2ab702f
|
fix: job card for quantity UX
(cherry picked from commit 87d37e90a2)
|
2022-11-24 13:54:59 +00:00 |
|
Deepesh Garg
|
517e40e1b8
|
Merge pull request #33099 from frappe/mergify/bp/version-14-hotfix/pr-33097
fix: precision in asset test_scrap_asset (backport #33097)
|
2022-11-24 16:58:04 +05:30 |
|
anandbaburajan
|
0fe5e9a9d1
|
fix: precision in asset test_scrap_asset
(cherry picked from commit 0e726609f1)
|
2022-11-24 10:44:31 +00:00 |
|
Deepesh Garg
|
82e41a2721
|
Merge pull request #33089 from frappe/mergify/bp/version-14-hotfix/pr-33088
fix: Valuation Rate column UX in stock ledger report (backport #33088)
|
2022-11-23 18:22:15 +05:30 |
|
Rohit Waghchaure
|
5c065e8a64
|
fix: Valuation Rate column UX in stock ledger report
(cherry picked from commit be19e4f621)
|
2022-11-23 12:00:49 +00:00 |
|
rohitwaghchaure
|
188b18dc5b
|
Merge pull request #33083 from frappe/mergify/bp/version-14-hotfix/pr-33077
fix: UX for inventory dimension (backport #33077)
|
2022-11-23 12:33:44 +05:30 |
|
Deepesh Garg
|
5d7c4c182a
|
Merge pull request #33085 from frappe/mergify/bp/version-14-hotfix/pr-33062
fix: create rounding gl entry for PCV during gle post processing (backport #33062)
|
2022-11-23 11:50:26 +05:30 |
|
Deepesh Garg
|
798717b12b
|
Merge pull request #33082 from frappe/mergify/bp/version-14-hotfix/pr-33063
feat: item wise tds in purchase order (backport #33063)
|
2022-11-23 11:47:54 +05:30 |
|
Deepesh Garg
|
7a9f384b18
|
chore: resolve conflicts
|
2022-11-23 10:58:47 +05:30 |
|
Nabin Hait
|
fd4bcd9f7f
|
fix: create rounding gl entry for PCV during gle post processing
(cherry picked from commit 022d8d5d79)
|
2022-11-23 05:07:29 +00:00 |
|
Rohit Waghchaure
|
f1dd4d0449
|
fix: UX for inventory dimension
(cherry picked from commit 0a69523940)
|
2022-11-23 04:24:36 +00:00 |
|
niralisatapara
|
5f8f574e20
|
feat: item wise tds calculation for purchase order
(cherry picked from commit 0fdde2e5c0)
# Conflicts:
# erpnext/patches.txt
|
2022-11-23 04:22:46 +00:00 |
|
niralisatapara
|
2bd8bd224b
|
feat: item wise tds calculation for purchase order.
(cherry picked from commit 46e8cdf31a)
|
2022-11-23 04:22:45 +00:00 |
|
niralisatapara
|
ba3643514e
|
feat: item wise tds in purchase order
(cherry picked from commit b9d0b4e2d3)
|
2022-11-23 04:22:45 +00:00 |
|
Deepesh Garg
|
084d81025c
|
Merge pull request #33078 from frappe/mergify/bp/version-14-hotfix/pr-33072
chore: Rearrange supplier invoice section in Purchase Invoice (backport #33072)
|
2022-11-22 20:41:10 +05:30 |
|
Deepesh Garg
|
995ad90b5a
|
Merge pull request #33079 from frappe/mergify/bp/version-14-hotfix/pr-33068
fix: Don't show payment button for invoices on hold (backport #33068)
|
2022-11-22 20:40:53 +05:30 |
|
Deepesh Garg
|
f71f907b31
|
Merge pull request #33080 from frappe/mergify/bp/version-14-hotfix/pr-33069
fix: Remove unnecessary filters from Journal Entry (backport #33069)
|
2022-11-22 20:40:34 +05:30 |
|
Deepesh Garg
|
387665d221
|
fix: Remove unnecessary filters from Journal Entry
(cherry picked from commit cd88a53533)
|
2022-11-22 14:46:02 +00:00 |
|
Deepesh Garg
|
7487acdeb6
|
fix: Don't show payment button for invoices on hold
(cherry picked from commit 1b9e83251f)
|
2022-11-22 14:45:39 +00:00 |
|
Deepesh Garg
|
54317b56ea
|
chore: Rearrange supplier invoice section in Purchase Invoice
(cherry picked from commit e96be712b8)
|
2022-11-22 14:45:05 +00:00 |
|
ruthra kumar
|
a2012cb710
|
Merge pull request #33073 from frappe/mergify/bp/version-14-hotfix/pr-33071
fix: advance paid updated in account currency for SO/PO (backport #33071)
|
2022-11-22 14:27:06 +05:30 |
|
ruthra kumar
|
48a3b3f6f3
|
test: fix test case for SO/PO advance amount
(cherry picked from commit 541cf153f7)
|
2022-11-22 08:15:57 +00:00 |
|
ruthra kumar
|
14235f24b2
|
fix: update advace paid in SO/PO in account currency
(cherry picked from commit bf76b85dfd)
|
2022-11-22 08:15:56 +00:00 |
|
Deepesh Garg
|
622c5837cf
|
Merge pull request #33056 from frappe/mergify/bp/version-14-hotfix/pr-33051
fix: Timesheet timer button (backport #33051)
|
2022-11-21 14:04:47 +05:30 |
|
Deepesh Garg
|
db0b4d5966
|
Merge pull request #33055 from frappe/mergify/bp/version-14-hotfix/pr-33052
fix: Viewing account ledger from party master (backport #33052)
|
2022-11-21 12:49:28 +05:30 |
|
Deepesh Garg
|
53cf6b8c89
|
fix: Timesheet timer button
(cherry picked from commit 64802d1220)
|
2022-11-21 05:45:35 +00:00 |
|
Deepesh Garg
|
da2dfcc10b
|
fix: Viewing account ledger from party master
(cherry picked from commit 15e74c5d7b)
|
2022-11-21 05:45:08 +00:00 |
|
Deepesh Garg
|
8215469b5e
|
Merge pull request #33044 from frappe/mergify/bp/version-14-hotfix/pr-32958
fix: link `Item Price` brand to `Brand` doctype. (backport #32958)
|
2022-11-20 18:52:26 +05:30 |
|
Devin Slauenwhite
|
a198a55d2d
|
fix: naming
(cherry picked from commit 3a35651441)
|
2022-11-19 13:45:19 +00:00 |
|
Devin Slauenwhite
|
b428307e9f
|
fix: link to brand doctype.
(cherry picked from commit cee069d426)
|
2022-11-19 13:45:19 +00:00 |
|
Deepesh Garg
|
5456fec4d5
|
Merge pull request #33042 from frappe/mergify/bp/version-14-hotfix/pr-33032
fix: Accounting Dimension filtering for Sales and Purchase Report (backport #33032)
|
2022-11-19 18:52:45 +05:30 |
|
Deepesh Garg
|
3ee3f8e38e
|
Merge pull request #33043 from frappe/mergify/bp/version-14-hotfix/pr-32999
fix: incorrect currency in Exchange rate revaluation (backport #32999)
|
2022-11-19 18:52:27 +05:30 |
|
Deepesh Garg
|
7bad53104b
|
Merge pull request #33001 from frappe/mergify/bp/version-14-hotfix/pr-32994
chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch (backport #32994)
|
2022-11-19 18:46:27 +05:30 |
|
ruthra kumar
|
f2fde8327d
|
fix: always send account currency in response
(cherry picked from commit 5caaccc94b)
|
2022-11-19 13:00:42 +00:00 |
|
ruthra kumar
|
a26470a65f
|
fix: incorrect currency in Exchange rate revaluation
(cherry picked from commit 68b04e2577)
|
2022-11-19 13:00:42 +00:00 |
|
Deepesh Garg
|
44dbdba6a0
|
Merge pull request #33035 from frappe/mergify/bp/version-14-hotfix/pr-33034
fix(realtime): Restrict updates to only last modified or current user (backport #33034)
|
2022-11-19 18:22:07 +05:30 |
|
Deepesh Garg
|
b78220957b
|
fix: Accounting Dimension filtering for Sales and Purchase Report
(cherry picked from commit 8b394afaa9)
|
2022-11-19 12:50:39 +00:00 |
|
gavin
|
9e8a8356e9
|
fix(realtime): Restrict updates to only last modified or current user (#33034)
(cherry picked from commit dd2493a541)
|
2022-11-18 11:48:47 +00:00 |
|
Deepesh Garg
|
f2283546b5
|
Merge pull request #33031 from frappe/mergify/bp/version-14-hotfix/pr-33014
fix: Bulk payment generation against invoices (backport #33014)
|
2022-11-18 16:51:54 +05:30 |
|
Faris Ansari
|
b1215f8ccf
|
Merge pull request #33030 from frappe/mergify/bp/version-14-hotfix/pr-32986
|
2022-11-18 16:32:45 +05:30 |
|
Sagar Sharma
|
b403c7fdca
|
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32986
|
2022-11-18 16:11:51 +05:30 |
|
Sagar Sharma
|
59c35d9f88
|
Merge pull request #33029 from frappe/mergify/bp/version-14-hotfix/pr-32905
fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt (backport #32905)
|
2022-11-18 15:12:28 +05:30 |
|
Deepesh Garg
|
57b00e3b16
|
fix: Bulk payment generation against invoices
(cherry picked from commit 2dfe849c7d)
|
2022-11-18 09:41:01 +00:00 |
|
Deepesh Garg
|
a30747b723
|
Merge pull request #33017 from frappe/mergify/bp/version-14-hotfix/pr-33009
fix(pos): item selector image border radius (backport #33009)
|
2022-11-18 15:09:47 +05:30 |
|
Deepesh Garg
|
6d22305b9f
|
Merge pull request #33018 from frappe/mergify/bp/version-14-hotfix/pr-33003
fix: precision in asset tests (backport #33003)
|
2022-11-18 15:09:04 +05:30 |
|
s-aga-r
|
71d6f2a490
|
fix: hide reject-fields in return SCR
(cherry picked from commit 7dd7617ec7)
|
2022-11-18 09:31:11 +00:00 |
|
s-aga-r
|
4de02dc258
|
fix: don't set rejected-qty in return SCR
(cherry picked from commit 8a73e963ce)
|
2022-11-18 09:31:11 +00:00 |
|
s-aga-r
|
0c73280a9b
|
chore: linters
(cherry picked from commit 12d7b7e9c2)
|
2022-11-18 07:46:49 +00:00 |
|
Vishal
|
660e3fa081
|
chore: minor fix
(cherry picked from commit e5dfd53e6f)
|
2022-11-18 07:46:49 +00:00 |
|
Vishal
|
ac3120b6f9
|
fix: minor change
(cherry picked from commit ba6189d054)
|
2022-11-18 07:46:49 +00:00 |
|