Nabin Hait
0551f7bb00
Cleanup and fixes of payment terms feature
2017-11-21 19:58:16 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Nabin Hait
877e1bb377
Post GL Entry based on rounded total in Sales/Purchase Invoice ( #11542 )
2017-11-17 12:27:43 +05:30
Britlog
b6096057c6
Hide cart icon and badge count after logging out ( #11530 )
2017-11-17 11:41:35 +05:30
Shreya Shah
be690ef817
Rate with margin in customer and company currency ( #11437 )
...
* field for company margin
* added base_rate_with_margin
* calculate company margin
* test for item price
* test for delivery note
* test for sales order
* test for quotation
* test for sales invoice
2017-11-14 17:22:41 +05:30
Rushabh Mehta
d5c6416d91
[new feature] Product Configurator (via Item Quick Entry) ( #11535 )
...
* [Feature] Item Variant Creation from Quick Entry
* [minor] formatted js
* [minor] set 3 attribute per page instead of 5 in template
* [fix] fixed codecy issue
* [fix] label translation
* [minor] changed trigger event of item template
* [fix] moved item ui tests under stock
* [UI test] added test for item attribute
* [UI test] added test for creation of item variant from quick entry
* [fix] item variant ui test fixes
* [wip]
* [cleanup] item quick entry
* [remove] tests, fixtures were missing
* [refactor] use set_only_once in item
2017-11-14 15:27:28 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
4d99ebaeb5
Merge branch 'master' into develop
2017-11-14 13:58:37 +05:30
Rushabh Mehta
98aa581864
[fix] default tax only on insert ( #11544 )
...
* [fix] default tax only on insert
* [fix] default tax only on insert
* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
Saurabh
0faa61009f
Merge branch 'master' into develop
2017-11-03 16:56:23 +05:30
rohitwaghchaure
7677ff00a2
[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings ( #11409 )
2017-11-02 18:12:14 +05:30
Jay Parikh
96f167573b
POS - Add % to the Discount Field #9749
2017-10-31 01:07:09 -07:00
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +05:30
Makarand Bauskar
e6712c129c
[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings ( #11182 )
...
* [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings
* [minor] renamed the allow_stale_rate method to stale_rate_allowed
2017-10-25 12:17:40 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
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
tunde
37c2b6116c
Merge branch 'develop' into payment-terms
2017-10-09 15:42:47 +01:00
Rohit Waghchaure
beeba8b37a
[Fix] Discount field not displaying in offline POS
2017-10-06 09:50:43 +05:30
Makarand Bauskar
f23788bb7d
[hotfix] Show Make button only for Email communication ( #10876 )
2017-10-05 14:19:45 +05:30
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
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
Nabin Hait
1f10d693e9
Don't set currency as company currency if default currency is different ( #11011 )
2017-10-02 13:20:51 +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
Makarand Bauskar
b1bf502119
[hotfix] validate company name on 'The Brand' Slide instead of 'Your Organization' ( #11007 )
2017-10-02 11:38:03 +05:30
tunde
c49e748c85
Merge branch 'develop' into payment-terms
2017-09-29 13:30:22 +01:00
tundebabzy
5510d0751d
correctly set frm company currency ( #10944 )
2017-09-29 15:21:59 +05:30
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01:00
Nabin Hait
76e1ca35ad
Merge branch 'master' into develop
2017-09-27 13:05:21 +05:30
rohitwaghchaure
45d45f4247
[hotfix] Wrong calculation of total in taxes and totals ( #10924 )
2017-09-27 11:49:13 +05:30
tunde
567119170e
Merge branch 'develop' into payment-terms
2017-09-26 17:28:07 +01:00
tunde
79f9a4aef1
bug fix: sales invoice always dirty even after reloading
2017-09-26 10:39:30 +01:00
Nabin Hait
39c2f75e6d
Merge branch 'master' into staging
2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f
Merge branch 'master' into develop
2017-09-25 16:03:31 +05:30
Nabin Hait
3d5d858933
set total in tax table if category not valuation and consider deductions ( #10870 )
2017-09-21 16:15:30 +05:30
tunde
82de375ba0
Merge branch 'develop' into payment-terms
2017-09-21 11:21:05 +01:00
tundebabzy
ab5b03011d
Enhance Currency Exchange Management ( #10482 )
...
* add new settings in Accouts Settings
* patch for new settings
* refactor `get_exchange_rate`
* adds validation
* tests validation
* disables conversion rate field if stale rates not allowed
* more test cases
more test case...
test `get_exchange_rate` behaviour with stale not allowed in sett..
fix currency exchange test case
do housekeeping after running accounts settings test
* clean up
* documentation
* make use of correct api url
* Fix tests failing due to wrong exchange rate from fixer.io
* remove mandatory constraint from `allow_stale`
* added info to documentation
2017-09-21 14:50:39 +05:30
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
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
Manas Solanki
a22c94c246
refactored assessment result tool ( #10633 )
...
* save the assessment instead of submit
* Added comments in the artool
* remove the cur_frm and message for submitted result
* link field for the assessment result
2017-09-18 16:59:54 +05:30
tunde
9448f4b13c
codacy corrections
2017-09-18 12:08:34 +01:00
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
tunde
df3a175974
fix bugs: add payment_schedule if payment_terms_schedule specified
2017-09-11 11:02:57 +01:00
tunde
199daf7ac5
Merge branch 'develop' into payment-terms
2017-09-08 09:59:13 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
tunde
dba6f841e6
refactor: DRY for due date disabled
2017-09-07 06:51:07 +01:00
