Deepesh Garg
e2324c77fe
fix: Test Cases
2021-02-15 20:01:32 +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
47f5f4757a
Merge branch 'develop' into fixed-consolidated-report-not-working-develop
2021-02-15 16:35:31 +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
Deepesh Garg
535dc4aea2
fix: Do not round off per day interest
2021-02-15 15:54:25 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Afshan
e963362dfd
fix: check if customer provided item while setting opening stock
2021-02-15 15:00:37 +05:30
Deepesh Garg
429fb3bba8
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix
2021-02-15 14:10:10 +05:30
Deepesh Garg
9bf05ad927
feat: Loans Dashboard
2021-02-15 13:32:50 +05:30
Richard Case
fd4e7bdbb1
fix: plaid client version to support latest API ( #24531 )
2021-02-15 11:58:27 +05:30
Marica
45db1c5d74
Merge branch 'develop' into shopping-cart
2021-02-15 10:35:05 +05:30
rohitwaghchaure
164ffac4ef
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-12 17:33:07 +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
Marica
87fcae4efd
Merge branch 'develop' into shopping-cart
2021-02-12 12:16:13 +05:30
Rucha Mahabal
ad1f2b41f4
fix: Issues with packing items
2021-02-12 11:29:24 +05:30
Saqib Ansari
138e98fef2
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-12 11:19:25 +05:30
Nabin Hait
1e6cce3593
Merge branch 'develop' into item_group_on_update_items
2021-02-11 21:59:38 +05:30
Jannat Patel
bb0d8f8038
Update accounts_controller.py
2021-02-11 20:59:28 +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
marination
e2d0715cdf
fix: Server side validation for missing payment gateway account
2021-02-11 19:06:10 +05:30
marination
8615227090
fix: Shopping cart breaks without Payment Gateway Account
2021-02-11 18:51:35 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated ( #24608 )
2021-02-11 17:50:57 +05:30
Jannat Patel
6756d3b561
Merge branch 'develop' into item_group_on_update_items
2021-02-11 16:29:34 +05:30
Marica
819b8d0266
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 14:45:09 +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
Nabin Hait
aa235b36e0
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-11 13:26:53 +05:30
Marica
a5039e8f85
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 13:23:56 +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
e07eb86498
Merge branch 'develop' into tcs_calculation
2021-02-11 12:13:47 +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
Nabin Hait
9d3f242f39
Update subscription.js
2021-02-11 11:17:33 +05:30
Nabin Hait
b58b8ec2fb
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-11 11:14:02 +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
Nabin Hait
79ba299abc
Merge branch 'develop' into subscription_fix_new
2021-02-11 11:03:45 +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
