Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,270 Commits 3 Branches 0 Tags 1 GiB
470fe65cc1
Commit Graph

31270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
anoop
470fe65cc1 fix: inpatient date validation removed, added role perms 
service unit defaults not set when created from tree, added validations on after_insert
 2020-05-22 20:39:15 +05:30
anoop
09ec030baa fix: ip-order dialogs use long text field 2020-05-22 20:39:15 +05:30
anoop
f71f9556ab fix: consider only submitted docs for invoicing 2020-05-22 20:39:15 +05:30
anoop
08f76d73e3 feat: admission and discharge schedule detials via dialog 2020-05-22 20:39:15 +05:30
Deepesh Garg
18ace30a81 fix: Project filter in Trial Baalance Report 2020-05-22 20:39:14 +05:30
anoop
6917849273 fix: service unit create - set fields based on service unit type, added validations 2020-05-22 20:39:14 +05:30
Faris Ansari
c71e7eb56f fix: Move address and contact templates to frappe 2020-05-22 20:39:14 +05:30
Deepesh Garg
60d81c285c
Merge pull request #21879 from frappe/mergify/bp/version-13-beta-pre-release/pr-21877 
feat: rename loan management to loan on Desk Page (bp #21877)
 2020-05-22 18:01:30 +05:30
Shivam Mishra
29742e4cbe feat: rename loan management to loan on Desk Page 
(cherry picked from commit 5cf90baf16)
 2020-05-22 10:40:33 +00:00
mergify[bot]
54bcda42ce
fix(patch): Handle single value in patch (#21823) (#21834) 
(cherry picked from commit 5cef8db4db)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-05-21 18:57:42 +05:30
rohitwaghchaure
630050411f
Merge pull request #21832 from rohitwaghchaure/fixed-forecasting-error-report-python3-pre-release 
fix: dict object has no attribute append
 2020-05-21 14:24:06 +05:30
Rohit Waghchaure
fa1e0bdda2 fix: dict object has no attribute append 2020-05-21 14:12:50 +05:30
Nabin Hait
eb7a9a569a fix: merge conflict 2020-05-20 20:14:12 +05:30
Nabin Hait
054aafa1d7 fix: Assets module onboarding and dashboard 2020-05-20 18:22:39 +05:30
Saqib Ansari
4f024128af fix: dashboard chart dialog filters 2020-05-20 18:22:39 +05:30
Saqib Ansari
7c5e22e9d8 fix: depreciation amount not shown in asset register 2020-05-20 18:22:39 +05:30
Saqib Ansari
37c3bd2892 chore: rename onboarding to module onboarding 2020-05-20 18:22:39 +05:30
Saqib Ansari
8990697fee feat: fixed asset register based on fiscal year 
*asset value chart
 2020-05-20 18:22:39 +05:30
Saqib Ansari
3882939fd9 fix: dashboard fixtures and FAR chart 2020-05-20 18:22:38 +05:30
Saqib Ansari
ecddf3358d fix: dashboard fixtures 2020-05-20 18:22:38 +05:30
Saqib Ansari
1dcf103398 chore: enhance fixed asset report and remove redundant reports 2020-05-20 18:22:38 +05:30
Saqib Ansari
03007de4d7 fix: unexpected removal of finance book filter 2020-05-20 18:22:38 +05:30
Saqib Ansari
22aec57beb feat: asset onboarding, dashboards 2020-05-20 18:22:38 +05:30
Shivam Mishra
e091789332
feat: remove website settings from boot (#21801) 2020-05-20 16:17:12 +05:30
Anupam Kumar
ab250e4ed5
enable Allow Rename in sales stage (#21799) 2020-05-20 16:15:48 +05:30
Anurag Mishra
2346353a22
fix: missing parameter (#21802) 2020-05-20 16:14:09 +05:30
Marica
2b04e8eef0
fix: Validate Payment Gateway only if it exists in Payment Request. (#21805) 2020-05-20 16:13:43 +05:30
Marica
91a9d3fbe5
fix: Reload doc in Healthcare company patch (#21808) 2020-05-20 16:12:46 +05:30
Nabin Hait
e9864aa578 Merge branch 'anupamvs-crm-onboarding' into develop 2020-05-20 12:55:59 +05:30
Nabin Hait
7cbbd68176 fix: CRM module dashboard and onboarding 2020-05-20 12:55:34 +05:30
rohitwaghchaure
df78e29957
Merge pull request #21724 from rohitwaghchaure/production-forecasting 
feat: production forecasting using exponential smoothing method
 2020-05-20 12:30:56 +05:30
Nabin Hait
189be3c68b Merge branch 'crm-onboarding' of https://github.com/anupamvs/erpnext into anupamvs-crm-onboarding 2020-05-20 12:07:55 +05:30
Rohit Waghchaure
841a8db5d1 updated manufacturing desk 2020-05-20 12:06:07 +05:30
Nabin Hait
9d04c06c62 fix: HR dashboard and onboarding 2020-05-20 12:05:03 +05:30
Rohit Waghchaure
e6147ed9bc feat: production forecasting using exponential smoothing method 2020-05-20 11:31:06 +05:30
rohitwaghchaure
bd4629568d
Merge pull request #21793 from deepeshgarg007/general_ledger_against_voucher 
fix: Against voucher in General Ledger
 2020-05-20 10:30:11 +05:30
Deepesh Garg
3949b51026
Merge pull request #21785 from anupamvs/sales-order-tax-fix 
fix: tax id is not fetched when creating sales order from quotation
 2020-05-19 21:49:11 +05:30
Anupam K
75e8b1b519 tax id is not fetched in when creating sales order from quoation 2020-05-19 21:39:56 +05:30
Nabin Hait
6277367d21 fix: project desk 2020-05-19 21:18:26 +05:30
Nabin Hait
0b10c6a1bc Merge branch 'project-refresh' of https://github.com/scmmishra/erpnext into scmmishra-project-refresh 2020-05-19 21:03:39 +05:30
Nabin Hait
041e31b8ba fix: added dashboard link in healthcare desk 2020-05-19 20:58:00 +05:30
Nabin Hait
4db4464123 Merge branch 'healthcare-charts-and-onboarding' of https://github.com/ruchamahabal/erpnext into ruchamahabal-healthcare-charts-and-onboarding 2020-05-19 20:53:08 +05:30
Deepesh Garg
1b1787c61a fix: Against voucher in General Ledger 2020-05-19 20:51:30 +05:30
Rucha Mahabal
0c03834190
fix(minor): pass ignore_mandatory flag for Lab Test Item Creation (#21784) 2020-05-19 20:30:20 +05:30
Rucha Mahabal
99d348ffa3
fix: Patch for Setting Missing Company in Healthcare DocTypes (#21790) 
* fix: patch for setting missing company in Healthcare DocTypes

* fix: check doctype exists

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-19 20:28:19 +05:30
Nabin Hait
939441117a Merge branch 'marination-purchase-dashboard' into develop 2020-05-19 20:22:48 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
Deepesh Garg
3dae7af868
Merge pull request #21792 from deepeshgarg007/gst_insstate_v1_13 
fix: Tax amount in GSTR-1 JSON
 2020-05-19 20:05:07 +05:30
Deepesh Garg
9a914dc592 fix: Tax amount in GSTR-1 JSON 2020-05-19 20:01:25 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-19 19:51:45 +05:30