nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-26 13:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,781 Commits 613 Branches 1,804 Tags
de631e65cc0d15ed6616d20000a5d3248095006d
Commit Graph

2913 Commits

Author SHA1 Message Date
Vishal
de631e65cc fix: multiple pos conversion issue resolved 
(cherry picked from commit 1de531e56e)
 2023-02-28 09:26:36 +00:00
ruthra kumar
7971c149ed fix(test): use standalone method to fetch work orders from SO 
(cherry picked from commit a11d3327df)
 2023-02-27 10:14:36 +05:30
ruthra kumar
3d7b2b1a6d fix: permission error while calling get_work_order_items 
(cherry picked from commit b6bad728cd)
 2023-02-27 10:14:31 +05:30
ruthra kumar
d1b611d37f fix: ui freeze on item selection in sales invoice 
(cherry picked from commit 6412583e98)
 2023-02-23 05:06:50 +00:00
mergify[bot]
9826245d8a fix: Filters in item-wise sales history report (#34145) 
fix: Filters in item-wise sales history report (#34145)

(cherry picked from commit c88444a6c4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 15:06:21 +05:30
mergify[bot]
f04542eac9 feat: Setting to allow Sales Order creation against expired quotation (#33952) 
* feat: Setting to allow Sales Order creation against expired quotation (#33952)

* feat: Setting to allow Sales Order creation against expired quotation

* chore: linting issues

(cherry picked from commit 148703bfc2)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 11:39:30 +05:30
mergify[bot]
f6410393ce fix: currency formatting in item-wise sales history (#33903) 
fix: currency formatting in item-wise sales history (#33903)

* fix(item-sales-history): currency formatting

* chore: linting issues

* fix: convert raw sql to qb

(cherry picked from commit 2cc7239dd5)

Co-authored-by: Dany Robert <danyrt@wahni.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:10:58 +05:30
HENRY Florian
54c1642e3b fix: enable customs in Selling Workpace by default (#33853) 
* fix: enable customs in Selling Workpace by default

* fix: enable customs in Selling Workpace by default
 2023-01-31 08:50:34 +05:30
Rohit Waghchaure
09e13d279c fix: incorrect actual qty for the packed item 
(cherry picked from commit 02566a02a8)
 2023-01-20 18:10:16 +00:00
Florian HENRY
97488aee88 fix: Sales ORder Connections on Material Request 
(cherry picked from commit e19161a8ee)
 2023-01-17 04:37:12 +00:00
ruthra kumar
edc20ae8b8 Merge pull request #33672 from frappe/mergify/bp/version-13-hotfix/pr-33646 
Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (backport #33646)
 2023-01-16 15:28:33 +05:30
mergify[bot]
2f81f15f02 fix: allow to create sales order from expired quotation (#33582) 
fix: allow to create sales order from expired quotation (#33582)

(cherry picked from commit dceef0397a)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-01-16 10:02:41 +05:30
ruthra kumar
f1bb8933c1 Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (#33646) 
(cherry picked from commit 333907b7a5)
 2023-01-16 04:09:26 +00:00
ruthra kumar
a46aa808be fix: Updating SO throws ordered_qty not allowed to change after submission 
(cherry picked from commit 391f42db04)
 2023-01-13 08:22:50 +05:30
s-aga-r
19feebbcb6 fix: shipping_address for non-drop shipping item 
(cherry picked from commit 67a7ccf3ce)
 2022-12-26 15:51:49 +00:00
s-aga-r
1068d0ec63 fix: shipping_address in PO 
(cherry picked from commit 7e1b6b3c2a)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
 2022-12-25 14:11:23 +00:00
s-aga-r
988a327b58 fix: Material Request reference in internal Sales Order 
(cherry picked from commit 78b438f6cf)
 2022-12-12 18:19:15 +00:00
Sabu Siyad
ab31eb4ee7 fix(pos): item selector image border radius 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 2f4940cc26)
 2022-11-17 12:02:46 +00:00
mergify[bot]
3aba14f71a fix: cast POS query inputs to integers (backport #32975) (#32978) 
* fix: cast POS query inputs to integers  (#32975)

fix: cast POS query inputs to integers
(cherry picked from commit c013db6ea1)

# Conflicts:
#	erpnext/selling/page/point_of_sale/point_of_sale.py

* chore: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-15 18:50:32 +05:30
Deepesh Garg
43aa670e90 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into mergify/bp/version-13-hotfix/pr-32777 2022-11-08 10:40:07 +05:30
Maharshi Patel
76e4bb44f1 fix: Create POS Opening Entry POS Profile filter. 
pos_profile_query was variable instead of function.

(cherry picked from commit 1328a45f2a)
 2022-11-05 11:15:58 +00:00
Deepesh Garg
e32e0bc8fa fix: Reset advance paid amount on Oreder cancel and amend 
(cherry picked from commit 92f37ca111)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
 2022-10-31 16:09:48 +00:00
Raffael Meyer
ea032893d3 fix: allow to create Sales Order from expired Quotation (#32641) 
(cherry picked from commit 4ad3002861)
 2022-10-19 16:38:19 +00:00
Deepesh Garg
0ae2a4f1c4 fix: Party account for multi-order invoices 
(cherry picked from commit fd49503ba2)
 2022-10-15 11:29:21 +00:00
Deepesh Garg
a604eed1b9 chore: Resolve conflicts 2022-09-28 14:49:25 +05:30
Maharshi Patel
96fa14be88 fix: POS properly validate stock for bundle products 
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.

(cherry picked from commit e392ea1104)

# Conflicts:
#	erpnext/selling/page/point_of_sale/pos_item_details.js
 2022-09-28 08:16:02 +00:00
Deepesh Garg
de8f44bbff chore: Resolve conflicts 2022-09-20 16:42:30 +05:30
Maharshi Patel
8abfdb6598 fix: remove no_copy for ignore_pricing_rule 
(cherry picked from commit 8c5b420aea)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 2022-09-20 10:49:59 +00:00
ruthra kumar
3c10e5066a fix: use default supplier currency if default supplier is enabled 
(cherry picked from commit 77fdc37cb7)
 2022-09-19 07:32:58 +00:00
Nihantra C. Patel
d79aacd1cb fix: Purchase Order creation from Sales Order 2022-09-08 13:51:11 +05:30
MOHAMMED NIYAS
ea995de4a3 fix: lost quotation not to expired 
code is merged in version-14 and conflict in version 13
 2022-08-31 15:31:07 +05:30
ruthra kumar
a46dca57cb fix(minor): don't print tax rate if its '0' (#31838) 
(cherry picked from commit 3b4c0a3fc0)
 2022-08-30 07:34:26 +00:00
ruthra kumar
9751f1060e fix: limit pos recent order page result 
(cherry picked from commit bb40e38451)
 2022-08-11 08:40:05 +00:00
mergify[bot]
b145fe3b3e fix(pos): validate product bundles while submitting pos invoice (backport #31615) (#31657) 2022-07-31 19:12:14 +05:30
Deepesh Garg
25da4d28ff Merge pull request #31727 from frappe/mergify/bp/version-13-hotfix/pr-31656 
fix: use current pos profile on sales return (backport #31656)
 2022-07-28 16:32:36 +05:30
ruthra kumar
c442b4aef1 fix: use current pos profile on sales return 
(cherry picked from commit 5b85af5f1a)
 2022-07-28 10:36:23 +00:00
ruthra kumar
ef9b25cf08 test: SO percentage billed when cr_note made against delivery return 
(cherry picked from commit 243f66fcd3)
 2022-07-28 10:21:19 +00:00
Deepesh Garg
8ab65bc44e Merge pull request #31453 from frappe/mergify/bp/version-13-hotfix/pr-31446 
fix: Quotation and Sales Order item sync (backport #31446)
 2022-06-28 08:49:21 +05:30
mergify[bot]
5e7cad476f refactor: clean up product bundle client side code (backport #31455) (#31456) 
refactor: clean up product bundle client side code (#31455)

refactor: clean up product bundle cient side code

- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema

(cherry picked from commit 20dac08f5f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-27 18:33:17 +05:30
Deepesh Garg
2219132fdb fix: Quotation and Sales Order item sync 
(cherry picked from commit 58fe220479)
 2022-06-27 05:48:39 +00:00
hrzzz
736f20656d fix: translation for filter status on report 
(cherry picked from commit 8b1ff96e30)
 2022-06-22 06:16:52 +00:00
Ankush Menat
8a4cd2aba1 fix: internal transfer GLE validation 
(cherry picked from commit 65b21ee7d6)
 2022-06-21 09:02:02 +00:00
Deepesh Garg
8e2e61ef84 chore: resolve conflicts 2022-06-18 20:23:58 +05:30
Deepesh Garg
8d63abb442 chore: fix condition 
(cherry picked from commit e457288dba)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2022-06-17 15:39:53 +00:00
Deepesh Garg
3b9f943335 fix: Quotation lost update 
(cherry picked from commit 02f9441e1a)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2022-06-17 15:39:52 +00:00
marination
7c35887d07 fix: Pick Template BOM if variant BOM absent in WO popup from SO 
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked

(cherry picked from commit 9f2d325e67)
 2022-06-15 09:07:54 +00:00
mergify[bot]
ebcdaf7c82 fix: Spelling mistake in quotation depend on (backport #31362) (#31363) 
* fix: Spelling mistake in quotation depend on (#31362)

Update quotation.json

(cherry picked from commit 37e9622426)

* chore: bump modified

Co-authored-by: Nihantra C. Patel <99652762+nihantra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:05:46 +05:30
Deepesh Garg
da1a948a28 chore: resolve conflicts 2022-06-14 11:36:43 +05:30
Deepesh Garg
823cf88c3c chore: linting issues 
(cherry picked from commit fb3da124e5)
 2022-06-14 05:47:58 +00:00
Deepesh Garg
37ba550398 fix: Partially Ordered status for quotation 
(cherry picked from commit 118c786e63)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.json
 2022-06-14 05:47:57 +00:00