mergify[bot]
|
f42f1bb35f
|
fix: performance issue for the report Purchase Order Analysis report (backport #42503) (#42506)
* fix: performance issue for the report Purchase Order Analysis report (#42503)
(cherry picked from commit cb522f8f22)
# Conflicts:
# erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-07-30 14:25:23 +05:30 |
|
mergify[bot]
|
0256c64634
|
fix: builtins.KeyError: ('ABC', 'Store - CP') (backport #42505) (#42508)
fix: builtins.KeyError: ('ABC', 'Store - CP') (#42505)
(cherry picked from commit 25dac1f18e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-07-30 14:25:01 +05:30 |
|
ruthra kumar
|
e4f583d25a
|
Merge pull request #42529 from frappe/mergify/bp/version-14-hotfix/pr-42528
chore: button name should reflect what it creates (backport #42528)
|
2024-07-30 12:12:32 +05:30 |
|
ruthra kumar
|
7259c0fe30
|
chore: button name should reflect what it creates
(cherry picked from commit 0b6e7f83cd)
|
2024-07-30 06:31:17 +00:00 |
|
ruthra kumar
|
02547115e5
|
Merge pull request #42335 from frappe/mergify/bp/version-14-hotfix/pr-42330
fix: incorrect valuation rate for items from different warehouses in Gross Profit (backport #42330)
|
2024-07-29 10:17:04 +05:30 |
|
ruthra kumar
|
0bc9825238
|
Merge pull request #42491 from frappe/mergify/bp/version-14-hotfix/pr-42477
fix: incorrect cost_center on AR/AP report (backport #42477)
|
2024-07-26 20:10:43 +05:30 |
|
ruthra kumar
|
bb66126dfa
|
test: invoice cost center reported in AR/AP report
(cherry picked from commit 9a0894fd65)
|
2024-07-26 14:14:32 +00:00 |
|
ruthra kumar
|
0e2abbd08e
|
fix: incorrect cost_center on AR/AP report
(cherry picked from commit 3e19041fa3)
|
2024-07-26 14:14:32 +00:00 |
|
Smit Vora
|
ff78fab176
|
Merge pull request #42483 from frappe/mergify/bp/version-14-hotfix/pr-42305
fix: consider payment entries for checking if tds is deducted (backport #42305)
|
2024-07-26 15:17:05 +05:30 |
|
Smit Vora
|
04840762dd
|
Merge pull request #42481 from frappe/mergify/bp/version-14-hotfix/pr-42444
fix: parenttype in purchase and sales item query (backport #42444)
|
2024-07-26 15:16:44 +05:30 |
|
ljain112
|
e7432fc60d
|
fix: consider payment entries for checking if tds is deducted
(cherry picked from commit 40b59de4cd)
|
2024-07-26 09:11:50 +00:00 |
|
ljain112
|
97f2e88f4c
|
fix: parenttype in item wise purchase and sales register
(cherry picked from commit 35981b8730)
|
2024-07-26 08:56:42 +00:00 |
|
ruthra kumar
|
37f24ae763
|
Merge pull request #42473 from frappe/mergify/bp/version-14-hotfix/pr-42472
refactor: index on Purchase Invoice 'release_date' (backport #42472)
|
2024-07-25 21:51:16 +05:30 |
|
ruthra kumar
|
25b9127bae
|
refactor: index on Purchase Invoice 'release_date'
(cherry picked from commit 764dd12b10)
|
2024-07-25 15:57:59 +00:00 |
|
ruthra kumar
|
6e74e6f314
|
Merge pull request #42464 from frappe/mergify/bp/version-14-hotfix/pr-42462
refactor: provision for re-evaluating Exchange Rates in monthly frequency (backport #42462)
|
2024-07-24 22:11:22 +05:30 |
|
ruthra kumar
|
240118ee8b
|
chore: resolve conflict
|
2024-07-24 18:48:32 +05:30 |
|
ruthra kumar
|
c1fd95ac66
|
refactor: hooks for monthly re-evaluation jobs
(cherry picked from commit fc4e5f165c)
# Conflicts:
# erpnext/hooks.py
|
2024-07-24 13:15:15 +00:00 |
|
ruthra kumar
|
8e340bb7fd
|
refactor: provision for monthly re-evaluation
(cherry picked from commit ce2b9e0f1a)
# Conflicts:
# erpnext/setup/doctype/company/company.json
# erpnext/setup/doctype/company/company.py
|
2024-07-24 13:15:15 +00:00 |
|
ruthra kumar
|
96a6172999
|
Merge pull request #42455 from frappe/mergify/bp/version-14-hotfix/pr-42390
refactor: cleaning up stale code related to reposting (backport #42390)
|
2024-07-24 17:35:24 +05:30 |
|
Smit Vora
|
d0d587432d
|
Merge pull request #42439 from frappe/mergify/bp/version-14-hotfix/pr-42377
fix: ignore duplicates while creating default templates (backport #42377)
|
2024-07-24 14:25:46 +05:30 |
|
ruthra kumar
|
07509b5e99
|
chore: resolve conflicts
|
2024-07-24 13:07:15 +05:30 |
|
ruthra kumar
|
99d5b6dc71
|
chore: resolve conflicts
|
2024-07-24 13:04:57 +05:30 |
|
ruthra kumar
|
56b1582027
|
refactor(test): remove assert on 'repost_required'
(cherry picked from commit e71cb4eab7)
|
2024-07-24 07:29:10 +00:00 |
|
ruthra kumar
|
149109649d
|
refactor: remove attribute check on 'repost_required'
(cherry picked from commit 07fc952a43)
# Conflicts:
# erpnext/accounts/doctype/journal_entry/journal_entry.py
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
|
2024-07-24 07:29:09 +00:00 |
|
ruthra kumar
|
0284328e2c
|
refactor: repost without checking on flag
(cherry picked from commit 09f429ffba)
|
2024-07-24 07:29:09 +00:00 |
|
ruthra kumar
|
a243873ab0
|
chore: remove stale UI code related to repost
(cherry picked from commit fe46e1d089)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
|
2024-07-24 07:29:09 +00:00 |
|
ruthra kumar
|
197e043fc9
|
chore: remove 'repost_required' from Journal Entry
(cherry picked from commit e81373bb6a)
# Conflicts:
# erpnext/accounts/doctype/journal_entry/journal_entry.json
# erpnext/accounts/doctype/journal_entry/journal_entry.py
|
2024-07-24 07:29:09 +00:00 |
|
ruthra kumar
|
925a164101
|
chore: remove 'repost_required' from purchase invoice
(cherry picked from commit a467888a67)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
|
2024-07-24 07:29:08 +00:00 |
|
ruthra kumar
|
8f1a4b9717
|
chore: remove stale 'repost_required' flag from sales invoice
(cherry picked from commit 06c5334f2a)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
|
2024-07-24 07:29:08 +00:00 |
|
ruthra kumar
|
67d4020241
|
chore: remove stale code from sales invoice
(cherry picked from commit f3fda9ce98)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
|
2024-07-24 07:29:08 +00:00 |
|
Smit Vora
|
99bc8e849c
|
fix: ignore duplicates while creating default templates
(cherry picked from commit cf55c2ab3d)
|
2024-07-23 04:56:31 +00:00 |
|
ruthra kumar
|
7a25d33547
|
Merge pull request #42408 from frappe/mergify/bp/version-14-hotfix/pr-42407
test: basic test case for item-wise purchase register (backport #42407)
|
2024-07-21 20:08:19 +05:30 |
|
ruthra kumar
|
2466e28bf5
|
test: basic test case for item-wise purchase register
(cherry picked from commit c3c5d3f615)
|
2024-07-19 11:21:08 +00:00 |
|
ruthra kumar
|
1096528bb9
|
Merge pull request #42401 from frappe/mergify/bp/version-14-hotfix/pr-42386
fix: set pos data if not return doc (backport #42386)
|
2024-07-19 10:57:20 +05:30 |
|
ljain112
|
6ecb064264
|
fix: set pos data if not return doc
(cherry picked from commit 65d672da65)
|
2024-07-19 04:56:26 +00:00 |
|
ruthra kumar
|
92300b27c9
|
Merge pull request #42384 from frappe/mergify/bp/version-14-hotfix/pr-42374
fix: Show the rows in AR/AP report where outstanding equals to 0.01 (backport #42374)
|
2024-07-18 15:08:55 +05:30 |
|
ruthra kumar
|
4fa9626de0
|
chore: resolve conflict
|
2024-07-18 14:41:09 +05:30 |
|
ruthra kumar
|
9b828b829a
|
test: AR/AP report on miniscule outstanding
(cherry picked from commit bb9e42cce2)
|
2024-07-18 08:15:39 +00:00 |
|
Nabin Hait
|
2936988cc6
|
fix: Show the rows in AR/AP report where outstanding equals to 0.01
(cherry picked from commit e1dedc5402)
# Conflicts:
# erpnext/patches.txt
|
2024-07-18 08:15:38 +00:00 |
|
ruthra kumar
|
9fca232578
|
Merge pull request #42382 from frappe/mergify/bp/version-14-hotfix/pr-42369
fix: missing cr/dr notes on payment reconciliation (backport #42369)
|
2024-07-18 13:43:36 +05:30 |
|
ruthra kumar
|
fac22e93d0
|
chore: resolve conflict
|
2024-07-18 12:44:34 +05:30 |
|
ruthra kumar
|
3109efaf09
|
test: payment filter should not affect dr/cr notes
(cherry picked from commit 2d686c06ea)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
|
2024-07-18 07:12:45 +00:00 |
|
ruthra kumar
|
90ee21f868
|
fix: missing cr/dr notes on payment reconciliation
(cherry picked from commit a30af68e9e)
|
2024-07-18 07:12:45 +00:00 |
|
Smit Vora
|
36c46bb344
|
Merge pull request #42366 from vorasmit/update-prop-backport
fix: remove redundant proprietorship field from customer type and supplier type (backport #42307)
|
2024-07-17 18:55:40 +05:30 |
|
Sanket322
|
8c1f6196b8
|
fix: remove proprietorship and update it with individual (backport #42307)
|
2024-07-17 14:03:52 +05:30 |
|
ruthra kumar
|
2ce7300c3c
|
Merge pull request #42337 from frappe/mergify/bp/version-14-hotfix/pr-42294
refactor: make reposting implicit (backport #42294)
|
2024-07-15 15:41:23 +05:30 |
|
ruthra kumar
|
b96b3b51b6
|
chore: resolve conflicts
|
2024-07-15 15:22:06 +05:30 |
|
ruthra kumar
|
8f03769bf2
|
chore: contextual comments
(cherry picked from commit 794a62aecb)
|
2024-07-15 09:41:56 +00:00 |
|
ruthra kumar
|
d20f3ab492
|
refactor(test): reposting happens implicitly
(cherry picked from commit c283cda169)
|
2024-07-15 09:41:56 +00:00 |
|
ruthra kumar
|
980ca1d8c5
|
refactor(test): no need to assert repost_required flag
Reposting happens implicitly upon 'Update After Submit'
(cherry picked from commit 8f135e9859)
# Conflicts:
# erpnext/accounts/doctype/journal_entry/test_journal_entry.py
|
2024-07-15 09:41:56 +00:00 |
|