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

21946 Commits

Author SHA1 Message Date
Abhishek Balam
e4e23836e7 mandatory depends on for cheque no and date, fix typo 2020-04-26 13:06:55 +05:30
Saqib
7e73473a65
fix: (ux) set jv voucher type depending on mode of payment (#21411) 2020-04-26 09:40:57 +05:30
rohitwaghchaure
8b1c71ea44
fix: work order creation message against material request (#21413) 2020-04-26 09:38:18 +05:30
Abhishek Balam
84187fb8e9 Code cleanup and improvements requested in PR:21404 2020-04-26 05:00:36 +05:30
Abhishek Balam
331bc0c366 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 18:25:27 +05:30
Abhishek Balam
539c67966f rename je template account dt 2020-04-25 18:13:01 +05:30
Abhishek Balam
fb5fbd7e0c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 17:59:00 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
 2020-04-25 14:52:05 +05:30
Ahmad
454b1cf48d
Hook Fix in the scheduler events (#21410) 2020-04-25 14:51:24 +05:30
Deepesh Garg
0b7bef5971
Merge pull request #21408 from deepeshgarg007/loan_disbursement_against 
fix: Loan Disbursement against account
 2020-04-25 13:18:49 +05:30
Deepesh Garg
c20de8ac8d fix: Loan Disbursement against account 2020-04-25 13:15:45 +05:30
Saqib
8952ac1ab4
fix: custom buttons are hidden if order type of SO is customised (#21397) 2020-04-25 09:44:21 +05:30
Abhishek Balam
d64438ff47 feat: Journal Entry Template 2020-04-25 03:13:50 +05:30
Abhishek Balam
291837e63d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 02:46:00 +05:30
Abhishek Balam
7bbb77e66f feat: Journal Entry Template 2020-04-25 02:45:45 +05:30
rohitwaghchaure
55102f455f
Merge pull request #21401 from rohitwaghchaure/fixed-taget-warehouse-mandatory-issue 
fix: make target warehouse field mandatory while saving the work order
 2020-04-25 01:19:19 +05:30
Anupam K
524eb6ce9b freeze screen while posting and login 2020-04-25 00:35:26 +05:30
Diksha Jadhav
7b91617303 feat(accounting): show actual qty for warehouse in sales invoice 2020-04-25 00:02:32 +05:30
Rohit Waghchaure
5460691c8f fix: make target warehouse field mandatory while saving the work order 2020-04-24 23:55:33 +05:30
Rucha Mahabal
d124581044
Merge pull request #21384 from anupamvs/email-camp-end-date 
fix: set end_date in Email Campaign
 2020-04-24 20:04:34 +05:30
Saqib Ansari
8c70e8d4df fix: remove debugger 2020-04-24 16:41:48 +05:30
Saqib Ansari
40140c63dc fix: rate gets overwritten when pricing rule is set 2020-04-24 14:51:56 +05:30
Saqib Ansari
22d2970339 fix: query 2020-04-24 13:47:44 +05:30
Saqib
869ea1d9e4
Merge branch 'develop' into quo-status-fix 2020-04-24 12:17:30 +05:30
Anupam K
e01723e360 Review changes 2020-04-23 23:02:08 +05:30
Marica
ba3adf2461
Merge branch 'develop' into stock-entry-form-cleanup 2020-04-23 20:58:44 +05:30
marination
e1e98fe116 fix: Issues on qty trigger in Stock Entry Detail 2020-04-23 20:18:52 +05:30
Rucha Mahabal
1700fc8011
Merge branch 'develop' into email-camp-end-date 2020-04-23 19:42:17 +05:30
marination
f7aa6a8357 chore: Stock Entry Form Cleanup 2020-04-23 19:27:50 +05:30
Saqib Ansari
0f2c64cfef fix: travis 2020-04-23 19:19:09 +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
Rucha Mahabal
78d7ed521f
Merge branch 'develop' into email-camp-end-date 2020-04-23 16:00:27 +05:30
Saqib
63084c6292
Merge branch 'develop' into quo-status-fix 2020-04-23 15:30:31 +05:30
Anupam K
0f7bac26e6 setting end date in email campaign 2020-04-23 15:29:12 +05:30
Saqib Ansari
1e4c28e99d fix: quotation have expired status even if sales order exists 2020-04-23 15:28:47 +05:30
Anupam K
39911b40f0 setting end date in email campaign 2020-04-23 14:14:49 +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
Rohit Waghchaure
690855d3a1 fix: unsupported operand type issue in pricing rule 2020-04-22 02:49:48 +05:30
Anupam K
4e2256f2e3 Linkedin, Twitter Integration 2020-04-21 22:07:03 +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
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
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
Anupam K
790b9ee8d0 Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat 2020-04-18 01:51:47 +05:30
Anupam K
c12a40c923 Linkedin, Twitter Integration 2020-04-18 01:50:18 +05:30
Anupam K
22318b2eb6 Linkedin, Twitter Integration 2020-04-18 01:46:38 +05:30
Anupam K
d683dc250d Linkedin, Twitter Integration 2020-04-18 00:48:34 +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
Deepesh Garg
3c6795a52d
Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes 
fix: Loan Repayment code clean up and other fixes
 2020-04-17 11:16:38 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales (#21299) 
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
 2020-04-17 10:52:28 +05:30
rohitwaghchaure
e894c35b9a
Merge pull request #21309 from rohitwaghchaure/fixed_job_card_time_issue_develop 
fix: job card timer issue
 2020-04-17 00:56:28 +05:30
Rohit Waghchaure
250daa3f94 fix: job card time issue 2020-04-17 00:50:00 +05:30
Deepesh Garg
bf78ed6947 fix: Loan Repayment code clean up and other fixes 2020-04-16 22:53:47 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes (#21296) 
* fix: Made received qty readonly and no-copy

* fix: Made release date mandatory

* fix: requested qty calculation fix for UOM
 2020-04-16 20:11:32 +05:30
Shivam Mishra
3e4ab760db
Merge branch 'develop' into razorpay-subscription 2020-04-16 18:17:42 +05:30
Gavin D'souza
496c6a3baa style: removed unused imports and updated formatting 2020-04-16 16:51:59 +05:30
Deepesh Garg
d521ba2c00
Merge pull request #21102 from nextchamp-saqib/asset-cat-validation 
fix: no server side validations for accounts in asset category
 2020-04-16 16:25:08 +05:30
Saqib
14cdb24290
fix: serial and batch selection from delivery note bug fix (#21291) 2020-04-16 16:21:35 +05:30
Saqib Ansari
33eb35d8b1 fix: incorrect transalation 2020-04-16 16:16:09 +05:30
Gavin D'souza
6abdfc586b fix: strip data fields of whitespaces 2020-04-16 16:14:29 +05:30
Gavin D'souza
72a94941bf fix(tally-migration): DocType improvement 2020-04-16 16:12:40 +05:30
Gavin D'souza
2ad7e81560 fix: handle errors in enqueued methods and update status 2020-04-16 16:11:55 +05:30
Shivam Mishra
88c1f28351
Merge branch 'develop' into razorpay-subscription 2020-04-16 12:23:46 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation 2020-04-16 11:23:52 +05:30
Deepesh Garg
17ab1592c7
Merge pull request #21265 from vishdha/chart_account_v13 
fix: Chart of account importer UX improved
 2020-04-16 11:21:05 +05:30
vishdha
5b36d15927 fix: fix Transalation 2020-04-16 11:13:43 +05:30