Saqib
18c7c45cfe
fix: NoneType has no len() ( #24600 )
2021-02-18 20:55:53 +05:30
Saqib
4fb547179d
fix: customer_currency referenced before assignment ( #24607 )
2021-02-18 20:53:49 +05:30
Saqib
a439d19917
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-18 20:53:26 +05:30
Saqib
57c2e07c45
fix: validate cancellation only if irn generated ( #24608 )
2021-02-18 20:45:27 +05:30
Anupam Kumar
4dad1f01ba
fix: contact permmission issue ( #24503 )
2021-02-18 20:26:39 +05:30
Rucha Mahabal
73c2d23a9a
feat: Department Wise Appointment Type charges ( #24572 )
...
* feat: Appointment Type Service Items
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* fix: set practitioner service item charges mandatory on item selection
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* feat: use charges from appointment type during billing
* feat: handle appointment charges priority for invoice automation
* test: patient appointment auto invoicing scenarios
* fix: sider
* fix: minor fixes
Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 20:22:41 +05:30
Anupam Kumar
6485eeb302
fix: portal permission issue ( #24577 )
2021-02-18 20:21:39 +05:30
pateljannat
4858b40813
fix: excluding unidentified accounts from gstr-1
2021-02-18 18:44:29 +05:30
Marica
77d72d59ef
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-18 16:55:44 +05:30
Marica
f3ca4bcb70
Merge branch 'develop' into rfq-contact-email-set
2021-02-18 16:51:50 +05:30
Rucha Mahabal
ccc80927f6
feat: Department Wise Appointment Type charges ( #24572 )
...
* feat: Appointment Type Service Items
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* fix: set practitioner service item charges mandatory on item selection
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* feat: use charges from appointment type during billing
* feat: handle appointment charges priority for invoice automation
* test: patient appointment auto invoicing scenarios
* fix: sider
* fix: minor fixes
Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 16:41:10 +05:30
Raffael Meyer
d44e60f17c
feat: add Print Language to Lead and Opportunity ( #24317 )
...
* fix: move "Print Language" to "More Information"
* feat: add "Print Language" in "More Information"
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 16:24:37 +05:30
Rucha Mahabal
e7bf87cc84
fix: POS return for Serialized Items ( #24292 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 16:04:35 +05:30
Jannat Patel
ef5c714de2
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 15:52:29 +05:30
Rohit Waghchaure
c697cb8b2d
fix: validation of job card in stock entry
2021-02-18 15:10:12 +05:30
Nabin Hait
d826bee13a
fix: update qty in future sle ( #24649 )
...
* fix: update qty in future sle
* fix: validate cancellation due to ongoing reposting
* fix: process sle against current timestamp
2021-02-18 14:14:21 +05:30
Anurag Mishra
5ec592d09c
fix: supplier was not able to Submit RFQ due to in sufficient permission
2021-02-18 13:42:04 +05:30
Deepesh Garg
c5b94adc87
Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so
...
fix(selling): cancel sales order with cancelled PE
2021-02-17 18:39:35 +05:30
rohitwaghchaure
03a1484aed
Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop
...
fix: Consolidated Financial Statement report not works if child compa…
2021-02-17 16:35:43 +05:30
Marica
208d1942c3
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-17 12:56:35 +05:30
Marica
a9de890993
Merge pull request #24534 from pateljannat/item_group_on_update_items
...
fix: item_group on update items
2021-02-17 11:17:49 +05:30
Marica
7de7bb5202
Merge branch 'develop' into item_group_on_update_items
2021-02-16 23:06:20 +05:30
Marica
b43c2e5d7c
Merge pull request #24613 from marination/shopping-cart
...
fix: Shopping cart breaks without Payment Gateway Account
2021-02-16 23:05:19 +05:30
Marica
4441cebbb3
Merge branch 'develop' into shopping-cart
2021-02-16 20:55:00 +05:30
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
prssanna
9c36dc3798
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-02-16 16:17:32 +05:30
prssanna
7166b6740f
fix: duplicate css property
2021-02-16 16:17:17 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-16 14:57:00 +05:30
Prssanna Desai
f1c0f680f4
Merge pull request #24645 from prssanna/hub-image
...
fix: broken image style
2021-02-16 12:02:28 +05:30
prssanna
7e8113c7e8
fix: broken image style
2021-02-16 12:00:35 +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
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
