nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-23 20:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,961 Commits 604 Branches 1,802 Tags
b00fa1dfeec602c13b8c2cd32da1e660bc17a23c
Commit Graph

2022 Commits

Author SHA1 Message Date
Mihir Kandoi
567fb8abd1 fix: set sco_qty field of PO to non negative 
(cherry picked from commit dfc3dc4944)
 2025-02-18 14:29:22 +00:00
venkat102
7e85a123b2 fix(report): add options to multiselectlist fields 
(cherry picked from commit 8785342fce)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
#	erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
 2025-02-13 08:47:15 +00:00
mergify[bot]
b112d88767 fix: map project from rfq to supplier quotation (backport #45745) (#45828) 
* fix: map project from rfq to supplier quotation

(cherry picked from commit d0479036bb)

* fix: add project field map from mr to rfq

(cherry picked from commit 8fa39bec61)

---------

Co-authored-by: HenningWendtland <156231187+HenningWendtland@users.noreply.github.com>
 2025-02-11 14:52:13 +05:30
Mihir Kandoi
c0b32c446b fix: bind this to function 
(cherry picked from commit 41649cf52d)
 2025-02-03 06:22:47 +00:00
mergify[bot]
f9d96726f0 fix: secure bulk transaction (backport #45386) (#45426) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: secure bulk transaction (#45386)
 2025-01-24 17:18:50 +01:00
mergify[bot]
ea4b6e8dd7 fix(report): Purchase Order Analysis pymysql.err (backport #44957) (#44994) 
fix(report): Purchase Order Analysis pymysql.err (#44957)

(cherry picked from commit d6980a9493)

Co-authored-by: Vishnu  VS <Vishnuviswambaran2002@gmail.com>
 2024-12-31 12:52:13 +05:30
Navin R C
2f279a6eb4 fix: SQL syntax error in Purchase Receipt query for empty filters (#44636) 
fix(po-analysis): handle SQL error due to empty data in IN() clause

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 48b49cdea4)
 2024-12-30 04:11:08 +00:00
mergify[bot]
8f811728d9 feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (backport #44711) (#44782) 
* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)

* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep

(cherry picked from commit 3eba6bf3dd)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/buying/doctype/purchase_order/test_purchase_order.py
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json

* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)

* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep

* fix: Resolved errors and removed code from develop branch merged by mistake

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2024-12-20 12:18:01 +05:30
mahsem
f06827c6fb fix: add labels for translation in purchase_order_analysis.py 
(cherry picked from commit 342a398bec)
 2024-12-06 06:49:55 +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
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
bc93de682b chore: resolve conflict 2024-11-26 13:48:00 +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
mergify[bot]
5958d0c257 fix: calculate percentage received and delivered considering over-receipt and over-delivery (backport #43870) (#44030) 
fix: calculate percentage received and delivered considering over-receipt and over-delivery (#43870)

(cherry picked from commit adba1168c1)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-11-08 12:24:21 +05:30
bhaveshkumar.j
978a0078d8 fix: NoneType while updating ordered_qty in SO for removed items 
(cherry picked from commit 442cdd7ce4)
 2024-11-08 05:11:25 +00:00
CaseSolved
84a40c282b chore: linting 
(cherry picked from commit be6970c850)
 2024-11-04 08:32:21 +00:00
CaseSolved
9f7afda4db fix: SO link on PO and add in missing dashboard references on both 
(cherry picked from commit 2017fd80d1)
 2024-11-04 08:32:21 +00:00
mergify[bot]
07aaef2af2 fix(RFQ): make strings translatable (backport #43843) (#43848) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(RFQ): make strings translatable (#43843)
 2024-10-26 19:43:23 +02:00
mergify[bot]
a33d5535a7 fix: list view and form status not same for purchase order (backport #43690) (#43692) 
* fix: list view and form status not same for purchase order (#43690)

(cherry picked from commit a671fe13d4)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/buying/doctype/purchase_order/purchase_order_list.js

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-16 14:57:57 +05:30
mergify[bot]
b2deb89826 fix: conversion factor issue (backport #43645) (#43674) 
fix: conversion factor issue (#43645)

(cherry picked from commit a52756f1d4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-15 16:04:48 +05:30
ruthra kumar
2c7f5ec324 Merge pull request #43521 from mujeerhashmi/version-15-hotfix 
fix: Link opportunity from RFQ to supplier quotation
 2024-10-15 10:08:25 +05:30
Nihantra Patel
5660e8b26d fix: add include closed orders option in so/po trends report v15 2024-10-08 18:48:11 +05:30
Syed Mujeer Hashmi
eb1f1255eb fix: Link opportunity from RFQ to supplier quotation 2024-10-07 14:12:43 +00:00
Smit Vora
5268da2e55 Merge pull request #43355 from Ninad1306/mapping_docs_fix 
fix: update child table from the last source doc (backport #42925)
 2024-10-07 15:18:41 +05:30
Ninad Parikh
6770610c6d fix: Update Values before after_mapping hook is called (#42682) 
* fix: update values before after_mapping hook is called

* fix: appropriate function name
 2024-10-07 12:19:49 +05:30
Smit Vora
f36a68b42b Merge pull request #42925 from Ninad1306/mapping_docs_fix 
fix: Replace `add_if_empty` with `reset_value` flag
 2024-09-24 11:10:09 +05:30
ljain112
741c18b144 fix: do not auto apply tds in purchase order 
(cherry picked from commit 0b942a0614)
 2024-09-16 13:16:15 +00:00
ljain112
7027be8fbc fix: set tax_withholding_category from Purchase Order while creating pi form po 
(cherry picked from commit b9048ca6fa)
 2024-09-16 13:16:15 +00:00
ljain112
01f30682ee fix: consistent behaviour on refresh 
(cherry picked from commit b216d71278)
 2024-09-16 13:16:15 +00:00
ljain112
5edebb28a5 fix: do not check appy_tds in Purchase Order Automatically 
(cherry picked from commit be6c174b43)
 2024-09-16 13:16:14 +00:00
ljain112
11359bd235 fix: tds workflow in purchase order 
(cherry picked from commit a7888b26a7)
 2024-09-16 13:16:13 +00:00
mergify[bot]
5110975c6d fix: incorrect actual cost in Procurement Tracker report (backport #43109) (#43138) 
fix: incorrect actual cost in Procurement Tracker report (#43109)

(cherry picked from commit 80f101f92e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-09 20:34:56 +05:30
Nihantra Patel
a0a932a235 refactor: item-wise purchase history (query to script report) --upd 
(cherry picked from commit 2851764ed6)
 2024-08-27 11:19:03 +00:00
Nihantra Patel
6f75a3c617 refactor: item-wise purchase history (query to script report) --prettier 
(cherry picked from commit 7bae18aba8)
 2024-08-27 11:19:03 +00:00
Nihantra Patel
a4d3934f75 refactor: item-wise purchase history (query to script report) --prettier 
(cherry picked from commit f740c94363)
 2024-08-27 11:19:03 +00:00
Nihantra Patel
b4171e4bd9 refactor: item-wise purchase history (query to script report) -- formatter 
(cherry picked from commit 003a9608dc)
 2024-08-27 11:19:03 +00:00
Nihantra Patel
76d32ab07a refactor: item-wise purchase history (query to script report) 
(cherry picked from commit 49331e6109)
 2024-08-27 11:19:03 +00:00
Nihantra Patel
3d469db47b refactor: item-wise purchase history (query to script report) 
(cherry picked from commit 5de91cf55e)
 2024-08-27 11:19:02 +00:00
venkat102
0650c22b53 fix: make party naming sequential when naming_by set as auto name 
(cherry picked from commit c9015f7c04)
 2024-08-27 10:07:50 +00:00
mergify[bot]
72c16097d6 fix: incorrect Received Qty Amount in Purchase Order Analysis (backport #42852) (#42854) 
fix: incorrect Received Qty Amount in Purchase Order Analysis (#42852)

(cherry picked from commit fb846ffa12)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-21 16:12:33 +05:30
mergify[bot]
59b9b7dc91 fix: do not update item price and last purchase rate for inter transf… (backport #42616) (#42633) 
fix: do not update item price and last purchase rate for inter transf… (#42616)

fix: do not update item price and last purchase rate for inter transfer transaction
(cherry picked from commit c8af544ef3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-06 08:19:59 +05:30
mergify[bot]
edf1fcb742 fix: performance issue for the report Purchase Order Analysis report (backport #42503) (#42507) 
fix: performance issue for the report Purchase Order Analysis report (#42503)

(cherry picked from commit cb522f8f22)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-29 09:50:02 +05:30
mergify[bot]
709be13e82 fix: Purchase Order Analysis Report Data (backport #42387) (#42394) 
fix: Purchase Order Analysis Report Data (#42387)

(cherry picked from commit 67bf9bec47)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-19 14:49:39 +05:30
Sanket322
527781a588 fix: remove proprietorship and update it with individual 
(cherry picked from commit c8ad6d1b2c)
 2024-07-17 08:32:17 +00:00
mergify[bot]
43c7513cfe fix: Billed Qty and Qty to Bill Calculation in Purchase Order Analysis (backport #42100) (#42249) 
fix: Billed Qty and Qty to Bill Calculation in Purchase Order Analysis (#42100)

(cherry picked from commit 0c76a8cc9e)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-07-09 16:17:57 +05:30
ruthra kumar
d1679d4663 chore: fix test data 
(cherry picked from commit 07d59443b7)
 2024-06-22 23:58:10 +00:00
ruthra kumar
78ad3f6cdc refactor: validation to force accounts to be on same currency 
(cherry picked from commit 0f0b4d88bc)
 2024-06-22 23:58:10 +00:00
ljain112
7cc5579eca refactor: ignore unreconcile doc for PO and SO on cancel/delete 
(cherry picked from commit b618d685c6)
 2024-06-18 04:58:09 +00:00
Nihantra Patel
4551b4b638 fix: update received qty in MR on purchase invoice submit with update stock 
(cherry picked from commit 13cb53fa89)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 2024-06-17 06:06:34 +00:00
mergify[bot]
3777cae860 fix: local var referenced before assignment (backport #41780) (#41782) 
fix: local var referenced before assignment (#41780)

(cherry picked from commit 4ff3e6caaa)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-04 22:25:20 +05:30