nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,085 Commits 402 Branches 1,700 Tags
3f577779be3c8a2140ffb24947252c15b848a008
Commit Graph

50085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ninad1306
3f577779be fix: initially closing amt should be equal to expected amt 
(cherry picked from commit af9524920b)
 2024-11-27 14:28:47 +00:00
ruthra kumar
5e7cfeb514 Merge pull request #44388 from frappe/mergify/bp/version-15-hotfix/pr-44378 
fix: filter item with search fields (backport #44378)
 2024-11-27 17:53:51 +05:30
ruthra kumar
223d30ecd8 Merge pull request #44389 from frappe/mergify/bp/version-15-hotfix/pr-44327 
fix: set debit transaction currency in gl entry (backport #44327)
 2024-11-27 17:53:37 +05:30
venkat102
a2612d5f36 fix: set debit transaction currency in gl entry 
(cherry picked from commit 6e19c06e58)
 2024-11-27 11:59:09 +00:00
ruthra kumar
632412bd72 Merge pull request #44383 from frappe/mergify/bp/version-15-hotfix/pr-44376 
fix: remove field precision in Sales and Purchase Order for percentage fields (backport #44376)
 2024-11-27 17:27:06 +05:30
ruthra kumar
09c28760e4 Merge pull request #44385 from frappe/mergify/bp/version-15-hotfix/pr-44323 
fix: update gross profit for returned invoices (backport #44323)
 2024-11-27 17:21:26 +05:30
ruthra kumar
7c85e4056f Merge pull request #44387 from frappe/mergify/bp/version-15-hotfix/pr-44359 
fix: check difference with company currency (backport #44359)
 2024-11-27 17:21:00 +05:30
venkat102
d073b005a8 fix: filter item with search fields 
(cherry picked from commit ebfbee3da5)
 2024-11-27 11:50:51 +00:00
ruthra kumar
45e41827c7 chore: resolve conflict 2024-11-27 17:20:36 +05:30
venkat102
d6ef43858c fix: check difference with company currency 
(cherry picked from commit e2bae4cf07)
 2024-11-27 11:26:58 +00:00
ljain112
66af7f4a14 fix: test case 
(cherry picked from commit af5a3e5a48)
 2024-11-27 11:20:34 +00:00
ljain112
f4518cac9a fix: gp for return invoice 
(cherry picked from commit 00403515a8)
 2024-11-27 11:20:34 +00:00
ljain112
ca56709295 fix: update gross profit for returned invoices 
(cherry picked from commit 8a42601e99)
 2024-11-27 11:20:34 +00:00
vishakhdesai
860350a5b3 fix: remove field precision in SO and PO for percentage fields 
(cherry picked from commit eff9cd10cd)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order_list.js
 2024-11-27 11:19:13 +00:00
ruthra kumar
6a34abefba Merge pull request #44379 from frappe/mergify/bp/version-15-hotfix/pr-44377 
fix:  correct placeholder index in message (backport #44377)
 2024-11-27 15:38:48 +05:30
ljain112
a523c14fd5 fix: correct placeholder index in message 
(cherry picked from commit d61cb9a4bf)
 2024-11-27 09:26:09 +00:00
ruthra kumar
6f798ab288 Merge pull request #44372 from frappe/mergify/bp/version-15-hotfix/pr-44343 
fix: show cc on the process statement of accounts email (backport #44343)
 2024-11-27 10:47:15 +05:30
mergify[bot]
ef882de509 feat: provision to disable item attribute (backport #44358) (#44370) 
* feat: provision to disable item attribute (#44358)

(cherry picked from commit 123e3ef263)

# Conflicts:
#	erpnext/stock/doctype/item_attribute/item_attribute.json
#	erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-27 10:31:30 +05:30
venkat102
67809c781a fix: show cc on the email 
(cherry picked from commit 2dd5699f6d)
 2024-11-27 04:53:16 +00:00
mergify[bot]
7e61aca512 fix: unify company address query in sales transactions (backport #44361) (#44365) 
fix: unify company address query in sales transactions (#44361)

* fix: unify company address query in sales transactions

* refactor: get the correct field label

(cherry picked from commit 3f92a57d63)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-11-26 20:16:24 +01:00
mergify[bot]
89bd4eba46 fix: added validation for quality inspection (backport #44351) (#44357) 
fix: added validation for quality inspection (#44351)

(cherry picked from commit 0fd50b5048)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-26 21:18:26 +05:30
mergify[bot]
ea0f24aa57 fix: billed qty and received amount in PO analysis report (backport #44349) (#44354) 
fix: billed qty and received amount in PO analysis report (#44349)

(cherry picked from commit 2ab7ec5437)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-26 19:43:51 +05:30
ruthra kumar
069c763010 Merge pull request #44338 from frappe/mergify/bp/version-15-hotfix/pr-44319 
fix: use field precision in Sales and Purchase Order (backport #44319)
 2024-11-26 14:02:33 +05:30
ruthra kumar
bc93de682b chore: resolve conflict 2024-11-26 13:48:00 +05:30
ruthra kumar
8aa4779191 Merge pull request #44335 from frappe/mergify/bp/version-15-hotfix/pr-44304 
chore: Add translations to QI validations in Update stock_controller.py (backport #44304)
 2024-11-26 12:09:56 +05:30
vishakhdesai
cde19066fe fix: use field precision instead of hardcoded precision in so and po 
(cherry picked from commit 1a1e2c7e01)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
 2024-11-26 06:18:33 +00:00
Ernesto Ruiz
465a26f714 chore: Add translations to QI validations in Update stock_controller.py 
chore: Add translations to QI validations in Update stock_controller.py
(cherry picked from commit 6754f15487)
 2024-11-26 06:07:15 +00:00
ruthra kumar
ca8e7e9891 Merge pull request #44332 from frappe/mergify/bp/version-15-hotfix/pr-44257 
fix: add company dynamic filters in number cards (backport #44257)
 2024-11-26 11:19:43 +05:30
Sugesh393
7423d7d337 fix: remove irrelavent filters 
(cherry picked from commit 29762c4826)
 2024-11-26 05:24:57 +00:00
Sugesh393
db21def58b fix: add company dynamic filters in number cards 
(cherry picked from commit 4e7725de66)
 2024-11-26 05:24:57 +00:00
ruthra kumar
6a4058052b Merge pull request #44331 from frappe/mergify/bp/version-15-hotfix/pr-44320 
fix: Increase quantity by `1 UOM` when adding an item from the selector in `POS` (backport #44320)
 2024-11-26 10:40:45 +05:30
Abdeali Chharchhoda
b65e16a91b revert: use + flt(value) instead of direct increment 
(cherry picked from commit 112b4c705b)
 2024-11-26 05:00:41 +00:00
Abdeali Chharchhoda
49dad1a456 fix: Show available stock qty in stock_uom instead of uom 
(cherry picked from commit 84dcbe6639)
 2024-11-26 05:00:40 +00:00
Abdeali Chharchhoda
0d3802873b fix: Increase quantity by 1 UOM when adding an item from the selector in POS 
(cherry picked from commit bbab850135)
 2024-11-26 05:00:40 +00:00
mergify[bot]
20d0e95d7c feat: available qty at company in sales transactions (backport #44260) (#44325) 
* feat: available qty at company in sales transactions

(cherry picked from commit d8b9aef14f)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-11-25 20:29:13 +05:30
ruthra kumar
d77a880a62 Merge pull request #44318 from frappe/mergify/bp/version-15-hotfix/pr-44274 
fix: set price_list_currency only if it exists (backport #44274)
 2024-11-25 12:57:02 +05:30
ruthra kumar
7ccb2ead09 Merge pull request #44317 from frappe/mergify/bp/version-15-hotfix/pr-44163 
feat: Show Aggregate Value from Subsidiary Companies (backport #44163)
 2024-11-25 12:56:37 +05:30
Sugesh393
8cd455b050 fix: set price_list_currency only if it exists 
(cherry picked from commit f0b9cb4019)
 2024-11-25 07:10:04 +00:00
ruthra kumar
072c5b7753 chore: resolve conflict 2024-11-25 12:28:02 +05:30
l0gesh29
0469b0d1ec feat: Show Aggregate Value from Subsidiary Companies 
(cherry picked from commit c23af6af41)

# Conflicts:
#	erpnext/selling/report/sales_analytics/sales_analytics.js
 2024-11-25 06:40:00 +00:00
rohitwaghchaure
74af7d01a2 Merge pull request #44312 from rohitwaghchaure/fixed-support-25969 
fix: not able to fetch batch item price
 2024-11-25 11:22:43 +05:30
ruthra kumar
c545de7bc6 Merge pull request #44315 from frappe/mergify/bp/version-15-hotfix/pr-44297 
refactor: added translate function for some columns of report (backport #44297)
 2024-11-25 10:28:02 +05:30
Abdeali Chharchhoda
8928e062b1 refactor: added translate function for some columns of report 
(cherry picked from commit e545c913b5)
 2024-11-25 04:39:36 +00:00
Rohit Waghchaure
97f2341b98 fix: not able to fetch batch item price 2024-11-24 22:23:11 +05:30
Smit Vora
aa2ae5e408 Merge pull request #44279 from frappe/mergify/bp/version-15-hotfix/pr-44263 
fix: toggle debit credit amounts for transaction currency too; minor refactor (backport #44263)
 2024-11-22 18:38:26 +05:30
ruthra kumar
6d10ccfc15 Merge pull request #44287 from frappe/mergify/bp/version-15-hotfix/pr-44246 
fix: Get submitted documents in validate_for_closed_fiscal_year (backport #44246)
 2024-11-22 16:15:48 +05:30
ruthra kumar
dc99e74ae3 Merge pull request #44285 from frappe/mergify/bp/version-15-hotfix/pr-44266 
fix: make free qty round on large transaction qty (backport #44266)
 2024-11-22 16:15:35 +05:30
ruthra kumar
fd9aa288c4 Merge pull request #44283 from frappe/mergify/bp/version-15-hotfix/pr-44277 
fix: filter with item group only if it is mentioned in pos profile (backport #44277)
 2024-11-22 16:15:08 +05:30
vimalraj27
af74a3c32f fix: Get submitted documents in validate_for_closed_fiscal_year 
(cherry picked from commit c607e5f940)
 2024-11-22 10:23:11 +00:00
venkat102
db1bc8a3db test: add unit test to validate free qty round on large transaction qty 
(cherry picked from commit 013a6fc6ec)
 2024-11-22 10:20:57 +00:00