nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 23:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,449 Commits 621 Branches 1,804 Tags
3f16902b0090c1c967b1809870831525bf059341
Commit Graph

34449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
3f16902b00 fix(selling): cancel sales order with cancelled PE 
Allow cancelling sales order with cancelled payment entry. Ignoring GL
entries while cancelling the document is required to cancel it, reverse
entries are created by accounts controller.

Related issue: ISS-20-21-09586
 2021-02-16 18:53:40 +05:30
Ankush Menat
f9d4d9a095 test(selling): add test for cancelling sales order 
Add failing test to reproduce bug in cancelling sales order with advance
payments

Related issue: ISS-20-21-09586
 2021-02-16 18:45:39 +05:30
rohitwaghchaure
29878e5c3b Merge pull request #24642 from rohitwaghchaure/fixed-patch-item_reposting_for_incorrect_sl_and_gl 
fix: patch
 2021-02-16 10:39:31 +05:30
Rohit Waghchaure
9a40c1b2e1 fix: patch 2021-02-16 10:35:10 +05:30
rohitwaghchaure
d60ff83b6f fix: added patch to fix incorrect stock qty and account value (#24628) 2021-02-16 09:12:27 +05:30
Deepesh Garg
79f63526cb Merge pull request #24632 from ankush/ladakh_gst_addition 
fix(India): Add GST state code for Ladakh
 2021-02-15 21:11:54 +05:30
Nabin Hait
243661b37b fix: formatting query args (#24627) 2021-02-15 19:27:49 +05:30
Rushabh Mehta
8cc6a2d62c fix(typo): erpnext-logo.png 2021-02-15 17:40:50 +05:30
Rushabh Mehta
b0735732f9 fix(minor): add erpnext-logo.png 2021-02-15 17:38:55 +05:30
Deepesh Garg
df4eed4c0d Merge pull request #24615 from ruchamahabal/packed-item-fixes_v13 
fix: Issues with packing items
 2021-02-15 16:44:10 +05:30
Deepesh Garg
b6cd97e5fc Merge pull request #24320 from pateljannat/ldc-validations 
fix: validation for ldc against supplier and section code
 2021-02-15 16:33:41 +05:30
Ankush Menat
57c3d373a7 fix(India): Add GST state code for Ladakh 2021-02-15 15:03:50 +05:30
Richard Case
fd4e7bdbb1 fix: plaid client version to support latest API (#24531) 2021-02-15 11:58:27 +05:30
Nabin Hait
85252e7aef Merge branch 'develop' into packed-item-fixes_v13 2021-02-12 12:39:38 +05:30
Afshan
c44d6b9546 fix: NoneType object has no attribute len() (#24616) 2021-02-12 12:24:41 +05:30
Rucha Mahabal
ad1f2b41f4 fix: Issues with packing items 2021-02-12 11:29:24 +05:30
Anupam Kumar
7e1dcf911d feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-11 20:19:30 +05:30
Afshan
ee87484134 fix: calculated discount percentage (#24510) 
* fix: calculated discount percentage

* fix: slider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 20:11:58 +05:30
Jannat Patel
0a7939277c fix: dynamic links for reports (#24462) 
* fix: dynamic links for reports

* fix: revert changes for payment period report

* fix: link doctypes
 2021-02-11 20:11:06 +05:30
Saqib
f25ab6f826 fix: validate cancellation only if irn generated (#24608) 2021-02-11 17:50:57 +05:30
Saqib
0681a480c2 feat(pos): mpesa related fixes & additions (#24306) 
* fix: switching of mode of payments

* feat: transaction limit for mpesa integration

* feat: resend payment request if one fails

* feat: make new request only for failed ones

* fix: invalid amount for mpesa request

* fix: payment successful message not shown

* fix: url and business shortcode for live env

* fix: duplicate items validation for pos invoices

* fix: pos closing entry queued status

* fix: peroid end date for amended pos closing
 2021-02-11 14:06:15 +05:30
Shariq Ansari
a46a83b476 fix: Assignment Rule Unassign Condition doesn't work (#24551) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:41:10 +05:30
Shariq Ansari
47f784aa9c fix: Lead not getting linked to call logs (#24593) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:23:51 +05:30
rohitwaghchaure
aa00eb9898 fix: reposting issue with same posting date and posting time (#24570) 
* fix: reposting issue with same posting date and posting time

* Update erpnext/stock/stock_ledger.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:23:01 +05:30
Saqib
e37a5c2646 fix: customer_currency referenced before assignment (#24607) 2021-02-11 13:10:52 +05:30
Saqib
15f4672ffa fix: pos closing valdation (#24605) 2021-02-11 12:11:44 +05:30
Jannat Patel
30c8873f24 fix: validation for disabled warehouse (#24539) 
* fix: validation for disabled warehouse

* fix: better function name

* fix: validation in stock ledger entry
 2021-02-11 11:46:48 +05:30
Kanchan Chauhan
bb05acb60d fix(Leave Application): List view fix (#24550) 2021-02-11 11:18:59 +05:30
Anupam Kumar
e816ed89e6 fix: portal permission issue (#24577) 2021-02-11 11:12:13 +05:30
Anuja Pawar
e3c72a3d71 fix: fix filters for the report (#24594) 2021-02-11 11:06:12 +05:30
Afshan
8609d31430 fix: amend cancelled job offer (#24589) 2021-02-11 11:05:48 +05:30
Ankush Menat
df6e20887d fix: update total in words after updating items (#24602) 
* fix: Update total in words after Updating items

Update total in words after Updating items in sales/purchase orders.
Port of #24592

Closes ISS-20-21-09425

* test: Add test for total & words after update item

Add test for total & words after updating items in sales order.
 2021-02-11 11:04:39 +05:30
Suraj Shetty
969d37da4c Merge pull request #24598 from surajshetty3416/fix-favicon 2021-02-10 22:18:10 +05:30
Saqib
7b2afaf349 fix: NoneType has no len() (#24600) 2021-02-10 17:21:12 +05:30
Prssanna Desai
161e3954a8 Merge branch 'develop' into fix-favicon 2021-02-10 16:37:13 +05:30
Rucha Mahabal
3237f5bb88 fix: Inpatient Medication Orders report test (#24596) 2021-02-10 16:36:49 +05:30
Prssanna Desai
a751b6bb7a Merge pull request #24599 from frappe/product-query-fix 
fix: also fetch item variants if hide variants is disabled
 2021-02-10 16:36:40 +05:30
prssanna
fd0e8a4e23 fix: also fetch item variants if hide variants is disabled 2021-02-10 16:31:41 +05:30
Suraj Shetty
5f27c9e100 chore: Remove unnecessary image files 2021-02-10 15:48:58 +05:30
Suraj Shetty
6fa44fefc3 fix: Use new favicon 2021-02-10 15:48:32 +05:30
pateljannat
1ab95413be fix: conditions simplified 2021-02-09 17:35:17 +05:30
Anurag Mishra
5164223b99 fix: error on group by filter (#24587) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-02-09 16:22:28 +05:30
Suraj Shetty
1016ff48fc fix: Create new call popup if call popup does not exists 2021-02-09 12:17:29 +05:30
Marica
6330e20d16 Merge pull request #24565 from marination/stock-dashboard-font-weight 
fix: (ui) Empty State text font weight in Item Dashboard
 2021-02-09 11:03:18 +05:30
Deepesh Garg
236c9ae453 Merge pull request #24578 from marination/acc-dimension-update-fix 
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
 2021-02-09 06:51:58 +05:30
Suraj Shetty
fbc3988037 Merge pull request #24581 from surajshetty3416/fix-telephony 2021-02-08 20:27:04 +05:30
Saqib
8991d4ed0b fix: fetching of standalone cr/dr notes for reconciliation (#24575) 2021-02-08 20:19:11 +05:30
Suraj Shetty
dcc9947d10 fix: Update call_popup 
- Setup missed & call ended listeners
- Show contacts based on links
 2021-02-08 20:13:23 +05:30
Suraj Shetty
c5248b30eb fix: Do not re-use call popup if call ID is different 2021-02-08 18:50:05 +05:30
Suraj Shetty
ba26020a82 fix: Show audio interface in call log which has recording URL 
- Also, remove unneccesary column & section break in call log doctype
 2021-02-08 18:45:55 +05:30