Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,671 Commits 3 Branches 0 Tags 1 GiB
b164070a4f
Commit Graph

36671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
bb8cd1cdaa
feat: Basic validation for indian PAN No. in Supplier (#24687) 2021-02-22 19:28:45 +05:30
Shariq Ansari
8676bedd18
fix: Add phone icon on read only phone fields (#24680) 
* fix: Add phone icon on read only phone fields

* fix: sider fix
 2021-02-22 19:28:01 +05:30
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation (#24679) 
* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition
 2021-02-22 19:27:23 +05:30
Afshan
fdafb55fba
fix: error message when making reverse journal entry (#24665) 2021-02-22 19:25:57 +05:30
Marica
28c834ac95
Merge branch 'develop' into fix-valuation-errror-customer-provided 2021-02-22 16:00:28 +05:30
rohitwaghchaure
311bb6452f
Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout 
fix: Accounting Dimension creation background job timeout
 2021-02-22 15:29:41 +05:30
Deepesh Garg
0c15f75524
Merge pull request #24696 from frappe/revert-24505-loan_exposure_report_fix 
Revert "fix: Error handling in loan reports and precision fixes"
 2021-02-22 15:13:11 +05:30
Deepesh Garg
d780f56ba8
Revert "fix: Error handling in loan reports and precision fixes" 2021-02-22 15:12:35 +05:30
Afshan
133ebc1d51
Merge branch 'develop' into fix-valuation-errror-customer-provided 2021-02-22 14:16:33 +05:30
Marica
ed1c7649cd
Merge pull request #24553 from nextchamp-saqib/quality-inspection-parameter-group 
feat: introduce parameter group in quality inspection
 2021-02-22 13:53:14 +05:30
Marica
4a1ffcf742
Merge branch 'develop' into quality-inspection-parameter-group 2021-02-22 11:34:34 +05:30
Afshan
01b4ee8a3c
Merge branch 'develop' into fix-valuation-errror-customer-provided 2021-02-22 11:17:45 +05:30
Deepesh Garg
aa46def745 fix: Accounting Dimension creation background job timeout 2021-02-21 21:54:23 +05:30
Deepesh Garg
e4964a0c6c fix: Update color in charts 2021-02-21 21:03:42 +05:30
Deepesh Garg
e53fd87669 fix: Rearrange cards 2021-02-21 20:57:56 +05:30
Deepesh Garg
cbb4fe2cce fix: Add cards 2021-02-21 20:57:30 +05:30
Deepesh Garg
a6d0610730
Merge pull request #24505 from deepeshgarg007/loan_exposure_report_fix 
fix: Error handling in loan reports and precision fixes
 2021-02-20 17:57:09 +05:30
Deepesh Garg
e12398e75e
Merge pull request #24682 from frappe/michellealva-leave 
fix: typo in Leave Balance Report
 2021-02-20 17:53:04 +05:30
Deepesh Garg
75b01e3d72
Merge pull request #24683 from frappe/michellealva-patch-1 
fix: Typo in Leave Application
 2021-02-20 17:52:38 +05:30
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