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 |
|
Frappe PR Bot
|
fe4b2e36cc
|
chore(release): Bumped to Version 14.70.12
## [14.70.12](https://github.com/frappe/erpnext/compare/v14.70.11...v14.70.12) (2024-07-24)
### Bug Fixes
* missing cr/dr notes on payment reconciliation ([90ee21f](90ee21f868))
* remove proprietorship and update it with individual (backport [#42307](https://github.com/frappe/erpnext/issues/42307)) ([8c1f619](8c1f6196b8))
* set pos data if not return doc ([6ecb064](6ecb064264))
* Show the rows in AR/AP report where outstanding equals to 0.01 ([2936988](2936988cc6))
v14.70.12
|
2024-07-24 07:26:52 +00:00 |
|
ruthra kumar
|
6759b90f85
|
Merge pull request #42448 from frappe/version-14-hotfix
chore: release v14
|
2024-07-24 12:55:36 +05:30 |
|
Smit Vora
|
99bc8e849c
|
fix: ignore duplicates while creating default templates
(cherry picked from commit cf55c2ab3d)
|
2024-07-23 04:56:31 +00:00 |
|
trustedcomputer
|
eb5505187e
|
fix: header_img field schema
|
2024-07-22 12:35:46 -07: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 |
|
Frappe PR Bot
|
12a31de25a
|
chore(release): Bumped to Version 14.70.11
## [14.70.11](https://github.com/frappe/erpnext/compare/v14.70.10...v14.70.11) (2024-07-17)
### Bug Fixes
* missing discount on POS Credit Notes ([ac48c3d](ac48c3d4e7))
v14.70.11
|
2024-07-17 05:11:39 +00:00 |
|
ruthra kumar
|
3b9400755e
|
Merge pull request #42353 from frappe/version-14-hotfix
chore: release v14
|
2024-07-17 10:40:24 +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 |
|
ruthra kumar
|
4668a2d7d8
|
refactor: make reposting implicit
(cherry picked from commit 722ef92324)
# Conflicts:
# erpnext/accounts/doctype/journal_entry/journal_entry.py
|
2024-07-15 09:41:56 +00:00 |
|
ruthra kumar
|
1a7efbb654
|
fix(gross profit): incorrect valuation rate on different warehouses
(cherry picked from commit f9d2dd0a62)
|
2024-07-15 08:50:15 +00:00 |
|
ruthra kumar
|
ccc2a47e73
|
Merge pull request #42290 from frappe/mergify/bp/version-14-hotfix/pr-42192
refactor: tests for item wise sales register report (backport #42192)
|
2024-07-12 09:28:05 +05:30 |
|
ruthra kumar
|
f98716cc2a
|
refactor(test): clear old records
|
2024-07-11 21:03:29 +05:30 |
|
ruthra kumar
|
7903e8d669
|
refactor(test): use each instance UOM for assertion
(cherry picked from commit cf4fbfb601)
|
2024-07-11 12:34:13 +00:00 |
|
ruthra kumar
|
9a50a0a129
|
refactor: test suite for item-wise sales register
(cherry picked from commit 3aaa22e672)
|
2024-07-11 12:34:12 +00:00 |
|
ruthra kumar
|
1646517dc4
|
chore: rename test suite for payable report
(cherry picked from commit 9474f72776)
|
2024-07-11 12:34:12 +00:00 |
|
ruthra kumar
|
38811e792c
|
Merge pull request #42288 from frappe/mergify/bp/version-14-hotfix/pr-42287
fix: missing discount on POS Credit Notes (backport #42287)
|
2024-07-11 17:33:26 +05:30 |
|
ruthra kumar
|
edfb408464
|
chore: resolve conflict
|
2024-07-11 17:31:20 +05:30 |
|
ruthra kumar
|
ac48c3d4e7
|
fix: missing discount on POS Credit Notes
(cherry picked from commit 1049550951)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
|
2024-07-11 11:58:57 +00:00 |
|
Frappe PR Bot
|
1d66b7e5a3
|
chore(release): Bumped to Version 14.70.10
## [14.70.10](https://github.com/frappe/erpnext/compare/v14.70.9...v14.70.10) (2024-07-10)
### Bug Fixes
* add missing german translations ([d5c1c62](d5c1c62622))
* empty item-wise sales/purchase register reports on initial load ([13895fa](13895fa060))
* fetch expence account from asset category ([4d6a71a](4d6a71ab4b))
* group by in item-wise purchase register ([62ad466](62ad466a3b))
* **Holiday List:** sort holidays on save to avoid disorienting the user (backport [#42236](https://github.com/frappe/erpnext/issues/42236)) ([#42251](https://github.com/frappe/erpnext/issues/42251)) ([fcf6500](fcf6500144))
* manual pick allow to pick more than available stock (backport [#42155](https://github.com/frappe/erpnext/issues/42155)) ([#42158](https://github.com/frappe/erpnext/issues/42158)) ([454e147](454e147592))
* multiple free items on same Item Group ([701dd9e](701dd9e19b))
* removed max discount validation for sales return ([4195c50](4195c50f02))
* stock qty validation in SCR (backport [#42124](https://github.com/frappe/erpnext/issues/42124)) ([#42224](https://github.com/frappe/erpnext/issues/42224)) ([e2f8e02](e2f8e02c73))
* tax on stock_rbnb on repost of Purchase Receipt ([106c154](106c154a16))
* **tds:** use doctype reference when mapping keys across multiple doctypes ([51cbbee](51cbbee4ca))
* updated logic for calculating tax_withholding_net_total in payment entry ([49e5066](49e50662b6))
* use standard method to get `_doc_before_save` ([9fde733](9fde7330e0))
v14.70.10
|
2024-07-10 10:43:56 +00:00 |
|
ruthra kumar
|
ab9bde86f9
|
Merge pull request #42254 from frappe/version-14-hotfix
chore: release v14
|
2024-07-10 16:12:40 +05:30 |
|
ruthra kumar
|
5c75bb8775
|
Merge pull request #42271 from frappe/mergify/bp/version-14-hotfix/pr-42247
fix: don't merge tax into stock account on purchase receipt repost (backport #42247)
|
2024-07-10 15:52:00 +05:30 |
|
ruthra kumar
|
115a0123ed
|
chore: resolve conflict
|
2024-07-10 15:30:24 +05:30 |
|
ruthra kumar
|
fdf1dfe46e
|
test: tax account heads on PR report without LCV
(cherry picked from commit 9562628ed6)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2024-07-10 09:58:30 +00:00 |
|