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

27602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f7c151e7ba
Merge pull request #18241 from scmmishra/cash-flow-chart 
feat: added chart to cash-flow report
 2019-07-12 12:30:18 +05:30
Jamsheer
5073ac4dcb fix: Patient History (Patient Medical Record) (#17972) 
* Page - Patient History

* Healthcare Utils - get patient vitals

* Healthcare Utils - render doc as html for patient history page

* Page - Patient History -  prcatitioner image in time line

* Page - Patient History in menu

* fix - page medical history

* fix: page patient_history broken img, minor fixes

* fix: patient_history page, add pagination, show doc if fetched

* fix: Patient Medical Record to Patient History

* fix: patient history page - set route options

* fix: update to code standards

* fix: remove Eidt button form patient history

* fix: css update to code standards

* fix: Remove page medical_record
 2019-07-12 12:28:34 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency 2019-07-12 12:24:05 +05:30
Himanshu
7d1d9aa46b feat(Issue): Reset SLA (#18244) 
* feat: reset sla

* fix: db.get_single_value

* feat: timeline entry for reset sla

* fix: remove communication from support config

* fix: reset sla on split_issue
 2019-07-12 12:19:35 +05:30
Anurag Mishra
53e7df078e fix: set project link in item tables (#18233) 2019-07-12 12:05:39 +05:30
rohitwaghchaure
9b34eab93a
Merge pull request #18258 from Mangesh-Khairnar/purchase-order-tax-category 
feat(purchase-order): Add tax category field in purchase order
 2019-07-12 11:39:35 +05:30
Saurabh
98d429d271
Merge pull request #18239 from netchampfaris/breadcrumbs-module-map-2 
fix: Add module map for breadcrumbs
 2019-07-12 11:09:20 +05:30
Deepesh Garg
abd4a7a950
Merge pull request #18253 from frappe/jigneshpshah-Report-link 
fix: navigation link updated for Item Shortage Report
 2019-07-11 22:22:54 +05:30
Aditya Hase
d02c8ad898
fix: Quickbooks Migrator (#18259) 
fix: Quickbooks Migrator
 2019-07-11 20:27:00 +05:30
Aditya Hase
f04b19aa2e fix: Company might not have any warehouses when on_update hook for QBM is being executed 
This used to throw while renaming a Company that is either used with QuickBooks
Migrator or is set as a Default Company in Global Defaults.
 2019-07-11 18:29:24 +05:30
Mangesh-Khairnar
f8c92f30bf feat(purchase-order): Add tax category field in purchase order 2019-07-11 18:27:49 +05:30
Aditya Hase
d4c10801d1 style: Remove multiple whitespace after : 2019-07-11 18:17:01 +05:30
Aditya Hase
7352227a24 fix: Remove unused local variable 2019-07-11 18:16:42 +05:30
Aditya Hase
2f6cd1999a style: One import per line 2019-07-11 18:16:23 +05:30
Aditya Hase
9f40ffcd1e style: Insert whitespace after , 2019-07-11 18:10:05 +05:30
Aditya Hase
dfeb6bef8c style: Remove whitespace before : 2019-07-11 18:08:46 +05:30
Aditya Hase
6bbb726769 fix: Remove unused imports 2019-07-11 18:04:41 +05:30
Nabin Hait
bd055a858c
fix: UX fixes in loan (#18220) 
* fix: UX fixes in loan

* Update loan.py
 2019-07-11 17:18:00 +05:30
Rushabh Mehta
af88e15e92 fix(patch): set_priority_for_support.py (#18255) 2019-07-11 17:14:29 +05:30
rohitwaghchaure
b390b70ee3 fix: set project in material request when pull items from bom (#18256) 2019-07-11 15:22:03 +05:30
Suraj Shetty
ef1d0d1d14
Merge branch 'develop' into breadcrumbs-module-map-2 2019-07-11 15:02:42 +05:30
Nabin Hait
fca86c48c8
fix: Revert #frappe/erpnext/17896 (#18251) 2019-07-11 14:39:24 +05:30
Jignesh Greycube
870cbad5b2
fix: navigation link updated for Item Shortage Report 
Item Shortage Report navigation link was incorrect , hence updated.
 2019-07-11 13:56:43 +05:30
Himanshu
c32e287441
Merge pull request #18252 from hrwX/indi-fix 
fix(Issue): resolution by indicator
 2019-07-11 07:55:28 +00:00
Himanshu Warekar
523d0ab0d4 fix: resolution by indicator 2019-07-11 13:24:28 +05:30
Suraj Shetty
bc2ff785f1 fix: Restore "allow delivery" condition checks (#18246) 
* fix: Remove `allow_delivery` flag

- User was not able to create delivery note
because allow_delivery flag was false and
it never used to get updated

* fix: Restore allow_delivery condition checks
 2019-07-11 10:43:40 +05:30
Suraj Shetty
c6c6b05522 fix: update_due_date_in_gle patch (#18248) 2019-07-11 10:42:37 +05:30
Shivam Mishra
020f405367
Merge branch 'develop' into cash-flow-chart 2019-07-11 10:12:45 +05:30
Mangesh-Khairnar
bfcc84789f fix(sales-invoice): get items from quotation (#18237) 2019-07-11 10:04:46 +05:30
rohitwaghchaure
4870e95b83 fix: po, rate set as zero against the item (#18242) 2019-07-11 10:03:35 +05:30
Deepesh Garg
8457fcf0c4
Merge pull request #18243 from deepeshgarg007/cash_flow 
fix: Add missing Cost Centre filter in cash flow statement
 2019-07-11 08:20:02 +05:30
deepeshgarg007
285701d9f1 fix: Add missing Cost Center filter in cash flow statement 2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f feat: added chart to cash-flow report 2019-07-10 20:28:52 +05:30
Suraj Shetty
7391054603
Merge branch 'develop' into breadcrumbs-module-map-2 2019-07-10 19:39:56 +05:30
Suraj Shetty
7837fbe231
style: Add missing semicolon 2019-07-10 19:39:40 +05:30
Mangesh-Khairnar
d749f20f63 fix: installation note (#18232) 2019-07-10 19:29:39 +05:30
Faris Ansari
a7a6987c42 fix: Add Shopping Cart and Contacts 2019-07-10 19:27:57 +05:30
Faris Ansari
ab46f0f5bb fix: Add module map for breadcrumbs 2019-07-10 19:27:44 +05:30
Himanshu
e7bb54ed76 feat(Issue): Settings to stop SLA tracking (#18112) 
* fix: fix msgprint when creating new issues

* fix: use getdate

* fix: do not self save

* fix: test case

* fix: error due to comparing date and str

* fix: creation time for replicated issue

* feat: sla in support settings

* fix: remove sla settings

* feat: enable check in sla

* fix: throw if sla is disabled

* fix: enable sla
 2019-07-10 17:15:59 +05:30
Nabin Hait
59c5c3c347
fix: Make material request against SO only for pending qty (#18216) 2019-07-10 17:05:49 +05:30
Suraj Shetty
61d8088be4 fix: Return fieldtype so that the client-side can format chart values (#18211) 2019-07-10 17:05:25 +05:30
rohitwaghchaure
058787d204 fix: error report for item price (#18212) 2019-07-10 17:03:48 +05:30
Mangesh-Khairnar
3d28c065db fix(exchange-rate-revaluation): change create to view button on creation of journal entry (#18201) 2019-07-10 17:03:23 +05:30
Suraj Shetty
838697261d
fix: Call popup avatar 
Avoid getting session users image if customer doc has no image
 2019-07-10 10:39:43 +05:30
Deepesh Garg
62911ec198
Merge pull request #18206 from Anurag810/sending_sms_from_quotation 
fix: sending sms from quotation
 2019-07-10 09:18:43 +05:30
Anurag Mishra
e9dd9b842e
Update erpnext/public/js/sms_manager.js 
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2019-07-09 17:54:00 +05:30
Deepesh Garg
d1be5d0f55
Merge pull request #18207 from deepeshgarg007/dimension-filter-fix 
fix: Tree filter fixes for accounting dimensions
 2019-07-09 17:02:43 +05:30
deepeshgarg007
890ea195f3 fix: Tree filter fixes for erpnext dimensions 2019-07-09 16:56:56 +05:30
Anurag Mishra
de13faf19a fix: sending sms from quotation 2019-07-09 14:27:20 +05:30
Mangesh-Khairnar
6a7969117f fix(bom): escape name with wildcard character (#18164) 2019-07-08 10:40:40 +05:30