Nabin Hait
|
edef9811f9
|
Merge branch 'master' into develop
|
2017-10-26 14:35:34 +05:30 |
|
Faris Ansari
|
6887cedaea
|
[fix] item qty trigger (#11349)
|
2017-10-26 14:34:15 +05:30 |
|
Saurabh
|
0d597cef8d
|
Merge branch 'master' into develop
|
2017-10-26 09:59:22 +05:30 |
|
rohitwaghchaure
|
c65f1d7745
|
Search item using name instead of item code (#11327)
|
2017-10-25 17:04:56 +05:30 |
|
Nabin Hait
|
4d22b6db30
|
Fixed Merge Conflict
|
2017-10-25 14:09:46 +05:30 |
|
Nabin Hait
|
cd3dbcb2ef
|
Fixed Merge Conflict
|
2017-10-25 14:07:25 +05:30 |
|
rohitwaghchaure
|
4a60554b91
|
Green indicator in the cart for non stock item (#11325)
|
2017-10-25 13:59:29 +05:30 |
|
tundebabzy
|
bafcd7418a
|
Add Bundle Description Field To Product Bundle (#11122)
* add description field that shows in list view
* description field should be simply `description`
|
2017-10-25 12:22:08 +05:30 |
|
Nabin Hait
|
1c1237537b
|
Subscription fixes (#11292)
* Subscription fixes
* Removed recurring fields, cleanup code
|
2017-10-25 12:10:44 +05:30 |
|
Rushabh Mehta
|
bc4e2cd9c1
|
[added] hospitality domain (#11020)
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
|
2017-10-17 12:30:34 +05:30 |
|
mbauskar
|
cd4202c2f7
|
Merge branch 'master' into develop
|
2017-10-15 19:10:56 +05:30 |
|
rohitwaghchaure
|
8bf7230fcc
|
[Fix] New invoice showing old paid amount if POS Profile is not created (#11160)
|
2017-10-15 19:09:14 +05:30 |
|
Saurabh
|
5ffed60916
|
Merge branch 'master' into develop
|
2017-10-11 14:39:11 +05:30 |
|
rohitwaghchaure
|
76a9cefc9c
|
Merge pull request #11151 from rohitwaghchaure/minor_fix_title
[minor] Title not showing in payment modal
|
2017-10-11 12:05:29 +05:30 |
|
Rohit Waghchaure
|
4f7873b9df
|
[minor] Title not showing in payment modal
|
2017-10-11 12:03:49 +05:30 |
|
Saurabh
|
ad9afe68f3
|
Merge pull request #11119 from rohitwaghchaure/default_company_pos
[enhance] Provision to select company in the POS screen if company is not defined in the global defaults
|
2017-10-11 12:00:56 +05:30 |
|
Rohit Waghchaure
|
3f309e1c20
|
Multiple items showing for single barcode
|
2017-10-11 02:14:56 +05:30 |
|
Rohit Waghchaure
|
9bb81ee1cb
|
[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment
|
2017-10-11 01:54:36 +05:30 |
|
mbauskar
|
966b3c156a
|
[conflicts] resolved merge conflicts
|
2017-10-09 15:20:30 +05:30 |
|
Rohit Waghchaure
|
d270748eea
|
[Fix] Provision to select company in the POS screen if company is not defined in the global defaults
|
2017-10-09 12:54:26 +05:30 |
|
Rohit Waghchaure
|
62ce218fc2
|
Show total instead of net total
|
2017-10-06 11:16:46 +05:30 |
|
Nabin Hait
|
5a834209d0
|
Cleanup of PO schedule date pull requests
|
2017-10-05 19:51:10 +05:30 |
|
rohitwaghchaure
|
e0dfd1608e
|
[Fix] Auto add item in the cart if sinfle items found in the serach (#11072)
|
2017-10-05 18:30:51 +05:30 |
|
Nabin Hait
|
395cf4689b
|
Cleanup of schedule date functionality in Material Request
|
2017-10-05 18:27:37 +05:30 |
|
rohitwaghchaure
|
607b5d4985
|
[Fix] Negative qty issue in POS (#11070)
* [Fix] Negative qty issue in POS
* Update point_of_sale.js
|
2017-10-05 15:57:58 +05:30 |
|
Rohit Waghchaure
|
f7a856b913
|
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
|
2017-10-05 13:31:29 +05:30 |
|
Nabin Hait
|
b779644493
|
Merge branch 'master' into develop
|
2017-10-04 14:52:32 +05:30 |
|
rohitwaghchaure
|
5049edb494
|
[Fix] Discount and serial no search issue (#11040)
|
2017-10-04 14:33:12 +05:30 |
|
Saurabh
|
ee4a2dd26f
|
[fix] resolved merge conflicts
|
2017-10-03 18:02:09 +05:30 |
|
Nabin Hait
|
7b6eaee05b
|
Fixes to handle async events (#11018)
* Fixes to handle async events
* transaction.js code cleanup
* Don't map taxes and charges while making PO from SO for drop-ship
* Removed print
|
2017-10-03 01:09:46 +05:30 |
|
Rohit Waghchaure
|
c4e52e5f95
|
[Fix] Old invoice payment amount showing in the payment modal while making payment
|
2017-10-02 21:20:54 +05:30 |
|
Nabin Hait
|
7eba1a35d3
|
Controller init args fix (#11015)
* Controller init args fix
* cleanup useless code
|
2017-10-02 15:59:27 +05:30 |
|
Nabin Hait
|
8919669ac2
|
Merge branch 'master' into develop
|
2017-10-02 12:28:27 +05:30 |
|
rohitwaghchaure
|
88491715e0
|
[Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005)
|
2017-10-02 12:13:36 +05:30 |
|
Sunny
|
869b878286
|
set schedule_Date when creating po
|
2017-10-02 11:36:24 +08:00 |
|
Nabin Hait
|
c314485d55
|
Fixes based on test case
|
2017-09-28 18:55:49 +05:30 |
|
rohitwaghchaure
|
94799a8b93
|
[fix] ‘NoneType’ object is not iterable onload of POS (#10941)
|
2017-09-28 10:56:27 +05:30 |
|
Makarand Bauskar
|
70eaf2da95
|
[minor] removed the default precision for the margin_rate_or_amount field (#10923)
|
2017-09-27 12:49:16 +05:30 |
|
Rohit Waghchaure
|
87e994e0a2
|
[fixed] Disocunt amount not working for POS
|
2017-09-27 12:16:58 +05:30 |
|
rohitwaghchaure
|
d4c2d77bba
|
[fix] POS not working if user clicks on back button from form view (#10912)
|
2017-09-26 13:27:06 +05:30 |
|
Nabin Hait
|
b2dca79d89
|
Updated modified timestamp in sales/purchase transaction doctypes
|
2017-09-20 09:56:06 +05:30 |
|
Nabin Hait
|
2e4de83df6
|
Rounding Adjustment via a separate field, instead of last tax row (#10659)
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
|
2017-09-19 14:53:16 +05:30 |
|
rohitwaghchaure
|
850eaa73b0
|
Move subscription module to accounts (#10772)
|
2017-09-18 17:23:00 +05:30 |
|
mbauskar
|
ea832b8157
|
resolved merge conflicts
|
2017-09-14 15:32:10 +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 |
|
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 |
|
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
|
de9eebe51c
|
Fixed multiple ui tests
|
2017-09-12 15:40:33 +05:30 |
|
Rohit Waghchaure
|
4e006b0bc5
|
rename Is Online field to Use POS in Offline Mode in pos settings
|
2017-09-11 14:51:50 +05:30 |
|