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

33266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
ba1cca6b2d
fix: Show accounts in financial statements upto level 20 (#23718) 2020-10-24 22:00:32 +05:30
rohitwaghchaure
8be296b343
Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop 
feat: balance serial nos in stock ledger report
 2020-10-24 19:04:31 +05:30
Rucha Mahabal
434791ed6e
feat: Therapy Plan Template (#23558) 
* feat: Therapy Plan Template

* feat: Handle billing Therapy Plans created via Templates

* feat: add dashboard to Therapy Plan Template

* fix: codacy issues

* fix: sider

* fix: validate Therapy Session overlap

* feat: Create Sales Invoice from Therapy Plan

* fix: sider

* chore: added tests for Therapy Plan Template

* fix: test

* fix: test

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-24 14:20:38 +05:30
Rucha Mahabal
e977bc38a3
Merge pull request #23714 from ruchamahabal/education-module-fixes 
fix: Education Module fixes
 2020-10-24 01:08:42 +05:30
Rucha Mahabal
5ecf6b34b0
Merge branch 'develop' into education-module-fixes 2020-10-24 00:27:24 +05:30
Rucha Mahabal
1c4d732873 fix: sider and translation issues 2020-10-24 00:21:05 +05:30
Rucha Mahabal
b3f81ad5b0 fix: allow future attendance marking for leave applications 2020-10-23 21:21:58 +05:30
Rucha Mahabal
4887b69946
feat: Inpatient Medication Order and Entry (#23473) 
* feat: Inpatient Medication Order

* feat: Inpatient Medication Entry

* feat: update medication orders on medication entry submission

* feat: added custom fields for medication references in Stock Entry

* feat: make stock entry if update stock is checked in IPMOE

* fix: handle cancel event for Inpatient Medication Entry

* fix(ux): add link and progress bar to dashboard

* refactor(ux): Adding Medication Orders without linking to Patient Encounter

* fix: make medication entry child table read only

* fix: filter stock items during manual medication order creation

* fix: codacy

* chore: tests for Inpatient Medication Order

* chore: tests for Inpatient Medication Entry

* fix: code clean-up

* fix: filter for inpatients in IPMO

* fix: add datetime validations for IPME filters

* fix: do not hardcode stock entry type

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-23 20:33:30 +05:30
Marica
3ad9393ff8
fix: SO to PO flow improvement (#23357) 
* fix: SO to PO flow improvement

* fix: Dont map shipping_address

- shipping_address is a text field in SO and link field in PO
- Drop shipping case handles its mapping
- normal case doesnt need to map

* fix: Hide/Add rows depending on Against Default Supplier

* fix: Removed Default Supplier Select field from popup

- removed Default Supplier Select field from popup
- only loop through suppliers of selected items if via default supplier
- only check for items in selected items

* fix: Sales Order Drop Shipping Test

* fix: (translation)Multi line to single line strings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-23 19:40:55 +05:30
Marica
0bd576aa44
fix: RFQ UX fixes (#23382) 
* chore: RFQ UX fixes

* fix: RFQ to SUpplier Quotation Dialog

* fix: Remove 'No Quote' functionality

- No Quote in Suppliers table is removed
- It's use everywhere has been removed too (tests, server side files, DOM event)

* chore: More Info section and Project field

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-23 19:38:30 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration 
feat: M-pesa integration
 2020-10-23 19:35:52 +05:30
Saqib
b4448114cf
feat: opening invoice creation tool with background jobs (#23595) 
* feat: opening invoice creation tool with background jobs

* fix: tests

* fix: codacy

* fix: sider

* fix: codacy

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-23 19:32:37 +05:30
Marica
758a68da35
fix: Sequence Matcher shouldn't get None input (#23539) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-23 19:26:43 +05:30
Deepesh Garg
2b3f8e0c3b fix: Cancel repayment accrual interest entry on payment cancellation 2020-10-23 19:02:24 +05:30
Rucha Mahabal
b01334d2e1 fix: attendance cannot be marked outside of Academic Year validation 2020-10-23 18:32:33 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings (#23612) 
* fix(Stock Settings): Type/Grammatical fixes in Settings

* fix: grammatical fixes in manufacturing settings

* fix: typo fix in accounting settings

* fix: typo fixes in HR settings

* fix: typo fixes in buying settings

* fix: typo fixes in Selling Settings

* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Update accounts_settings.json

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-10-23 18:22:26 +05:30
rohitwaghchaure
93bbc52a68
feat: added sequence id in routing for the completion of operations sequentially (#23641) 
* feat: added sequence id in routing for the completion of operations sequentially

* fix: translation syntax
 2020-10-23 18:18:03 +05:30
Marica
9d94f785e9
fix: Hide Ex-Employees from Employee Tree and minor message UX (#23711) 
* fix: Hide Ex-Employees from Employee Tree and minor message UX

* fix: translation syntax
 2020-10-23 18:15:55 +05:30
Rucha Mahabal
8b4d33474e fix: validation for attendance marked on future dates 2020-10-23 16:23:30 +05:30
Rucha Mahabal
6c3efbdb48 fix: filters for course and academic term fields 2020-10-23 16:11:40 +05:30
rohitwaghchaure
4eb87ea8e2
Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue 
fix: incorrect backflush qty in manufacture entry
 2020-10-23 15:43:43 +05:30
Mangesh-Khairnar
675f79920e fix: consider the existing paid payment request for phone payment channel 2020-10-23 15:41:05 +05:30
Marica
99dfbfc365
Merge pull request #23709 from marination/cashier-closing-type-issue 
fix: Cashier Closing Type Issue
 2020-10-23 14:43:18 +05:30
Rohit Waghchaure
558879fad7 fix: Translation Syntax 2020-10-23 13:42:51 +05:30
Mangesh-Khairnar
e03a02d9c0 fix: show descriptive message for missing fields 2020-10-23 13:38:55 +05:30
marination
efcc489967 fix: Cashier Closing Type Issue 2020-10-23 11:55:03 +05:30
Deepesh Garg
ca6cb6433c Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove 2020-10-22 21:52:16 +05:30
Deepesh Garg
cd2c90451e fix: Unaccrued interest after disbursal 2020-10-22 21:50:06 +05:30
Nabin Hait
ed1553ea81
Merge branch 'develop' into mpesa-integration 2020-10-22 21:45:03 +05:30
Nabin Hait
9ff4a2ebd8
Merge branch 'develop' into feat-added-balance-serial-no-column-develop 2020-10-22 21:40:29 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items (#23702) 
* fix: Add Taxes if missing via Update Items

* chore: PO Test for adding tax row via Update Items

* chore: SO Test for adding tax row via Update Items
 2020-10-22 17:04:31 +05:30
rohitwaghchaure
e3ad5f0bc3
Merge pull request #23407 from deepeshgarg007/stock_entry_conversion_factor 
fix: Conversion factor fixes in Stock Entry
 2020-10-22 16:58:06 +05:30
Saqib
a6ff664386
fix: cannot auto unlink payments for credit/debit notes (#23689) 2020-10-22 16:30:57 +05:30
rohitwaghchaure
cc5171a324
Merge branch 'develop' into stock_entry_conversion_factor 2020-10-22 15:20:32 +05:30
Suraj Shetty
6a0eb61af3
fix: Set customer only if contact is present (#23704) 2020-10-22 14:05:58 +05:30
Rohit Waghchaure
fa842e8774 fix: incorrect backflush qty in manufacture entry 2020-10-22 13:35:27 +05:30
Michelle Alva
52514a30d7
feat: Add Integrations Settings in desk (#22857) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-10-22 09:52:34 +05:30
Deepesh Garg
2c97244bad fix: Test Cases 2020-10-22 09:34:27 +05:30
Mangesh-Khairnar
1a6d82a447 fix(payment-request): only consider paid transactions 2020-10-22 01:07:49 +05:30
Deepesh Garg
3f177bffac fix: Add test for loan top up 2020-10-21 22:15:18 +05:30
Deepesh Garg
8f9bab79a7 fix: Update no copy fields 2020-10-21 19:03:13 +05:30
Deepesh Garg
13cbda110d fix: Test Case 2020-10-21 16:11:52 +05:30
Mangesh-Khairnar
c8a04fec35 fix(mpesa-settings): add test cases to verify transactions 2020-10-21 14:07:00 +05:30
Deepesh Garg
2f65ab5355 fix: Validatiion for loan write off amountt 2020-10-21 10:40:59 +05:30
Deepesh Garg
ce95bc2ce0
Merge pull request #23691 from nextchamp-saqib/fix-#214 
fix: '>' not supported between instances of 'str' and 'int'
 2020-10-20 14:17:55 +05:30
rohitwaghchaure
b74d17b1e3
Merge pull request #23688 from rohitwaghchaure/fixed-overproduction-issue-develop 
fix: overproduction issue develop
 2020-10-20 12:55:43 +05:30
Saqib Ansari
903055b7b6 fix: '>' not supported between instances of 'str' and 'int' 2020-10-20 11:59:06 +05:30
Rohit Waghchaure
09572f10f8 fix: overproduction, not allowed to transfer extra materials 2020-10-20 11:01:36 +05:30
Rohit Waghchaure
6471912216 fix: not able to do overproduction 2020-10-20 10:02:01 +05:30
Mangesh-Khairnar
5c29eb08c4 Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-10-19 18:29:46 +05:30