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

30676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
fe7e6f5f53 fix: Test 2020-04-27 14:05:45 +05:30
Deepesh Garg
4eecc65cff fix: E-way bill fix in Delivery Note 2020-04-27 10:50:59 +05:30
Deepesh Garg
00ea59b447 fix: Utils messsage cleanup 2020-04-27 10:50:40 +05:30
Deepesh Garg
10aff8e118 fix: E-way bill fix in List view 2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b fix: E-way bill fix in sales invoice 2020-04-27 10:50:03 +05:30
Anurag Mishra
92b933f4ac
feat: Upload Attendance (#20947) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:15:18 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms (#20945) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:07:36 +05:30
Deepesh Garg
67173ce112
Merge pull request #21382 from deepeshgarg007/loan_security_pledge_aginst_application 
fix: Allow creation of loan security pledge from Loan Application for old prices
 2020-04-23 13:54:38 +05:30
Deepesh Garg
2daf6dad2e fix: Allow creation of loan security pledge from Loan Application for old prices 2020-04-23 13:51:29 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes (#21179) 
* fix: Rename bank account type doctypes

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-23 12:19:30 +05:30
Deepesh Garg
fa8396feb5
fix: Budget against accounting dimensions (#21268) 
* fix: Budget warning against custom accounting dimension

* fix: Codacy

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 10:34:57 +05:30
rohitwaghchaure
168babfebc
fix: bom update cost issue (#21372) 
* fix: bom update cost is not working

* added test case for bom cost
 2020-04-23 09:48:50 +05:30
rohitwaghchaure
6fa6caf46c
fix: patch and validation message to fix target warehouse issue (#21371) 2020-04-23 09:46:29 +05:30
rohitwaghchaure
e8a651bc00
fix: BOM stock report (#21380) 2020-04-23 09:45:09 +05:30
rohitwaghchaure
28deddeb6f
fix: incorrect out value in stock balance due to precision issue (#21379) 2020-04-23 09:44:58 +05:30
Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module (#21216) 
* feat: added rehab sub-module doctypes

* feat: rehab module

* feat: prescribe procedures in Patient Encounter

* feat: create Therapy Plan on Encounter submission

* feat: manage item for Therapy Type

* feat: book appointments, get prescribed therapies for Therapy Sessions

* feat: invoice Therapy Sessions

* feat: plan completion progress bar and exercise countsindicators

* feat: Motor Assessment Scale

* feat: add editable card view for exercise steps

* fix: add rehab in healthcare desk page

* fix: card deletion not working when child table is hidden

* feat: automatically fetch therapies according to Body Part

* fix: added tests for Therapy Type and Plan

* fix: add exercises according to body parts in Therapy Type

* fix: label for Exercise Instructions

* fix: exercise cards css

* feat: add dashboard for Therapy Plan

* feat: Patient Assessment Template and Patient Assessment

* feat: add title fields in Therapy Plan and Session

* fix: remove Motor Assessment Scale

* fix: fetch assessment description

* feat: create Patient Assessment from Therapy Session

* fix: anti pattern code

* fix: update desk page

* fix: exercise card rendering

* fix(test): filter out disabled Items in test_mapper

* fix: get stock uom from Stock Settings for Therapy Type Item creation

* fix: multiline SQL query

* fix: permissions for DocTypes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-22 13:07:12 +05:30
Deepesh Garg
37665e12ca
Merge pull request #21367 from scmmishra/cal-report 
fix: specify column width
 2020-04-22 12:03:05 +05:30
Shivam Mishra
55baccd63a fix: specify column width 2020-04-22 11:50:06 +05:30
Saqib
9c494d3e72
fix: asset maintenance fixes (#21277) 
* fix: asset maintenance fixes

* fix: tests
 2020-04-22 11:48:19 +05:30
Nabin Hait
471cf95300
Update purchase_invoice_item.json 2020-04-22 11:46:31 +05:30
Chinmay Pai
8fb863da07
chore: remove oldfieldtype from purchase invoice item (#21365) 
fixes issue where framework expects data field type to be validated with
options either set to "Email" or "Phone".

removing oldfieldtype works for now, should be fixed inside framework

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-22 11:23:14 +05:30
Deepesh Garg
0fcdc33393
Merge pull request #21361 from rohitwaghchaure/fixed-unsupported-operand-type-issue-develop 
fix: unsupported operand type issue in pricing rule
 2020-04-22 08:45:56 +05:30
Rohit Waghchaure
690855d3a1 fix: unsupported operand type issue in pricing rule 2020-04-22 02:49:48 +05:30
Nabin Hait
5f77854448
Revert "fix : Create Pick List Fos Sales Order List (#20915)" (#21352) 
This reverts commit 27c6f69435.
 2020-04-21 14:28:08 +05:30
Nabin Hait
a529a5078f
Update purchase_receipt.json 2020-04-21 13:50:26 +05:30
Marica
bda0ddf1cf
fix: Purchase Receipt Form Cleanup (#21232) 2020-04-21 13:15:05 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX (#20810) 
* fix (ux): Material Request Form Cleanup

* fix: Get Items from popup UX

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:13:39 +05:30
Dharmraj-48
27c6f69435
fix : Create Pick List Fos Sales Order List (#20915) 
Co-authored-by: Dharmraj <Dharmraj@bloomstack.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:10:09 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup (#21230) 
* fix: Purchase Invoice Form Cleanup

* fix: Made Supplier field mandatory

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:00:14 +05:30
Anupam Kumar
a9d59fad94
fix: on item change UOM not updated (#21242) 
* fix: on item change UOM not updated

* removing uom from js
 2020-04-21 12:57:44 +05:30
Rucha Mahabal
ca1c37c56d
fix(Healthcare): remove hardcoded UOM during Item creation for Templates (#21350) 2020-04-21 12:54:07 +05:30
Marica
9ea1ad4051
fix: Re-order Item Error Email format (#21342) 
* fix: Re-order Item Error Email format

* fix: Translated strings
 2020-04-21 12:52:29 +05:30
rohitwaghchaure
a92eaff83b
fix: scrap items order not showing correctly in stock entry (#21346) 2020-04-21 11:27:10 +05:30
rohitwaghchaure
3d2ced7926
Merge pull request #21345 from rohitwaghchaure/fixed_free_item_qty_develop 
fix: free item quantity issue
 2020-04-21 01:10:33 +05:30
Rohit Waghchaure
d093a377ef fix: free item quantity issue 2020-04-21 01:09:44 +05:30
Shivam Mishra
6372d0a842
Merge pull request #21187 from scmmishra/razorpay-subscription 
feat: Razorpay subscription for Non profit memberships
 2020-04-20 21:01:34 +05:30
Shivam Mishra
745b632ea1 fix: linting fixes 2020-04-20 18:25:51 +05:30
rohitwaghchaure
6e201a00df
Merge pull request #21340 from sahil28297/fix_italy_einvoicing_develop 
fix(patch): reload 'Import Supplier Invoice' doc
 2020-04-20 14:22:48 +05:30
Sahil Khan
f03efdc6b1 fix(patch): reload 'Import Supplier Invoice' doc 2020-04-20 14:18:28 +05:30
Shivam Mishra
83f80517c6
Merge branch 'develop' into razorpay-subscription 2020-04-20 13:54:00 +05:30
Wolfram Schmidt
6d49238159
Update project.json (#21274) 
unnecessary requirement for project creation as this is a field of the Type select which will be pre-filled. When creating a project of list view it will also bring up this field as it has "reqd": 1. A new projekt will have the status set to open in most cases.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-04-19 20:19:10 +05:30
rohitwaghchaure
3bc23f5339
Merge pull request #21334 from scmmishra/issue-list-context 
fix: filters as dictionary
 2020-04-19 13:58:22 +05:30
Shivam Mishra
bd53f3b080 fix: filters as dictionary 2020-04-19 12:47:48 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print 
fix: account name not showing in the gl print
 2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154 fix: account name not showing in the gl print 2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop 
fix: minor issues
 2020-04-18 02:08:26 +05:30
Deepesh Garg
5239c0e6d5
Merge pull request #21320 from Mangesh-Khairnar/fix-gl-entry-label 
fix: add label to gl report
 2020-04-17 20:00:42 +05:30
Mangesh-Khairnar
bd14a64bfb fix: add label to gl entry 2020-04-17 19:52:47 +05:30
gavin
25932e0613
Merge pull request #21298 from gavindsouza/tally-migration-fixes 
fix: Tally migration
 2020-04-17 19:12:55 +05:30