+
+If User has Role define in the Account Setting assigned, then he/she will be able to set an Account as Frozen.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
index 8b7768a2d18..af8572c2332 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -13,4 +13,5 @@ what-is-the-differences-of-total-and-valuation-in-tax-and-charges
withdrawing-salary-from-owners-equity-account
adjust-withhold-amount-payment-entry
common-receivable-account.md
-types-in-tax-template
\ No newline at end of file
+types-in-tax-template
+freeze-account
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
index 6a0da3a8945..41cb243dc66 100644
--- a/erpnext/docs/user/manual/en/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -6,6 +6,7 @@ purchase-invoice
payments
journal-entry
payment-entry
+subscription
multi-currency-accounting
advance-payment-entry
payment-request
diff --git a/erpnext/docs/user/manual/en/accounts/subscription.md b/erpnext/docs/user/manual/en/accounts/subscription.md
new file mode 100644
index 00000000000..9afab58e257
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/subscription.md
@@ -0,0 +1,24 @@
+# Subscription
+
+If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
+
+
+
+#### Scenario
+
+Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
+
+To set the subscription for the sales invoice
+Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
+
+
+
+**From Date and To Date**: This defines contract period with the customer.
+
+**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
+
+**Notify By Email**: If you want to notify the user about auto recurring invoice.
+
+**Print Format**: Select a print format to define document view which should be emailed to customer.
+
+**Disabled**: It will stop to make auto recurring documents against the subscription
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
index 829015db6d6..9a480bdca5a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
@@ -11,7 +11,7 @@ You can insert Custom Link Field by following steps below.
####Step 2: Select Form
-In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once field are updated in table, open field before which you wish to insert Custom Field. Then click on "Insert Above" to insert new Custom Field.
+In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once fields are updated in the accompanying table below, open a field above the one you wish to insert your Custom Field. Then click on "Insert Above" to insert the new Custom Field.
@@ -26,4 +26,4 @@ To set field as Link, enter values as below.
-
\ No newline at end of file
+
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
new file mode 100644
index 00000000000..04b20ac4b9f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
@@ -0,0 +1,19 @@
+# Fetching Data from one Document to Another
+
+**Question:** We track Customer's PO No and PO Date field in the Sales Order. To have these values fetched into Sales Invoice as well, we have inserted Custom Field in the Sales Invoice. However, when we create Sales Invoice from the Sales Order, Customer's PO details are not being fetched.
+
+**Answer:** When data is fetched from one transaction to the another transaction, then the mapping of data is done based on the field names. If two transactions have fields with the exact same name, then it's values are mapped.
+
+For example, if you want Customer's PO No. and PO Date to be fetched from Sales Order to Sales Invoice, then you should ensure that Custom Fields added in the Sales Invoice has an exact same field name as in the Sales Order.
+
+Sales Order (standard fields)
+
+
+
+Sales Invoice (custom fields)
+
+
+
+Since names for the Customer's PO related fields are same in the Sales Order and Sales Invoice, when creating Sales Invoice from the Sales Order, values in these fields are auto-fetched.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
index 1740ef0e943..56e7040b47a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -15,4 +15,5 @@ set-language
set-precision
user-restriction
maximum-numbers-of-fields-in-a-form
-child-table
\ No newline at end of file
+child-table
+fetching-data-from-a-document
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/healthcare/._.DS_Store b/erpnext/docs/user/manual/en/healthcare/._.DS_Store
new file mode 100755
index 00000000000..ed70b669b54
Binary files /dev/null and b/erpnext/docs/user/manual/en/healthcare/._.DS_Store differ
diff --git a/erpnext/docs/user/manual/en/healthcare/__init__.py b/erpnext/docs/user/manual/en/healthcare/__init__.py
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/erpnext/docs/user/manual/en/healthcare/appointment.md b/erpnext/docs/user/manual/en/healthcare/appointment.md
new file mode 100755
index 00000000000..a5cea36b20e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/appointment.md
@@ -0,0 +1,38 @@
+# Patient Appointment
+ERPNext Healthcare allows you to book Patient appointments for any date and if configured, send them alerts via Email or SMS.
+
+You can create a Patient Appointment from
+> Healthcare > Patient Appointment > New Patient Appointment
+
+You can book appointments for a registered Patient by searching and selecting the Patient field. You can search the Patient by Patient ID, Name, Email or Mobile number. You can also register a new Patient from the Appointment screen by selecting "Create a new patient" in the Patient field.
+
+
+
+If you have a front desk executive to manage your appointments, you can configure a user role to have access to Patient Appointment so that she can do the bookings by selecting the Physician whom the Patient wish to consult and the date for booking. "Check Availability" button will pop up all the available time slots with status indicators for the date. She can select a time slot and "Book" the Appointment for the Patient.
+
+
+
+After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document.
+
+
+
+You can configure ERPNext to send an SMS alert to the Patient about the booking confirmation or a reminder on the day of Appointment by doing necessary configurations in -
+
+> Healthcare > Healthcare Settings > Out Patient SMS Alerts
+
+The screen also allows the executive to select a Referring Physician so that you can track the source the appointment.
+
+### Actions
+ * Billing: If you collect the consultation fee while booking the Appointment itself you can do so by using the "Create > Invoice" button. This will take you to the ERPNext Accounts Sales Invoice screen.
+
+ * Vital Signs: "Create > Vital Signs" button will take you to the new Vital Signs screen to record the vitals of the Patient.
+
+ * Consultation: From the Appointment screen you can directly create a Consultation to record the details of patient encounter.
+
+ * View Patient Medical Record.
+
+> Note: User should have privileges (User Role) to view the buttons
+
+A Patient can also book an appointment with a Physician by checking the Physician's availability directly through the **ERPNext Portal**.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/consultation.md b/erpnext/docs/user/manual/en/healthcare/consultation.md
new file mode 100755
index 00000000000..a98713bcb56
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/consultation.md
@@ -0,0 +1,28 @@
+# Consultation
+ERPNext Healthcare allows you to record Patient encounters through the Consultation document. You can create a Consultation based on a previously booked Appointment or directly by creating a new Consultation
+>Healthcare > Consultation > Consultation
+
+If you are creating the Consultation document from an Appointment, Patient and other related data will automatically be populated else you can search the Patient by name, email phone number etc. The Patient Details section will list the latest Vital Signs record of the patient and other information captured in the Patient screen.
+
+
+
+### Assessment
+
+Encounter Impression section allows you to select (or create new) Complaints and your assessment based on the presented complaints. You can opt to include the captured data in Consultation print by selecting the "In Print" flag
+
+
+
+### Prescriptions
+
+You can prescribe medicines in the Drug Prescription section by selecting the drug codes (Stock Item) and appropriate dosages. If you are not managing Stock and Items are not configured, you can simply enter the Medicine name and strength in the Strength field which will printed.
+
+Prescribing a laboratory investigation is similar and if you have Lab Tests configured, you can select from the list. Or key in the Lab Test name to be printed as part of the Prescription.
+
+
+
+### Medical Coding
+You can also attach one or more Medical Codes to designate the Diagnosis in the Medical Coding Section. You will have to select the Medical Code Standard you wish to encode the diagnosis and then select the Code by searching the Code itself or the Code Description.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/index.md b/erpnext/docs/user/manual/en/healthcare/index.md
new file mode 100755
index 00000000000..85e3b6fec89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/index.md
@@ -0,0 +1,13 @@
+# Healthcare
+
+ERPNext Healthcare helps you manage your Clinic or Practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care.
+
+
+
+Patients can view various documents relevant to them and book Appointments via the **ERPNext Portal**. The healthcare module is integrated with **Accounts** and **Human Resources** modules, helping you in **Billing**, **Payroll Management** etc. and benefit from other rich features of ERPNext. You can configure the **Selling** and **Stock** modules manage your Pharmacy.
+
+ERPNext Healthcare also includes features for effectively managing the functions of an associated **Laboratory** by helping you record **Sample Collection**, emailing and printing **Lab Test** results etc. ERPNext Healthcare allows you to upload **Medical Code Standards** like **ICD10** and attach to Consultations.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/healthcare/index.txt b/erpnext/docs/user/manual/en/healthcare/index.txt
new file mode 100755
index 00000000000..471d91d5c91
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/index.txt
@@ -0,0 +1,12 @@
+patient
+appointment
+vital_signs
+consultation
+medical_record
+sample_collection
+lab_test
+invoicing
+physician
+physician_schedule
+medical_codes
+setup
diff --git a/erpnext/docs/user/manual/en/healthcare/invoicing.md b/erpnext/docs/user/manual/en/healthcare/invoicing.md
new file mode 100755
index 00000000000..bc9dead49f4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/invoicing.md
@@ -0,0 +1,8 @@
+# Invoicing
+Billing is an integral part of any undertaking and ERPNext Healthcare achieves this by making use of the ERPNext Accounts module.
+
+> Note: All transactions of a Patient is booked against the Customer which it is linked to.
+
+All ERPNext Healthcare documents which require Invoicing will have buttons which would take you to the Sales Invoice with the Items configured for the service. You can then proceed by following the ERPNExt Accounts module workflows. Please note that your User account should have appropriate privileges to access the Accounts documents.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/lab_test.md b/erpnext/docs/user/manual/en/healthcare/lab_test.md
new file mode 100755
index 00000000000..bdf0cfcee34
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/lab_test.md
@@ -0,0 +1,22 @@
+# Lab Test
+
+ERPNext Healthcare allows you to manage a clinical laboratory efficiently by allowing you to enter Lab Tests and print or email test results, manage samples collected, create Invoice etc. ERPNext Healthcare comes pre-packed with some sample tests, you can reconfigure Lab Test Templates for each Test and its result format or crate new ones. You can do this in
+>Healthcare > Setup > Lab Text Templates
+
+Once you have all necessary Lab Test Templates configured, you can start creating Lab Tests by selecting a Test Template every time you create a Test. To create a new Lab Test
+>Healthcare > Laboratory > Lab Test > New Lab Test
+
+
+
+You can record the test results in the Lab Test document as the results gets ready.
+
+
+
+> Note: To create Sample Collection documents for every Lab Test, check "Manage Sample Collection" flag in Healthcare Settings and select Sample in the Lab Test Template
+
+In many Laboratories, approval of Lab Tests is a must before printing and submitting the document. ERPNext Healthcare allows you to create Users with Role "Lab Test Approver" for this. You will also have to enable this in
+>Healthcare Settings > Laboratory Settings > Require Lab Test Approval
+
+This will ensure that emailing or printing of Lab Tests can only be done after Approval of the Lab Test by the Lab Test Approver.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/medical_codes.md b/erpnext/docs/user/manual/en/healthcare/medical_codes.md
new file mode 100755
index 00000000000..c0997b1ebe1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/medical_codes.md
@@ -0,0 +1,9 @@
+# Medical Code Standards
+Medical Coding are in many countries required for regulatory compliance and many of the Medical Insurance companies do that pricing based on Medical Code standards. ERPNext Healthcare offers support, however limited, to encode diagnosis and assessments recorded as part of Consultation. This can be done if you configure the Medical Code Standard and related Medical Codes - this is easily done by data import as the code data tends to be quite large. You can create as many Medical Code Standards you wish
+> Healthcare > Masters > Medical Code Standard
+
+Medical Code Standard document is used to name the Code Standard and act as a container for all the medical codes which are standardized under it. Medical Codes and descriptions can then be imported to the Medical Code document, after ensuring that you set the Medical Code Standard field to the appropriate Standard name.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/medical_record.md b/erpnext/docs/user/manual/en/healthcare/medical_record.md
new file mode 100755
index 00000000000..9d2697d6004
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/medical_record.md
@@ -0,0 +1,13 @@
+# Patient Medical Record
+The maintenance of complete and accurate medical records is a requirement of healthcare providers and is critical in rendering effective, high quality care. ERPNext Healthcare allows you to draw up the treatment history of a Patient anytime by merely selecting the Patient. "Medical Record" button is available in various screens so that you can easily switch to the Medical Record page to view the patient history.
+
+Medical Record automatically keeps track of all Consultations, recorded Vital Signs, Lab Investigations etc. Complaints, Diagnosis etc. captured as part of consultation are easily viewable but to look at the details of other documents, links are provided.
+
+
+
+##### Adding notes manually to Medical Record
+In the Patient screen Create > Medical Record will allow you to record notes to the Medical Record manually. You can also attach files when doing this, and the Medical Record will display links to the attached file along side the notes. Create > Medical Record button is also made available in the Consultation screen
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/patient.md b/erpnext/docs/user/manual/en/healthcare/patient.md
new file mode 100755
index 00000000000..ed6810e88f2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/patient.md
@@ -0,0 +1,43 @@
+# Patient
+
+In ERPNext Healthcare, the Patient document corresponds any individual who is the recipient of healthcare services you provide. For every ERPNext Healthcare document, it is important to have a Patient associated with it. You can create a new Patient from
+> Healthcare > Masters > Patient > New Patient
+
+
+
+The Patient document holds most details that are required to identify and qualify a patient. You can enter as much information available while creating the Patient. All information in the patient document is presented on the Consultation screen for easy lookup and you can always update this information. Other data like observations, vital signs etc. are not part of the Patient document. These could be recorded during patient encounters and will be available as part of the Patient Medical Record.
+
+
+
+### Patient as a Customer
+
+ERPNext Accounts makes use of "Customer" document for booking all transactions. So, you may want to associate every Patient to be associated with a Customer in ERPNext. By default, ERPNext Healthcare creates a Customer alongside a Patient and links to it - every transaction against a Patient is booked against the associated Customer. If, for some reason you do not intend to use the ERPNext Accounts module you can turn this behavior off by unchecking this flag
+>Healthcare > Setup > Healthcare Settings > Manage Customer
+
+In many cases, you may want to associate multiple Patients to a single Customer against whom you want to book the transactions. For instance, a Veterinarian would require the care services provided to different pets of an individual invoiced against a single Customer.
+
+
+
+The Patient Relation section of the Patient allows you to select how a Patient is related to another Patient in the system. This is optional, but will be quite handy if you want to use ERPNext in a fertility clinic, for example.
+
+### Registration Fee
+Many clinical facilities collect a registration fee during Registration. You can turn this feature on and set the registration fee amount by checking this flag
+> Healthcare > Setup > Healthcare Settings > Collect Fee for Patient Registration
+
+If you have this enabled, all new Patients you create will by default be in Disabled mode and will be enabled only after Invoicing the Registration Fee. To create Invoice and record the payment receipt, you can use the "Invoice Patient Registration" button in the Patient document.
+
+> Note: For all ERPNext Healthcare documents, "Disabled" Patients are filtered out.
+
+### Grant access to Patient Portal
+ERPNext Healthcare allows you to create a portal user associated with a Patient by simply entering the user email id. A welcome email will be sent to the Patient email address to "Complete" registration.
+
+### Actions
+From the Patient document, the following links are enabled
+
+* Vital Signs: "Create > Vital Signs" button will take you to the new Vital Signs screen to record the vitals of the Patient.
+
+* View Patient Medical Record.
+
+* Consultation: You can directly create a new Consultation to record the details of patient encounter.
+
+> Note: User should have privileges (User Role) to view the buttons
diff --git a/erpnext/docs/user/manual/en/healthcare/physician.md b/erpnext/docs/user/manual/en/healthcare/physician.md
new file mode 100755
index 00000000000..7b7995bcd97
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/physician.md
@@ -0,0 +1,18 @@
+# Physician
+ERPNext Healthcare allows you to create multiple physicians and optionally link to a User with appropriate Roles. You can create a Physician here -
+>Healthcare > Masters > Physician
+
+Linking a User to the Physician makes the system populate the Physician field in all documents to the Physician associated with the logged in User.
+>Note: You should also relate the User to an Employee to utilize the various features of Human Resources module.
+
+
+
+### Scheduling and Availability
+Each Physician can have a "Physician Schedule" and a "Time per Appointment" on the basis of which, the scheduler will book Appointments. Also, you can select appropriate Income Accounts for a Physician to book all Consultation charges into separate accounts.
+
+
+
+### Referring Physicians
+You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Physician document itself by leaving out the User link.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/physician_schedule.md b/erpnext/docs/user/manual/en/healthcare/physician_schedule.md
new file mode 100755
index 00000000000..0da7896014f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/physician_schedule.md
@@ -0,0 +1,13 @@
+# Physician Schedule
+Physician Schedule will help you to configure the availability and work hours of Physicians. You can then select an applicable schedule for each Physician.
+
+You can create Physician Schedule from -
+> Healthcare > Masters > Physician Schedule
+
+
+
+After naming the schedule you can use the "Add Time Slots" button to create time slots for each day of the week. These time slots will then be displayed while checking the availability of a Physician when booking an Appointment.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/sample_collection.md b/erpnext/docs/user/manual/en/healthcare/sample_collection.md
new file mode 100755
index 00000000000..3473dafd105
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/sample_collection.md
@@ -0,0 +1,13 @@
+# Sample Collection
+It's critical for a Laboratory to manage collected samples and you may want to ID the sample, print stickers etc. ERPNext Healthcare "Sample Collection" document helps you to easily manage the sample collection process by creating a sample collection document for every Lab Test automatically. You will have to turn on the flag in Healthcare Settings to enable this feature.
+> Healthcare Settings > Laboratory Settings > Manage Sample Collection
+
+
+
+> Note: You will have to select a Sample in the Lab Test Template for the system to automatically create a Sample Collection document
+
+You will have to enter the sample collected date and time to Submit the document signaling that the sample is collected.
+
+Printing on sample identification tags is also possible. By default a sample sticker print template is made available, but you can always create a custom Print Format by using "Customize" button in the print preview.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/setup/__init__.py b/erpnext/docs/user/manual/en/healthcare/setup/__init__.py
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/erpnext/docs/user/manual/en/healthcare/setup/index.md b/erpnext/docs/user/manual/en/healthcare/setup/index.md
new file mode 100755
index 00000000000..721f521eda8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/setup/index.md
@@ -0,0 +1,7 @@
+# Setup
+
+Once you setup ERPNext (Company, Chart Of Accounts etc.), you can start with setting up your domain. To setup Healthcare module, User should have Healthcare Admin Role enabled. You can configure each of the departments as detailed in the Topics below.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/healthcare/setup/index.txt b/erpnext/docs/user/manual/en/healthcare/setup/index.txt
new file mode 100755
index 00000000000..f2423811eca
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/setup/index.txt
@@ -0,0 +1,3 @@
+Setting up Practice Management
+Setting up Laboratory
+Setting up Pharmacy (Stock)
diff --git a/erpnext/docs/user/manual/en/healthcare/setup/setup_laboratory.md b/erpnext/docs/user/manual/en/healthcare/setup/setup_laboratory.md
new file mode 100755
index 00000000000..93e53b8a8e5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/setup/setup_laboratory.md
@@ -0,0 +1,67 @@
+# Laboratory
+
+If you wish to use features of Laboratory, you can create Users with "Laboratory User". Lab Tests, Sample Collection etc. are only visible to users with this Role enabled.
+
+### Laboratory Settings
+> Healthcare > Setup > Healthcare Settings > Laboratory Settings
+
+* Manage Sample Collection - If this flag is enabled, every time you create a Lab Test, a Sample Collection document will be created.
+
+* Require Lab Test Approval - Turning this on will restrict printing and emailing of Lab Tests only if the documents are in Approved status. You can use this flag to ensure that every Test result leaves your facility after verification.
+
+* Enable the third option if you want the name and designation of the Employee associated with the User who submits the document to be printed in the Lab Test Report.
+
+##### SMS Alerts
+You can configure ERPNext Healthcare to alert Patients via SMS when the Lab Test result gets ready (Submit) and when you Email the result. You an configure the templates for the SMS as registered with your provider here.
+> Healthcare > Setup > Healthcare Settings > Laboratory SMS Alerts
+
+
+### Lab Test Templates
+Whenever you create a new Lab Test, the Lab Test document is loaded based on the template configured for that particular test. This means, you will have to have separate templates configured for each Lab Test.
+
+Here's how you can configure various types of templates.
+> Healthcare > Setup > Lab Test Template > New Lab Test Template
+
+After providing the Name for the Test you will have to select a Code and Item group for creating the mapped Item. ERPNext Healthcare maps every Lab Test (every other billable healthcare service) to an Item with "Maintain Stock" set to false. This way, the Accounts Module will invoice the Item and you can see the Sales related reports of Selling Module. You can also set selling rate of the Lab Test here - this will update the Selling Price List.
+
+> The Standard Selling Rate field behaves similar to the Item Standard Selling Rate, updating this will not update the Selling Price List
+
+The Is Billable flag in Lab Test Template creates the Item, but as Disabled. Likewise, unchecking this flag will Enable the Item.
+
+###### Result Format
+Following are the result formats available in ERPNext Healthcare
+
+* Single - select this format for results which require only a single input, result UOM and normal value
+* Compound - allows you to configure results which require multiple input fields with corresponding event names, result UOMs and normal values
+* Descriptive - this format is helpful for results which have multiple result components and corresponding result entry fields.
+* Grouped - You can group test templates which are already configured and combine as a single test. For such templates select "Grouped".
+* No Result - Select this if you don not need to enter or manage test result. Also, no Lab Test document will be created. e.g., Sub Tests for Grouped results.
+
+###### Normal values
+For Single and Compound result formats, you can set the normal values.
+
+###### Sample
+You will have to select the Sample required for the test. You can also mention the quantity of sample that needs to be collected. These details will be used when creating the Sample Collection document for the Lab Test.
+
+### Medical Department
+To organize your clinic into departments, you can create multiple Medical Departments. You can select appropriate departments in Lab Test Template and will be included in the Lab Test result print.
+> Healthcare > Setup > Medical Department > New Medical Department
+
+### Lab Test Sample
+You can create various masters for Samples that are to be collected for a Lab Test.
+> Healthcare > Setup > Lab Test Sample > New Lab Test Sample
+
+
+### Lab Test UOM
+You can create various masters for Unit of Measures to be used in Lab Test document.
+> Healthcare > Setup > Lab Test UOM > New Lab Test UOM
+
+### Antibiotic
+You can create masters for a list of Antibiotics.
+> Healthcare > Setup > Antibiotic > New Antibiotic
+
+### Sensitivity
+You can create masters for a list of Sensitivity to various Antibiotics.
+> Healthcare > Setup > Sensitivity > New Sensitivity
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/setup/setup_pharmacy.md b/erpnext/docs/user/manual/en/healthcare/setup/setup_pharmacy.md
new file mode 100755
index 00000000000..7f9c7199370
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/setup/setup_pharmacy.md
@@ -0,0 +1,4 @@
+# Pharmacy
+ERPNext Healthcare do not have a Pharmacy module - but you can configure the Stock module to manage your stock and Accounts and Buying modules for Billing and Purchases. The stock module allows you to configure Items with serial numbers and Batches. Expiry dates can be set if you turn on the "Has Batch No" check. You can also configure the auto reorder levels if required.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/setup/setup_practice.md b/erpnext/docs/user/manual/en/healthcare/setup/setup_practice.md
new file mode 100755
index 00000000000..81604826a4f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/setup/setup_practice.md
@@ -0,0 +1,38 @@
+# Clinic / Practice
+Configuring ERPNext Healthcare for your practice is simple.
+> Healthcare > Setup > Healthcare Settings > Out Patient Settings
+
+By default Patient document uses the patient name as the name, but you can opt to use a naming series if required.
+
+The "Manage Customer" option will enable the system to create and link a Customer whenever a new Patient is created. This Customer is used while booking all transactions.
+
+Here, you can also select the default Medical Code Standard to use.
+
+###### Collect Fee for Patient Registration
+If you enable this, all new Patients you create will by default be in Disabled mode and will be enabled only after Invoicing the Registration Fee. To create Invoice and record the payment receipt, you can use the "Invoice Patient Registration" button in the Patient document. Also note that all ERPNext Healthcare documents, "Disabled" Patients are filtered out. You can set the registration fee to be collected here.
+
+###### Consultation Fee validity
+Many healthcare facilities do not charge for follow up consultations within a time period after the first visit. You can configure the number of free visits allowed as well as the time period for free consultations here.
+
+### Medical Department
+To organize your clinic into departments, you can create multiple Medical Departments.
+> Healthcare > Setup > Medical Department > New Medical Department
+
+### Appointment Type
+You can create masters for various type of Appointments. This is optional and not considered while appointment scheduling.
+> Healthcare > Setup > Appointment Type > New Appointment Type
+
+### Prescription Dosage & Duration
+You can configure different dosages to be used while prescribing medication to patients. You can name the Prescription dosage in anyway you want (for example, BID or I-0-I), and then set the strength of the drug and the times at which it should be administered.
+> Healthcare > Setup > Prescription Dosage > New Prescription Dosage
+
+> Healthcare > Setup > Prescription Duration > New Prescription Duration
+
+### Complaint and Diagnosis
+To ease the data entry while recording the encounter impression, ERPNext Healthcare allows you to save each of the Complaint / Diagnosis data you enter, from the Consultation screen itself. This way, the database keeps building a list of all complaints and diagnosis you entered. Later on, every time you start keying in, you will be able to select the previously entered word / sentence from the search field. You can also configure the masters manually.
+
+> Healthcare > Setup > Complaints > New Complaint
+
+> Healthcare > Setup > Diagnosis > New Diagnosis
+
+{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/vital_signs.md b/erpnext/docs/user/manual/en/healthcare/vital_signs.md
new file mode 100755
index 00000000000..21b25d96d18
--- /dev/null
+++ b/erpnext/docs/user/manual/en/healthcare/vital_signs.md
@@ -0,0 +1,13 @@
+# Vital Signs
+ERPNext Healthcare allows you to record Vital Signs of Patients and manage this information as part of the Patient's health record. You can create a new document and record Vital Signs of a Patient from most of the Healthcare documents or directly by
+> Healthcare > Consultation > Vital Signs > New Vital Signs
+
+
+
+You can select the Patient for whom you are recording the vitals and start by entering each of the fields. Normal values or ranges are provided for ease of assessment. Also present is an auto BMI calculator.
+
+
+
+All recorded Vital Signs are made available in the Patient Medical Record and the last recorded Vital Sign is displayed on the left hand side pane for easy review.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/training.md b/erpnext/docs/user/manual/en/human-resources/training.md
index 39b9790246d..2aa06791f05 100644
--- a/erpnext/docs/user/manual/en/human-resources/training.md
+++ b/erpnext/docs/user/manual/en/human-resources/training.md
@@ -9,22 +9,23 @@ Schedule seminars, workshops, conferences etc using Training Event. You can also
### Inviting Employees for Event
You can invite your employees to attend the event. You can do so by selecting the employees to be invited in the employee table.
+
By default the status of the employee will be 'Open'.
-The system shall notify the employee with status 'Open' by sending a email to the office email address of the employee as mentioned in the employee master if you have selected 'Send Email' checkbox.
-The status is changed to 'Invited' when an invitation email is sent to the employee by the system.
-When an Employee confirms his/her presence for the event you can change the status to 'Confirmed'.
+When you submit the Training Event, a notifcation will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modifiy this Email Alert to customize the message.
+
### Training Result
-After compleation of the training Employee Wise training results can be stored based on the Feedback received from the Trainer.
+After compleation of the training Employee-wise training results can be stored based on the Feedback received from the Trainer.
+When the Training Result is submitted, all the employees will receive an email notifying them that they must share their feedback via "Training Feedback". This is also managed via an Email Alert, so you can customize this alert too.
-### Trainig Feedback
+### Training Feedback
-Collect feedback regarding the event from your Employees using Training Feedback.
+Employees can then share their feedback via Training Feedback.
diff --git a/erpnext/docs/user/manual/en/index.txt b/erpnext/docs/user/manual/en/index.txt
index fff4da7d8ef..712ab8eabd3 100644
--- a/erpnext/docs/user/manual/en/index.txt
+++ b/erpnext/docs/user/manual/en/index.txt
@@ -9,6 +9,7 @@ manufacturing
projects
support
human-resources
+subscription
customer-portal
website
using-erpnext
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
index 9be2bad0e21..4dbdcbb6dc3 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
@@ -48,6 +48,8 @@ In the Timesheet, if "Is Billable" is checked, you will find option to create Sa
+
+
####Sales Invoice
Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table.
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
new file mode 100644
index 00000000000..4287ca86179
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
@@ -0,0 +1 @@
+#
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/__init__.py b/erpnext/docs/user/manual/en/schools/Attendance/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.md b/erpnext/docs/user/manual/en/schools/Attendance/index.md
new file mode 100644
index 00000000000..3153a590227
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/index.md
@@ -0,0 +1,6 @@
+#Attendance
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.txt b/erpnext/docs/user/manual/en/schools/Attendance/index.txt
new file mode 100644
index 00000000000..8cd02627a20
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/index.txt
@@ -0,0 +1,3 @@
+student-attendance
+student-leave-application
+student-attendance-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
new file mode 100644
index 00000000000..5c4ce3072a3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
@@ -0,0 +1,15 @@
+# Student Attendance Tool
+
+The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
+
+To mark the **Attedance* based on Student Group select the group based on
+
+**1. Batch
+ 2. Course
+ 3. Activity **
+
+Student detials will be autofetched and you can mark the attendance of the given date.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md
new file mode 100644
index 00000000000..1b917d0ae26
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md
@@ -0,0 +1,15 @@
+# Student Attendance
+
+Attendance doctype allows you to track and manage attendance of a student in all the days at any time. The Attendance module is designed to help teachers easily mark student attendance during class.
+
+Attendance Records can be created against Student on daily basis.
+
+To create Attendance record :
+
+Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save.
+
+
+
+**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md
new file mode 100644
index 00000000000..5620bdadd73
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md
@@ -0,0 +1,13 @@
+#Student Leave Application
+
+ERPNext allows you to record the leave application for a student.
+
+To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
+
+
+
+Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself.
+
+Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.md b/erpnext/docs/user/manual/en/schools/admission/index.md
index 87cdfe5c899..b602271bbbd 100644
--- a/erpnext/docs/user/manual/en/schools/admission/index.md
+++ b/erpnext/docs/user/manual/en/schools/admission/index.md
@@ -1,6 +1,6 @@
# Admission
-This section contains student admission related documents.
+The Admission section allow you to create all records starting from Student application till the program enrollment. Below is the list of documents for Student addmission.
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.txt b/erpnext/docs/user/manual/en/schools/admission/index.txt
index ec9e768116a..680d7790897 100644
--- a/erpnext/docs/user/manual/en/schools/admission/index.txt
+++ b/erpnext/docs/user/manual/en/schools/admission/index.txt
@@ -1,2 +1,4 @@
+student-admission
student-applicant
-program-enrollment
\ No newline at end of file
+program-enrollment
+program-enrollment-Tool
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md
new file mode 100644
index 00000000000..2a2fa1e58e7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md
@@ -0,0 +1,16 @@
+# Program Enrollment Tool
+
+The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program.
+
+
+You can create the the Program Enrollment for :
+
+1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
+
+
+
+2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
index 2dcc6cb2cec..cc1308cf6c1 100644
--- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
+++ b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
@@ -1,7 +1,12 @@
# Program Enrollment
-This form allows you to enroll a student to a program. A student can be enrolled to multiple programs.
+Program Enrollment describes an educational model where students must complete a defined set of courses towards their academic objective in a specified sequence. Enrollment is a program driven process in which the student select the Program to enrol for in a Academic Year.
-
+Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
+
+
+
+- A student can be enrolled in multiple Course for a program in a given academeic year.
+- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
{next}
diff --git a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
index e67c1dc79e6..22d370939d1 100644
--- a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
+++ b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
@@ -18,7 +18,9 @@ You can Approve or Reject a student applicant. By accepting a student applicant
and will not allow you to change the application status unless the student record is deleted.
### Student Enrollment
+Once the form is submitted you can either approve or reject the application form.
+
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).
diff --git a/erpnext/docs/user/manual/en/schools/admission/student_admission.md b/erpnext/docs/user/manual/en/schools/admission/student_admission.md
new file mode 100644
index 00000000000..eeaa977912b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/admission/student_admission.md
@@ -0,0 +1,13 @@
+# Student Admission
+
+The admission process begins with filling the admission form. The Student Admission record enables to intitate your admission process for a given **Academic year**. ERPNext admission module allow you to create an admission record which can be then published on the ERPNext generate website.
+
+To create a Student Admission record go to :
+
+**Schools** >> **Admissions** >> **Student Admission** >>
+
+
+
+
+
+Once a admission record is created it can be published on the website and the student can apply from the web portal itself.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/index.md b/erpnext/docs/user/manual/en/schools/index.md
index 8c766d6db49..d317d39bfaa 100644
--- a/erpnext/docs/user/manual/en/schools/index.md
+++ b/erpnext/docs/user/manual/en/schools/index.md
@@ -1,7 +1,7 @@
# Schools
-The School Modules is designed to meet requirements of Schools, Colleges & Educational Institutes.
+The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee.
diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/schools/index.txt
index b485fdcfea5..159089c6f38 100644
--- a/erpnext/docs/user/manual/en/schools/index.txt
+++ b/erpnext/docs/user/manual/en/schools/index.txt
@@ -1,6 +1,7 @@
student
admission
+Attendance
schedule
fees
setup
-assessment
\ No newline at end of file
+Assessment
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md b/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
deleted file mode 100644
index 84e1ea8669d..00000000000
--- a/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Student Attendance
-
-Maintains attendance record of the student. Attendance Records can be created against Course Schedules.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-term.md b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
index 6306444b616..b52bea71086 100644
--- a/erpnext/docs/user/manual/en/schools/setup/academic-term.md
+++ b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
@@ -1,5 +1,9 @@
# Academic Term
+An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quater, trimester or a semester.
+
+The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year.
+
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-year.md b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
index 3913eb634b2..4fc5f929a56 100644
--- a/erpnext/docs/user/manual/en/schools/setup/academic-year.md
+++ b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
@@ -1,5 +1,11 @@
# Academic Year
+An academic year is a period of time which schools, colleges and universities use to measure a quantity of study.
+
+The **Academic year** form have the Start and End date for the Academic year.
+
-{next}
\ No newline at end of file
+**Student group** link is given to view or add the respective groups to the Academic year.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/course.md b/erpnext/docs/user/manual/en/schools/setup/course.md
index 140131dccd2..dc10ed54b17 100644
--- a/erpnext/docs/user/manual/en/schools/setup/course.md
+++ b/erpnext/docs/user/manual/en/schools/setup/course.md
@@ -1,5 +1,15 @@
# Course
+ A course is a unit of teaching that typically lasts one academic term, is led by one or more instructors (teachers or professors), and has a fixed number of students. Students may receive a grade and academic credit after completion of the course.
+
+To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
+
+Once a **Course** is created, a course schedule can defined for the same.
+
+
+
+The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.md b/erpnext/docs/user/manual/en/schools/setup/index.md
index 9de753614c8..4e0915277b7 100644
--- a/erpnext/docs/user/manual/en/schools/setup/index.md
+++ b/erpnext/docs/user/manual/en/schools/setup/index.md
@@ -1,5 +1,7 @@
# Setup
+The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.txt b/erpnext/docs/user/manual/en/schools/setup/index.txt
index fb9ba05d090..8fb9bb2def9 100644
--- a/erpnext/docs/user/manual/en/schools/setup/index.txt
+++ b/erpnext/docs/user/manual/en/schools/setup/index.txt
@@ -2,5 +2,8 @@ course
program
instructor
room
+student-category
+student-batch-name
academic-term
-academic-year
\ No newline at end of file
+academic-year
+school-settings
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/instructor.md b/erpnext/docs/user/manual/en/schools/setup/instructor.md
index 1a4d35161c2..6150f025fe7 100644
--- a/erpnext/docs/user/manual/en/schools/setup/instructor.md
+++ b/erpnext/docs/user/manual/en/schools/setup/instructor.md
@@ -1,5 +1,18 @@
# Instructor
+An instructoe is a teacher, or professor, of a specialised subject that involves skill.
+
+You can create an Instructor and link it to the Employee master and a Departmemt.
+
+An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
+
+
+It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
+
+
+
+An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment.
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/program.md b/erpnext/docs/user/manual/en/schools/setup/program.md
index 64513e20b0f..be10166e7be 100644
--- a/erpnext/docs/user/manual/en/schools/setup/program.md
+++ b/erpnext/docs/user/manual/en/schools/setup/program.md
@@ -1,5 +1,19 @@
# Program
+An educational program is a program written by the institutions which determines the learning progress of each subject in all the stages of formal education.
+
+To create a Program go to :
+
+###Schools >> Setup >> Program >> New Program
+
+Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
+
+Add the relevant Course and the Fee details for a program.
+
+
+
+The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/room.md b/erpnext/docs/user/manual/en/schools/setup/room.md
index bb265e3ea21..43ddde92245 100644
--- a/erpnext/docs/user/manual/en/schools/setup/room.md
+++ b/erpnext/docs/user/manual/en/schools/setup/room.md
@@ -1,6 +1,17 @@
# Room
+A classroom is a space (room or lab) where you want to schedule courses or examinations. A room in an educational institute can be a Class room, a laboratory or a Examination hall.
+
+The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom.
+The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
+
+
+
+The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/school-settings.md b/erpnext/docs/user/manual/en/schools/setup/school-settings.md
new file mode 100644
index 00000000000..ce9e9144b7a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/setup/school-settings.md
@@ -0,0 +1,15 @@
+#School Settings
+
+The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup.
+
+
+
+The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group**
+
+
+
+You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md b/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md
new file mode 100644
index 00000000000..056f9108636
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md
@@ -0,0 +1,10 @@
+# Student Batch
+
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
+
+
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/schools/setup/student-category.md b/erpnext/docs/user/manual/en/schools/setup/student-category.md
new file mode 100644
index 00000000000..0d769279727
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/setup/student-category.md
@@ -0,0 +1,12 @@
+# Student Category
+
+Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
+
+To create Student category go to Setup >> Student Category >> New.
+
+We can create new student category by adding a name and save it
+
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/guardian.md b/erpnext/docs/user/manual/en/schools/student/guardian.md
new file mode 100644
index 00000000000..7bbdbc22c5c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/student/guardian.md
@@ -0,0 +1,9 @@
+#Guardian
+
+The Guardian doctype allows you to record the guardian details for a **Student**.
+
+
+
+The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/index.txt b/erpnext/docs/user/manual/en/schools/student/index.txt
index 9b31be4dc98..89704b1fc79 100644
--- a/erpnext/docs/user/manual/en/schools/student/index.txt
+++ b/erpnext/docs/user/manual/en/schools/student/index.txt
@@ -1,5 +1,6 @@
student
+guardian
student-log
student-batch
student-group
-student-group-creation-tool
+student-group-creation-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-batch.md b/erpnext/docs/user/manual/en/schools/student/student-batch.md
index 4987c0313f2..056f9108636 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-batch.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-batch.md
@@ -1,7 +1,10 @@
# Student Batch
-Student batch is a collection of students from Student Groups.
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
index 130c94491eb..1cd9b1e796f 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
@@ -1,8 +1,17 @@
# Student Group Creation Tool
-This tool allows you to create student groups in bulk. You can specify multiple parameters to create them.
+The Student group creation tool allows you to create student groups in bulk.
+To create Student group using this tool go to
-
+##Schools >>Student >> Student Group creation tool
+
+Select the **Academic Term** and the **Program** for which a student group is to be created.
+
+
+
+By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
+
+You can leave it unchecked if you don't want to consider batch while making course based groups.
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group.md b/erpnext/docs/user/manual/en/schools/student/student-group.md
index 191e917a8bf..cf3f82c5a2d 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-group.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-group.md
@@ -1,8 +1,22 @@
# Student Group
-A student group is a collection of students taking a same course. You can create Course Schedules and Examinations against a Student Group.
-A student group needs to be created for every course in a particular academic term and academic year.
+A student group is a collection of students taking same course. You can create Course Schedules and Examinations against a Student Group.
+
+A Student Group needs to be created for every course for **Academic Term** and **Academic Year**. The student group can be create based on **Batch, Course and Activity**.
+
+To create a Student Group go to:
+
+Schools >> Student >> New Student Group
+
+
+
+To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute.
+
+Once a student group is created you can mark attendance for the group.
+
+
+
+You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
-
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-log.md b/erpnext/docs/user/manual/en/schools/student/student-log.md
index a037a231ac6..160e39fcdc4 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-log.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-log.md
@@ -1,6 +1,7 @@
# Student Log
-You can make a note of student activities using student log.
+The Student log Doctype enables you to add and edit addtional information for a student.
+You can make a note of student activities using Student log.
Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
diff --git a/erpnext/docs/user/manual/en/schools/student/student.md b/erpnext/docs/user/manual/en/schools/student/student.md
index dd99a80d2f4..09e44714e68 100644
--- a/erpnext/docs/user/manual/en/schools/student/student.md
+++ b/erpnext/docs/user/manual/en/schools/student/student.md
@@ -1,10 +1,12 @@
# Student
A Student is a person who has enrolled at your institute and you have accepted their application.
-The student doctype maintains personal details of the student.
-
-You can view everything related to a particular student on this page. Eg : Fees, Student Group, etc
+The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details.
+The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
-{next}
+You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/email-error.md b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
new file mode 100644
index 00000000000..9d5abd021e7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
@@ -0,0 +1,9 @@
+# Email Error in Sending or Receiving
+
+In ERPNext, you can customize the Incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account is saved successfully. If not, then you might receive an error as below.
+
+
+
+This indicates that using login credentials and other email gateway details provided in the Email Account, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
+
+Note: Your ERPNext account is connected with an ERPNext email server by default. If you don't want to use your own email server, you can continue sending emails using ERPNext email server, without any configuration required in the Email Account.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
index d175d929dae..259229ec8d6 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -14,4 +14,5 @@ using-custom-domain-on-erpnext
setup-two-factor-authentication
difference-between-system-user-and-website-user
outgoing-email-gateway
-print-format-sections
\ No newline at end of file
+print-format-sections
+email-error
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/download-backup.md b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
new file mode 100644
index 00000000000..6c98cf34f84
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
@@ -0,0 +1,13 @@
+# Download Backup
+
+In the ERPNext, you can manually download database backup. To get the latest database backup, go to:
+
+`Setup > Data > Download Backup`
+
+Backup available for the download is updated in every eight hours. Click on the link to download the backups at a given time.
+
+
+
+By default three latest backups will be available for the download. If you want to customize no. of backups, then click on "Set Number of Backups". In the System Settings, you can set Number of Backups available for the download at a time.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/index.txt b/erpnext/docs/user/manual/en/setting-up/data/index.txt
index 998b5a21647..d15f9175bb3 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/data/index.txt
@@ -1,2 +1,3 @@
data-import-tool
bulk-rename
+download-backup
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
index 244d893c7bb..c05c4af5b6a 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
@@ -1,6 +1,6 @@
# Setup Wizard
-The Setup Wizard helps you quickly setup your ERPnext by helping you create your company, Items, Customer, Suppliers and will also setup a basic website with this data.
+The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organisation.
Here is a quick overview of the steps:
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
index eb7655826e7..b2f680a388b 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
@@ -1,10 +1,5 @@
step-1-language
step-2-currency-and-timezone
step-3-user-details
+step-4-two-factor-authentication
step-5-company-details
-step-6-letterhead-and-logo
-step-7-add-users
-step-8-tax-details
-step-9-customer-names
-step-10-suppliers
-step-11-item
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md
deleted file mode 100644
index 364b4d6982c..00000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Step 10: Suppliers
-
-Enter a few of your Suppliers' names.
-
-
-
----
-
-### Letterhead
-
-A letterhead is the heading at the top of a sheet of letter paper (stationery). That heading usually consists of a name and an address, and a logo or corporate design.
-
-Click on the box ‘Attach Letterhead’ . Select the image file from the place it is stored and click enter.
-
-You may choose to skip this step if your letterhead is not ready.
-
-To select letterhead later through the setup module, read [Letter-head](/docs/user/manual/en/setting-up/print/letter-head.html)
-
-#### To "attach as web-link"
-
-For any attachments in ERPNext, you can also attach as a web-link. If you are using other tools like Dropbox or Google Docs to manage your files, you can set its public link.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md
deleted file mode 100644
index c92721c91b0..00000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Step 7: Add Users
-
-Add other users and assign them roles based on their job responsibilities.
-
-
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md
deleted file mode 100644
index dae88e4432a..00000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Step 8: Tax Details
-
-Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type.
-
-
-
-Just set the tax name and the standard percentage levied.
-
----
-
-Some examples of tax types are given below.
-
-#### VAT
-
-A value added tax (VAT) is a form of consumption tax. From the perspective of the buyer, it is a tax on the purchase price. From that of the seller, it is a tax only on the value added to a product, material, or a service. From an accounting point of view, by the stage of its manufacture or distribution. The manufacturer remits to the government the difference between these two amounts, and retains the rest for themselves to offset the taxes they had previously paid on the inputs.
-
-The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT.
-
-To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html)
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md
deleted file mode 100644
index e3489433fcb..00000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Step 9: Customers
-
-Enter your Customer names and the contact person from that organisation.
-
-
-
-
----
-
-#### Difference between a customer name and a contact name
-
-A customer name is the name of the organisation and a contact name is the name of the person from that organisation.
-
-For Example: If American Power Mills is an organisation name and their founder Shiv Agarwal has installed ERPNext on his system. Then,
-
-Customer Name: American Power Mills
-
-Contact Name: Shiv Agarwal
-
-To understand Customer in detail visit [Customer Details](/docs/user/manual/en/CRM/customer.html)
-
-{next}
diff --git a/erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md b/erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md
new file mode 100644
index 00000000000..afb6de92d8c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md
@@ -0,0 +1,7 @@
+# Delivery Note Negative Stock Error
+
+**Question**: When submitting a Delivery Note, receiving a message says that item's stock is insufficient, but we have item's stock available in the Warehouse.
+
+**Answer**: On submission of Delivery Note, stock level is checked as on Posting Date and Posting Time of a Delivery Note. It's possible that you have stock of an Item available in the Warehouse. But if you are creating back-dated Delivery Note, and if item was not available in the warehouse on the Posting Date and Posting Time of Delivery Note, you are likely to receive an error message on the negative stock. You can refer to the Stock Ledger report to confirm the same.
+
+If this is the case, you should edit the Posting Date and Time of a Delivery Note, and ensure that it is after the Posting Date and Time of item's receipt entry.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
index df779de628a..acf1375214e 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.txt
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -10,4 +10,8 @@ repack-entry
serial-no-naming
stock-entry-purpose
stock-level-report
-track-items-using-barcode
\ No newline at end of file
+track-items-using-barcode
+stock-received-but-not-billed
+return-rejected-item
+item-valuation-transactions
+delivery-note-stock-error
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
new file mode 100644
index 00000000000..5cc6529d89a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
@@ -0,0 +1,17 @@
+# Item Valuation Methods and Transactions
+
+In ERPNext, Item's stock valuation is updated on the creation of one of the following transaction.
+
+1. Purchase Receipt
+2. Stock Entry of type Material Receipt
+3. Stock Reconciliation made for updating stock opening balance
+
+You can select valuation method based on which item's value will be calculated. Valuation Method can be set globally for all the items from the Stock Settings.
+
+
+
+You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method.
+
+
+
+[Click here to learn about the valuation methods available in the ERPNext, and how it works.](https://frappe.io/blog/erpnext-features/inventory-valuation-method-fifo-vs-moving-average)
diff --git a/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
new file mode 100644
index 00000000000..aaaec2dea0b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
@@ -0,0 +1,13 @@
+# Return Rejected Items
+
+In the Purchase Receipt, you can receive the Items in the Accepted or the Rejected Warehouse.
+
+If you are creating Purchase Return for the items received in the Rejected Warehouse, then create return entry following these steps.
+
+1. In the Purchase Receipt Item table, for the item to be returned, in the Received Qty field, enter return entry in negative.
+2. In the Accepted Warehouse field, set value as zero.
+3. In the Rejected Warehouse field, set the quantity to be returned in negative.
+
+For detailed steps on how to create Purchase Return Entry for the Rejected Item, refer to the below example.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md b/erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md
new file mode 100644
index 00000000000..25ef3b8aa68
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md
@@ -0,0 +1,9 @@
+# Purpose of Stock Received but not Billed
+
+When purchased items are received, an accounts posting is done based on the value of the purchased items in the Stock-in-hand / fixed-assets account. When you sell and deliver those items, an expense (cost-of-goods-sold) is booked, equal to the buying cost of the items.
+
+As stock balance increases through Purchase Receipt, Warehouse account is debited and an adjustment account called **Stock Received But Not Billed** account is credited. At the same time, the negative expense is booked in account **Expense included in Valuation** for the amount added for valuation purpose, to avoid double expense booking.
+
+On receiving Bill from the supplier, you will make Purchase Invoice against a Purchase Receipt. Here **Stock Received But Not Billed** account is debited, hence nullifies the balance in the Stock Received but not Billed Account.
+
+The balance in the Stock Received but not Billed account indicates the value of items for which Purchase Receipt has been made, but billing is pending.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/subscription/__init__.py b/erpnext/docs/user/manual/en/subscription/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/docs/user/manual/en/subscription/index.md b/erpnext/docs/user/manual/en/subscription/index.md
new file mode 100644
index 00000000000..24d75eda95d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/subscription/index.md
@@ -0,0 +1,22 @@
+If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
+
+
+
+#### Scenario
+
+Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
+
+To set the subscription for the sales invoice
+Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
+
+
+
+**From Date and To Date**: This defines contract period with the customer.
+
+**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
+
+**Notify By Email**: If you want to notify the user about auto recurring invoice.
+
+**Print Format**: Select a print format to define document view which should be emailed to customer.
+
+**Disabled**: It will stop to make auto recurring documents against the subscription
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/subscription/index.txt b/erpnext/docs/user/manual/en/subscription/index.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
index 4ca21aa969b..9dc7df3f31f 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -8,4 +8,5 @@ bulk-rename
renaming-documents
search-filter
tree-master-renaming
-pos-view
\ No newline at end of file
+pos-view
+letter-head-in-the-report
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
new file mode 100644
index 00000000000..4f8b2e9ea3e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
@@ -0,0 +1,15 @@
+# Letter Head in the Report's Print Format
+
+In the reports, Letter Head is fetched from the Company master. To have company's Letter Head fetched correctly in the report, please ensure that you have updated default Letter Head in the Company master.
+
+`Explore > Accounts > Company`
+
+
+
+In a Company master, if no Letter Head is set as default, then in the reports, Letter Head having Default field checked will be fetched.
+
+
+
+If you are managing multiple companies in a single ERPNext account, then ensure that for each Company, default Letter Head is set in the Company master.
+
+After updating Letter Head in the Company master, refresh your ERPNext account, and then check the print format of a report.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-banner.md b/erpnext/docs/user/manual/en/website/articles/website-banner.md
new file mode 100644
index 00000000000..514e23e58de
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-banner.md
@@ -0,0 +1,9 @@
+# Website Banner Resizing
+
+Each ERPNext account website automatically generated from it. On a website, logo is set based on logo image selected in the Setup Wizard. You can change or edit property for your company's logo from the Website Settings.
+
+`Explore > Website > Website Settings`
+
+For the exact steps on how to upload a Website Banner and resize it, please refer to the help given below.
+
+
\ No newline at end of file
diff --git a/erpnext/healthcare/__init__.py b/erpnext/healthcare/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/__init__.py b/erpnext/healthcare/doctype/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/antibiotic/__init__.py b/erpnext/healthcare/doctype/antibiotic/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/antibiotic/antibiotic.js b/erpnext/healthcare/doctype/antibiotic/antibiotic.js
new file mode 100644
index 00000000000..42e6adb6030
--- /dev/null
+++ b/erpnext/healthcare/doctype/antibiotic/antibiotic.js
@@ -0,0 +1,5 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Antibiotic', {
+});
diff --git a/erpnext/healthcare/doctype/antibiotic/antibiotic.json b/erpnext/healthcare/doctype/antibiotic/antibiotic.json
new file mode 100644
index 00000000000..d481036ee60
--- /dev/null
+++ b/erpnext/healthcare/doctype/antibiotic/antibiotic.json
@@ -0,0 +1,115 @@
+{
+ "allow_copy": 1,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:antibiotic_name",
+ "beta": 1,
+ "creation": "2016-02-23 11:11:30.749731",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "antibiotic_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Antibiotic Name",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-08-31 13:44:43.199657",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Antibiotic",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Healthcare Administrator",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Laboratory User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 0
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Healthcare",
+ "search_fields": "antibiotic_name",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "antibiotic_name",
+ "track_changes": 0,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/antibiotic/antibiotic.py b/erpnext/healthcare/doctype/antibiotic/antibiotic.py
new file mode 100644
index 00000000000..8236c8ab73a
--- /dev/null
+++ b/erpnext/healthcare/doctype/antibiotic/antibiotic.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class Antibiotic(Document):
+ pass
diff --git a/erpnext/healthcare/doctype/antibiotic/test_antibiotic.js b/erpnext/healthcare/doctype/antibiotic/test_antibiotic.js
new file mode 100644
index 00000000000..b92103d7509
--- /dev/null
+++ b/erpnext/healthcare/doctype/antibiotic/test_antibiotic.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Antibiotic", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Antibiotic
+ () => frappe.tests.make('Antibiotic', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/healthcare/doctype/antibiotic/test_antibiotic.py b/erpnext/healthcare/doctype/antibiotic/test_antibiotic.py
new file mode 100644
index 00000000000..6ac4f4f9fc0
--- /dev/null
+++ b/erpnext/healthcare/doctype/antibiotic/test_antibiotic.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestAntibiotic(unittest.TestCase):
+ pass
diff --git a/erpnext/healthcare/doctype/appointment_type/__init__.py b/erpnext/healthcare/doctype/appointment_type/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/appointment_type/appointment_type.js b/erpnext/healthcare/doctype/appointment_type/appointment_type.js
new file mode 100644
index 00000000000..15916a5134a
--- /dev/null
+++ b/erpnext/healthcare/doctype/appointment_type/appointment_type.js
@@ -0,0 +1,5 @@
+// Copyright (c) 2016, ESS LLP and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Appointment Type', {
+});
diff --git a/erpnext/healthcare/doctype/appointment_type/appointment_type.json b/erpnext/healthcare/doctype/appointment_type/appointment_type.json
new file mode 100644
index 00000000000..4b34892ffd3
--- /dev/null
+++ b/erpnext/healthcare/doctype/appointment_type/appointment_type.json
@@ -0,0 +1,145 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 1,
+ "autoname": "field:appointment_type",
+ "beta": 1,
+ "creation": "2016-07-22 11:52:34.953019",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "appointment_type",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Type",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "ip",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Inpatient",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-08-31 13:46:57.142289",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Appointment Type",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Healthcare Administrator",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Physician",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Healthcare",
+ "search_fields": "appointment_type",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "",
+ "track_changes": 0,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/appointment_type/appointment_type.py b/erpnext/healthcare/doctype/appointment_type/appointment_type.py
new file mode 100644
index 00000000000..1dacffab357
--- /dev/null
+++ b/erpnext/healthcare/doctype/appointment_type/appointment_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, ESS LLP and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class AppointmentType(Document):
+ pass
diff --git a/erpnext/healthcare/doctype/appointment_type/test_appointment_type.js b/erpnext/healthcare/doctype/appointment_type/test_appointment_type.js
new file mode 100644
index 00000000000..93274e55c7b
--- /dev/null
+++ b/erpnext/healthcare/doctype/appointment_type/test_appointment_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Appointment Type", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Appointment Type
+ () => frappe.tests.make('Appointment Type', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/healthcare/doctype/appointment_type/test_appointment_type.py b/erpnext/healthcare/doctype/appointment_type/test_appointment_type.py
new file mode 100644
index 00000000000..04452e470e2
--- /dev/null
+++ b/erpnext/healthcare/doctype/appointment_type/test_appointment_type.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, ESS LLP and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+# test_records = frappe.get_test_records('Appointment Type')
+
+class TestAppointmentType(unittest.TestCase):
+ pass
diff --git a/erpnext/healthcare/doctype/codification_table/__init__.py b/erpnext/healthcare/doctype/codification_table/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/codification_table/codification_table.json b/erpnext/healthcare/doctype/codification_table/codification_table.json
new file mode 100644
index 00000000000..c4117782ffd
--- /dev/null
+++ b/erpnext/healthcare/doctype/codification_table/codification_table.json
@@ -0,0 +1,135 @@
+{
+ "allow_copy": 1,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 1,
+ "creation": "2017-06-22 13:09:23.159579",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "medical_code",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Medical Code",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Medical Code",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "code",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Code",
+ "length": 0,
+ "no_copy": 0,
+ "options": "medical_code.code",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "description",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "options": "medical_code.description",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-08-31 14:06:50.281545",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Codification Table",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Healthcare",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/codification_table/codification_table.py b/erpnext/healthcare/doctype/codification_table/codification_table.py
new file mode 100644
index 00000000000..ae29c03bbbd
--- /dev/null
+++ b/erpnext/healthcare/doctype/codification_table/codification_table.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class CodificationTable(Document):
+ pass
diff --git a/erpnext/healthcare/doctype/complaint/__init__.py b/erpnext/healthcare/doctype/complaint/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/complaint/complaint.js b/erpnext/healthcare/doctype/complaint/complaint.js
new file mode 100644
index 00000000000..5a2d219fe3b
--- /dev/null
+++ b/erpnext/healthcare/doctype/complaint/complaint.js
@@ -0,0 +1,5 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Complaint', {
+});
diff --git a/erpnext/healthcare/doctype/complaint/complaint.json b/erpnext/healthcare/doctype/complaint/complaint.json
new file mode 100644
index 00000000000..0899a399715
--- /dev/null
+++ b/erpnext/healthcare/doctype/complaint/complaint.json
@@ -0,0 +1,116 @@
+{
+ "allow_copy": 1,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:complaints",
+ "beta": 1,
+ "creation": "2017-02-15 12:25:28.045267",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "complaints",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Complaints",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-08-31 13:44:31.848346",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Complaint",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Healthcare Administrator",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Physician",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Healthcare",
+ "search_fields": "complaints",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "complaints",
+ "track_changes": 0,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/complaint/complaint.py b/erpnext/healthcare/doctype/complaint/complaint.py
new file mode 100644
index 00000000000..717f9dbb4ae
--- /dev/null
+++ b/erpnext/healthcare/doctype/complaint/complaint.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class Complaint(Document):
+ pass
diff --git a/erpnext/healthcare/doctype/complaint/test_complaint.js b/erpnext/healthcare/doctype/complaint/test_complaint.js
new file mode 100644
index 00000000000..9ff44d8da46
--- /dev/null
+++ b/erpnext/healthcare/doctype/complaint/test_complaint.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Complaint", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Complaint
+ () => frappe.tests.make('Complaint', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/healthcare/doctype/complaint/test_complaint.py b/erpnext/healthcare/doctype/complaint/test_complaint.py
new file mode 100644
index 00000000000..2b9273a9675
--- /dev/null
+++ b/erpnext/healthcare/doctype/complaint/test_complaint.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestComplaint(unittest.TestCase):
+ pass
diff --git a/erpnext/healthcare/doctype/consultation/__init__.py b/erpnext/healthcare/doctype/consultation/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/doctype/consultation/consultation.js b/erpnext/healthcare/doctype/consultation/consultation.js
new file mode 100644
index 00000000000..15a1c7f2340
--- /dev/null
+++ b/erpnext/healthcare/doctype/consultation/consultation.js
@@ -0,0 +1,317 @@
+// Copyright (c) 2016, ESS LLP and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Consultation', {
+ setup: function(frm) {
+ frm.get_field('drug_prescription').grid.editable_fields = [
+ {fieldname: 'drug_code', columns: 2},
+ {fieldname: 'drug_name', columns: 2},
+ {fieldname: 'dosage', columns: 2},
+ {fieldname: 'period', columns: 2}
+ ];
+ frm.get_field('test_prescription').grid.editable_fields = [
+ {fieldname: 'test_code', columns: 2},
+ {fieldname: 'test_name', columns: 4},
+ {fieldname: 'test_comment', columns: 4}
+ ];
+ },
+ onload: function(frm){
+ if(frm.doc.patient){
+ frappe.call({
+ "method": "erpnext.healthcare.doctype.patient.patient.get_patient_detail",
+ args: {
+ patient: frm.doc.patient
+ },
+ callback: function (data) {
+ var age = null;
+ if(data.message.dob){
+ age = calculate_age(data.message.dob);
+ }
+ frappe.model.set_value(frm.doctype,frm.docname, "patient_age", age);
+ show_details(data.message);
+ }
+ });
+ }
+ },
+ refresh: function(frm) {
+ refresh_field('drug_prescription');
+ refresh_field('test_prescription');
+
+ frm.add_custom_button(__('Medical Record'), function() {
+ if (frm.doc.patient) {
+ frappe.route_options = {"patient": frm.doc.patient};
+ frappe.set_route("medical_record");
+ } else {
+ frappe.msgprint("Please select Patient");
+ }
+ },"View");
+ frm.add_custom_button(__('Vital Signs'), function() {
+ btn_create_vital_signs(frm);
+ },"Create");
+ frm.add_custom_button(__('Medical Record'), function() {
+ create_medical_record(frm);
+ },"Create");
+
+ frm.set_query("patient", function () {
+ return {
+ filters: {"disabled": 0}
+ };
+ });
+ frm.set_query("drug_code", "drug_prescription", function() {
+ return {
+ filters: {
+ is_stock_item:'1'
+ }
+ };
+ });
+ frm.set_query("test_code", "test_prescription", function() {
+ return {
+ filters: {
+ is_billable:'1'
+ }
+ };
+ });
+ frm.set_query("medical_code", "codification_table", function() {
+ return {
+ filters: {
+ medical_code_standard: frappe.defaults.get_default("default_medical_code_standard")
+ }
+ };
+ });
+ frm.set_query("appointment", function() {
+ return {
+ filters: {
+ // Scheduled filter for demo ...
+ status:['in',["Open","Scheduled"]]
+ }
+ };
+ });
+ if(!frm.doc.__islocal && !frm.doc.invoice && (frappe.user.has_role("Accounts User"))){
+ frm.add_custom_button(__('Invoice'), function() {
+ btn_invoice_consultation(frm);
+ },__("Create"));
+ }
+ frm.set_df_property("appointment", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("patient", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("patient_age", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("patient_sex", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("type", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("physician", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("visit_department", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("consultation_date", "read_only", frm.doc.__islocal ? 0:1);
+ frm.set_df_property("consultation_time", "read_only", frm.doc.__islocal ? 0:1);
+ }
+});
+
+var btn_invoice_consultation = function(frm){
+ var doc = frm.doc;
+ frappe.call({
+ method:
+ "erpnext.healthcare.doctype.consultation.consultation.create_invoice",
+ args: {company: doc.company, patient: doc.patient, physician: doc.physician, consultation_id: doc.name },
+ callback: function(data){
+ if(!data.exc){
+ if(data.message){
+ frappe.set_route("Form", "Sales Invoice", data.message);
+ }
+ cur_frm.reload_doc();
+ }
+ }
+ });
+};
+
+var create_medical_record = function (frm) {
+ if(!frm.doc.patient){
+ frappe.throw("Please select patient");
+ }
+ frappe.route_options = {
+ "patient": frm.doc.patient,
+ "status": "Open",
+ "reference_doctype": "Patient Medical Record",
+ "reference_owner": frm.doc.owner
+ };
+ frappe.new_doc("Patient Medical Record");
+};
+
+var btn_create_vital_signs = function (frm) {
+ if(!frm.doc.patient){
+ frappe.throw("Please select patient");
+ }
+ frappe.route_options = {
+ "patient": frm.doc.patient,
+ };
+ frappe.new_doc("Vital Signs");
+};
+
+var show_details = function(data){
+ var personal_details = "";
+ var age = null;
+ if(data.dob){
+ age = calculate_age(data.dob);
+ personal_details += "
+
diff --git a/erpnext/healthcare/page/medical_record/patient_select.html b/erpnext/healthcare/page/medical_record/patient_select.html
new file mode 100644
index 00000000000..321baf738d7
--- /dev/null
+++ b/erpnext/healthcare/page/medical_record/patient_select.html
@@ -0,0 +1,5 @@
+
+ {%= date_sep || "" %}
+
+
+
+
+
diff --git a/erpnext/healthcare/print_format/__init__.py b/erpnext/healthcare/print_format/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/print_format/consultation_print/__init__.py b/erpnext/healthcare/print_format/consultation_print/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/print_format/consultation_print/consultation_print.json b/erpnext/healthcare/print_format/consultation_print/consultation_print.json
new file mode 100644
index 00000000000..05b8b43bf3f
--- /dev/null
+++ b/erpnext/healthcare/print_format/consultation_print/consultation_print.json
@@ -0,0 +1,22 @@
+{
+ "align_labels_left": 0,
+ "creation": "2017-04-10 14:05:53.355863",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "Consultation",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "{%= __("Select Patient") %}
+ +\n {% if letter_head and not no_letterhead -%}\n
\n {% else %}\n
\n{{ letter_head }}
\n \n {% else %}\n
\n
\n {%- endif %}\n {{doc.name}}
\n\n
\n\n\n {% if doc.appointment %}\n\t
\n \n\t\t\t
\n\t\t{%- endif -%}\n\n \n\t\t\t\n\t\t\t
\n\t\t\t\n\t\t\t: {{doc.appointment}}\n\t\t\t
\n\t\t\n\t\t
\n\t \n\t\t\t \n\t\t
\n {% if doc.patient %}\n\t\t \n\t\t\t : {{doc.patient}}\n\t\t
\n {% else %}\n \n\t\t\t : Patient Name\n\t\t
\n {%- endif -%}\n\t\t\n\t\t\t
\n\n \n\t\t\t\t\n\t\t\t
\n\t\t\t\n\t\t\t : {{doc.patient_age}}\n\t\t\t
\n\t\t\n
\n\n \n\t\t\t\t\n\t\t\t
\n\t\t\t\n\t\t\t : {{doc.patient_sex}}\n\t\t\t
\n \n\n
\n\n \n\t
\n\n {% if doc.consultation_date %}\n\t \n\t\t \n\t
\n {% if doc.physician %}\n\t \n\t\t\t: {{doc.physician}}\n\t
\n {%- endif -%}\n\t\n\t\t
\n\t {%- endif -%}\n {% if doc.consultation_time %}\n\t \n\t\t\n\t\t
\n\t\t\n\t\t: {{doc.consultation_date}}\n\t\t
\n \n\t\t
\n\t {%- endif -%}\n {% if doc.visit_department %}\n\t \n\t\t\n\t\t
\n\t\t\n\t\t: {{doc.consultation_time}}\n\t\t
\n \n\t\t
\n {%- endif -%}\n \n\t\t\n\t\t
\n\t\t\n\t\t: {{doc.visit_department}}\n\t\t
\n \n
\n {% if doc.symptoms_in_print%}\n {% if doc.symptoms %}\n Complaints:\n {{doc.symptoms}}\n \t
\n {%- endif -%}\n {%- endif -%}\n\n {% if doc.diagnosis_in_print%}\n {% if doc.diagnosis %}\n \t Diagnosis:\n {{doc.diagnosis}}\n
\n {%- endif -%}\n {%- endif -%}\n\n
\n\n\n {% if doc.symptoms_in_print%}\n {% if doc.symptoms %}\n Complaints:\n {{doc.symptoms}}\n \t
\n {%- endif -%}\n {%- endif -%}\n\n {% if doc.diagnosis_in_print%}\n {% if doc.diagnosis %}\n \t Diagnosis:\n {{doc.diagnosis}}\n
\n {%- endif -%}\n {%- endif -%}\n\n
\n {% if doc.drug_prescription %}\n
\n Rx,\n\n \n \n\n {%- for row in doc.drug_prescription -%}\n
\n\n\n {%- endif -%}\n
\n\n\n\n Rx,\n
| \n {%- if row.drug_name -%}{{ row.drug_name }}{%- endif -%}\n | \n \t\n {%- if row.dosage -%}{{ row.dosage }}{%- endif -%}\n | \n \t\n {%- if row.period -%}{{ row.period }}{%- endif -%}\n\t\t | \n\n\t\t\t \n {%- if row.comment -%}{{ row.comment }}{%- endif -%}\n \n\t\t | \n
\n {% if doc.test_prescription %}\n Investigations,\n \n \n \n\n {%- for row in doc.test_prescription -%}\n
\n\n\n {%- endif -%}\n
\n| \n {%- if row.test_name -%}{{ row.test_name }}{%- endif -%}\n | \n\n\t\t\t \n {%- if row.test_comment -%}{{ row.test_comment }}{%- endif -%}\n \n\t\t | \n
\n {% if doc.consultation_comment %}\n
\n {{doc.consultation_comment}}\n {%- endif -%}\n
\n",
+ "idx": 0,
+ "line_breaks": 0,
+ "modified": "2017-05-15 16:36:06.034909",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Consultation Print",
+ "owner": "Administrator",
+ "print_format_builder": 0,
+ "print_format_type": "Server",
+ "show_section_headings": 0,
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/print_format/lab_test_print/__init__.py b/erpnext/healthcare/print_format/lab_test_print/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json b/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json
new file mode 100644
index 00000000000..e3e21a71ceb
--- /dev/null
+++ b/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json
@@ -0,0 +1,22 @@
+{
+ "align_labels_left": 0,
+ "creation": "2017-04-24 15:38:45.332473",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "Lab Test",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "\n {{doc.consultation_comment}}\n {%- endif -%}\n
\n {% if letter_head and not no_letterhead -%}\n
\n {%- endif %}\n\n {% if (doc.docstatus != 1) %}\n Lab Tests have to be Submitted for Print .. !\n {% elif (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"require_test_result_approval\") == '1' and doc.approval_status != \"Approved\") %}\n Lab Tests have to be Approved for Print .. !\n {%- else -%}\n\n \n {%- if doc.normal_test_items -%}\n
\n\n \n \n {%- if doc.special_test_items -%}\n
\n {%- endif -%}\n\n
\n",
+ "idx": 0,
+ "line_breaks": 0,
+ "modified": "2017-04-27 12:11:58.342145",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Lab Test Print",
+ "owner": "Administrator",
+ "print_format_builder": 0,
+ "print_format_type": "Server",
+ "show_section_headings": 0,
+ "standard": "Yes"
+}
diff --git a/erpnext/healthcare/print_format/sample_id_print/__init__.py b/erpnext/healthcare/print_format/sample_id_print/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/print_format/sample_id_print/sample_id_print.json b/erpnext/healthcare/print_format/sample_id_print/sample_id_print.json
new file mode 100644
index 00000000000..e99ce708f46
--- /dev/null
+++ b/erpnext/healthcare/print_format/sample_id_print/sample_id_print.json
@@ -0,0 +1,22 @@
+{
+ "align_labels_left": 0,
+ "creation": "2017-02-17 17:40:52.967840",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "Sample Collection",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "\n{% set column = 0 %}\n{{ letter_head }}
\n \n {%- endif %}\n\n {% if (doc.docstatus != 1) %}\n Lab Tests have to be Submitted for Print .. !\n {% elif (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"require_test_result_approval\") == '1' and doc.approval_status != \"Approved\") %}\n Lab Tests have to be Approved for Print .. !\n {%- else -%}\n
\n
\n\n \n {% if doc.invoice %}\n
\n\n \n
\n {%- endif -%}\n\n \n \n
\n \n : {{doc.invoice}}\n
\n \n
\n\n \n \n
\n {% if doc.patient %}\n \n : {{doc.patient}}\n
\n {% else %}\n \n : Patient Name\n
\n {%- endif -%}\n \n
\n\n \n \n
\n \n : {{doc.patient_age}}\n
\n \n
\n\n \n \n
\n \n : {{doc.patient_sex}}\n
\n \n\n
\n\n \n
\n\n {% if doc.sample_date %}\n \n \n
\n {% if doc.physician %}\n \n : {{doc.physician}}\n
\n {%- endif -%}\n \n
\n {%- endif -%}\n\n {% if doc.result_date %}\n \n \n
\n \n : {{doc.sample_date}}\n
\n \n
\n {%- endif -%}\n\n \n \n
\n \n : {{doc.result_date}}\n
\n \n
\n\n Department of {{doc.department}}
\n| Name of Test | \nResult | \nNormal Range | \n
|---|---|---|
| {{ doc.test_name }} | ||
| \n {%- if doc.normal_test_items|length > 1 %} {%- endif -%}\n {%- if row.test_name -%}{{ row.test_name }}\n {%- else -%} {%- endif -%}\n {%- if row.test_event -%} {{ row.test_event }}{%- endif -%}\n | \n\n\n {%- if row.result_value -%}{{ row.result_value }}{%- endif -%} \n {%- if row.test_uom -%}{{ row.test_uom }}{%- endif -%}\n | \n\n\n \n {%- if row.normal_range -%}{{ row.normal_range }}{%- endif -%}\n \n | \n
| Name of Test | \nResult | \n
|---|---|
| {{ doc.test_name }} | |
| {{ row.test_particulars }} | \n\n {%- if row.result_value -%}{{ row.result_value }}{%- endif -%}\n | \n
| Antibiotic | \nSensitivity | \n
| {{ row.antibiotic }} | \n{{ row.antibiotic_sensitivity }} | \n
\n {%- if (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"employee_name_and_designation_in_print\") == '1') -%}\n
\n{{doc.employee_name}}
\n{{doc.employee_designation}}
\n {%- else -%}\n{{frappe.db.get_value(\"Healthcare Settings\", \"None\", \"custom_signature_in_print\") }}
\n {%- endif -%}\n| {{doc.name}} {{doc.patient}} \n{% if doc.patient_age %}{{doc.patient_age}}, {% endif %} {% if doc.patient_sex %}{{doc.patient_sex}}{% endif %} {% if doc.collected_time %}{{doc.collected_time}} {% endif %} {% if doc.collected_by %} {{doc.collected_by}} {% endif %} | \n{% if column == 0 %}{% set column = column+1 %}\n{% elif column == 2%}
{{ _("Hello") }},
+ +You attended training {{ frappe.utils.get_link_to_form( + "Training Event", doc.training_event) }}
+ +{{ _("Please share your feedback to the training by clicking on 'Training Feedback' and then 'New'") }}
\ No newline at end of file diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.json b/erpnext/hr/email_alert/training_feedback/training_feedback.json new file mode 100644 index 00000000000..51f6cedfecd --- /dev/null +++ b/erpnext/hr/email_alert/training_feedback/training_feedback.json @@ -0,0 +1,24 @@ +{ + "attach_print": 0, + "creation": "2017-08-11 03:17:11.769210", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Email Alert", + "document_type": "Training Result", + "enabled": 1, + "event": "Submit", + "idx": 0, + "is_standard": 1, + "message": "{{_(\"Training Event\")}}
\n{{ message }}
\n\n{{_(\"Details\")}}
\n{{_(\"Event Name\")}}: {{ name }}\n{{_(\"Event Location\")}}: {{ location }}\n
{{_(\"Start Time\")}}: {{ start_time }}\n
{{_(\"End Time\")}}: {{ end_time }}\n
{{_(\"Attendance\")}}: {{ attendance }}\n", + "modified": "2017-08-11 04:26:58.194793", + "modified_by": "Administrator", + "module": "HR", + "name": "Training Feedback", + "owner": "Administrator", + "recipients": [ + { + "email_by_document_field": "employee_emails" + } + ], + "subject": "Please Share your Feedback For {{ doc.training_event }}" +} \ No newline at end of file diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.md b/erpnext/hr/email_alert/training_feedback/training_feedback.md new file mode 100644 index 00000000000..bcadf7df590 --- /dev/null +++ b/erpnext/hr/email_alert/training_feedback/training_feedback.md @@ -0,0 +1,9 @@ +
{{_("Training Event")}}
+{{ message }}
+ +{{_("Details")}}
+{{_("Event Name")}}: {{ name }} +{{_("Event Location")}}: {{ location }} +
{{_("Start Time")}}: {{ start_time }} +
{{_("End Time")}}: {{ end_time }} +
{{_("Attendance")}}: {{ attendance }} diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.py b/erpnext/hr/email_alert/training_feedback/training_feedback.py new file mode 100644 index 00000000000..2334f8b26d8 --- /dev/null +++ b/erpnext/hr/email_alert/training_feedback/training_feedback.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/erpnext/hr/email_alert/training_scheduled/__init__.py b/erpnext/hr/email_alert/training_scheduled/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.html b/erpnext/hr/email_alert/training_scheduled/training_scheduled.html new file mode 100644 index 00000000000..b1aeb2c8739 --- /dev/null +++ b/erpnext/hr/email_alert/training_scheduled/training_scheduled.html @@ -0,0 +1,9 @@ +
{{_("Training Event")}}
+ +{{ doc.introduction }}
+ +{{_("Details")}}
+{{_("Event Name")}}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }} +{{_("Event Location")}}: {{ doc.location }} +
{{_("Start Time")}}: {{ doc.start_time }} +
{{_("End Time")}}: {{ doc.end_time }} diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.json b/erpnext/hr/email_alert/training_scheduled/training_scheduled.json new file mode 100644 index 00000000000..e1631f86839 --- /dev/null +++ b/erpnext/hr/email_alert/training_scheduled/training_scheduled.json @@ -0,0 +1,24 @@ +{ + "attach_print": 0, + "creation": "2017-08-11 03:13:40.519614", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Email Alert", + "document_type": "Training Event", + "enabled": 1, + "event": "Submit", + "idx": 0, + "is_standard": 1, + "message": "
{{_(\"Training Event\")}}
\n\n{{ doc.introduction }}
\n\n{{_(\"Details\")}}
\n{{_(\"Event Name\")}}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}\n{{_(\"Event Location\")}}: {{ doc.location }}\n
{{_(\"Start Time\")}}: {{ doc.start_time }}\n
{{_(\"End Time\")}}: {{ doc.end_time }}\n", + "modified": "2017-08-13 22:49:42.338881", + "modified_by": "Administrator", + "module": "HR", + "name": "Training Scheduled", + "owner": "Administrator", + "recipients": [ + { + "email_by_document_field": "employee_emails" + } + ], + "subject": "Training Scheduled: {{ doc.name }}" +} \ No newline at end of file diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.md b/erpnext/hr/email_alert/training_scheduled/training_scheduled.md new file mode 100644 index 00000000000..bcadf7df590 --- /dev/null +++ b/erpnext/hr/email_alert/training_scheduled/training_scheduled.md @@ -0,0 +1,9 @@ +
{{_("Training Event")}}
+{{ message }}
+ +{{_("Details")}}
+{{_("Event Name")}}: {{ name }} +{{_("Event Location")}}: {{ location }} +
{{_("Start Time")}}: {{ start_time }} +
{{_("End Time")}}: {{ end_time }} +
{{_("Attendance")}}: {{ attendance }} diff --git a/erpnext/hr/email_alert/training_scheduled/training_scheduled.py b/erpnext/hr/email_alert/training_scheduled/training_scheduled.py new file mode 100644 index 00000000000..2334f8b26d8 --- /dev/null +++ b/erpnext/hr/email_alert/training_scheduled/training_scheduled.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js index 94a21130812..531da8a1c33 100644 --- a/erpnext/manufacturing/doctype/bom/bom.js +++ b/erpnext/manufacturing/doctype/bom/bom.js @@ -5,7 +5,10 @@ frappe.provide("erpnext.bom"); frappe.ui.form.on("BOM", { setup: function(frm) { - frm.add_fetch('buying_price_list', 'currency', 'currency'); + frm.add_fetch("item", "description", "description"); + frm.add_fetch("item", "image", "image"); + frm.add_fetch("item", "item_name", "item_name"); + frm.add_fetch("item", "stock_uom", "uom"); frm.set_query("bom_no", "items", function() { return { @@ -23,6 +26,38 @@ frappe.ui.form.on("BOM", { } }; }); + + frm.set_query("item", function() { + return { + query: "erpnext.controllers.queries.item_query" + }; + }); + + frm.set_query("project", function() { + return{ + filters:[ + ['Project', 'status', 'not in', 'Completed, Cancelled'] + ] + }; + }); + + frm.set_query("item_code", "items", function() { + return { + query: "erpnext.controllers.queries.item_query", + filters: [["Item", "name", "!=", cur_frm.doc.item]] + }; + }); + + frm.set_query("bom_no", "items", function(doc, cdt, cdn) { + var d = locals[cdt][cdn]; + return { + filters: { + 'item': d.item_code, + 'is_active': 1, + 'docstatus': 1 + } + }; + }); }, onload_post_render: function(frm) { @@ -69,14 +104,14 @@ frappe.ui.form.on("BOM", { }); erpnext.bom.BomController = erpnext.TransactionController.extend({ - conversion_rate: function(doc, cdt, cdn) { + conversion_rate: function(doc) { if(this.frm.doc.currency === this.get_company_currency()) { this.frm.set_value("conversion_rate", 1.0); } else { erpnext.bom.update_cost(doc); } }, - + item_code: function(doc, cdt, cdn){ var scrap_items = false; var child = locals[cdt][cdn]; @@ -90,39 +125,34 @@ erpnext.bom.BomController = erpnext.TransactionController.extend({ get_bom_material_detail(doc, cdt, cdn, scrap_items); }, - conversion_factor: function(doc, cdt, cdn, dont_fetch_price_list_rate) { + conversion_factor: function(doc, cdt, cdn) { if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) { var item = frappe.get_doc(cdt, cdn); frappe.model.round_floats_in(item, ["qty", "conversion_factor"]); item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item)); refresh_field("stock_qty", item.name, item.parentfield); this.toggle_conversion_factor(item); + this.frm.events.update_cost(this.frm); } }, -}) +}); $.extend(cur_frm.cscript, new erpnext.bom.BomController({frm: cur_frm})); -cur_frm.add_fetch("item", "description", "description"); -cur_frm.add_fetch("item", "image", "image"); -cur_frm.add_fetch("item", "item_name", "item_name"); -cur_frm.add_fetch("item", "stock_uom", "uom"); - - -cur_frm.cscript.hour_rate = function(doc, dt, dn) { +cur_frm.cscript.hour_rate = function(doc) { erpnext.bom.calculate_op_cost(doc); erpnext.bom.calculate_total(doc); -} +}; cur_frm.cscript.time_in_mins = cur_frm.cscript.hour_rate; cur_frm.cscript.bom_no = function(doc, cdt, cdn) { get_bom_material_detail(doc, cdt, cdn, false); -} +}; cur_frm.cscript.is_default = function(doc) { if (doc.is_default) cur_frm.set_value("is_active", 1); -} +}; var get_bom_material_detail= function(doc, cdt, cdn, scrap_items) { var d = locals[cdt][cdn]; @@ -141,6 +171,7 @@ var get_bom_material_detail= function(doc, cdt, cdn, scrap_items) { $.extend(d, r.message); refresh_field("items"); refresh_field("scrap_items"); + doc = locals[doc.doctype][doc.name]; erpnext.bom.calculate_rm_cost(doc); erpnext.bom.calculate_scrap_materials_cost(doc); @@ -149,13 +180,13 @@ var get_bom_material_detail= function(doc, cdt, cdn, scrap_items) { freeze: true }); } -} +}; -cur_frm.cscript.qty = function(doc, cdt, cdn) { +cur_frm.cscript.qty = function(doc) { erpnext.bom.calculate_rm_cost(doc); erpnext.bom.calculate_scrap_materials_cost(doc); erpnext.bom.calculate_total(doc); -} +}; cur_frm.cscript.rate = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; @@ -173,14 +204,14 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) { erpnext.bom.calculate_scrap_materials_cost(doc); erpnext.bom.calculate_total(doc); } -} +}; erpnext.bom.update_cost = function(doc) { erpnext.bom.calculate_op_cost(doc); erpnext.bom.calculate_rm_cost(doc); erpnext.bom.calculate_scrap_materials_cost(doc); erpnext.bom.calculate_total(doc); -} +}; erpnext.bom.calculate_op_cost = function(doc) { var op = doc.operations || []; @@ -189,7 +220,7 @@ erpnext.bom.calculate_op_cost = function(doc) { for(var i=0;i
| Student | -Student Name | - {% for c in criteria %} -{{ c.assessment_criteria }} | - {% endfor %} -Total Marks | - -|
|---|---|---|---|---|
| {{ c.maximum_score }} | - {% endfor %} -{{max_total_score}} | -|||
| {{ s.student }} | -{{ s.student_name }} | - {% for c in criteria %} -- - | - {% endfor %} -- {% if(s.assessment_details) { %} {{s.assessment_details.total_score}} {% } %} - | -|
| Student | +Student Name | + {% for c in criteria %} +{{ c.assessment_criteria }} | + {% endfor %} +Comments | +Total Marks | + +
| Score ({{ c.maximum_score }}) | + {% endfor %} +Score ({{max_total_score}}) | +|||
| {{ s.student }} | +{{ s.student_name }} | + {% for c in criteria %} ++ + {% if(s.assessment_details) { %} + {{s.assessment_details[c.assessment_criteria][1]}} + {% } %} + + + | + {% endfor %} ++ + | + + {% if(s.assessment_details) { %} + {{s.assessment_details.total_score[1]}} + {% } %} + + + {% if(s.assessment_details) { %} + {{s.assessment_details.total_score[0]}} + {% } %} + + + + + + + | +
+
+
+
+
+
+
+
+ `);
+ }
+
+ make_cart() {
+ this.cart = new POSCart({
+ frm: this.frm,
+ wrapper: this.wrapper.find('.cart-container'),
+ events: {
+ on_customer_change: (customer) => this.frm.set_value('customer', customer),
+ on_field_change: (item_code, field, value) => {
+ this.update_item_in_cart(item_code, field, value);
+ },
+ on_numpad: (value) => {
+ if (value == 'Pay') {
+ if (!this.payment) {
+ this.make_payment_modal();
+ }
+ this.payment.open_modal();
+ }
+ },
+ on_select_change: () => {
+ this.cart.numpad.set_inactive();
+ }
+ }
+ });
+ }
+
+ toggle_editing(flag) {
+ let disabled;
+ if (flag !== undefined) {
+ disabled = !flag;
+ } else {
+ disabled = this.frm.doc.docstatus == 1 ? true: false;
+ }
+ const pointer_events = disabled ? 'none' : 'inherit';
+
+ this.wrapper.find('input, button, select').prop("disabled", disabled);
+ this.wrapper.find('.number-pad-container').toggleClass("hide", disabled);
+
+ this.wrapper.find('.cart-container').css('pointer-events', pointer_events);
+ this.wrapper.find('.item-container').css('pointer-events', pointer_events);
+
+ this.page.clear_actions();
+ }
+
+ make_items() {
+ this.items = new POSItems({
+ wrapper: this.wrapper.find('.item-container'),
+ pos_profile: this.pos_profile,
+ events: {
+ update_cart: (item, field, value) => {
+ if(!this.frm.doc.customer) {
+ frappe.throw(__('Please select a customer'));
+ }
+ this.update_item_in_cart(item, field, value);
+ this.cart && this.cart.unselect_all();
+ }
+ }
+ });
+ }
+
+ update_item_in_cart(item_code, field='qty', value=1) {
+ if(this.cart.exists(item_code)) {
+ const item = this.frm.doc.items.find(i => i.item_code === item_code);
+ frappe.flags.hide_serial_batch_dialog = false;
+
+ if (typeof value === 'string' && !in_list(['serial_no', 'batch_no'], field)) {
+ // value can be of type '+1' or '-1'
+ value = item[field] + flt(value);
+ }
+
+ if(field === 'serial_no') {
+ value = item.serial_no + '\n'+ value;
+ }
+
+ if(field === 'qty' && (item.serial_no || item.batch_no)) {
+ this.select_batch_and_serial_no(item);
+ } else {
+ this.update_item_in_frm(item, field, value)
+ .then(() => {
+ // update cart
+ this.update_cart_data(item);
+ });
+ }
+ return;
+ }
+
+ let args = { item_code: item_code };
+ if (in_list(['serial_no', 'batch_no'], field)) {
+ args[field] = value;
+ }
+
+ // add to cur_frm
+ const item = this.frm.add_child('items', args);
+ frappe.flags.hide_serial_batch_dialog = true;
+ this.frm.script_manager
+ .trigger('item_code', item.doctype, item.name)
+ .then(() => {
+ const show_dialog = item.has_serial_no || item.has_batch_no;
+ if (show_dialog && field == 'qty') {
+ // check has serial no/batch no and update cart
+ this.select_batch_and_serial_no(item);
+ } else {
+ // update cart
+ this.update_cart_data(item);
+ }
+ });
+ }
+
+ select_batch_and_serial_no(item) {
+ erpnext.show_serial_batch_selector(this.frm, item, () => {
+ this.update_item_in_frm(item)
+ .then(() => {
+ // update cart
+ this.update_cart_data(item);
+ });
+ }, true);
+ }
+
+ update_cart_data(item) {
+ this.cart.add_item(item);
+ this.cart.update_taxes_and_totals();
+ this.cart.update_grand_total();
+ }
+
+ update_item_in_frm(item, field, value) {
+ if (field) {
+ frappe.model.set_value(item.doctype, item.name, field, value);
+ }
+
+ return this.frm.script_manager
+ .trigger('qty', item.doctype, item.name)
+ .then(() => {
+ if (field === 'qty' && value === 0) {
+ frappe.model.clear_doc(item.doctype, item.name);
+ }
+ });
+ }
+
+ make_payment_modal() {
+ this.payment = new Payment({
+ frm: this.frm,
+ events: {
+ submit_form: () => {
+ this.submit_sales_invoice();
+ }
+ }
+ });
+ }
+
+ submit_sales_invoice() {
+
+ frappe.confirm(__("Permanently Submit {0}?", [this.frm.doc.name]), () => {
+ frappe.call({
+ method: 'erpnext.selling.page.point_of_sale.point_of_sale.submit_invoice',
+ freeze: true,
+ args: {
+ doc: this.frm.doc
+ }
+ }).then(r => {
+ if(r.message) {
+ this.frm.doc = r.message;
+ frappe.show_alert({
+ indicator: 'green',
+ message: __(`Sales invoice ${r.message.name} created succesfully`)
+ });
+
+ this.toggle_editing();
+ this.set_form_action();
+ }
+ });
+ });
+ }
+
+ bind_events() {
+
+ }
+
+ setup_pos_profile() {
+ return frappe.call({
+ method: 'erpnext.stock.get_item_details.get_pos_profile',
+ args: {
+ company: frappe.sys_defaults.company
+ }
+ }).then(r => {
+ this.pos_profile = r.message;
+
+ if (!this.pos_profile) {
+ this.pos_profile = {
+ currency: frappe.defaults.get_default('currency'),
+ selling_price_list: frappe.defaults.get_default('selling_price_list')
+ };
+ }
+ });
+ }
+
+ make_new_invoice() {
+ return frappe.run_serially([
+ () => this.make_sales_invoice_frm(),
+ () => {
+ if (this.cart) {
+ this.cart.frm = this.frm;
+ this.cart.reset();
+ } else {
+ this.make_cart();
+ }
+ this.toggle_editing(true);
+ }
+ ]);
+ }
+
+ make_sales_invoice_frm() {
+ const doctype = 'Sales Invoice';
+ return new Promise(resolve => {
+ if (this.frm) {
+ this.frm = get_frm(this.frm);
+ resolve();
+ } else {
+ frappe.model.with_doctype(doctype, () => {
+ this.frm = get_frm();
+ resolve();
+ });
+ }
+ });
+
+ function get_frm(_frm) {
+ const page = $('');
+ const frm = _frm || new _f.Frm(doctype, page, false);
+ const name = frappe.model.make_new_doc_and_get_name(doctype, true);
+ frm.refresh(name);
+ frm.doc.items = [];
+ frm.set_value('is_pos', 1);
+ frm.meta.default_print_format = 'POS Invoice';
+ return frm;
+ }
+ }
+
+ prepare_menu() {
+ var me = this;
+ this.page.clear_menu();
+
+ // for mobile
+ // this.page.add_menu_item(__("Pay"), function () {
+ //
+ // }).addClass('visible-xs');
+
+ this.page.add_menu_item(__("Form View"), function () {
+ frappe.model.sync(me.frm.doc);
+ frappe.set_route("Form", me.frm.doc.doctype, me.frm.doc.name);
+ });
+
+ this.page.add_menu_item(__("POS Profile"), function () {
+ frappe.set_route('List', 'POS Profile');
+ });
+
+ this.page.add_menu_item(__('POS Settings'), function() {
+ frappe.set_route('Form', 'POS Settings');
+ });
+ }
+
+ set_form_action() {
+ if(this.frm.doc.docstatus !== 1) return;
+
+ this.page.set_secondary_action(__("Print"), () => {
+ if (this.pos_profile && this.pos_profile.print_format_for_online) {
+ this.frm.meta.default_print_format = this.pos_profile.print_format_for_online;
+ }
+ this.frm.print_preview.printit(true);
+ });
+
+ this.page.set_primary_action(__("New"), () => {
+ this.make_new_invoice();
+ });
+
+ this.page.add_menu_item(__("Email"), () => {
+ this.frm.email_doc();
+ });
+ }
+};
+
+class POSCart {
+ constructor({frm, wrapper, events}) {
+ this.frm = frm;
+ this.wrapper = wrapper;
+ this.events = events;
+ this.make();
+ this.bind_events();
+ }
+
+ make() {
+ this.make_dom();
+ this.make_customer_field();
+ this.make_numpad();
+ }
+
+ make_dom() {
+ this.wrapper.append(`
+ `;
+ }
+
+ this.set_class();
+ }
+
+ set_class() {
+ for (const btn in this.add_class) {
+ const class_name = this.add_class[btn];
+ this.get_btn(btn).addClass(class_name);
+ }
+ }
+
+ bind_events() {
+ // bind click event
+ const me = this;
+ this.wrapper.on('click', '.num-col', function() {
+ const $btn = $(this);
+ const btn_value = $btn.attr('data-value');
+ if (!me.disable_highlight.includes(btn_value)) {
+ me.highlight_button($btn);
+ }
+ if (me.reset_btns.includes(btn_value)) {
+ me.reset_value();
+ } else {
+ if (btn_value === me.del_btn) {
+ me.value = me.value.substr(0, me.value.length - 1);
+ } else {
+ me.value += btn_value;
+ }
+ }
+ me.onclick(btn_value);
+ });
+ }
+
+ reset_value() {
+ this.value = '';
+ }
+
+ get_value() {
+ return flt(this.value);
+ }
+
+ get_btn(btn_value) {
+ return this.wrapper.find(`.num-col[data-value="${btn_value}"]`);
+ }
+
+ highlight_button($btn) {
+ $btn.addClass('highlight');
+ setTimeout(() => $btn.removeClass('highlight'), 1000);
+ }
+
+ set_active(btn_value) {
+ const $btn = this.get_btn(btn_value);
+ this.wrapper.find('.num-col').removeClass('active');
+ $btn.addClass('active');
+ }
+
+ set_inactive() {
+ this.wrapper.find('.num-col').removeClass('active');
+ }
+}
+
+class Payment {
+ constructor({frm, events}) {
+ this.frm = frm;
+ this.events = events;
+ this.make();
+ this.bind_events();
+ this.set_primary_action();
+ }
+
+ open_modal() {
+ this.dialog.show();
+ }
+
+ make() {
+ this.set_flag();
+
+ let title = __('Total Amount {0}',
+ [format_currency(this.frm.doc.grand_total, this.frm.doc.currency)]);
+
+ this.dialog = new frappe.ui.Dialog({
+ title: title,
+ fields: this.get_fields(),
+ width: 800
+ });
+
+ this.$body = this.dialog.body;
+
+ this.numpad = new NumberPad({
+ wrapper: $(this.$body).find('[data-fieldname="numpad"]'),
+ button_array: [
+ [1, 2, 3],
+ [4, 5, 6],
+ [7, 8, 9],
+ ['Del', 0, '.'],
+ ],
+ onclick: () => {
+ if(this.fieldname) {
+ this.dialog.set_value(this.fieldname, this.numpad.get_value());
+ }
+ }
+ });
+ }
+
+ bind_events() {
+ var me = this;
+ $(this.dialog.body).find('.input-with-feedback').focusin(function() {
+ me.numpad.reset_value();
+ me.fieldname = $(this).prop('dataset').fieldname;
+ });
+ }
+
+ set_primary_action() {
+ var me = this;
+
+ this.dialog.set_primary_action(__("Submit"), function() {
+ me.dialog.hide();
+ me.events.submit_form();
+ });
+ }
+
+ get_fields() {
+ const me = this;
+
+ let fields = this.frm.doc.payments.map(p => {
+ return {
+ fieldtype: 'Currency',
+ label: __(p.mode_of_payment),
+ options: me.frm.doc.currency,
+ fieldname: p.mode_of_payment,
+ default: p.amount,
+ onchange: () => {
+ const value = this.dialog.get_value(this.fieldname);
+ me.update_payment_value(this.fieldname, value);
+ }
+ };
+ });
+
+ fields = fields.concat([
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'HTML',
+ fieldname: 'numpad'
+ },
+ {
+ fieldtype: 'Section Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Write off Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "write_off_amount",
+ default: me.frm.doc.write_off_amount,
+ onchange: () => {
+ me.update_cur_frm_value('write_off_amount', () => {
+ frappe.flags.change_amount = false;
+ me.update_change_amount();
+ });
+ }
+ },
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Change Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "change_amount",
+ default: me.frm.doc.change_amount,
+ onchange: () => {
+ me.update_cur_frm_value('change_amount', () => {
+ frappe.flags.write_off_amount = false;
+ me.update_write_off_amount();
+ });
+ }
+ },
+ {
+ fieldtype: 'Section Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Paid Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "paid_amount",
+ default: me.frm.doc.paid_amount,
+ read_only: 1
+ },
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Outstanding Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "outstanding_amount",
+ default: me.frm.doc.outstanding_amount,
+ read_only: 1
+ },
+ ]);
+
+ return fields;
+ }
+
+ set_flag() {
+ frappe.flags.write_off_amount = true;
+ frappe.flags.change_amount = true;
+ }
+
+ update_cur_frm_value(fieldname, callback) {
+ if (frappe.flags[fieldname]) {
+ const value = this.dialog.get_value(fieldname);
+ this.frm.set_value(fieldname, value)
+ .then(() => {
+ callback();
+ });
+ }
+
+ frappe.flags[fieldname] = true;
+ }
+
+ update_payment_value(fieldname, value) {
+ var me = this;
+ $.each(this.frm.doc.payments, function(i, data) {
+ if (__(data.mode_of_payment) == __(fieldname)) {
+ frappe.model.set_value('Sales Invoice Payment', data.name, 'amount', value)
+ .then(() => {
+ me.update_change_amount();
+ me.update_write_off_amount();
+ });
+ }
+ });
+ }
+
+ update_change_amount() {
+ this.dialog.set_value("change_amount", this.frm.doc.change_amount);
+ this.show_paid_amount();
+ }
+
+ update_write_off_amount() {
+ this.dialog.set_value("write_off_amount", this.frm.doc.write_off_amount);
+ }
+
+ show_paid_amount() {
+ this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
+ this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
+ }
+}
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.json b/erpnext/selling/page/point_of_sale/point_of_sale.json
new file mode 100644
index 00000000000..6d2f5f2f8d5
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.json
@@ -0,0 +1,33 @@
+{
+ "content": null,
+ "creation": "2017-08-07 17:08:56.737947",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2017-09-11 13:49:05.415211",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "point-of-sale",
+ "owner": "Administrator",
+ "page_name": "Point of Sale",
+ "restrict_to_domain": "Retail",
+ "roles": [
+ {
+ "role": "Accounts User"
+ },
+ {
+ "role": "Accounts Manager"
+ },
+ {
+ "role": "Sales User"
+ },
+ {
+ "role": "Sales Manager"
+ }
+ ],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Point of Sale"
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
new file mode 100644
index 00000000000..8ed288b6e9d
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -0,0 +1,71 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+
+@frappe.whitelist()
+def get_items(start, page_length, price_list, item_group, search_value=""):
+ serial_no = ""
+ batch_no = ""
+ item_code = search_value
+
+ if search_value:
+ # search serial no
+ serial_no_data = frappe.db.get_value('Serial No', search_value, ['name', 'item_code'])
+ if serial_no_data:
+ serial_no, item_code = serial_no_data
+
+ if not serial_no:
+ batch_no_data = frappe.db.get_value('Batch', search_value, ['name', 'item'])
+ if batch_no_data:
+ batch_no, item_code = batch_no_data
+
+ lft, rgt = frappe.db.get_value('Item Group', item_group, ['lft', 'rgt'])
+ # locate function is used to sort by closest match from the beginning of the value
+ res = frappe.db.sql("""select i.name as item_code, i.item_name, i.image as item_image,
+ item_det.price_list_rate, item_det.currency
+ from `tabItem` i LEFT JOIN
+ (select item_code, price_list_rate, currency from
+ `tabItem Price` where price_list=%(price_list)s) item_det
+ ON
+ (item_det.item_code=i.name or item_det.item_code=i.variant_of)
+ where
+ i.disabled = 0 and i.has_variants = 0
+ and i.item_group in (select name from `tabItem Group` where lft >= {lft} and rgt <= {rgt})
+ and (i.item_code like %(item_code)s
+ or i.item_name like %(item_code)s or i.barcode like %(item_code)s)
+ limit {start}, {page_length}""".format(start=start, page_length=page_length, lft=lft, rgt=rgt),
+ {
+ 'item_code': '%%%s%%'%(frappe.db.escape(item_code)),
+ 'price_list': price_list
+ } , as_dict=1)
+
+ res = {
+ 'items': res
+ }
+
+ if serial_no:
+ res.update({
+ 'serial_no': serial_no
+ })
+
+ if batch_no:
+ res.update({
+ 'batch_no': batch_no
+ })
+
+ return res
+
+@frappe.whitelist()
+def submit_invoice(doc):
+ if isinstance(doc, basestring):
+ args = json.loads(doc)
+
+ doc = frappe.new_doc('Sales Invoice')
+ doc.update(args)
+ doc.run_method("set_missing_values")
+ doc.run_method("calculate_taxes_and_totals")
+ doc.submit()
+
+ return doc
diff --git a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
new file mode 100644
index 00000000000..c70d076c70a
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
@@ -0,0 +1,38 @@
+QUnit.test("test:Point of Sales", function(assert) {
+ assert.expect(1);
+ let done = assert.async();
+
+ frappe.run_serially([
+ () => frappe.set_route('point-of-sale'),
+ () => frappe.timeout(2),
+ () => frappe.set_control('customer', 'Test Customer 1'),
+ () => frappe.timeout(0.2),
+ () => cur_frm.set_value('customer', 'Test Customer 1'),
+ () => frappe.timeout(2),
+ () => frappe.click_link('Test Product 2'),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.cart-items [data-item-code="Test Product 2"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="Rate"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="2"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="5"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="0"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="Pay"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.frappe-control [data-value="4"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.frappe-control [data-value="5"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.frappe-control [data-value="0"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_button('Submit'),
+ () => frappe.click_button('Yes'),
+ () => frappe.timeout(3),
+ () => assert.ok(cur_frm.doc.docstatus==1, "Sales invoice created successfully"),
+ () => done()
+ ]);
+});
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 2822dd0fa04..34ecf26316f 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -8,6 +8,16 @@ frappe.ui.form.on("Company", {
erpnext.company.setup_queries(frm);
},
+ company_name: function(frm) {
+ if(frm.doc.__islocal) {
+ let parts = frm.doc.company_name.split();
+ let abbr = $.map(parts, function (p) {
+ return p? p.substr(0, 1) : null;
+ }).join("");
+ frm.set_value("abbr", abbr);
+ }
+ },
+
refresh: function(frm) {
if(frm.doc.abbr && !frm.doc.__islocal) {
frm.set_df_property("abbr", "read_only", 1);
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index c338a81a8ed..ec83705a43b 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,26 +1,207 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:company_name",
- "beta": 0,
- "creation": "2013-04-10 08:35:39",
- "custom": 0,
- "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:company_name",
+ "beta": 0,
+ "creation": "2013-04-10 08:35:39",
+ "custom": 0,
+ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "company_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "abbr",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Abbr",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "abbr",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
+ "fieldname": "change_abbr",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Change Abbreviation",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "cb0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "domain",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Domain",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Distribution\nManufacturing\nRetail\nServices\nEducation\nHealthcare\nOther",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "details",
+ "fieldname": "sales_settings",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -29,11 +210,11 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "",
+ "label": "Sales",
"length": 0,
"no_copy": 0,
- "oldfieldtype": "Section Break",
"permlevel": 0,
+ "precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
@@ -50,27 +231,26 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "company_name",
- "fieldtype": "Data",
- "hidden": 0,
+ "fieldname": "sales_monthly_history",
+ "fieldtype": "Small Text",
+ "hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Company",
+ "label": "Sales Monthly History",
"length": 0,
- "no_copy": 0,
- "oldfieldname": "company_name",
- "oldfieldtype": "Data",
+ "no_copy": 1,
"permlevel": 0,
+ "precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 0,
+ "read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 1,
+ "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -81,9 +261,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "description": "",
- "fieldname": "abbr",
- "fieldtype": "Data",
+ "fieldname": "monthly_sales_target",
+ "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -91,42 +270,12 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Abbr",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "abbr",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
- "fieldname": "change_abbr",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Change Abbreviation",
+ "label": "Monthly Sales Target",
"length": 0,
"no_copy": 0,
+ "options": "default_currency",
"permlevel": 0,
+ "precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
@@ -143,7 +292,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "cb0",
+ "fieldname": "column_break_goals",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -155,6 +304,7 @@
"length": 0,
"no_copy": 0,
"permlevel": 0,
+ "precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
@@ -171,8 +321,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "domain",
- "fieldtype": "Select",
+ "fieldname": "total_monthly_sales",
+ "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -180,14 +330,15 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Domain",
+ "label": "Total Monthly Sales",
"length": 0,
- "no_copy": 0,
- "options": "Distribution\nManufacturing\nRetail\nServices\nEducation\nOther",
+ "no_copy": 1,
+ "options": "default_currency",
"permlevel": 0,
+ "precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 0,
+ "read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -499,1483 +650,1332 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Accounts Settings",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_monthly_history",
- "fieldtype": "Small Text",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Monthly History",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_bank_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Bank Account",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "default_bank_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_target",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Target",
- "length": 0,
- "no_copy": 1,
- "options": "default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_cash_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Cash Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_goals",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_receivable_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Receivable Account",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "receivables_group",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_monthly_sales",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Total Monthly Sales",
- "length": 0,
- "no_copy": 1,
- "options": "default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "round_off_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Round Off Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Accounts Settings",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Write Off Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_bank_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Bank Account",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "default_bank_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "exchange_gain_loss_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Exchange Gain / Loss Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_cash_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Cash Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_receivable_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Receivable Account",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "receivables_group",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "round_off_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Round Off Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Write Off Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "exchange_gain_loss_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Exchange Gain / Loss Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payable_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Payable Account",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "payables_group",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_payable_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Payable Account",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "payables_group",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Cost of Goods Sold Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Cost of Goods Sold Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_income_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Income Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_income_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Income Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payroll_payable_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Payroll Payable Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_payroll_payable_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Payroll Payable Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "round_off_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Round Off Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "round_off_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Round Off Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_22",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_22",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Cost Center",
- "length": 0,
- "no_copy": 1,
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Cost Center",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "credit_limit",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Limit",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "credit_limit",
- "oldfieldtype": "Currency",
- "options": "default_currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "credit_limit",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Credit Limit",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "credit_limit",
+ "oldfieldtype": "Currency",
+ "options": "default_currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_26",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "credit_days_based_on",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Days Based On",
- "length": 0,
- "no_copy": 0,
- "options": "\nFixed Days\nLast Day of the Next Month",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "credit_days_based_on",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Credit Days Based On",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nFixed Days\nLast Day of the Next Month",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')",
- "fieldname": "credit_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Days",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "credit_days",
- "oldfieldtype": "Int",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')",
+ "fieldname": "credit_days",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Credit Days",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "credit_days",
+ "oldfieldtype": "Int",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "auto_accounting_for_stock_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Stock Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "auto_accounting_for_stock_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Settings",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "enable_perpetual_inventory",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Enable Perpetual Inventory",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "enable_perpetual_inventory",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Enable Perpetual Inventory",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_inventory_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Inventory Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_inventory_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Inventory Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "stock_adjustment_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Stock Adjustment Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "stock_adjustment_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Adjustment Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_32",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_32",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "stock_received_but_not_billed",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Stock Received But Not Billed",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "stock_received_but_not_billed",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Received But Not Billed",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "expenses_included_in_valuation",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Expenses Included In Valuation",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "expenses_included_in_valuation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Expenses Included In Valuation",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fixed_asset_depreciation_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fixed Asset Depreciation Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "fixed_asset_depreciation_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Fixed Asset Depreciation Settings",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "accumulated_depreciation_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Accumulated Depreciation Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "accumulated_depreciation_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Accumulated Depreciation Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "depreciation_expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Depreciation Expense Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "depreciation_expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Depreciation Expense Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "series_for_depreciation_entry",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Series for Asset Depreciation Entry (Journal Entry)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "series_for_depreciation_entry",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series for Asset Depreciation Entry (Journal Entry)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_40",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_40",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "disposal_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Gain/Loss Account on Asset Disposal",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "disposal_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Gain/Loss Account on Asset Disposal",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "depreciation_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Asset Depreciation Cost Center",
- "length": 0,
- "no_copy": 1,
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "depreciation_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Asset Depreciation Cost Center",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "For reference only.",
- "fieldname": "company_info",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Company Info",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "For reference only.",
+ "fieldname": "company_info",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company Info",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "address_html",
- "fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "address_html",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "phone_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Phone No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "phone_no",
- "oldfieldtype": "Data",
- "options": "Phone",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "phone_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Phone No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "phone_no",
+ "oldfieldtype": "Data",
+ "options": "Phone",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fax",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fax",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "fax",
- "oldfieldtype": "Data",
- "options": "Phone",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "fax",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Fax",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "fax",
+ "oldfieldtype": "Data",
+ "options": "Phone",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "email",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Email",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "email",
- "oldfieldtype": "Data",
- "options": "Email",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "email",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Email",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "email",
+ "oldfieldtype": "Data",
+ "options": "Email",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "website",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "website",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "website",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "website",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "registration_info",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "registration_info",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Company registration numbers for your reference. Tax numbers etc.",
- "fieldname": "registration_details",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Registration Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "registration_details",
- "oldfieldtype": "Code",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Company registration numbers for your reference. Tax numbers etc.",
+ "fieldname": "registration_details",
+ "fieldtype": "Code",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Registration Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "registration_details",
+ "oldfieldtype": "Code",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "delete_company_transactions",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Delete Company Transactions",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "delete_company_transactions",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Delete Company Transactions",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
}
],
@@ -1991,158 +1991,158 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-08-03 16:17:31.206886",
+ "modified": "2017-08-31 11:48:56.278568",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
"owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 0,
- "role": "Accounts User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Employee",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Sales User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Stock User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Projects User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Projects User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 1,
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 1,
+ "sort_order": "ASC",
+ "track_changes": 1,
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 849e6f9886f..0459e84b252 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -76,7 +76,10 @@ class Company(Document):
self.create_default_accounts()
self.create_default_warehouses()
- self.install_country_fixtures()
+ if cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
+ # In the case of setup, fixtures should be installed after setup_success
+ # This also prevents db commits before setup is successful
+ install_country_fixtures(self.name)
if not frappe.db.get_value("Cost Center", {"is_group": 0, "company": self.name}):
self.create_default_cost_center()
@@ -95,12 +98,6 @@ class Company(Document):
frappe.clear_cache()
- def install_country_fixtures(self):
- path = frappe.get_app_path('erpnext', 'regional', frappe.scrub(self.country))
- if os.path.exists(path.encode("utf-8")):
- frappe.get_attr("erpnext.regional.{0}.setup.setup"
- .format(self.country.lower()))(self)
-
def create_default_warehouses(self):
for wh_detail in [
{"warehouse_name": _("All Warehouses"), "is_group": 1},
@@ -281,6 +278,8 @@ class Company(Document):
frappe.db.sql("""update `tabSingles` set value=""
where doctype='Global Defaults' and field='default_company'
and value=%s""", self.name)
+ # delete mode of payment account
+ frappe.db.sql("delete from `tabMode of Payment Account` where company=%s", self.name)
@frappe.whitelist()
@@ -324,6 +323,13 @@ def get_name_with_abbr(name, company):
return " - ".join(parts)
+def install_country_fixtures(company):
+ company_doc = frappe.get_doc("Company", company)
+ path = frappe.get_app_path('erpnext', 'regional', frappe.scrub(company_doc.country))
+ if os.path.exists(path.encode("utf-8")):
+ frappe.get_attr("erpnext.regional.{0}.setup.setup"
+ .format(company_doc.country.lower()))(company_doc)
+
def update_company_current_month_sales(company):
current_month_year = formatdate(today(), "MM-yyyy")
diff --git a/erpnext/setup/doctype/company/company_dashboard.py b/erpnext/setup/doctype/company/company_dashboard.py
index da7f2b582a7..7526dd6c547 100644
--- a/erpnext/setup/doctype/company/company_dashboard.py
+++ b/erpnext/setup/doctype/company/company_dashboard.py
@@ -8,8 +8,8 @@ def get_data():
'graph': True,
'graph_method': "frappe.utils.goal.get_monthly_goal_graph_data",
'graph_method_args': {
- 'title': 'Sales',
- 'goal_value_field': 'sales_target',
+ 'title': _('Sales'),
+ 'goal_value_field': 'monthly_sales_target',
'goal_total_field': 'total_monthly_sales',
'goal_history_field': 'sales_monthly_history',
'goal_doctype': 'Sales Invoice',
diff --git a/erpnext/setup/doctype/company/tests/test_company.js b/erpnext/setup/doctype/company/tests/test_company.js
index afa3296e896..8c0b609775a 100644
--- a/erpnext/setup/doctype/company/tests/test_company.js
+++ b/erpnext/setup/doctype/company/tests/test_company.js
@@ -1,7 +1,7 @@
QUnit.module('setup');
QUnit.test("Test: Company [SetUp]", function (assert) {
- assert.expect(1);
+ assert.expect(2);
let done = assert.async();
frappe.run_serially([
@@ -16,8 +16,10 @@ QUnit.test("Test: Company [SetUp]", function (assert) {
// save form
() => cur_frm.save(),
() => frappe.timeout(1),
- () => assert.equal("Test Company", cur_frm.doc.company_name,
- 'name of company correctly saved'),
+ () => assert.equal("Debtors - TC", cur_frm.doc.default_receivable_account,
+ 'chart of acounts created'),
+ () => assert.equal("Main - TC", cur_frm.doc.cost_center,
+ 'chart of cost centers created'),
() => done()
]);
});
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/tests/test_company_production.js b/erpnext/setup/doctype/company/tests/test_company_production.js
index b73af1dd98b..37a3d744d06 100644
--- a/erpnext/setup/doctype/company/tests/test_company_production.js
+++ b/erpnext/setup/doctype/company/tests/test_company_production.js
@@ -8,7 +8,7 @@ QUnit.test("Test: Company", function (assert) {
() => frappe.set_route("List", "Company"),
() => frappe.new_doc("Company"),
() => frappe.timeout(1),
- () => cur_frm.set_value("company_name", "Razer Blade"),
+ () => cur_frm.set_value("company_name", "For Testing"),
() => cur_frm.set_value("abbr", "RB"),
() => cur_frm.set_value("default_currency", "INR"),
() => cur_frm.save(),
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
index e6b26eee555..675f9ca560b 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.py
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.py
@@ -16,7 +16,7 @@ class SalesPartner(WebsiteGenerator):
def onload(self):
"""Load address and contacts in `__onload`"""
- load_address_and_contact(self, "sales_partner")
+ load_address_and_contact(self)
def autoname(self):
self.name = self.partner_name
diff --git a/erpnext/setup/doctype/setup_progress/__init__.py b/erpnext/setup/doctype/setup_progress/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/setup/doctype/setup_progress/setup_progress.js b/erpnext/setup/doctype/setup_progress/setup_progress.js
new file mode 100644
index 00000000000..5c78bd50758
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/setup_progress.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Setup Progress', {
+ refresh: function() {
+
+ }
+});
diff --git a/erpnext/setup/doctype/setup_progress/setup_progress.json b/erpnext/setup/doctype/setup_progress/setup_progress.json
new file mode 100644
index 00000000000..09072d4665b
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/setup_progress.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-08-27 21:01:42.032109",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "actions_sb",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Actions",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "actions",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Actions",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Setup Progress Action",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 1,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-09-21 11:52:56.106659",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Setup Progress",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "All",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/setup_progress/setup_progress.py b/erpnext/setup/doctype/setup_progress/setup_progress.py
new file mode 100644
index 00000000000..9187eb79962
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/setup_progress.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+from frappe.model.document import Document
+
+class SetupProgress(Document):
+ pass
+
+def get_setup_progress():
+ if not getattr(frappe.local, "setup_progress", None):
+ frappe.local.setup_progress = frappe.get_doc("Setup Progress", "Setup Progress")
+
+ return frappe.local.setup_progress
+
+def get_action_completed_state(action_name):
+ return [d.is_completed for d in get_setup_progress().actions
+ if d.action_name == action_name][0]
+
+def update_action_completed_state(action_name):
+ action_table_doc = [d for d in get_setup_progress().actions
+ if d.action_name == action_name][0]
+ update_action(action_table_doc)
+
+def update_action(doc):
+ doctype = doc.action_doctype
+ docname = doc.action_document
+ field = doc.action_field
+
+ if not doc.is_completed:
+ if doc.min_doc_count:
+ if frappe.db.count(doctype) >= doc.min_doc_count:
+ doc.is_completed = 1
+ doc.save()
+ if docname and field:
+ d = frappe.get_doc(doctype, docname)
+ if d.get(field):
+ doc.is_completed = 1
+ doc.save()
+
+def update_domain_actions(domain):
+ for d in get_setup_progress().actions:
+ domains = json.loads(d.domains)
+ if domains == [] or domain in domains:
+ update_action(d)
+
+def get_domain_actions_state(domain):
+ state = {}
+ for d in get_setup_progress().actions:
+ domains = json.loads(d.domains)
+ if domains == [] or domain in domains:
+ state[d.action_name] = d.is_completed
+ return state
+
+@frappe.whitelist()
+def set_action_completed_state(action_name):
+ action_table_doc = [d for d in get_setup_progress().actions
+ if d.action_name == action_name][0]
+ action_table_doc.is_completed = 1
+ action_table_doc.save()
diff --git a/erpnext/setup/doctype/setup_progress/test_setup_progress.js b/erpnext/setup/doctype/setup_progress/test_setup_progress.js
new file mode 100644
index 00000000000..9e84e0cb154
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/test_setup_progress.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Setup Progress", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Setup Progress
+ () => frappe.tests.make('Setup Progress', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/setup/doctype/setup_progress/test_setup_progress.py b/erpnext/setup/doctype/setup_progress/test_setup_progress.py
new file mode 100644
index 00000000000..89262191436
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/test_setup_progress.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestSetupProgress(unittest.TestCase):
+ pass
diff --git a/erpnext/setup/doctype/setup_progress_action/__init__.py b/erpnext/setup/doctype/setup_progress_action/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/setup/doctype/setup_progress_action/setup_progress_action.json b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.json
new file mode 100644
index 00000000000..e9abcbcd1ac
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.json
@@ -0,0 +1,253 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-08-27 21:00:40.715360",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "action_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Action Name",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "action_doctype",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Action Doctype",
+ "length": 0,
+ "no_copy": 0,
+ "options": "DocType",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "action_document",
+ "fieldtype": "Dynamic Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Action Document",
+ "length": 0,
+ "no_copy": 0,
+ "options": "action_doctype",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "action_field",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Action Field",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "min_doc_count",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Min Doc Count",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "domains",
+ "fieldtype": "Code",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Domains",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_completed",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Is Completed",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 1,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-09-01 14:34:59.685730",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Setup Progress Action",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 1,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/setup_progress_action/setup_progress_action.py b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.py
new file mode 100644
index 00000000000..24af94347e5
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class SetupProgressAction(Document):
+ pass
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index 7f333cc8150..ddb2a80afb1 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -12,7 +12,8 @@ def get_domain(domain):
'desktop_icons': ['Item', 'BOM', 'Customer', 'Supplier', 'Sales Order',
'Production Order', 'Stock Entry', 'Purchase Order', 'Task', 'Buying', 'Selling',
'Accounts', 'HR', 'ToDo'],
- 'remove_roles': ['Academics User', 'Instructor'],
+ 'remove_roles': ['Academics User', 'Instructor', 'Physician', 'Nursing User',
+ 'Laboratory user', 'LabTest Approver', 'Healthcare Administrator'],
'properties': [
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'},
],
@@ -25,7 +26,9 @@ def get_domain(domain):
'Retail': {
'desktop_icons': ['POS', 'Item', 'Customer', 'Sales Invoice', 'Purchase Order',
'Warranty Claim', 'Accounts', 'Task', 'Buying', 'ToDo'],
- 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User', 'Instructor'],
+ 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User', 'Instructor',
+ 'Physician', 'Nursing User', 'Laboratory user',
+ 'LabTest Approver', 'Healthcare Administrator'],
'properties': [
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
{'doctype': 'Customer', 'fieldname': 'credit_limit_section', 'property': 'hidden', 'value': 1},
@@ -39,7 +42,9 @@ def get_domain(domain):
'Distribution': {
'desktop_icons': ['Item', 'Customer', 'Supplier', 'Lead', 'Sales Order', 'Task',
'Sales Invoice', 'CRM', 'Selling', 'Buying', 'Stock', 'Accounts', 'HR', 'ToDo'],
- 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User', 'Instructor'],
+ 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User', 'Instructor',
+ 'Physician', 'Nursing User', 'Laboratory user',
+ 'LabTest Approver', 'Healthcare Administrator'],
'set_value': [
['Stock Settings', None, 'show_barcode_field', 1]
],
@@ -49,7 +54,9 @@ def get_domain(domain):
'Services': {
'desktop_icons': ['Project', 'Timesheet', 'Customer', 'Sales Order', 'Sales Invoice',
'Lead', 'Opportunity', 'Task', 'Expense Claim', 'Employee', 'HR', 'ToDo'],
- 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User', 'Instructor'],
+ 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User', 'Instructor',
+ 'Physician', 'Nursing User', 'Laboratory user',
+ 'LabTest Approver', 'Healthcare Administrator'],
'properties': [
{'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0},
],
@@ -66,6 +73,13 @@ def get_domain(domain):
'Student', 'Projects User', 'Instructor'],
'default_portal_role': 'Student'
},
+ 'Healthcare': {
+ 'desktop_icons': ['Patient', 'Patient Appointment', 'Consultation', 'Lab Test', 'Healthcare',
+ 'Accounts', 'Buying', 'Stock', 'HR', 'ToDo'],
+ 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Projects User', 'Projects Manager',
+ 'Academics User', 'Instructor'],
+ 'default_portal_role': 'Patient'
+ },
}
if not domain in data:
raise 'Invalid Domain {0}'.format(domain)
diff --git a/erpnext/setup/setup_wizard/healthcare.py b/erpnext/setup/setup_wizard/healthcare.py
new file mode 100644
index 00000000000..ebc644e87b7
--- /dev/null
+++ b/erpnext/setup/setup_wizard/healthcare.py
@@ -0,0 +1,281 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+
+from frappe import _
+
+def setup_healthcare():
+ create_medical_departments()
+ create_antibiotics()
+ create_test_uom()
+ create_duration()
+ create_dosage()
+ create_healthcare_item_groups()
+ create_lab_test_items()
+ create_lab_test_template()
+ create_sensitivity()
+ make_custom_fields()
+
+def make_custom_fields():
+ custom_fields = {
+ 'Sales Invoice': [
+ dict(fieldname='appointment', label='Patient Appointment',
+ fieldtype='Link', options='Patient Appointment',
+ insert_after='customer')
+ ]
+ }
+
+ create_custom_fields(custom_fields)
+
+
+def create_medical_departments():
+ depts = ["Accident and emergency care" ,"Anaesthetics", "Biochemistry", "Cardiology", "Dermatology",
+ "Diagnostic imaging", "ENT", "Gastroenterology", "General Surgery", "Gynaecology",
+ "Haematology", "Maternity", "Microbiology", "Nephrology", "Neurology", "Oncology",
+ "Orthopaedics", "Pathology", "Physiotherapy", "Rheumatology", "Serology", "Urology"]
+ for d in depts:
+ mediacal_department = frappe.new_doc("Medical Department")
+ mediacal_department.department = d
+ try:
+ mediacal_department.save()
+ except frappe.DuplicateEntryError:
+ pass
+
+def create_antibiotics():
+ abt = ["Amoxicillin", "Ampicillin", "Bacampicillin", "Carbenicillin", "Cloxacillin", "Dicloxacillin",
+ "Flucloxacillin", "Mezlocillin", "Nafcillin", "Oxacillin", "Penicillin G", "Penicillin V",
+ "Piperacillin", "Pivampicillin", "Pivmecillinam", "Ticarcillin", "Cefacetrile (cephacetrile)",
+ "Cefadroxil (cefadroxyl)", "Cefalexin (cephalexin)", "Cefaloglycin (cephaloglycin)",
+ "Cefalonium (cephalonium)", "Cefaloridine (cephaloradine)", "Cefalotin (cephalothin)",
+ "Cefapirin (cephapirin)", "Cefatrizine", "Cefazaflur", "Cefazedone", "Cefazolin (cephazolin)",
+ "Cefradine (cephradine)", "Cefroxadine", "Ceftezole", "Cefaclor", "Cefamandole", "Cefmetazole",
+ "Cefonicid", "Cefotetan", "Cefoxitin", "Cefprozil (cefproxil)", "Cefuroxime", "Cefuzonam",
+ "Cefcapene", "Cefdaloxime", "Cefdinir", "Cefditoren", "Cefetamet", "Cefixime", "Cefmenoxime",
+ "Cefodizime", "Cefotaxime", "Cefpimizole", "Cefpodoxime", "Cefteram", "Ceftibuten", "Ceftiofur",
+ "Ceftiolene", "Ceftizoxime", "Ceftriaxone", "Cefoperazone", "Ceftazidime", "Cefclidine", "Cefepime",
+ "Cefluprenam", "Cefoselis", "Cefozopran", "Cefpirome", "Cefquinome", "Ceftobiprole", "Ceftaroline",
+ "Cefaclomezine","Cefaloram", "Cefaparole", "Cefcanel", "Cefedrolor", "Cefempidone", "Cefetrizole",
+ "Cefivitril", "Cefmatilen", "Cefmepidium", "Cefovecin", "Cefoxazole", "Cefrotil", "Cefsumide",
+ "Cefuracetime", "Ceftioxide", "Ceftazidime/Avibactam", "Ceftolozane/Tazobactam", "Aztreonam",
+ "Imipenem", "Imipenem/cilastatin", "Doripenem", "Meropenem", "Ertapenem", "Azithromycin",
+ "Erythromycin", "Clarithromycin", "Dirithromycin", "Roxithromycin", "Telithromycin", "Clindamycin",
+ "Lincomycin", "Pristinamycin", "Quinupristin/dalfopristin", "Amikacin", "Gentamicin", "Kanamycin",
+ "Neomycin", "Netilmicin", "Paromomycin", "Streptomycin", "Tobramycin", "Flumequine", "Nalidixic acid",
+ "Oxolinic acid", "Piromidic acid", "Pipemidic acid", "Rosoxacin", "Ciprofloxacin", "Enoxacin",
+ "Lomefloxacin", "Nadifloxacin", "Norfloxacin", "Ofloxacin", "Pefloxacin", "Rufloxacin", "Balofloxacin",
+ "Gatifloxacin", "Grepafloxacin", "Levofloxacin", "Moxifloxacin", "Pazufloxacin", "Sparfloxacin",
+ "Temafloxacin", "Tosufloxacin", "Besifloxacin", "Clinafloxacin", "Gemifloxacin",
+ "Sitafloxacin", "Trovafloxacin", "Prulifloxacin", "Sulfamethizole", "Sulfamethoxazole",
+ "Sulfisoxazole", "Trimethoprim-Sulfamethoxazole", "Demeclocycline", "Doxycycline", "Minocycline",
+ "Oxytetracycline", "Tetracycline", "Tigecycline", "Chloramphenicol", "Metronidazole",
+ "Tinidazole", "Nitrofurantoin", "Vancomycin", "Teicoplanin", "Telavancin", "Linezolid",
+ "Cycloserine 2", "Rifampin", "Rifabutin", "Rifapentine", "Rifalazil", "Bacitracin", "Polymyxin B",
+ "Viomycin", "Capreomycin"]
+ for a in abt:
+ antibiotic = frappe.new_doc("Antibiotic")
+ antibiotic.antibiotic_name = a
+ try:
+ antibiotic.save()
+ except frappe.DuplicateEntryError:
+ pass
+
+def create_test_uom():
+ records = [
+ {"doctype": "Lab Test UOM", "name": "umol/L", "test_uom": "umol/L", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "mg/L", "test_uom": "mg/L", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "mg / dl", "test_uom": "mg / dl", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "pg / ml", "test_uom": "pg / ml", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "U/ml", "test_uom": "U/ml", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "/HPF", "test_uom": "/HPF", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "Million Cells / cumm", "test_uom": "Million Cells / cumm", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "Lakhs Cells / cumm", "test_uom": "Lakhs Cells / cumm", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "U / L", "test_uom": "U / L", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "g / L", "test_uom": "g / L", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "IU / ml", "test_uom": "IU / ml", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "gm %", "test_uom": "gm %", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "Microgram", "test_uom": "Microgram", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "Micron", "test_uom": "Micron", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "Cells / cumm", "test_uom": "Cells / cumm", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "%", "test_uom": "%", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "mm / dl", "test_uom": "mm / dl", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "mm / hr", "test_uom": "mm / hr", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "ulU / ml", "test_uom": "ulU / ml", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "ng / ml", "test_uom": "ng / ml", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "ng / dl", "test_uom": "ng / dl", "uom_description": None },
+ {"doctype": "Lab Test UOM", "name": "ug / dl", "test_uom": "ug / dl", "uom_description": None }
+ ]
+
+ insert_record(records)
+
+def create_duration():
+ records = [
+ {"doctype": "Prescription Duration", "name": "3 Month", "number": "3", "period": "Month" },
+ {"doctype": "Prescription Duration", "name": "2 Month", "number": "2", "period": "Month" },
+ {"doctype": "Prescription Duration", "name": "1 Month", "number": "1", "period": "Month" },
+ {"doctype": "Prescription Duration", "name": "12 Hour", "number": "12", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "11 Hour", "number": "11", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "10 Hour", "number": "10", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "9 Hour", "number": "9", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "8 Hour", "number": "8", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "7 Hour", "number": "7", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "6 Hour", "number": "6", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "5 Hour", "number": "5", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "4 Hour", "number": "4", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "3 Hour", "number": "3", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "2 Hour", "number": "2", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "1 Hour", "number": "1", "period": "Hour" },
+ {"doctype": "Prescription Duration", "name": "5 Week", "number": "5", "period": "Week" },
+ {"doctype": "Prescription Duration", "name": "4 Week", "number": "4", "period": "Week" },
+ {"doctype": "Prescription Duration", "name": "3 Week", "number": "3", "period": "Week" },
+ {"doctype": "Prescription Duration", "name": "2 Week", "number": "2", "period": "Week" },
+ {"doctype": "Prescription Duration", "name": "1 Week", "number": "1", "period": "Week" },
+ {"doctype": "Prescription Duration", "name": "6 Day", "number": "6", "period": "Day" },
+ {"doctype": "Prescription Duration", "name": "5 Day", "number": "5", "period": "Day" },
+ {"doctype": "Prescription Duration", "name": "4 Day", "number": "4", "period": "Day" },
+ {"doctype": "Prescription Duration", "name": "3 Day", "number": "3", "period": "Day" },
+ {"doctype": "Prescription Duration", "name": "2 Day", "number": "2", "period": "Day" },
+ {"doctype": "Prescription Duration", "name": "1 Day", "number": "1", "period": "Day" }
+ ]
+ insert_record(records)
+
+def create_dosage():
+ records = [
+ {"doctype": "Prescription Dosage", "name": "1-1-1-1", "dosage": "1-1-1-1","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "13:00:00"},{"strength": "1.0","strength_time": "17:00:00"},{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "0-0-1", "dosage": "0-0-1","dosage_strength":
+ [{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "1-0-0", "dosage": "1-0-0","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "0-1-0", "dosage": "0-1-0","dosage_strength":
+ [{"strength": "1.0","strength_time": "14:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "1-1-1", "dosage": "1-1-1","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "14:00:00"},{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "1-0-1", "dosage": "1-0-1","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "Once Bedtime", "dosage": "Once Bedtime","dosage_strength":
+ [{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "5 times a day", "dosage": "5 times a day","dosage_strength":
+ [{"strength": "1.0","strength_time": "5:00:00"}, {"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "13:00:00"},{"strength": "1.0","strength_time": "17:00:00"},{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "QID", "dosage": "QID","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "13:00:00"},{"strength": "1.0","strength_time": "17:00:00"},{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "TID", "dosage": "TID","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "14:00:00"},{"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "BID", "dosage": "BID","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}, {"strength": "1.0","strength_time": "21:00:00"}]
+ },
+ {"doctype": "Prescription Dosage", "name": "Once Daily", "dosage": "Once Daily","dosage_strength":
+ [{"strength": "1.0","strength_time": "9:00:00"}]
+ }
+ ]
+ insert_record(records)
+
+def create_healthcare_item_groups():
+ records = [
+ {'doctype': 'Item Group', 'item_group_name': _('Laboratory'),
+ 'is_group': 0, 'parent_item_group': _('All Item Groups') },
+ {'doctype': 'Item Group', 'item_group_name': _('Drug'),
+ 'is_group': 0, 'parent_item_group': _('All Item Groups') }
+ ]
+ insert_record(records)
+
+def create_lab_test_items():
+ records = [
+ {"doctype": "Item", "item_code": "MCH", "item_name": "MCH", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "LDL", "item_name": "LDL", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "GTT", "item_name": "GTT", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "HDL", "item_name": "HDL", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "BILT", "item_name": "BILT", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "BILD", "item_name": "BILD", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "BP", "item_name": "BP", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+ {"doctype": "Item", "item_code": "BS", "item_name": "BS", "item_group": "Laboratory",
+ "stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1}
+ ]
+ insert_record(records)
+
+def create_lab_test_template():
+ records = [
+ {"doctype": "Lab Test Template", "name": "MCH","test_name": "MCH","test_code": "MCH",
+ "test_group": "Laboratory","department": "Haematology","item": "MCH",
+ "test_template_type": "Single","is_billable": 1,"test_rate": 0.0,"test_uom": "Microgram",
+ "test_normal_range": "27 - 32 Microgram",
+ "sensitivity": 0,"test_description": "Mean Corpuscular Hemoglobin"},
+ {"doctype": "Lab Test Template", "name": "LDL","test_name": "LDL (Serum)","test_code": "LDL",
+ "test_group": "Laboratory","department": "Biochemistry",
+ "item": "LDL","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "70 - 160 mg/dlLow-density Lipoprotein (LDL)",
+ "sensitivity": 0,"test_description": "Low-density Lipoprotein (LDL)"},
+ {"doctype": "Lab Test Template", "name": "GTT","test_name": "GTT","test_code": "GTT",
+ "test_group": "Laboratory","department": "Haematology",
+ "item": "GTT","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "Less than 85 mg/dl",
+ "sensitivity": 0,"test_description": "Glucose Tolerance Test"},
+ {"doctype": "Lab Test Template", "name": "HDL","test_name": "HDL (Serum)","test_code": "HDL",
+ "test_group": "Laboratory","department": "Biochemistry",
+ "item": "HDL","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "35 - 65 mg/dl",
+ "sensitivity": 0,"test_description": "High-density Lipoprotein (HDL)"},
+ {"doctype": "Lab Test Template", "name": "BILT","test_name": "Bilirubin Total","test_code": "BILT",
+ "test_group": "Laboratory","department": "Biochemistry",
+ "item": "BILT","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "0.2 - 1.2 mg / dl",
+ "sensitivity": 0,"test_description": "Bilirubin Total"},
+ {"doctype": "Lab Test Template", "name": "BILD","test_name": "Bilirubin Direct","test_code": "BILD",
+ "test_group": "Laboratory","department": "Biochemistry",
+ "item": "BILD","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "0.4 mg / dl",
+ "sensitivity": 0,"test_description": "Bilirubin Direct"},
+
+ {"doctype": "Lab Test Template", "name": "BP","test_name": "Bile Pigment","test_code": "BP",
+ "test_group": "Laboratory","department": "Pathology",
+ "item": "BP","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "","test_normal_range": "",
+ "sensitivity": 0,"test_description": "Bile Pigment"},
+ {"doctype": "Lab Test Template", "name": "BS","test_name": "Bile Salt","test_code": "BS",
+ "test_group": "Laboratory","department": "Pathology",
+ "item": "BS","test_template_type": "Single",
+ "is_billable": 1,"test_rate": 0.0,"test_uom": "","test_normal_range": "",
+ "sensitivity": 0,"test_description": "Bile Salt"}
+ ]
+ insert_record(records)
+
+def create_sensitivity():
+ records = [
+ {"doctype": "Sensitivity", "sensitivity": "Low Sensitivity"},
+ {"doctype": "Sensitivity", "sensitivity": "High Sensitivity"},
+ {"doctype": "Sensitivity", "sensitivity": "Moderate Sensitivity"},
+ {"doctype": "Sensitivity", "sensitivity": "Susceptible"},
+ {"doctype": "Sensitivity", "sensitivity": "Resistant"},
+ {"doctype": "Sensitivity", "sensitivity": "Intermediate"}
+ ]
+ insert_record(records)
+
+def insert_record(records):
+ for r in records:
+ doc = frappe.new_doc(r.get("doctype"))
+ doc.update(r)
+ try:
+ doc.insert(ignore_permissions=True)
+ except frappe.DuplicateEntryError, e:
+ # pass DuplicateEntryError and continue
+ if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
+ # make sure DuplicateEntryError is for the exact same doc and not a related doc
+ pass
+ else:
+ raise
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index ea6da04641a..e6a4a81959e 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -19,6 +19,33 @@ def install(country=None):
{ 'doctype': 'Domain', 'domain': _('Retail')},
{ 'doctype': 'Domain', 'domain': _('Services')},
{ 'doctype': 'Domain', 'domain': _('Education')},
+ { 'doctype': 'Domain', 'domain': _('Healthcare')},
+
+ # Setup Progress
+ {'doctype': "Setup Progress", "actions": [
+ {"action_name": "Add Company", "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
+ "domains": '[]' },
+ {"action_name": "Set Sales Target", "action_doctype": "Company", "min_doc_count": 99,
+ "action_document": frappe.defaults.get_defaults().get("company") or '',
+ "action_field": "monthly_sales_target", "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": "Add Customers", "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": "Add Suppliers", "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": "Add Products", "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": "Add Programs", "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": "Add Instructors", "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": "Add Courses", "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
+ "domains": '[]' }
+ ]},
# address template
{'doctype':"Address Template", "country": country},
@@ -240,3 +267,8 @@ def install(country=None):
pass
else:
raise
+
+ # set default customer group and territory
+ selling_settings = frappe.get_doc("Selling Settings")
+ selling_settings.set_default_customer_group_and_territory()
+ selling_settings.save()
diff --git a/erpnext/setup/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py
index cfc6726d1ca..bc26e09677c 100644
--- a/erpnext/setup/setup_wizard/sample_data.py
+++ b/erpnext/setup/setup_wizard/sample_data.py
@@ -10,26 +10,27 @@ import random, os, json
from frappe import _
from markdown2 import markdown
-def make_sample_data(args):
+def make_sample_data(domain, make_dependent = False):
"""Create a few opportunities, quotes, material requests, issues, todos, projects
to help the user get started"""
- items = frappe.get_all("Item", {'is_sales_item': 1})
- customers = frappe.get_all("Customer")
- warehouses = frappe.get_all("Warehouse")
+ if make_dependent:
+ items = frappe.get_all("Item", {'is_sales_item': 1})
+ customers = frappe.get_all("Customer")
+ warehouses = frappe.get_all("Warehouse")
- if items and customers:
- for i in range(3):
- customer = random.choice(customers).name
- make_opportunity(items, customer)
- make_quote(items, customer)
+ if items and customers:
+ for i in range(3):
+ customer = random.choice(customers).name
+ make_opportunity(items, customer)
+ make_quote(items, customer)
- make_projects(args.get('domain'))
+ if items and warehouses:
+ make_material_request(frappe.get_all("Item"))
+
+ make_projects(domain)
import_email_alert()
- if items and warehouses:
- make_material_request(frappe.get_all("Item"))
-
frappe.db.commit()
def make_opportunity(items, customer):
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index c40ad55f8bd..d3e4a084f53 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -10,11 +10,13 @@ from frappe.utils import cstr, flt, getdate
from frappe import _
from frappe.utils.file_manager import save_file
from .default_website import website_maker
+from .healthcare import setup_healthcare
import install_fixtures
from .sample_data import make_sample_data
from erpnext.accounts.doctype.account.account import RootNotEditable
from frappe.core.doctype.communication.comment import add_info_comment
from erpnext.setup.setup_wizard.domainify import setup_domain
+from erpnext.setup.doctype.company.company import install_country_fixtures
def setup_complete(args=None):
if frappe.db.sql("select name from tabCompany"):
@@ -25,24 +27,19 @@ def setup_complete(args=None):
create_price_lists(args)
create_fiscal_year_and_company(args)
create_sales_tax(args)
- create_users(args)
+ create_employee_for_self(args)
set_defaults(args)
create_territories()
create_feed_and_todo()
create_email_digest()
create_letter_head(args)
- create_taxes(args)
- create_items(args)
- create_customers(args)
- create_suppliers(args)
if args.get('domain').lower() == 'education':
create_academic_year()
create_academic_term()
- create_program(args)
- create_course(args)
- create_instructor(args)
- create_room(args)
+
+ if args.domain.lower() == 'healthcare':
+ setup_healthcare()
if args.get('setup_website'):
website_maker(args)
@@ -58,16 +55,19 @@ def setup_complete(args=None):
frappe.db.commit()
frappe.clear_cache()
- if args.get("add_sample_data"):
- try:
- make_sample_data(args)
- frappe.clear_cache()
- except:
- # clear message
- if frappe.message_log:
- frappe.message_log.pop()
+ try:
+ make_sample_data(args.get('domain'))
+ frappe.clear_cache()
+ except:
+ # clear message
+ if frappe.message_log:
+ frappe.message_log.pop()
- pass
+ pass
+
+def setup_success(args=None):
+ company = frappe.db.sql("select name from tabCompany", as_dict=True)[0]["name"]
+ install_country_fixtures(company)
def create_fiscal_year_and_company(args):
if (args.get('fy_start_date')):
@@ -91,8 +91,7 @@ def create_fiscal_year_and_company(args):
'country': args.get('country'),
'create_chart_of_accounts_based_on': 'Standard Template',
'chart_of_accounts': args.get('chart_of_accounts'),
- 'domain': args.get('domain'),
- 'sales_target': args.get('sales_target')
+ 'domain': args.get('domain')
}).insert()
#Enable shopping cart
@@ -159,7 +158,9 @@ def set_defaults(args):
global_defaults.save()
- frappe.db.set_value("System Settings", None, "email_footer_address", args.get("company"))
+ system_settings = frappe.get_doc("System Settings")
+ system_settings.email_footer_address = args.get("company")
+ system_settings.save()
stock_settings = frappe.get_doc("Stock Settings")
stock_settings.item_naming_by = "Item Code"
@@ -176,7 +177,6 @@ def set_defaults(args):
selling_settings.so_required = "No"
selling_settings.dn_required = "No"
selling_settings.allow_multiple_items = 1
- selling_settings.set_default_customer_group_and_territory()
selling_settings.save()
buying_settings = frappe.get_doc("Buying Settings")
@@ -260,22 +260,7 @@ def create_sales_tax(args):
tax_data.get('account_name'),
tax_data.get('tax_rate'), sales_tax)
-def get_country_wise_tax(country):
- data = {}
- with open (os.path.join(os.path.dirname(__file__), "data", "country_wise_tax.json")) as countrywise_tax:
- data = json.load(countrywise_tax).get(country)
-
- return data
-
-def create_taxes(args):
- for i in xrange(1,6):
- if args.get("tax_" + str(i)):
- # replace % in case someone also enters the % symbol
- tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
- account_name = args.get("tax_" + str(i))
-
- make_tax_account_and_template(args.get("company_name") , account_name, tax_rate)
-
+# Tax utils start
def make_tax_account_and_template(company, account_name, tax_rate, template_name=None):
try:
if not isinstance(account_name, (list, tuple)):
@@ -293,15 +278,6 @@ def make_tax_account_and_template(company, account_name, tax_rate, template_name
except RootNotEditable:
pass
-def get_tax_account_group(company):
- tax_group = frappe.db.get_value("Account",
- {"account_name": "Duties and Taxes", "is_group": 1, "company": company})
- if not tax_group:
- tax_group = frappe.db.get_value("Account", {"is_group": 1, "root_type": "Liability",
- "account_type": "Tax", "company": company})
-
- return tax_group
-
def make_tax_account(company, account_name, tax_rate):
tax_group = get_tax_account_group(company)
if tax_group:
@@ -346,115 +322,23 @@ def make_sales_and_purchase_tax_templates(accounts, template_name=None):
doc = frappe.get_doc(purchase_tax_template)
doc.insert(ignore_permissions=True)
-def create_items(args):
- for i in xrange(1,6):
- item = args.get("item_" + str(i))
- if item:
- item_group = _(args.get("item_group_" + str(i)))
- is_sales_item = args.get("is_sales_item_" + str(i))
- is_purchase_item = args.get("is_purchase_item_" + str(i))
- is_stock_item = item_group!=_("Services")
- default_warehouse = ""
- if is_stock_item:
- default_warehouse = frappe.db.get_value("Warehouse", filters={
- "warehouse_name": _("Finished Goods") if is_sales_item else _("Stores"),
- "company": args.get("company_name")
- })
+def get_tax_account_group(company):
+ tax_group = frappe.db.get_value("Account",
+ {"account_name": "Duties and Taxes", "is_group": 1, "company": company})
+ if not tax_group:
+ tax_group = frappe.db.get_value("Account", {"is_group": 1, "root_type": "Liability",
+ "account_type": "Tax", "company": company})
- try:
- frappe.get_doc({
- "doctype":"Item",
- "item_code": item,
- "item_name": item,
- "description": item,
- "show_in_website": 1,
- "is_sales_item": is_sales_item,
- "is_purchase_item": is_purchase_item,
- "is_stock_item": is_stock_item and 1 or 0,
- "item_group": item_group,
- "stock_uom": _(args.get("item_uom_" + str(i))),
- "default_warehouse": default_warehouse
- }).insert()
+ return tax_group
- if args.get("item_img_" + str(i)):
- item_image = args.get("item_img_" + str(i)).split(",")
- if len(item_image)==3:
- filename, filetype, content = item_image
- fileurl = save_file(filename, content, "Item", item, decode=True).file_url
- frappe.db.set_value("Item", item, "image", fileurl)
+# Tax utils end
- if args.get("item_price_" + str(i)):
- item_price = flt(args.get("item_price_" + str(i)))
+def get_country_wise_tax(country):
+ data = {}
+ with open (os.path.join(os.path.dirname(__file__), "data", "country_wise_tax.json")) as countrywise_tax:
+ data = json.load(countrywise_tax).get(country)
- if is_sales_item:
- price_list_name = frappe.db.get_value("Price List", {"selling": 1})
- make_item_price(item, price_list_name, item_price)
-
- if is_purchase_item:
- price_list_name = frappe.db.get_value("Price List", {"buying": 1})
- make_item_price(item, price_list_name, item_price)
-
- except frappe.NameError:
- pass
-
-def make_item_price(item, price_list_name, item_price):
- frappe.get_doc({
- "doctype": "Item Price",
- "price_list": price_list_name,
- "item_code": item,
- "price_list_rate": item_price
- }).insert()
-
-
-def create_customers(args):
- for i in xrange(1,6):
- customer = args.get("customer_" + str(i))
- if customer:
- try:
- doc = frappe.get_doc({
- "doctype":"Customer",
- "customer_name": customer,
- "customer_type": "Company",
- "customer_group": _("Commercial"),
- "territory": args.get("country"),
- "company": args.get("company_name")
- }).insert()
-
- if args.get("customer_contact_" + str(i)):
- create_contact(args.get("customer_contact_" + str(i)),
- "Customer", doc.name)
- except frappe.NameError:
- pass
-
-def create_suppliers(args):
- for i in xrange(1,6):
- supplier = args.get("supplier_" + str(i))
- if supplier:
- try:
- doc = frappe.get_doc({
- "doctype":"Supplier",
- "supplier_name": supplier,
- "supplier_type": _("Local"),
- "company": args.get("company_name")
- }).insert()
-
- if args.get("supplier_contact_" + str(i)):
- create_contact(args.get("supplier_contact_" + str(i)),
- "Supplier", doc.name)
- except frappe.NameError:
- pass
-
-def create_contact(contact, party_type, party):
- """Create contact based on given contact name"""
- contact = contact .split(" ")
-
- contact = frappe.get_doc({
- "doctype":"Contact",
- "first_name":contact[0],
- "last_name": len(contact) > 1 and contact[1] or ""
- })
- contact.append('links', dict(link_doctype=party_type, link_name=party))
- contact.insert()
+ return data
def create_letter_head(args):
if args.get("attach_letterhead"):
@@ -498,7 +382,7 @@ def login_as_first_user(args):
if args.get("email") and hasattr(frappe.local, "login_manager"):
frappe.local.login_manager.login_as(args.get("email"))
-def create_users(args):
+def create_employee_for_self(args):
if frappe.session.user == 'Administrator':
return
@@ -513,50 +397,7 @@ def create_users(args):
emp.flags.ignore_mandatory = True
emp.insert(ignore_permissions = True)
- for i in xrange(1,5):
- email = args.get("user_email_" + str(i))
- fullname = args.get("user_fullname_" + str(i))
- if email:
- if not fullname:
- fullname = email.split("@")[0]
-
- parts = fullname.split(" ", 1)
-
- user = frappe.get_doc({
- "doctype": "User",
- "email": email,
- "first_name": parts[0],
- "last_name": parts[1] if len(parts) > 1 else "",
- "enabled": 1,
- "user_type": "System User"
- })
-
- # default roles
- user.append_roles("Projects User", "Stock User", "Support Team")
-
- if args.get("user_sales_" + str(i)):
- user.append_roles("Sales User", "Sales Manager", "Accounts User")
- if args.get("user_purchaser_" + str(i)):
- user.append_roles("Purchase User", "Purchase Manager", "Accounts User")
- if args.get("user_accountant_" + str(i)):
- user.append_roles("Accounts Manager", "Accounts User")
-
- user.flags.delay_emails = True
-
- if not frappe.db.get_value("User", email):
- user.insert(ignore_permissions=True)
-
- # create employee
- emp = frappe.get_doc({
- "doctype": "Employee",
- "employee_name": fullname,
- "user_id": email,
- "status": "Active",
- "company": args.get("company_name")
- })
- emp.flags.ignore_mandatory = True
- emp.insert(ignore_permissions = True)
-
+# Schools
def create_academic_term():
at = ["Semester 1", "Semester 2", "Semester 3"]
ay = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
@@ -580,45 +421,3 @@ def create_academic_year():
except frappe.DuplicateEntryError:
pass
-def create_program(args):
- for i in xrange(1,6):
- if args.get("program_" + str(i)):
- program = frappe.new_doc("Program")
- program.program_code = args.get("program_" + str(i))
- program.program_name = args.get("program_" + str(i))
- try:
- program.save()
- except frappe.DuplicateEntryError:
- pass
-
-def create_course(args):
- for i in xrange(1,6):
- if args.get("course_" + str(i)):
- course = frappe.new_doc("Course")
- course.course_code = args.get("course_" + str(i))
- course.course_name = args.get("course_" + str(i))
- try:
- course.save()
- except frappe.DuplicateEntryError:
- pass
-
-def create_instructor(args):
- for i in xrange(1,6):
- if args.get("instructor_" + str(i)):
- instructor = frappe.new_doc("Instructor")
- instructor.instructor_name = args.get("instructor_" + str(i))
- try:
- instructor.save()
- except frappe.DuplicateEntryError:
- pass
-
-def create_room(args):
- for i in xrange(1,6):
- if args.get("room_" + str(i)):
- room = frappe.new_doc("Room")
- room.room_name = args.get("room_" + str(i))
- room.seating_capacity = args.get("room_capacity_" + str(i))
- try:
- room.save()
- except frappe.DuplicateEntryError:
- pass
diff --git a/erpnext/setup/setup_wizard/test_setup_wizard.py b/erpnext/setup/setup_wizard/test_setup_wizard.py
new file mode 100644
index 00000000000..57eeeff5b2c
--- /dev/null
+++ b/erpnext/setup/setup_wizard/test_setup_wizard.py
@@ -0,0 +1,65 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe, time
+from frappe.utils.selenium_testdriver import TestDriver
+
+def run_setup_wizard_test():
+ driver = TestDriver()
+ frappe.db.set_default('in_selenium', '1')
+ frappe.db.commit()
+
+ driver.login('#page-setup-wizard')
+ print('Running Setup Wizard Test...')
+
+ # Language slide
+ driver.wait_for_ajax(True)
+ time.sleep(2)
+ driver.set_select("language", "English (United States)")
+ driver.wait_for_ajax(True)
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Region slide
+ driver.wait_for_ajax(True)
+ driver.set_select("country", "India")
+ driver.wait_for_ajax(True)
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Profile slide
+ driver.set_field("full_name", "Great Tester")
+ driver.set_field("email", "great@example.com")
+ driver.set_field("password", "test")
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Brand slide
+ driver.set_select("domain", "Manufacturing")
+ time.sleep(5)
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Org slide
+ driver.set_field("company_name", "For Testing")
+ driver.wait_till_clickable(".next-btn").click()
+ driver.set_field("company_tagline", "Just for GST")
+ driver.set_field("bank_account", "HDFC")
+ driver.wait_till_clickable(".complete-btn").click()
+
+ # Wait for desktop
+ driver.wait_for('#page-desktop', timeout=600)
+
+ console = driver.get_console()
+ if frappe.flags.tests_verbose:
+ for line in console:
+ print(line)
+ print('-' * 40)
+ time.sleep(1)
+
+ frappe.db.set_default('in_selenium', None)
+ frappe.db.set_value("Company", "For Testing", "write_off_account", "Write Off - FT")
+ frappe.db.set_value("Company", "For Testing", "exchange_gain_loss_account", "Exchange Gain/Loss - FT")
+ frappe.db.commit()
+
+ driver.close()
+
+ return True
diff --git a/erpnext/setup/setup_wizard/utils.py b/erpnext/setup/setup_wizard/utils.py
index dc4abd4f502..d821a129899 100644
--- a/erpnext/setup/setup_wizard/utils.py
+++ b/erpnext/setup/setup_wizard/utils.py
@@ -10,6 +10,3 @@ def complete():
#setup_wizard.create_sales_tax(data)
setup_complete(data)
-
-
-
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 5b0ce391a13..eb06f27c70a 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -55,13 +55,19 @@ def get_notification_config():
},
"Production Order": { "status": ("in", ("Draft", "Not Started", "In Process")) },
"BOM": {"docstatus": 0},
- "Timesheet": {"status": "Draft"}
+
+ "Timesheet": {"status": "Draft"},
+
+ "Lab Test": {"docstatus": 0},
+ "Sample Collection": {"docstatus": 0},
+ "Patient Appointment": {"status": "Open"},
+ "Consultation": {"docstatus": 0}
},
"targets": {
"Company": {
- "filters" : { "sales_target": ( ">", 0 ) },
- "target_field" : "sales_target",
+ "filters" : { "monthly_sales_target": ( ">", 0 ) },
+ "target_field" : "monthly_sales_target",
"value_field" : "total_monthly_sales"
}
}
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index e4bbd8744e4..3d5a6740214 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py
@@ -269,7 +269,7 @@ data_map = {
},
"Purchase Receipt": {
"columns": ["name", "supplier", "posting_date", "company"],
- "conditions": ["docstatus=1"],
+ "conditions": ["docstatus=1"],
"order_by": "posting_date",
"links": {
"supplier": ["Supplier", "name"],
@@ -278,7 +278,7 @@ data_map = {
},
"Purchase Receipt Item[Purchase Analytics]": {
"columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
- "conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
+ "conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
"parent": ["Purchase Receipt", "name"],
@@ -297,5 +297,39 @@ data_map = {
"columns": ["name","status","creation","planned_start_date","planned_end_date","status","actual_start_date","actual_end_date", "modified"],
"conditions": ["docstatus = 1"],
"order_by": "creation"
+ },
+
+ #Medical
+ "Patient": {
+ "columns": ["name", "creation", "owner", "if(patient_name=name, '', patient_name) as patient_name"],
+ "conditions": ["docstatus < 2"],
+ "order_by": "name",
+ "links": {
+ "owner" : ["User", "name"]
+ }
+ },
+ "Patient Appointment": {
+ "columns": ["name", "appointment_type", "patient", "physician", "appointment_date", "department", "status", "company"],
+ "order_by": "name",
+ "links": {
+ "physician": ["Physician", "name"],
+ "appointment_type": ["Appointment Type", "name"]
+ }
+ },
+ "Physician": {
+ "columns": ["name", "department"],
+ "order_by": "name",
+ "links": {
+ "department": ["Department", "name"],
+ }
+
+ },
+ "Appointment Type": {
+ "columns": ["name"],
+ "order_by": "name"
+ },
+ "Medical Department": {
+ "columns": ["name"],
+ "order_by": "name"
}
}
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 46d536dacea..e0ee3708f43 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -166,6 +166,12 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
__("Status"))
}
erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);
+
+ if(doc.docstatus==1 && !doc.subscription) {
+ cur_frm.add_custom_button(__('Subscription'), function() {
+ erpnext.utils.make_subscription(doc.doctype, doc.name)
+ }, __("Make"))
+ }
},
make_sales_invoice: function() {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 41f8b8493e5..a41ae680d2a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -2109,6 +2109,37 @@
"unique": 0,
"width": "150px"
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_rounding_adjustment",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Rounding Adjustment (Company Currency)",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2240,6 +2271,37 @@
"unique": 0,
"width": "150px"
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rounding_adjustment",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Rounding Adjustment",
+ "length": 0,
+ "no_copy": 1,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -3251,6 +3313,67 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "subscription_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Subscription Section",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "subscription",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Subscription",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Subscription",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -3487,7 +3610,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-08-23 13:25:34.182268",
+ "modified": "2017-09-19 11:21:59.084183",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
index c296d8cb9f9..2e150f70d00 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -5,7 +5,8 @@ def get_data():
'fieldname': 'delivery_note',
'non_standard_fieldnames': {
'Stock Entry': 'delivery_note_no',
- 'Quality Inspection': 'reference_name'
+ 'Quality Inspection': 'reference_name',
+ 'Subscription': 'reference_document',
},
'internal_links': {
'Sales Order': ['items', 'against_sales_order'],
@@ -23,5 +24,9 @@ def get_data():
'label': _('Returns'),
'items': ['Stock Entry']
},
+ {
+ 'label': _('Subscription'),
+ 'items': ['Subscription']
+ },
]
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.js b/erpnext/stock/doctype/delivery_note/test_delivery_note.js
index 482f8929974..bbc97b8d402 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.js
@@ -34,4 +34,3 @@ QUnit.test("test delivery note", function(assert) {
]);
});
-
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 1af08070ecd..7837f8c73e8 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -63,8 +63,8 @@ frappe.ui.form.on("Item", {
frm.page.set_inner_btn_group_as_primary(__("Make"));
}
if (frm.doc.variant_of) {
- frm.set_intro(__("This Item is a Variant of {0} (Template).",
- [frm.doc.variant_of]), true);
+ frm.set_intro(__('This Item is a Variant of {0} (Template).',
+ [`${frm.doc.variant_of}`]), true);
}
if (frappe.defaults.get_default("item_naming_by")!="Naming Series" || frm.doc.variant_of) {
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 5dc97f623b3..f2ea1d88bca 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -488,6 +488,8 @@ class Item(WebsiteGenerator):
def validate_warehouse_for_reorder(self):
warehouse = []
for i in self.get("reorder_levels"):
+ if not i.warehouse_group:
+ i.warehouse_group = i.warehouse
if i.get("warehouse") and i.get("warehouse") not in warehouse:
warehouse += [i.get("warehouse")]
else:
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index ed647d6c8be..87cde0d3e2f 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -86,7 +86,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Type",
"length": 0,
@@ -144,7 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Series",
"length": 0,
@@ -211,7 +211,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Company",
"length": 0,
@@ -369,7 +369,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
@@ -686,7 +686,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-06-13 14:29:18.032657",
+ "modified": "2017-07-26 19:43:31.823549",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request/test_material_request.js b/erpnext/stock/doctype/material_request/test_material_request.js
new file mode 100644
index 00000000000..793cad0f3b6
--- /dev/null
+++ b/erpnext/stock/doctype/material_request/test_material_request.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Material Request", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially('Material Request', [
+ // insert a new Material Request
+ () => frappe.tests.make([
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 19cc44a1191..4447fb8cfab 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -48,7 +48,7 @@ frappe.ui.form.on("Purchase Receipt", {
toggle_display_account_head: function(frm) {
var enabled = erpnext.is_perpetual_inventory_enabled(frm.doc.company)
frm.fields_dict["items"].grid.set_column_disp(["cost_center"], enabled);
- }
+ },
});
erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
@@ -98,6 +98,13 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
if(flt(this.frm.doc.per_billed) < 100) {
cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __("Make"));
}
+
+ if(!this.frm.doc.subscription) {
+ cur_frm.add_custom_button(__('Subscription'), function() {
+ erpnext.utils.make_subscription(me.frm.doc.doctype, me.frm.doc.name)
+ }, __("Make"))
+ }
+
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index adcea6d76cb..113bbc2f11e 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1939,6 +1939,37 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_rounding_adjustment",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Rounding Adjustment (Company Currency)",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2064,6 +2095,37 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rounding_adjustment",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Rounding Adjustment",
+ "length": 0,
+ "no_copy": 1,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2611,6 +2673,67 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "subscription_detail",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Subscription Detail",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "subscription",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Subscription",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Subscription",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2999,7 +3122,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-08-06 19:33:59.822251",
+ "modified": "2017-09-19 11:02:24.831340",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
index 9722d8791f6..9ade1afd8a0 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -5,7 +5,8 @@ def get_data():
'fieldname': 'purchase_receipt_no',
'non_standard_fieldnames': {
'Purchase Invoice': 'purchase_receipt',
- 'Landed Cost Voucher': 'receipt_document'
+ 'Landed Cost Voucher': 'receipt_document',
+ 'Subscription': 'reference_document'
},
'internal_links': {
'Purchase Order': ['items', 'purchase_order'],
@@ -25,5 +26,9 @@ def get_data():
'label': _('Returns'),
'items': ['Stock Entry']
},
+ {
+ 'label': _('Subscription'),
+ 'items': ['Subscription']
+ },
]
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js
index b0eae735ef7..d4d1a0a52e0 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js
@@ -6,21 +6,21 @@ QUnit.test("test Stock Reconciliation", function(assert) {
frappe.run_serially([
() => frappe.set_route('List', 'Stock Reconciliation'),
() => frappe.click_button('New'),
- () => cur_frm.set_value('company','Razer Blade'),
+ () => cur_frm.set_value('company','For Testing'),
() => frappe.click_button('Items'),
- () => {cur_dialog.set_value('warehouse','Stores - RB'); },
+ () => {cur_dialog.set_value('warehouse','Stores - FT'); },
() => frappe.timeout(0.5),
() => frappe.click_button('Update'),
() => {
cur_frm.doc.items[0].qty = 150;
cur_frm.refresh_fields('items');},
() => frappe.timeout(0.5),
- () => cur_frm.set_value('expense_account','Stock Adjustment - RB'),
- () => cur_frm.set_value('cost_center','Main - RB'),
+ () => cur_frm.set_value('expense_account','Stock Adjustment - FT'),
+ () => cur_frm.set_value('cost_center','Main - FT'),
() => cur_frm.save(),
() => {
// get_item_details
- assert.ok(cur_frm.doc.expense_account=='Stock Adjustment - RB', "expense_account correct");
+ assert.ok(cur_frm.doc.expense_account=='Stock Adjustment - FT', "expense_account correct");
},
() => frappe.tests.click_button('Submit'),
() => frappe.tests.click_button('Yes'),
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.js b/erpnext/stock/doctype/warehouse/test_warehouse.js
index f13bc58084d..8ea280cc59e 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.js
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.js
@@ -10,7 +10,7 @@ QUnit.test("test: warehouse", function (assert) {
() => frappe.tests.make(
"Warehouse", [
{warehouse_name: "Laptop Scrap Warehouse"},
- {company: "Razer Blade"}
+ {company: "For Testing"}
]
),
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 2a22854677e..72a83c6c1b2 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -79,7 +79,7 @@ def get_item_details(args):
and out.warehouse and out.stock_qty > 0:
if out.has_serial_no:
- out.serial_no = get_serial_no(out)
+ out.serial_no = get_serial_no(out, args.serial_no)
if out.has_batch_no and not args.get("batch_no"):
out.batch_no = get_batch_no(out.item_code, out.warehouse, out.qty)
@@ -554,7 +554,8 @@ def get_gross_profit(out):
return out
@frappe.whitelist()
-def get_serial_no(args):
+def get_serial_no(args, serial_nos=None):
+ serial_no = None
if isinstance(args, basestring):
args = json.loads(args)
args = frappe._dict(args)
@@ -568,4 +569,9 @@ def get_serial_no(args):
args = json.dumps({"item_code": args.get('item_code'),"warehouse": args.get('warehouse'),"stock_qty": args.get('stock_qty')})
args = process_args(args)
serial_no = get_serial_nos_by_fifo(args)
- return serial_no
+
+ if not serial_no and serial_nos:
+ # For POS
+ serial_no = serial_nos
+
+ return serial_no
diff --git a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
index 557847abb6f..ed48a0fbd52 100644
--- a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
+++ b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
@@ -7,12 +7,12 @@
"doctype": "Report",
"idx": 3,
"is_standard": "Yes",
- "modified": "2017-07-22 09:24:30.201487",
+ "modified": "2017-09-18 12:28:49.322622",
"modified_by": "Administrator",
"module": "Stock",
"name": "Ordered Items To Be Delivered",
"owner": "Administrator",
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`customer_name` as \"Customer Name::150\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project` as \"Project:Link/Project:120\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order Item`.`delivery_date` as \"Item Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order` JOIN `tabSales Order Item` \n LEFT JOIN `tabBin` ON (`tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse)\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status not in (\"Stopped\", \"Closed\")\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc",
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`customer_name` as \"Customer Name::150\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project` as \"Project:Link/Project:120\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order Item`.`delivery_date` as \"Item Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order` JOIN `tabSales Order Item` \n LEFT JOIN `tabBin` ON (`tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse)\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status not in (\"Stopped\", \"Closed\")\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc",
"ref_doctype": "Delivery Note",
"report_name": "Ordered Items To Be Delivered",
"report_type": "Query Report",
diff --git a/erpnext/templates/emails/recurring_document_failed.html b/erpnext/templates/emails/recurring_document_failed.html
index 9b887311787..ea48034f418 100644
--- a/erpnext/templates/emails/recurring_document_failed.html
+++ b/erpnext/templates/emails/recurring_document_failed.html
@@ -1,12 +1,11 @@
-
{{_("Event Location")}}: {{ location }} +
{{_("Start Time")}}: {{ start_time }} +
{{_("End Time")}}: {{ end_time }} +
{{_("Attendance")}}: {{ attendance }} + +
-
+
+ `);
+ this.$cart_items = this.wrapper.find('.cart-items');
+ this.$empty_state = this.wrapper.find('.cart-items .empty-state');
+ this.$taxes_and_totals = this.wrapper.find('.taxes-and-totals');
+ this.$discount_amount = this.wrapper.find('.discount-amount');
+ this.$grand_total = this.wrapper.find('.grand-total');
+
+ this.toggle_taxes_and_totals(false);
+ this.$grand_total.on('click', () => {
+ this.toggle_taxes_and_totals();
+ });
+ }
+
+ reset() {
+ this.$cart_items.find('.list-item').remove();
+ this.$empty_state.show();
+ this.$taxes_and_totals.html(this.get_taxes_and_totals());
+ this.numpad && this.numpad.reset_value();
+ this.customer_field.set_value("");
+ }
+
+ get_grand_total() {
+ return `
+
+
+
+
+
+
+
+
+ ${__('Item Name')}
+ ${__('Quantity')}
+ ${__('Discount')}
+ ${__('Rate')}
+
+
+
+ No Items added to cart
+
+
+ ${this.get_taxes_and_totals()}
+
+
+ ${this.get_discount_amount()}
+
+
+ ${this.get_grand_total()}
+
+
+
+
+
+ `;
+ }
+
+ get_discount_amount() {
+ const get_currency_symbol = window.get_currency_symbol;
+
+ return `
+ ${__('Grand Total')}
+ 0.00
+
+
+ `;
+ }
+
+ get_taxes_and_totals() {
+ return `
+ ${__('Discount')}
+
+
+
+
+
+
+ ${__('Net Total')}
+ 0.00
+
+
+ `;
+ }
+
+ toggle_taxes_and_totals(flag) {
+ if (flag !== undefined) {
+ this.tax_area_is_shown = flag;
+ } else {
+ this.tax_area_is_shown = !this.tax_area_is_shown;
+ }
+
+ this.$taxes_and_totals.toggle(this.tax_area_is_shown);
+ this.$discount_amount.toggle(this.tax_area_is_shown);
+ }
+
+ update_taxes_and_totals() {
+ if (!this.frm.doc.taxes) { return; }
+
+ const currency = this.frm.doc.currency;
+ this.frm.refresh_field('taxes');
+
+ // Update totals
+ this.$taxes_and_totals.find('.net-total')
+ .html(format_currency(this.frm.doc.net_total, currency));
+
+ // Update taxes
+ const taxes_html = this.frm.doc.taxes.map(tax => {
+ return `
+ ${__('Taxes')}
+ 0.00
+
+ ${tax.description}
+
+ ${format_currency(tax.tax_amount, currency)}
+
+
+ `;
+ }).join("");
+ this.$taxes_and_totals.find('.taxes').html(taxes_html);
+ }
+
+ update_grand_total() {
+ this.$grand_total.find('.grand-total-value').text(
+ format_currency(this.frm.doc.grand_total, this.frm.currency)
+ );
+ }
+
+ make_customer_field() {
+ this.customer_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Link',
+ label: 'Customer',
+ fieldname: 'customer',
+ options: 'Customer',
+ reqd: 1,
+ default: this.frm.doc.customer,
+ onchange: () => {
+ this.events.on_customer_change(this.customer_field.get_value());
+ }
+ },
+ parent: this.wrapper.find('.customer-field'),
+ render_input: true
+ });
+ }
+
+ make_numpad() {
+ this.numpad = new NumberPad({
+ button_array: [
+ [1, 2, 3, 'Qty'],
+ [4, 5, 6, 'Disc'],
+ [7, 8, 9, 'Rate'],
+ ['Del', 0, '.', 'Pay']
+ ],
+ add_class: {
+ 'Pay': 'brand-primary'
+ },
+ disable_highlight: ['Qty', 'Disc', 'Rate', 'Pay'],
+ reset_btns: ['Qty', 'Disc', 'Rate', 'Pay'],
+ del_btn: 'Del',
+ wrapper: this.wrapper.find('.number-pad-container'),
+ onclick: (btn_value) => {
+ // on click
+ if (!this.selected_item && btn_value !== 'Pay') {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Please select an item in the cart')
+ });
+ return;
+ }
+ if (['Qty', 'Disc', 'Rate'].includes(btn_value)) {
+ this.set_input_active(btn_value);
+ } else if (btn_value !== 'Pay') {
+ if (!this.selected_item.active_field) {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Please select a field to edit from numpad')
+ });
+ return;
+ }
+
+ const item_code = this.selected_item.attr('data-item-code');
+ const field = this.selected_item.active_field;
+ const value = this.numpad.get_value();
+
+ this.events.on_field_change(item_code, field, value);
+ }
+
+ this.events.on_numpad(btn_value);
+ }
+ });
+ }
+
+ set_input_active(btn_value) {
+ this.selected_item.removeClass('qty disc rate');
+
+ this.numpad.set_active(btn_value);
+ if (btn_value === 'Qty') {
+ this.selected_item.addClass('qty');
+ this.selected_item.active_field = 'qty';
+ } else if (btn_value == 'Disc') {
+ this.selected_item.addClass('disc');
+ this.selected_item.active_field = 'discount_percentage';
+ } else if (btn_value == 'Rate') {
+ this.selected_item.addClass('rate');
+ this.selected_item.active_field = 'rate';
+ }
+ }
+
+ add_item(item) {
+ this.$empty_state.hide();
+
+ if (this.exists(item.item_code)) {
+ // update quantity
+ this.update_item(item);
+ } else {
+ // add to cart
+ const $item = $(this.get_item_html(item));
+ $item.appendTo(this.$cart_items);
+ }
+ this.highlight_item(item.item_code);
+ this.scroll_to_item(item.item_code);
+ }
+
+ update_item(item) {
+ const $item = this.$cart_items.find(`[data-item-code="${item.item_code}"]`);
+
+ if(item.qty > 0) {
+ const indicator_class = item.actual_qty >= item.qty ? 'green' : 'red';
+ const remove_class = indicator_class == 'green' ? 'red' : 'green';
+
+ $item.find('.quantity input').val(item.qty);
+ $item.find('.discount').text(item.discount_percentage + '%');
+ $item.find('.rate').text(format_currency(item.rate, this.frm.doc.currency));
+ $item.addClass(indicator_class);
+ $item.removeClass(remove_class);
+ } else {
+ $item.remove();
+ }
+ }
+
+ get_item_html(item) {
+ const rate = format_currency(item.rate, this.frm.doc.currency);
+ const indicator_class = item.actual_qty >= item.qty ? 'green' : 'red';
+ return `
+
+
+ `;
+
+ function get_quantity_html(value) {
+ return `
+
+ ${item.item_name}
+
+
+ ${get_quantity_html(item.qty)}
+
+
+ ${item.discount_percentage}%
+
+
+ ${rate}
+
+
+
+
+
+
+
+
+
+
+
+
+ `;
+ }
+ }
+
+ exists(item_code) {
+ let $item = this.$cart_items.find(`[data-item-code="${item_code}"]`);
+ return $item.length > 0;
+ }
+
+ highlight_item(item_code) {
+ const $item = this.$cart_items.find(`[data-item-code="${item_code}"]`);
+ $item.addClass('highlight');
+ setTimeout(() => $item.removeClass('highlight'), 1000);
+ }
+
+ scroll_to_item(item_code) {
+ const $item = this.$cart_items.find(`[data-item-code="${item_code}"]`);
+ if ($item.length === 0) return;
+ const scrollTop = $item.offset().top - this.$cart_items.offset().top + this.$cart_items.scrollTop();
+ this.$cart_items.animate({ scrollTop });
+ }
+
+ bind_events() {
+ const me = this;
+ const events = this.events;
+
+ // quantity change
+ this.$cart_items.on('click',
+ '[data-action="increment"], [data-action="decrement"]', function() {
+ const $btn = $(this);
+ const $item = $btn.closest('.list-item[data-item-code]');
+ const item_code = $item.attr('data-item-code');
+ const action = $btn.attr('data-action');
+
+ if(action === 'increment') {
+ events.on_field_change(item_code, 'qty', '+1');
+ } else if(action === 'decrement') {
+ events.on_field_change(item_code, 'qty', '-1');
+ }
+ });
+
+ // this.$cart_items.on('focus', '.quantity input', function(e) {
+ // const $input = $(this);
+ // const $item = $input.closest('.list-item[data-item-code]');
+ // me.set_selected_item($item);
+ // me.set_input_active('Qty');
+ // e.preventDefault();
+ // e.stopPropagation();
+ // return false;
+ // });
+
+ this.$cart_items.on('change', '.quantity input', function() {
+ const $input = $(this);
+ const $item = $input.closest('.list-item[data-item-code]');
+ const item_code = $item.attr('data-item-code');
+ events.on_field_change(item_code, 'qty', flt($input.val()));
+ });
+
+ // current item
+ this.$cart_items.on('click', '.list-item', function() {
+ me.set_selected_item($(this));
+ });
+
+ // disable current item
+ // $('body').on('click', function(e) {
+ // console.log(e);
+ // if($(e.target).is('.list-item')) {
+ // return;
+ // }
+ // me.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
+ // me.selected_item = null;
+ // });
+
+ this.wrapper.find('.additional_discount_percentage').on('change', (e) => {
+ frappe.model.set_value(this.frm.doctype, this.frm.docname,
+ 'additional_discount_percentage', e.target.value)
+ .then(() => {
+ let discount_wrapper = this.wrapper.find('.discount_amount');
+ discount_wrapper.val(this.frm.doc.discount_amount);
+ discount_wrapper.trigger('change');
+ });
+ });
+
+ this.wrapper.find('.discount_amount').on('change', (e) => {
+ frappe.model.set_value(this.frm.doctype, this.frm.docname,
+ 'discount_amount', e.target.value);
+ this.frm.trigger('discount_amount')
+ .then(() => {
+ let discount_wrapper = this.wrapper.find('.additional_discount_percentage');
+ discount_wrapper.val(this.frm.doc.additional_discount_percentage);
+ this.update_taxes_and_totals();
+ this.update_grand_total();
+ });
+ });
+ }
+
+ set_selected_item($item) {
+ this.selected_item = $item;
+ this.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
+ this.selected_item.addClass('current-item');
+ this.events.on_select_change();
+ }
+
+ unselect_all() {
+ this.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
+ this.selected_item = null;
+ this.events.on_select_change();
+ }
+}
+
+class POSItems {
+ constructor({wrapper, pos_profile, events}) {
+ this.wrapper = wrapper;
+ this.pos_profile = pos_profile;
+ this.items = {};
+ this.events = events;
+ this.currency = this.pos_profile.currency;
+
+ this.make_dom();
+ this.make_fields();
+
+ this.init_clusterize();
+ this.bind_events();
+
+ // bootstrap with 20 items
+ this.get_items()
+ .then(({ items }) => {
+ this.all_items = items;
+ this.items = items;
+ this.render_items(items);
+ });
+ }
+
+ make_dom() {
+ this.wrapper.html(`
+
+
+
+
+
+
+
+
+ `);
+
+ this.items_wrapper = this.wrapper.find('.items-wrapper');
+ this.items_wrapper.append(`
+
+
+ `);
+ }
+
+ make_fields() {
+ // Search field
+ this.search_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Data',
+ label: 'Search Item (Ctrl + I)',
+ placeholder: 'Search by item code, serial number, batch no or barcode'
+ },
+ parent: this.wrapper.find('.search-field'),
+ render_input: true,
+ });
+
+ frappe.ui.keys.on('ctrl+i', () => {
+ this.search_field.set_focus();
+ });
+
+ this.search_field.$input.on('input', (e) => {
+ clearTimeout(this.last_search);
+ this.last_search = setTimeout(() => {
+ const search_term = e.target.value;
+ this.filter_items({ search_term });
+ }, 300);
+ });
+
+ this.item_group_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Link',
+ label: 'Item Group',
+ options: 'Item Group',
+ default: 'All Item Groups',
+ onchange: () => {
+ const item_group = this.item_group_field.get_value();
+ if (item_group) {
+ this.filter_items({ item_group: item_group });
+ }
+ },
+ },
+ parent: this.wrapper.find('.item-group-field'),
+ render_input: true
+ });
+ }
+
+ init_clusterize() {
+ this.clusterize = new Clusterize({
+ scrollElem: this.wrapper.find('.pos-items-wrapper')[0],
+ contentElem: this.wrapper.find('.pos-items')[0],
+ rows_in_block: 6
+ });
+ }
+
+ render_items(items) {
+ let _items = items || this.items;
+
+ const all_items = Object.values(_items).map(item => this.get_item_html(item));
+ let row_items = [];
+
+ const row_container = '
+
+ ';
+ let curr_row = row_container;
+
+ for (let i=0; i < all_items.length; i++) {
+ // wrap 4 items in a div to emulate
+ // a row for clusterize
+ if(i % 4 === 0 && i !== 0) {
+ curr_row += '
';
+ row_items.push(curr_row);
+ curr_row = row_container;
+ }
+ curr_row += all_items[i];
+
+ if(i == all_items.length - 1 && all_items.length % 4 !== 0) {
+ row_items.push(curr_row);
+ }
+ }
+
+ this.clusterize.update(row_items);
+ }
+
+ filter_items({ search_term='', item_group='All Item Groups' }={}) {
+ if (search_term) {
+ search_term = search_term.toLowerCase();
+
+ // memoize
+ this.search_index = this.search_index || {};
+ if (this.search_index[search_term]) {
+ const items = this.search_index[search_term];
+ this.render_items(items);
+ return;
+ }
+ } else if (item_group == "All Item Groups") {
+ return this.render_items(this.all_items);
+ }
+
+ this.get_items({search_value: search_term, item_group })
+ .then(({ items, serial_no, batch_no }) => {
+ if (search_term) {
+ this.search_index[search_term] = items;
+ }
+
+ this.render_items(items);
+ if(serial_no) {
+ this.events.update_cart(items[0].item_code,
+ 'serial_no', serial_no);
+ this.search_field.set_value('');
+ }
+ if(batch_no) {
+ this.events.update_cart(items[0].item_code,
+ 'batch_no', serial_no);
+ this.search_field.set_value('');
+ }
+ });
+ }
+
+ bind_events() {
+ var me = this;
+ this.wrapper.on('click', '.pos-item-wrapper', function() {
+ const $item = $(this);
+ const item_code = $item.attr('data-item-code');
+ me.events.update_cart(item_code, 'qty', '+1');
+ });
+ }
+
+ get(item_code) {
+ return this.items[item_code];
+ }
+
+ get_all() {
+ return this.items;
+ }
+
+ get_item_html(item) {
+ const price_list_rate = format_currency(item.price_list_rate, this.currency);
+ const { item_code, item_name, item_image} = item;
+ const item_title = item_name || item_code;
+
+ const template = `
+
+
+ `;
+
+ return template;
+ }
+
+ get_items({start = 0, page_length = 40, search_value='', item_group="All Item Groups"}={}) {
+ return new Promise(res => {
+ frappe.call({
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
+ args: {
+ start,
+ page_length,
+ 'price_list': this.pos_profile.selling_price_list,
+ item_group,
+ search_value
+ }
+ }).then(r => {
+ // const { items, serial_no, batch_no } = r.message;
+
+ // this.serial_no = serial_no || "";
+ res(r.message);
+ });
+ });
+ }
+}
+
+class NumberPad {
+ constructor({
+ wrapper, onclick, button_array,
+ add_class={}, disable_highlight=[],
+ reset_btns=[], del_btn='',
+ }) {
+ this.wrapper = wrapper;
+ this.onclick = onclick;
+ this.button_array = button_array;
+ this.add_class = add_class;
+ this.disable_highlight = disable_highlight;
+ this.reset_btns = reset_btns;
+ this.del_btn = del_btn;
+ this.make_dom();
+ this.bind_events();
+ this.value = '';
+ }
+
+ make_dom() {
+ if (!this.button_array) {
+ this.button_array = [
+ [1, 2, 3],
+ [4, 5, 6],
+ [7, 8, 9],
+ ['', 0, '']
+ ];
+ }
+
+ this.wrapper.html(`
+
+
+
+
+
+ ${this.button_array.map(get_row).join("")}
+
+ `);
+
+ function get_row(row) {
+ return '' + row.map(get_col).join("") + '
';
+ }
+
+ function get_col(col) {
+ return `${col}
Recurring {{ type }} Failed
+{{_("Recurring")}} {{ type }} {{ _("Failed")}}
An error occured while creating recurring {{ type }} {{ name }} for {{ party }}.
This could be because of some invalid Email Addresses in the {{ type }}.
-To stop sending repetitive error notifications from the system, we have unchecked -"Convert into Recurring" field in the {{ type }} {{ name }}.
-Please correct the {{ type }} and make the {{ type }} recurring again.
+To stop sending repetitive error notifications from the system, we have checked "Disabled" field in the subscription {{ subscription}} for the {{ type }} {{ name }}.
+Please correct the {{ type }} and unchcked "Disabled" in the {{ subscription }} for making recurring again.
It is necessary to take this action today itself for the above mentioned recurring {{ type }} to be generated. If delayed, you will have to manually change the "Repeat on Day of Month" field -of this {{ type }} for generating the recurring {{ type }}.
+of this {{ type }} for generating the recurring {{ type }} in the subscription {{ subscription }}.[This email is autogenerated]
diff --git a/erpnext/templates/emails/training_event.html b/erpnext/templates/emails/training_event.html new file mode 100644 index 00000000000..51c232d8e87 --- /dev/null +++ b/erpnext/templates/emails/training_event.html @@ -0,0 +1,21 @@ +{{_("Training Event")}}
+{{ message }}
+ +{{_("Details")}}
+{{_("Event Name")}}: {{ name }} +{{_("Event Location")}}: {{ location }} +
{{_("Start Time")}}: {{ start_time }} +
{{_("End Time")}}: {{ end_time }} +
{{_("Attendance")}}: {{ attendance }} + +
{{_("Update Response")}}
+{% if not self_study %} +{{_("Please update your status for this training event")}}:
+ + +{% else %} +{{_("Please confirm once you have completed your training")}}:
+ +{% endif %} +{{_("Thank you")}},
+{{ user_fullname }}