diff --git a/medical_lab_management/__manifest__.py b/medical_lab_management/__manifest__.py
index 153f8d75e..01ea6d84e 100644
--- a/medical_lab_management/__manifest__.py
+++ b/medical_lab_management/__manifest__.py
@@ -21,7 +21,7 @@
{
'name': "Medical Lab Management",
- 'version': '16.0.1.0.0',
+ 'version': '16.0.1.1.0',
'summary': """Manage Medical Lab Operations.""",
'description': """Manage Medical Lab General Operations, Odoo15, Odoo 15""",
'author': "Cybrosys Techno Solutions",
diff --git a/medical_lab_management/models/lab_patient.py b/medical_lab_management/models/lab_patient.py
index 00b02575e..c28e772bd 100644
--- a/medical_lab_management/models/lab_patient.py
+++ b/medical_lab_management/models/lab_patient.py
@@ -44,7 +44,7 @@ class LabPatient(models.Model):
[('m', 'Male'), ('f', 'Female'),
('ot', 'Other')], 'Gender', required=True)
dob = fields.Date(string='Date Of Birth', required=True)
- age = fields.Char(string='Age', compute='compute_age')
+ age = fields.Char(string='Age', compute='compute_age', store=True)
blood_group = fields.Selection(
[('A+', 'A+ve'), ('B+', 'B+ve'), ('O+', 'O+ve'), ('AB+', 'AB+ve'),
('A-', 'A-ve'), ('B-', 'B-ve'), ('O-', 'O-ve'), ('AB-', 'AB-ve')],
@@ -56,13 +56,14 @@ class LabPatient(models.Model):
phone = fields.Char(string="Phone", required=True)
email = fields.Char(string="Email", required=True)
+ @api.depends('dob')
def compute_age(self):
for data in self:
if data.dob:
dob = fields.Datetime.from_string(data.dob)
date = fields.Datetime.from_string(data.date)
delta = relativedelta(date, dob)
- data.age = str(delta.years) + 'years'
+ data.age = str(delta.years) + ' ' + 'years'
else:
data.age = ''
diff --git a/medical_lab_management/report/lab_patient_card.xml b/medical_lab_management/report/lab_patient_card.xml
index c1890825e..1e730595b 100644
--- a/medical_lab_management/report/lab_patient_card.xml
+++ b/medical_lab_management/report/lab_patient_card.xml
@@ -3,7 +3,6 @@
-
-
diff --git a/medical_lab_management/static/description/assets/screenshots/hero.gif b/medical_lab_management/static/description/assets/screenshots/hero.gif
index 69927f5d5..378484038 100644
Binary files a/medical_lab_management/static/description/assets/screenshots/hero.gif and b/medical_lab_management/static/description/assets/screenshots/hero.gif differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-1.png b/medical_lab_management/static/description/assets/screenshots/screenshot-1.png
deleted file mode 100644
index eb772e98c..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-1.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-10.png b/medical_lab_management/static/description/assets/screenshots/screenshot-10.png
deleted file mode 100644
index b555c1329..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-10.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-11.png b/medical_lab_management/static/description/assets/screenshots/screenshot-11.png
deleted file mode 100644
index 75a2b0f58..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-11.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-12.png b/medical_lab_management/static/description/assets/screenshots/screenshot-12.png
deleted file mode 100644
index 7f5ddf1ef..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-12.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-13.png b/medical_lab_management/static/description/assets/screenshots/screenshot-13.png
deleted file mode 100644
index 4fd68e78e..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-13.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-14.png b/medical_lab_management/static/description/assets/screenshots/screenshot-14.png
deleted file mode 100644
index ab3df78d5..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-14.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-2.png b/medical_lab_management/static/description/assets/screenshots/screenshot-2.png
deleted file mode 100644
index acd162a5b..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-2.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-3.png b/medical_lab_management/static/description/assets/screenshots/screenshot-3.png
deleted file mode 100644
index 8b73e26e5..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-3.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-4.png b/medical_lab_management/static/description/assets/screenshots/screenshot-4.png
deleted file mode 100644
index dffc0f6c3..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-4.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-5.png b/medical_lab_management/static/description/assets/screenshots/screenshot-5.png
deleted file mode 100644
index 3204d9ee0..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-5.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-6.png b/medical_lab_management/static/description/assets/screenshots/screenshot-6.png
deleted file mode 100644
index f944eace7..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-6.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-7.png b/medical_lab_management/static/description/assets/screenshots/screenshot-7.png
deleted file mode 100644
index 26a51658b..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-7.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-8.png b/medical_lab_management/static/description/assets/screenshots/screenshot-8.png
deleted file mode 100644
index b62ed1781..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-8.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshot-9.png b/medical_lab_management/static/description/assets/screenshots/screenshot-9.png
deleted file mode 100644
index 9162d459f..000000000
Binary files a/medical_lab_management/static/description/assets/screenshots/screenshot-9.png and /dev/null differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-1.png b/medical_lab_management/static/description/assets/screenshots/screenshots-1.png
new file mode 100644
index 000000000..05c03b644
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-1.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-10.png b/medical_lab_management/static/description/assets/screenshots/screenshots-10.png
new file mode 100644
index 000000000..a9564db64
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-10.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-11.png b/medical_lab_management/static/description/assets/screenshots/screenshots-11.png
new file mode 100644
index 000000000..f98925ba4
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-11.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-12.png b/medical_lab_management/static/description/assets/screenshots/screenshots-12.png
new file mode 100644
index 000000000..6e43b7165
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-12.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-13.png b/medical_lab_management/static/description/assets/screenshots/screenshots-13.png
new file mode 100644
index 000000000..9de475784
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-13.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-14.png b/medical_lab_management/static/description/assets/screenshots/screenshots-14.png
new file mode 100644
index 000000000..87eec5a33
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-14.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-2.png b/medical_lab_management/static/description/assets/screenshots/screenshots-2.png
new file mode 100644
index 000000000..49bf47efb
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-2.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-3.png b/medical_lab_management/static/description/assets/screenshots/screenshots-3.png
new file mode 100644
index 000000000..57cb2dce3
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-3.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-4.png b/medical_lab_management/static/description/assets/screenshots/screenshots-4.png
new file mode 100644
index 000000000..43e27f434
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-4.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-5.png b/medical_lab_management/static/description/assets/screenshots/screenshots-5.png
new file mode 100644
index 000000000..dadd55815
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-5.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-6.png b/medical_lab_management/static/description/assets/screenshots/screenshots-6.png
new file mode 100644
index 000000000..d56c79cd3
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-6.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-7.png b/medical_lab_management/static/description/assets/screenshots/screenshots-7.png
new file mode 100644
index 000000000..bef95f310
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-7.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-8.png b/medical_lab_management/static/description/assets/screenshots/screenshots-8.png
new file mode 100644
index 000000000..da275d6f1
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-8.png differ
diff --git a/medical_lab_management/static/description/assets/screenshots/screenshots-9.png b/medical_lab_management/static/description/assets/screenshots/screenshots-9.png
new file mode 100644
index 000000000..2e636b36e
Binary files /dev/null and b/medical_lab_management/static/description/assets/screenshots/screenshots-9.png differ
diff --git a/medical_lab_management/static/description/index.html b/medical_lab_management/static/description/index.html
index 75c3bc83d..80b418c43 100644
--- a/medical_lab_management/static/description/index.html
+++ b/medical_lab_management/static/description/index.html
@@ -118,69 +118,43 @@

-
- Community & Enterprise Support.
-
- Available in Odoo 15.0 Community and Enterprise.
+
Available in Odoo 16.0 Community and Enterprise.
-
+

-
- Manage Patients.
-
- Manage each patients in detail.
+
Manage Patients.
-
-
+

-
- Issue Patient Card.
-
- Gives a patient report.
+
Issue Patient Card.
-
+

-
- Manage Referrals of Patients.
-
- Manages refered persons of each patients.
+
Manage Referrals of Patients.
-
+

-
- Manage Appointments.
-
- Manages appointments for each patients.
+
Manage Appointments.
-
+

-
- Mail Notification For Appointments.
-
- Gives a notification mail when appointment is confirmed.
+
Mail Notification For Appointments.

-
- Manage Lab Requests.
-
- Manage lab requests of each patients.
+
Manage Lab Requests.
-
+

-
- Print Lab Test Result Of Patient.
-
- Detailed Lab Report of each patients.
+
Print Lab Test Result Of Patient.
-
-
+
@@ -188,7 +162,7 @@
-

+
Screenshots
@@ -201,7 +175,7 @@
Create Patients
It creates each patients for lab test.
-

+
@@ -209,62 +183,62 @@
Go to Laboratory -> Patient -> Print -> Patient Card
Issues Patient card
-

+
Create Appointments
Go to Laboratory -> Appointments->Create Appointments.
-

+
Mail Notification For Appointments
When we confirm the appointment the appointment details will be sent through E-Mail
-

+
Lab Request
creates lab request of each patients
-

+
Lab Test Result
Issues Lab Test Result Report
-

+
Create invoice for lab test.
Invoices are created for each lab test.
-

+
You can see today's appointments here
Here,we can view today's appointments of all patients..
-

+
Go to Laboratory -> Configuration -> Lab test..
Create Lab tests..
-

+
Go to Laboratory -> Configuration -> Test Contents.
Create Lab test contents.
-

+
Go to Laboratory -> Configuration -> Testing Unit.
Create Lab test units..
-

+
@@ -272,10 +246,10 @@
We can add referral physician details..
-

+
There are two type of User Access
-

-

+

+
diff --git a/medical_lab_management/views/lab_test_type.xml b/medical_lab_management/views/lab_test_type.xml
index 41be81746..e5ed8fe1d 100644
--- a/medical_lab_management/views/lab_test_type.xml
+++ b/medical_lab_management/views/lab_test_type.xml
@@ -30,7 +30,7 @@
-
+
@@ -38,7 +38,6 @@
-