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

24264 Commits

Author SHA1 Message Date
Rohit Waghchaure
81b2c8ed60 fix: sequence id override with operation column 2020-11-04 13:10:03 +05:30
Mangesh-Khairnar
2df2b2f351
fix: update integrations desk page (#23767) 
* fix: update integrations desk page

* fix: setup dashboard after receiving API callback

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-11-04 12:48:33 +05:30
Mangesh-Khairnar
1354aecafa
fix: add check for allowing access to european region (#23770) 2020-11-04 12:42:02 +05:30
Frappe PR Bot
f4e410af5f
chore: Update translations (#23787) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-11-04 12:17:40 +05:30
rohitwaghchaure
a53454d3d1
Update test_budget.py 2020-11-04 12:06:21 +05:30
pateljannat
846ff323e2 feat: sales order status filter for production plan 2020-11-03 17:35:44 +05:30
Rohit Waghchaure
c8cc4bfc56 fix: Budget test cases 2020-11-03 17:09:09 +05:30
Marica
7b42e8e27c
Merge branch 'develop' into dialog-cleanup 2020-11-03 16:26:06 +05:30
Rucha Mahabal
ce8b5fc5ca
Merge branch 'develop' into fix-ipme 2020-11-03 13:56:53 +05:30
Rucha Mahabal
7190e1e4bb fix: Inpatient Medication Order and Entry fixes 2020-11-03 13:45:12 +05:30
Saqib
da878c43fc
fix: cannot save customer email & phone (#23797) 2020-11-03 10:51:09 +05:30
Saqib
c95dff7b7d
fix: cannot add items to cart (#23796) 
* fix: _ is not defined

* fix: item image alt gets overflowed due to large text

* fix: available item qty in pos search

* fix: cash shortcuts overflow
 2020-11-03 10:16:58 +05:30
Deepesh Garg
992bd69fc4
Merge pull request #23785 from deepeshgarg007/place_of_supply 
fix: Place of Supply fix in Sales Invoices
 2020-11-02 11:23:25 +05:30
marination
542ae6ab97 chore: Linter and Sider fixes 
- Translatable  strings cannot be multi line or be formatted by '+'
- Reduce no of tabs in stock_entry.js
 2020-11-02 08:50:48 +05:30
Deepesh Garg
eacfd792e6 fix: fieldname 2020-10-30 22:12:24 +05:30
Deepesh Garg
db3fa4e6b2 fix: Place of Supply fix in Sales Invoices 2020-10-30 19:19:48 +05:30
marination
97d38548aa chore: Purchase Invoice Get Items From cleanup 2020-10-30 17:50:25 +05:30
marination
66b2b544f8 chore: Purchase Receipt, added required by date in PO popup 2020-10-30 17:45:28 +05:30
marination
08e5031be2 chore: Supplier Quotation Get Items From cleanup 2020-10-30 17:36:20 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From' 
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
 2020-10-30 17:06:00 +05:30
rohitwaghchaure
c451c08824
Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop 
fix: po_detail field has no value for subcontracted stock entry
 2020-10-30 16:48:11 +05:30
rohitwaghchaure
ce7f9dffa9
Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving 
fix: patch to update reason for leaving in employee
 2020-10-30 16:47:48 +05:30
Shivam Mishra
2d1f8341f9 feat: update onboarding for accounts 2020-10-30 15:55:19 +05:30
Shivam Mishra
18ef17f3ba feat: add tour for sales taxes template 2020-10-30 15:55:19 +05:30
Rohit Waghchaure
e1781dc0bb fix: patch to update reason for leaving in employee 2020-10-30 15:34:04 +05:30
Saqib
32442008dc
fix: asset finance book posting date fix (#23778) 2020-10-30 15:30:18 +05:30
Rohit Waghchaure
71913c36a7 fix: po_detail field has no value for subcontracted stock entry 2020-10-30 14:35:16 +05:30
marination
6bf507a54b chore: (MR)Added delivery date in SO dialog 2020-10-30 13:59:47 +05:30
Marica
b05318aa51
Merge branch 'develop' into prod-plan-status 2020-10-30 12:33:27 +05:30
rohitwaghchaure
707788da4b
Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied 
fix: multiple pricing rules are not working on selling side
 2020-10-30 02:42:51 +05:30
Marica
9dc4941072
Merge branch 'develop' into prod-plan-status 2020-10-30 00:53:10 +05:30
François de Ryckel
ca5f5cb367
Update student_attendance.py (#23761) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 23:04:13 +05:30
Rucha Mahabal
9db26155ad
fix: set SLA variance in seconds for Duration fieldtype (#23765) 
* fix: calculate SLA variance in seconds for Duration fieldtype

* fix: sider
 2020-10-29 22:39:21 +05:30
rohitwaghchaure
445d23223b
Merge branch 'develop' into multiple-pricing-rules-are-not-applied 2020-10-29 22:25:19 +05:30
Anupam Kumar
e43f8f12d5
Merge branch 'develop' into project-timesheet 2020-10-29 22:03:31 +05:30
Anupam
9002904131 feat: added project link in timesheet form 2020-10-29 21:36:31 +05:30
Deepesh Garg
9c67629e28
fix: Ignore cancelled entries instock balance report (#23757) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-29 19:51:57 +05:30
Nabin Hait
b7285fdcad
Merge branch 'develop' into prod-plan-status 2020-10-29 18:58:32 +05:30
Nabin Hait
2bb110b3d1
Merge branch 'develop' into fix-po-no-fetching 2020-10-29 18:57:33 +05:30
Marica
8f6bd851d3
chore: Show Toast alert feedback on Scanning Barcode (#23760) 2020-10-29 18:55:52 +05:30
Marica
bf54ea9976
chore: (Production Plan) Simplify and fix translation in message popup (#23753) 2020-10-29 18:54:36 +05:30
rohitwaghchaure
d0c2700c85
fix: subscription test case (#23763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-29 18:52:16 +05:30
prssanna
71e5b60df1 refactor: refactor contextual print setting implementation 2020-10-29 14:19:34 +05:30
Saqib
b193731158
fix: pos profile has no attr 'show_only_available_items' (#23758) 2020-10-29 13:23:50 +05:30
Marica
1b8a1cfed2
Merge branch 'develop' into prod-plan-status 2020-10-29 13:02:19 +05:30
Kenneth Sequeira
10f2468076
fix: make asset dashboard charts public (#23751) 2020-10-29 12:02:48 +05:30
Syed Mujeer Hashmi
c17cdd7c2e
fix: Fix for LMS Sign Up link (#23743) 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 11:10:06 +05:30
Deepesh Garg
ae6a51b83a
Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix 
fix: Do not allow Company as accounting dimension
 2020-10-28 22:05:11 +05:30
Rohit Waghchaure
0fa741b267 added test cases 2020-10-28 17:43:36 +05:30
Deepesh Garg
94a630c255 fix: Do not allow Company as accounting dimension 2020-10-28 17:15:14 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents (#23747) 2020-10-28 17:08:47 +05:30
Saqib
7d9dd3c628
fix: item wise tax calculation (#23744) 2020-10-28 17:07:10 +05:30
Rohit Waghchaure
a248dfb9a5 fix: multiple pricing rules are not working on selling side 2020-10-28 16:22:49 +05:30
Faris Ansari
bc6a2b2f9c wip 2020-10-28 13:54:11 +05:30
Deepesh Garg
c9a6135d6c fix: Interest accrual after loan topup 2020-10-28 13:38:15 +05:30
Rushabh Mehta
1dd54e457d
Merge pull request #23734 from rmehta/quality-form-cleanup 
fix(cleanup): Quality Module, cleanup of forms, dashboards etc.
 2020-10-28 11:36:00 +05:30
Marica
4326d21a79
Merge branch 'develop' into purchase-invoice-payment-terms 2020-10-27 18:40:20 +05:30
Rushabh Mehta
12a2e51e20 fix(minor): translation string encoding in quality_procedure.py 2020-10-27 18:38:44 +05:30
Rushabh Mehta
cf1428904a fix(refactor): refactor tests, client side code 2020-10-27 17:36:30 +05:30
marination
67f2c82d90 chore: Test case for Payment Terms in PI from PR 2020-10-27 14:49:43 +05:30
Deepesh Garg
0db4d91c30
Merge pull request #23550 from nextchamp-saqib/add-acc-to-a-group-fix 
chore: validate is_group of child parent account
 2020-10-27 13:54:17 +05:30
marination
fa085d7f4b fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt 2020-10-27 13:18:30 +05:30
Afshan
0a6e1b3503 fix: refactor 2020-10-26 21:23:31 +05:30
Afshan
bd987e56bc
fix: showing error for wrong filters. (#23726) 
* fix: showing error for wrong filters.

* style: formatting translation
 2020-10-26 19:37:33 +05:30
Saqib
fa5fe18b70
fix error message 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-10-26 19:27:02 +05:30
Deepesh Garg
13f4b3fc17 fix: Translation syntax 2020-10-26 19:01:36 +05:30
Deepesh Garg
a630de56e9 fix: Loan disbursement amount validation check 2020-10-26 18:53:56 +05:30
Deepesh Garg
64a4437b48
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-26 18:41:32 +05:30
Afshan
3f971b2371 fix: copying po no when mapping doc 2020-10-26 16:59:57 +05:30
Deepesh Garg
5b4742fd25 fix: Permission fixes for some doctypes 2020-10-26 16:56:05 +05:30
marination
689b77d1ed fix: Don't show buttons if status is Completed 2020-10-26 16:28:39 +05:30
Rushabh Mehta
ea49e30bfd fix(cleanup): cleaned up forms 2020-10-26 15:30:52 +05:30
marination
097b32fe67 feat: Close Production Plan 2020-10-26 15:27:37 +05:30
Deepesh Garg
d63fbd79f4 fix: Unaccrued interest from last accrual date instead of disbursement date 2020-10-26 14:20:55 +05:30
Rohit Waghchaure
103ecec9d4 fixed translation syntax 2020-10-26 12:20:11 +05:30
Rohit Waghchaure
9caac6976c fix: incorrect supplied qty error 2020-10-26 12:19:00 +05:30
Rohit Waghchaure
538d62b43d fix: incorrect consumed qty if raw material with batch 2020-10-26 12:19:00 +05:30
rohitwaghchaure
4c688b71f3 fix: consumed qty logic for subcontracted raw materials (#23314) 
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
 2020-10-26 12:19:00 +05:30
rohitwaghchaure
1cfa61628d fix: incorrect calculation for consumed qty for subcontract item (#23257) 
* fix: incorrect calculation for consumed qty for subcontract item

* added test case
 2020-10-26 12:19:00 +05:30
Saqib
60212ff9b9
fix: multiple pos issues (#23347) 
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-26 11:17:04 +05:30
Frappe PR Bot
33881fd7e2
chore: Update translations (#23717) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-10-25 12:36:35 +05:30
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
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
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
prssanna
13c6e2f320 feat: contextual setting for print uom after quantity 2020-10-22 17:19:00 +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
prssanna
d7b704c90f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-22 15:39:47 +05:30
prssanna
b57b3c9f6c feat: hook to fetch additional print settings in print view 2020-10-22 15:37:47 +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
Shivam Mishra
5e00ed926c feat: update icons 2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +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
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
Mangesh-Khairnar
ebb8ee3dc6 fix(payment gateway account): add patch to set the payment channel as email 2020-10-19 18:27:40 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults (#23415) 
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date

The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
	before_load(frm) {
	    var posting_date = $("input[data-fieldname='posting_date']")[0].value
	    posting_date = moment(posting_date)._d
	    frm.set_value('posting_date', posting_date )
	}
})
```

Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-10-19 17:02:04 +05:30
Rucha Mahabal
174019a838
fix: Student Admission and Student Applicant fixes (#23515) 
* fix: student admission list portal styling

* fix: added basic validations to Student Admission DocType

* fix: show program description and apply button for every program

* fix: don't show apply now button if admissions have not started

* fix: fetch admission details in student applicant web form

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 17:00:56 +05:30
Deepesh Garg
8859b71956
fix: Check for backdated validation only for transaction company (#23639) 
* fix: Check SLE only for transaction company

* fix: Add tests

* fix: Move backdated entry validation from transaction base to stock ledger entry

* chore: Add tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 16:56:45 +05:30
Afshan
e0cb6c3b9d
fix: removed extra space from label "Rate" (#23683) 2020-10-19 16:55:20 +05:30
rohitwaghchaure
3a17147a32
refactor: book loss amount in the COGS instead of stock received but not billed (#23671) 2020-10-19 16:54:11 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search (#23629) 
* fix(Bank Reconciliation): update/merge CR/DR journal entry search

  Prior to this commit, the debit journal entry search (for
  credit-side Bank Transaction entries) and the corresponding
  credit journal entry search had diverged, with the latter
  working but the former not working. Thus, the search for
  journal entries matching a credit Bank Transaction (for the
  purposes of reconciliation) was never returning any matching
  journal entries, making reconciliation difficult.

  To fix this, this commit not only updates the debit journal
  entry search, but takes advantage of the fact that the two SQL
  queries for the two sides (debit/credit) differ only by the
  word "debit" or "credit," to merge the code for the two
  queries, making the code more DRY and hopefully reducing the
  chance of similar bugs occurring in the future.

* fix: message translation

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 16:49:55 +05:30
Shivam Mishra
2c2e7297ae feat: update accounts onboarding 2020-10-19 14:44:02 +05:30
Shivam Mishra
8261df29c4 feat: update splash logo 2020-10-19 13:52:35 +05:30
Saqib
896a0cc1f7
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-19 11:55:12 +05:30
rohitwaghchaure
2fbeb7c1dd
refactor: added new filters in the Batch-wise balance history report (#23676) 
* refactor: added new filters in the Batch-wise balance history report

* fix: added semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:37:54 +05:30
Frappe PR Bot
083f3fd981
chore: Update translations (#23677) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:19:27 +05:30
Rucha Mahabal
96bd65e203
fix: duplicate validation for Course Enrollment (#23659) 
* fix: duplicate validation for Course Enrollment

* fix: clean-up failing tests
 2020-10-19 10:41:25 +05:30
rohitwaghchaure
5d6686bd8c
Fixed stock ageing report data develop (#23673) 
* fix: stock ageing report

* Update stock_ageing.py
 2020-10-19 10:39:20 +05:30
rohitwaghchaure
21bf5e9b8e
Fixed incorrect operation time calculation develop (#23674) 
* fix: incorrect operation time calculation for batch size

* Update test_work_order.py
 2020-10-19 10:38:48 +05:30
Deepesh Garg
8cd8dbe15d fix: Add write off test 2020-10-18 22:26:09 +05:30
Deepesh Garg
9945ccc0cc fix: Write Off amount handling in Loan accrual and closure 2020-10-18 22:25:24 +05:30