rohitwaghchaure
|
99a57e689d
|
Merge pull request #40860 from frappe/mergify/bp/version-15-hotfix/pr-40848
fix: group warehouse added in the stock reconciliation (backport #40848)
|
2024-04-07 14:34:58 +05:30 |
|
rohitwaghchaure
|
97bf4a829a
|
Merge pull request #40894 from frappe/mergify/bp/version-15-hotfix/pr-40883
fix: incorrect operator causing incorrect validation (backport #40883)
|
2024-04-07 14:33:43 +05:30 |
|
Rohit Waghchaure
|
80c2a33fd7
|
fix: incorrect operator causing incorrect validation
(cherry picked from commit 6b317b0c0d)
|
2024-04-07 06:34:23 +00:00 |
|
rohitwaghchaure
|
25e0a808cd
|
Merge pull request #40889 from frappe/mergify/bp/version-15-hotfix/pr-40887
fix: query_report.trigger_refresh is not a function (backport #40887)
|
2024-04-07 12:02:46 +05:30 |
|
Rohit Waghchaure
|
4f48ede7a0
|
fix: query_report.trigger_refresh is not a function
(cherry picked from commit 30bbb58ca1)
|
2024-04-07 06:27:51 +00:00 |
|
ruthra kumar
|
0532b1fd94
|
Merge pull request #40869 from frappe/mergify/bp/version-15-hotfix/pr-40856
fix: unwanted Exc Gain/Loss journals on Payment against Journal entry (backport #40856)
|
2024-04-05 10:52:43 +05:30 |
|
ruthra kumar
|
4b78eb7e76
|
test: payment against JE reconciliation with different rates
(cherry picked from commit fe84558b77)
|
2024-04-05 05:04:02 +00:00 |
|
ruthra kumar
|
5b62f2050b
|
fix: use reference type name to update exc rate
(cherry picked from commit c15690e475)
|
2024-04-05 05:04:02 +00:00 |
|
Rohit Waghchaure
|
e6d6172b4c
|
fix: group warehouse added in the stock reconciliation
(cherry picked from commit 8f53bc0096)
|
2024-04-04 10:10:24 +00:00 |
|
Deepesh Garg
|
91f689575e
|
Merge pull request #40810 from frappe/mergify/bp/version-15-hotfix/pr-40796
fix: Default company bank account (#40796)
|
2024-04-04 14:28:07 +05:30 |
|
Deepesh Garg
|
5c5a0c965d
|
Merge pull request #40809 from frappe/mergify/bp/version-15-hotfix/pr-40770
fix: Recalculate sales commission on item update (#40770)
|
2024-04-04 14:27:40 +05:30 |
|
Deepesh Garg
|
7131e7836d
|
Merge pull request #40808 from frappe/mergify/bp/version-15-hotfix/pr-40755
fix: Receive payment entry from Employee (#40755)
|
2024-04-04 14:24:13 +05:30 |
|
rohitwaghchaure
|
806a802daa
|
Merge pull request #40853 from frappe/mergify/bp/version-15-hotfix/pr-40852
fix: workstation refresh after prompt (backport #40852)
|
2024-04-04 12:07:47 +05:30 |
|
Nihantra C. Patel
|
9f12c964dc
|
fix: workstation refresh after prompt
(cherry picked from commit bed1af26e3)
|
2024-04-04 06:21:36 +00:00 |
|
rohitwaghchaure
|
405719cd3d
|
Merge pull request #40838 from frappe/mergify/bp/version-15-hotfix/pr-40723
feat: allow to pick manually qty / batches / serial nos (backport #40723)
|
2024-04-02 22:55:34 +05:30 |
|
rohitwaghchaure
|
52c4157723
|
chore: fix conflicts
|
2024-04-02 22:23:22 +05:30 |
|
Rohit Waghchaure
|
5ea11af36b
|
feat: allow to pick manually qty / batches / serial nos
(cherry picked from commit 50dd9fa8a3)
# Conflicts:
# erpnext/stock/doctype/pick_list/pick_list.json
|
2024-04-02 16:45:23 +00:00 |
|
rohitwaghchaure
|
d3044e635e
|
Merge pull request #40832 from frappe/mergify/bp/version-15-hotfix/pr-40828
chore: remove rate of material based on Manual (backport #40828)
|
2024-04-02 19:41:04 +05:30 |
|
rohitwaghchaure
|
ca6caa86bc
|
chore: fix conflicts
|
2024-04-02 19:18:02 +05:30 |
|
rohitwaghchaure
|
152921b82a
|
chore: fix conflicts
|
2024-04-02 19:17:41 +05:30 |
|
Rohit Waghchaure
|
ecc317d690
|
chore: remove rate of material based on Manual
(cherry picked from commit 0b63dbf221)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.json
# erpnext/manufacturing/doctype/bom_creator/bom_creator.json
|
2024-04-02 12:42:22 +00:00 |
|
rohitwaghchaure
|
6607e6b2c3
|
Merge pull request #40822 from frappe/mergify/bp/version-15-hotfix/pr-40816
fix: added validation if parent id is missing in BOM Creator (backport #40816)
|
2024-04-02 15:37:29 +05:30 |
|
Rohit Waghchaure
|
87ce9d834f
|
fix: added validation if parent id is missing in BOM Creator
(cherry picked from commit 0a1fab762f)
|
2024-04-02 09:43:37 +00:00 |
|
rohitwaghchaure
|
204aea856d
|
Merge pull request #40817 from frappe/mergify/bp/version-15-hotfix/pr-40814
fix: barcode not fetched on selection of item (backport #40814)
|
2024-04-02 14:22:58 +05:30 |
|
Rohit Waghchaure
|
2b1b51b5bb
|
fix: barcode not fetched on selection of item
(cherry picked from commit b0730293e2)
|
2024-04-02 05:52:11 +00:00 |
|
Deepesh Garg
|
d8c5f15bc0
|
fix: Default company bank account
(cherry picked from commit 7ac91deb83)
|
2024-04-01 15:09:57 +00:00 |
|
Deepesh Garg
|
5117494a52
|
fix: Recalculate sales commission on item update
(cherry picked from commit f76da50b7e)
|
2024-04-01 15:09:05 +00:00 |
|
Deepesh Garg
|
0cee954f84
|
fix: Receive payment entry from Employee
(cherry picked from commit 29e5c6807e)
|
2024-04-01 15:08:35 +00:00 |
|
rohitwaghchaure
|
3971ff5f72
|
Merge pull request #40806 from frappe/mergify/bp/version-15-hotfix/pr-40735
fix: Show Stock Ageing Data filter not working in stock balance report (backport #40735)
|
2024-04-01 19:47:20 +05:30 |
|
rohitwaghchaure
|
f32de045e3
|
chore: fix conflicts
|
2024-04-01 18:53:04 +05:30 |
|
Rohit Waghchaure
|
2185a29555
|
fix: Show Stock Ageing Data filter not working in stock balance report
(cherry picked from commit 621421bda2)
# Conflicts:
# erpnext/stock/report/stock_ageing/stock_ageing.py
|
2024-04-01 11:25:46 +00:00 |
|
ruthra kumar
|
d12f89cdb2
|
Merge pull request #40804 from frappe/mergify/bp/version-15-hotfix/pr-40181
fix: show future payments consider allocated sales returns (backport #40181)
|
2024-04-01 14:13:50 +05:30 |
|
Devin Slauenwhite
|
0561d0a81c
|
fix: show future payments allocated sales returns is considered as payment
(cherry picked from commit 3381d0d945)
|
2024-04-01 07:34:45 +00:00 |
|
Devin Slauenwhite
|
ed4c6ef1a7
|
test: show future payments allocated sales returns is considered as payment
(cherry picked from commit daaa00bd4a)
|
2024-04-01 07:34:44 +00:00 |
|
rohitwaghchaure
|
ec91148672
|
Merge pull request #40738 from frappe/mergify/bp/version-15-hotfix/pr-40731
fix: markdown to text editor set for supplier quotation (backport #40731)
|
2024-03-31 21:14:15 +05:30 |
|
rohitwaghchaure
|
458d82aff2
|
Merge pull request #40784 from frappe/mergify/bp/version-15-hotfix/pr-40783
fix: button to select serial / batch bundle in the subcontracting receipt (backport #40783)
|
2024-03-31 21:13:45 +05:30 |
|
rohitwaghchaure
|
390b4986f9
|
chore: fix conflicts
|
2024-03-31 11:41:00 +05:30 |
|
rohitwaghchaure
|
6ecafe7606
|
chore: fix linter issue
|
2024-03-31 11:39:55 +05:30 |
|
rohitwaghchaure
|
04da610288
|
chore: fix conflicts
|
2024-03-30 20:05:21 +05:30 |
|
rohitwaghchaure
|
b397535392
|
chore: fix conflicts
|
2024-03-30 20:04:53 +05:30 |
|
Rohit Waghchaure
|
d2a6509950
|
fix: button to select serial / batch bundle in the subcontracting receipt
(cherry picked from commit d73b1f3e6a)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
# erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
|
2024-03-30 05:54:14 +00:00 |
|
mergify[bot]
|
33b6244ae6
|
fix: Warehouse linked company name in multicompany setup (backport #40779) (#40781)
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:33 +05:30 |
|
ruthra kumar
|
8ef0a66d3e
|
Merge pull request #40767 from frappe/mergify/bp/version-15-hotfix/pr-40758
fix: payment_order_status should be no_copy (backport #40758)
|
2024-03-29 13:49:16 +05:30 |
|
Ashish Shah
|
2dd697ee77
|
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:04 +00:00 |
|
rohitwaghchaure
|
bd7467a812
|
Merge pull request #40761 from frappe/mergify/bp/version-15-hotfix/pr-40757
chore: show item name in the validation message (backport #40757)
|
2024-03-29 13:24:18 +05:30 |
|
ruthra kumar
|
babcc420cc
|
Merge pull request #40763 from frappe/mergify/bp/version-15-hotfix/pr-40760
fix: cost center shouldn't update debit/credit in Exc gain/loss JV (backport #40760)
|
2024-03-29 11:46:56 +05:30 |
|
ruthra kumar
|
71704beb6f
|
fix: cost center shouldn't update debit/credit in Exc gain/loss JV
(cherry picked from commit 398d3022ef)
|
2024-03-29 06:13:51 +00:00 |
|
Rohit Waghchaure
|
0b4b0874f4
|
chore: show item name in the validation message
(cherry picked from commit d05412f96a)
|
2024-03-29 06:06:54 +00:00 |
|
rohitwaghchaure
|
0eb908e950
|
Merge pull request #40756 from frappe/mergify/bp/version-15-hotfix/pr-40752
chore: allow to override serial batch selector using custom app (backport #40752)
|
2024-03-29 09:15:37 +05:30 |
|
Rohit Waghchaure
|
8ca4f63572
|
chore: allow to override serial batch selector
(cherry picked from commit 0d9d42ae61)
|
2024-03-29 03:41:49 +00:00 |
|