Merge branch 'master' of dev.netforce.com:netforce-customized/clinic

netforce_clinic/layouts/clinic_menu.xml

@@ -28,7 +28,6 @@
     <item string="Settings">
         <item string="Cycles" action="clinic_cycle"/>
         <item string="Departments" action="clinic_department"/>
-        <item string="Translate" action="clinic_translate"/>
         <item string="Clinic Settings" action="clinic_setting"/>
     </item>
 </menu>

netforce_clinic/models/import_payment.py

@@ -1,11 +1,8 @@
-import re
 import time
 import xlrd
-from datetime import datetime
 
 from netforce.model import Model, fields, get_model
 from netforce.access import get_active_company
-from netforce.access import get_active_user, set_active_user
 from netforce.utils import get_file_path
 from netforce.utils import get_data_path
 from netforce.database import get_connection

netforce_clinic/models/payment.py

@@ -11,5 +11,9 @@ class Payment(Model):
         'amount': fields.Float("Amount"),
     }
 
+    _defaults={
+        'amount': 0.0,
+    }
+
 Payment.register()
 

netforce_clinic/scripts

@@ -0,0 +1 @@
+Subproject commit c8b4f9d18c7e96db2763ea2089db724140c2c89f

netforce_clinic/todo.txt

@@ -1,5 +1,7 @@
 ===
     - skip holiday
+        -> mum
+    - 
 ====
     - import data
         - payment