nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 18:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,437 Commits 636 Branches 1,812 Tags
85d74050e1b35126e4c9b2d4a7cb1bc3c27ae835
Commit Graph

3414 Commits

Author SHA1 Message Date
Nihantra C. Patel
73d98addbc fix: Translation for button SO to PO 
(cherry picked from commit a5275e9f28)
 2024-09-18 16:14:54 +00:00
ljain112
42494db3c7 fix: hide and reset discount control on new POS order 
(cherry picked from commit 5b0053f8dd)
 2024-09-16 14:25:20 +00:00
Nabin Hait
f060534625 feat: API for crm integration 
(cherry picked from commit b7bf9f80f2)
 2024-09-14 08:59:51 +00:00
Sagar Vora
2c1f72e44c fix: ensure SellingController.onload gets called for SO & DN 
(cherry picked from commit 8431e3c275)
 2024-09-09 01:44:17 +00:00
David
f56ee58e81 fix: spec mobile and email fields for notifications 
(cherry picked from commit 18993a97ce)
 2024-08-27 11:45:40 +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
Nihantra C. Patel
ec0201cb85 fix: create SO from Quot for Prospect --conflicts 2024-08-20 11:34:27 +05:30
Nihantra C. Patel
5d7fb1d945 fix: create SO from Quot for Prospect --conflicts 2024-08-20 11:31:49 +05:30
Nihantra Patel
f547befeb9 fix: Create Sales Order from Quotation for Prospect 
(cherry picked from commit 2f63fae31d)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2024-08-20 05:11:02 +00:00
mergify[bot]
aba54ba18f fix: ignore pricing rule while making DN from Pick List (backport #42763) (#42768) 
fix: ignore pricing rule while making DN from Pick List (#42763)

(cherry picked from commit 0db82ec93a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-14 23:03:01 +05:30
ljain112
a8de8aecf5 fix: text color in sales funnel report based on theme 
(cherry picked from commit 61bc0925d5)
 2024-08-13 08:36:31 +00:00
Corentin Forler
d8939e0bb0 fix: Sort lists before calling itertools.groupby 
(cherry picked from commit 45a6ecbd38)
 2024-08-09 06:23:57 +00:00
ljain112
2f81c99143 fix: min height for rows in sales funnel 
(cherry picked from commit fd71d8af52)
 2024-08-06 07:33:19 +00:00
mergify[bot]
555be2be11 fix: serial and batch bundle for POS Invoice (backport #41491) (#42396) 
* fix: serial and batch bundle for POS Invoice (#41491)

(cherry picked from commit e5dfc5e545)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-21 00:00:14 +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]
1754adfcd6 fix: extra qty pick in pick list (backport #42345) (#42349) 
fix: extra qty pick in pick list (#42345)

(cherry picked from commit 6a50b40976)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-16 15:46:44 +05:30
ruthra kumar
bff99d89b9 chore: resolve conflict 2024-07-01 17:05:22 +05:30
ruthra kumar
b63eab8cbb test: credit check on Sales Order re-open 
(cherry picked from commit 60694e09c4)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2024-07-01 11:33:36 +00:00
ruthra kumar
7fcb0f578a fix: Re-open allows SO's to be over credit limit 
(cherry picked from commit 5eed781263)
 2024-07-01 11:33:36 +00:00
mergify[bot]
e278fc683f fix: Stock Reservation Entry was not getting created (backport #42033) (#42035) 
fix: Stock Reservation Entry was not getting created (#42033)

(cherry picked from commit 1a9899b32b)

Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
 2024-06-26 09:11:01 +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
barredterra
9bad219f0a refactor: remove use of can_create for Payment Request (#41647) 
(cherry picked from commit 47bc5691a1)
 2024-06-20 14:28:24 +02:00
barredterra
ddbf9317a1 Merge remote-tracking branch 'upstream/version-15-hotfix' into mergify/bp/version-15-hotfix/pr-41384 2024-06-20 14:27:08 +02: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
mergify[bot]
ff8027b8eb Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-41384 2024-06-17 17:46:28 +00:00
mahsem
f4852d472a fix: add strings for translation in pos_item_cart.js 
fix: add strings for translation in pos_item_cart.js
(cherry picked from commit 2fb3e5da4a)
 2024-06-17 11:40:49 +00:00
mergify[bot]
1ead66721d fix: terms and conditions for material request (backport #41834) (#41837) 
fix: terms and conditions for material request (#41834)

(cherry picked from commit 4b026d66dc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-10 15:17:19 +05:30
mergify[bot]
806ff5bc19 fix: payment term when creating PO from SO (backport #41376) (#41744) 
fix: payment term when creating PO from SO (#41376)

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

(cherry picked from commit 441596f795)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-06-03 18:37:39 +05:30
mergify[bot]
4e9faf6ad6 fix: work order created message pops up if no items are selected (backport #41677) (#41682) 
fix: work order created message pops up if no items are selected (#41677)

(cherry picked from commit 388ba7f945)

Co-authored-by: Nijith anil <83776819+nijithanil@users.noreply.github.com>
 2024-05-30 18:51:26 +05:30
Deepesh Garg
d29686f882 Merge pull request #41375 from Nihantra-Patel/no_add_variant_item_15-14 
fix: not allow template item in product bundle item - v15/v14
 2024-05-29 10:30:47 +05:30
Akhil Narang
7a0aef218f Merge pull request #41625 from frappe/mergify/bp/version-15-hotfix/pr-41601 
fix: add in some indices to speed up Purchase Order deletion (backport #41601)
 2024-05-24 12:27:29 +05:30
Akhil Narang
3ed3b214c8 fix: add in some indices to speed up Purchase Order deletion 
`tabSales Order`.`inter_company_order_reference`
`tabSales Invoice Item`.`purchase_order`

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 0303d7dbdc)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 2024-05-24 05:28:24 +00:00
Akhil Narang
7af1b5d4ec refactor: use json directly instead of using frappe.json (#41609) 
(cherry picked from commit 3f06f1905f)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-05-24 10:51:09 +05:30
mergify[bot]
5e0bff3a60 fix: Show acheived amount and variance for parent item groups (backport #41495) (#41551) 
fix: Show achieved amount and variance for parent item groups

(cherry picked from commit 8ac11ae88d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-05-21 18:02:37 +05:30
ruthra kumar
52d5d7a4d3 fix: Filters in trend reports 2024-05-20 10:36:42 +05:30
Deepesh Garg
a90186f9ae fix: Unable to add items in POS Invoice 
(cherry picked from commit 7a3f8a5afb)
 2024-05-16 14:02:49 +00:00
barredterra
a0011c5b52 fix(Sales Order): only show permitted actions 
(cherry picked from commit c29d955371)
 2024-05-13 13:43:05 +00:00
mergify[bot]
b6f82a656f fix: consistent use of "Address & Contact" (backport #41386) (#41388) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: consistent use of "Address & Contact" (#41386)
 2024-05-10 17:42:05 +02:00
ruthra kumar
f337af9e90 refactor: make use of doc.quotation_to 
(cherry picked from commit 754c7f6d1c)
 2024-05-09 06:46:01 +00:00
Nihantra Patel
37741b5b45 fix: address filter and quotation to for prospect 
(cherry picked from commit 2896e3666c)
 2024-05-09 06:46:01 +00:00
Nihantra Patel
394b1f499d fix: address filter and quotation to for prospect 
(cherry picked from commit 24a68a79df)
 2024-05-09 06:46:00 +00:00
Nihantra Patel
cdbb515379 fix: address filter and quotation to for prospect 
(cherry picked from commit fe5b88522e)
 2024-05-09 06:46:00 +00:00
Nihantra C. Patel
8fb3294674 fix: not allow template item in product bundle item 2024-05-08 10:40:24 +05:30
Nihantra C. Patel
b64f5a4e54 fix: not allow template item in product bundle item 2024-05-08 10:38:58 +05:30
Nihantra C. Patel
9864377b47 fix: not allow template item in product bundle item - v15/v14 2024-05-08 10:32:28 +05:30
Deepesh Garg
410990b2a3 chore: Remove heatmap from party dashboards 
(cherry picked from commit a8f03e8baa)
 2024-04-24 06:32:03 +00:00
Nihantra C. Patel
dcfc768d33 fix: get address if multiple companies 
(cherry picked from commit 655a1797be)
 2024-04-16 11:01:58 +00:00
Nihantra Patel
ccdbad9f90 fix: get address if multiple companies 
(cherry picked from commit c6cf1bec76)
 2024-04-16 11:01:57 +00:00
Nabin Hait
0ee91a2e54 fix: test cases 
(cherry picked from commit 65c74fa3c7)
 2024-04-15 07:03:39 +00:00