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

21886 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
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
Anupam K
e01723e360 Review changes 2020-04-23 23:02:08 +05:30
Rucha Mahabal
1700fc8011
Merge branch 'develop' into email-camp-end-date 2020-04-23 19:42:17 +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
Anupam K
0f7bac26e6 setting end date in email campaign 2020-04-23 15:29:12 +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