Commit Graph

36302 Commits

Author SHA1 Message Date
Deepesh Garg
bbadebcf64
Merge branch 'develop' into loan_exposure_report_fix 2021-02-20 17:32:17 +05:30
Deepesh Garg
6f29f67a83
Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue
fix: excluding unidentified accounts from gstr-1
2021-02-20 17:27:56 +05:30
Michelle Alva
43f126ed13
fix: Typo in Leave Application
Change "Leaves" to "Leave"
2021-02-20 10:46:22 +05:30
Michelle Alva
ab149f196e
fix: typo in Leave Balance Report
Change Leaves to Leave
2021-02-20 10:43:47 +05:30
rohitwaghchaure
1aad27a539
Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card
fix: [minor] validation of job card in stock entry
2021-02-19 21:22:57 +05:30
Saqib Ansari
8c7c682f17 chore: make parameter group optional 2021-02-19 20:35:23 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes (#24488)
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Deepesh Garg
811ff5c397
Merge pull request #24669 from deepeshgarg007/transaction_delete_fix
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:54:56 +05:30
Deepesh Garg
7efbbcf3aa fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master 2021-02-19 10:53:58 +05:30
Marica
a43aea0dc1
Merge pull request #24482 from pateljannat/rfq-contact-email-set
fix: RFQ contact email set
2021-02-19 10:23:07 +05:30
Deepesh Garg
bc857522ad fix: Loan Interest Accrual Chart 2021-02-19 10:13:56 +05:30
Ankush Menat
3248da9089 fix(India): Add GST state code for Ladakh 2021-02-18 21:32:48 +05:30
Anupam Kumar
b1997da488 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-18 21:32:05 +05:30
Jannat Patel
4cef0f5983 fix: salary slip attribute error (#24455)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 21:30:13 +05:30
Ankush Menat
d9c84dff0f 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-18 21:29:12 +05:30
Ankush Menat
3508ed176b 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-18 21:29:03 +05:30
Nabin Hait
186a045e28 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 21:28:28 +05:30
Nabin Hait
deddcc513d 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-18 21:28:16 +05:30
Rohit Waghchaure
83f5468ca1 fix: patch 2021-02-18 21:28:03 +05:30
rohitwaghchaure
7797e9d3ac fix: added patch to fix incorrect stock qty and account value (#24628) 2021-02-18 21:27:01 +05:30
Nabin Hait
f2be0805f7 fix: formatting query args (#24627) 2021-02-18 21:25:59 +05:30
rohitwaghchaure
76f616565e fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580)
Fixed conflicts
2021-02-18 21:25:40 +05:30
Ankush Menat
4b2cbdc2dd 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-18 21:25:00 +05:30
rohitwaghchaure
83792ec009 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-18 21:24:48 +05:30
Nabin Hait
56e6ca6285 fix: couple of travis fixes (#24554)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-18 21:24:31 +05:30
Afshan
33f4419a78 fix: StopIteration error when e-invoice not enabled (#24548)
* fix: StopIteration error when e-invoice not enabled

* chore: update message

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 21:23:38 +05:30
Deepesh Garg
d60a40ae82 fix: Add accounts user role permission for accounting dimension filter 2021-02-18 21:23:20 +05:30
Afshan
83768b68c1 fix: emp disappear (#24525)
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 21:20:14 +05:30
Saqib
90ff48baa3 refactor: POS Invoice merging and cancellation (#24351)
* feat: pos invoice merging with background jobs

* fix: invoice threshold for queueing job

* refactor: cancellation flow of point of sale

* feat: tests for cancellation of pos closing

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-18 21:00:34 +05:30
Saqib
e965d0ff90 fix: discount amount calculation on net total (#24497) 2021-02-18 20:59:46 +05:30
Saqib
fd4bed1a38 fix(e-invoice): do not validate gstin for exports (#24561) 2021-02-18 20:59:26 +05:30
Saqib
ade96589b4 fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568) 2021-02-18 20:58:54 +05:30
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