Nabin Hait
|
46941e8b35
|
Time out increased for appraisal template
|
2017-09-15 18:56:49 +05:30 |
|
Prateeksha Singh
|
d1ce7bfff4
|
[fix] set item valuation rates (#10681)
|
2017-09-15 16:17:29 +05:30 |
|
rohitwaghchaure
|
dd092e30fb
|
Move subscription module to accounts (#10772)
|
2017-09-15 16:16:36 +05:30 |
|
Makarand Bauskar
|
5ac01a2bf7
|
[minor] translate the action name in get_slide_settings (#10740) (#10790)
|
2017-09-15 12:10:29 +05:30 |
|
AravindPranera
|
27bbb561d2
|
removed whitespace
|
2017-09-15 11:04:14 +05:30 |
|
AravindPranera
|
2c1f44ecfa
|
Trailing space removed in line 275
|
2017-09-15 10:57:23 +05:30 |
|
AravindPranera
|
c73383c34c
|
Trailing whitespace in Line 207 and 276
|
2017-09-15 10:34:21 +05:30 |
|
Nabin Hait
|
43268bd350
|
Fixed salary structure tests
|
2017-09-14 19:39:10 +05:30 |
|
Nabin Hait
|
2f64f0f5fa
|
Fixed salary structure tests
|
2017-09-14 19:08:15 +05:30 |
|
Nabin Hait
|
427172c941
|
Update test_salary_structure.js
|
2017-09-14 17:57:21 +05:30 |
|
Nabin Hait
|
41146657de
|
Set default customer group and territory after install
|
2017-09-14 17:26:23 +05:30 |
|
Nabin Hait
|
092f6d3739
|
Fixes ui tests
|
2017-09-14 16:45:47 +05:30 |
|
mbauskar
|
f41cff27e6
|
resolved merge conflicts
|
2017-09-14 15:32:55 +05:30 |
|
mbauskar
|
ea832b8157
|
resolved merge conflicts
|
2017-09-14 15:32:10 +05:30 |
|
mbauskar
|
fd39e6f3c8
|
Merge branch 'hotfix'
|
2017-09-14 15:28:44 +05:30 |
|
mbauskar
|
8ea3bb0d90
|
bumped to version 8.11.3
|
2017-09-14 15:58:44 +06:00 |
|
Nabin Hait
|
45dce89cae
|
Print Settings for printing taxes with zero amount (#10782)
* Print Settings for printing taxes with zero amount
* added __init__.py file to patch module v8_9
|
2017-09-14 15:17:38 +05:30 |
|
Rushabh Mehta
|
bf8e331135
|
[fix] unset default customer group (#10689)
* [fix] unset default customer group
* added __init__.py file for patch v8.9 directory
|
2017-09-14 15:03:45 +05:30 |
|
Nabin Hait
|
a6d78ef842
|
Added Supplier Bill Date in Itemised Purchase Register (#10783)
|
2017-09-14 15:01:04 +05:30 |
|
Nabin Hait
|
beb2f3c415
|
Merge branch 'creamdory-sort_bom_items' into develop
|
2017-09-14 13:23:37 +05:30 |
|
Nabin Hait
|
77b225e021
|
Fetch BOM items in Production Order in the same order as BOM
|
2017-09-14 13:22:45 +05:30 |
|
Nabin Hait
|
3f583b6dd2
|
Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items
|
2017-09-14 12:59:31 +05:30 |
|
Vishal Dhayagude
|
d3e22ac09e
|
[UI Test] Modified Sales Order UI Test (#10770)
* [UI Test] Modified Sales Order UI Test
* [fix] Codacy fixed
|
2017-09-14 12:51:22 +05:30 |
|
Nabin Hait
|
f6b132f78e
|
Update test_quotation.js
|
2017-09-14 11:55:31 +05:30 |
|
Nabin Hait
|
c7c141a5a0
|
Update test_setup_wizard.py
|
2017-09-14 11:51:43 +05:30 |
|
rohitwaghchaure
|
f8458ed9e4
|
Merge pull request #10771 from nabinhait/pro_order_99
Update actual dates in Production Order from Timesheet
|
2017-09-14 10:53:48 +05:30 |
|
rohitwaghchaure
|
9a0db392de
|
[Fix] Only typed keywords displying in the field on selection of customer (#10778)
|
2017-09-14 10:51:21 +05:30 |
|
Nabin Hait
|
92309afea1
|
Update test_setup_wizard.py
|
2017-09-13 22:37:14 +05:30 |
|
Prateeksha Singh
|
242218d2b7
|
Progress fixes (#10710)
* [progress] sales target slide
* [fix] rerun patch for sales target slide
|
2017-09-13 18:41:01 +05:30 |
|
tundebabzy
|
c050c6945c
|
show error message if cannot get accounts details (#10768)
|
2017-09-13 15:27:30 +05:30 |
|
Vishal Dhayagude
|
52ac483368
|
[NEW] Travis Parallel Test (#10755)
* test
* test2
* test travis
|
2017-09-13 15:18:41 +05:30 |
|
Nabin Hait
|
c443c9f05d
|
Update actual dates in Production Order from Timesheet
|
2017-09-13 15:14:40 +05:30 |
|
Nabin Hait
|
78baebfe0d
|
Setup wizard test fix
|
2017-09-13 15:12:45 +05:30 |
|
Rushabh Mehta
|
f056974bc5
|
[domain] Healthcare (#10664)
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix: #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
|
2017-09-13 12:52:30 +05:30 |
|
Nabin Hait
|
ff667695ad
|
timeout in setup wizard test
|
2017-09-13 11:26:55 +05:30 |
|
Rushabh Mehta
|
f849915c13
|
[fix] label
|
2017-09-13 10:48:53 +05:30 |
|
Nabin Hait
|
231c324589
|
Merge branch 'master' into staging
|
2017-09-12 16:26:31 +05:30 |
|
Nabin Hait
|
f8f29677fd
|
Merge branch 'master' into develop
|
2017-09-12 16:16:57 +05:30 |
|
Nabin Hait
|
50312b54a0
|
Merge branch 'hotfix'
|
2017-09-12 16:16:55 +05:30 |
|
Nabin Hait
|
e47bd4f477
|
bumped to version 8.11.2
|
2017-09-12 16:46:55 +06:00 |
|
rohitwaghchaure
|
ab64e323cd
|
Merge pull request #10747 from mbauskar/pos
rename Is Online field to Use POS in Offline Mode in pos settings
|
2017-09-12 16:14:28 +05:30 |
|
rohitwaghchaure
|
67dfd26639
|
[fix] Production planning tool, unable to download material required report (#10704)
|
2017-09-12 15:54:27 +05:30 |
|
rohitwaghchaure
|
54099e592e
|
[fix] Serial No has already been received error while making purchase receipt entry for the returned serial no (#10736)
|
2017-09-12 15:51:52 +05:30 |
|
Manas Solanki
|
580f39a12c
|
check the instructor table before querying (#10754)
|
2017-09-12 15:49:36 +05:30 |
|
Nabin Hait
|
c9e96c15af
|
Rate and amount in a single row in tax breakup
|
2017-09-12 15:45:49 +05:30 |
|
Nabin Hait
|
de9eebe51c
|
Fixed multiple ui tests
|
2017-09-12 15:40:33 +05:30 |
|
Sagar Vora
|
d54d6bc572
|
[fix] use stock_qty in reports instead of qty to match with stock_uom (#10727)
|
2017-09-12 11:31:10 +05:30 |
|
rohitwaghchaure
|
38830e54d8
|
[fix] No module namd student_batch_name.student_batch_name error in the patch (#10745)
|
2017-09-12 11:25:02 +05:30 |
|
Rohit Waghchaure
|
1a77922e85
|
rename Is Online field to Use POS in Offline Mode in pos settings
|
2017-09-12 11:01:48 +05:30 |
|
Makarand Bauskar
|
d0823adf42
|
[minor] translate the action name in get_slide_settings (#10740)
|
2017-09-12 10:52:24 +05:30 |
|