From 4687c318eea5e11bca94fba78259aa70a32368c5 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 27 Nov 2014 22:14:31 +0700
Subject: [PATCH] invoice policy

---
 netforce_clinic/actions/clinic_period.xml     |  6 +++
 .../layouts/clinic_cycle_item_form.xml        |  2 +-
 .../layouts/clinic_cycle_monthly_form.xml     |  6 +--
 .../layouts/clinic_hd_case_form.xml           | 27 +++++-----
 netforce_clinic/layouts/clinic_menu.xml       |  2 +-
 .../layouts/clinic_period_form.xml            | 22 ++++++++
 .../layouts/clinic_period_list.xml            |  3 ++
 netforce_clinic/layouts/clinic_setting.xml    | 43 +++++++++++-----
 netforce_clinic/layouts/clinic_staff_form.xml |  1 +
 netforce_clinic/models/__init__.py            |  3 ++
 netforce_clinic/models/cycle_daily.py         | 32 +++++++++---
 netforce_clinic/models/cycle_item.py          | 19 +++++--
 netforce_clinic/models/cycle_monthly_line.py  |  8 +++
 netforce_clinic/models/hd_case.py             | 11 +++-
 netforce_clinic/models/hd_case_line.py        |  2 +-
 netforce_clinic/models/patient.py             |  2 +-
 netforce_clinic/models/period.py              | 50 +++++++++++++++++++
 netforce_clinic/models/period_line.py         | 20 ++++++++
 .../models/report_nurse_fee_sum.py            |  4 +-
 netforce_clinic/models/setting.py             | 44 ++++++----------
 netforce_clinic/models/setting_policy.py      | 13 +++++
 netforce_clinic/models/setting_product.py     |  3 +-
 netforce_clinic/models/staff.py               |  1 +
 netforce_clinic/models/visit.py               |  9 +++-
 netforce_clinic/todo.txt                      | 17 +++++++
 25 files changed, 273 insertions(+), 77 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_period.xml
 create mode 100644 netforce_clinic/layouts/clinic_period_form.xml
 create mode 100644 netforce_clinic/layouts/clinic_period_list.xml
 create mode 100644 netforce_clinic/models/period.py
 create mode 100644 netforce_clinic/models/period_line.py
 create mode 100644 netforce_clinic/models/setting_policy.py

diff --git a/netforce_clinic/actions/clinic_period.xml b/netforce_clinic/actions/clinic_period.xml
new file mode 100644
index 0000000..67bf988
--- /dev/null
+++ b/netforce_clinic/actions/clinic_period.xml
@@ -0,0 +1,6 @@
+<action>
+    <field name="string">Period</field>
+    <field name="view_cls">multi_view</field>
+    <field name="model">clinic.period</field>
+    <field name="menu">clinic_menu</field>
+</action>
diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index 744a787..11b39d2 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -6,6 +6,7 @@
             <item string="Compute Labor Cost" method="compute" states='draft'/>
             <item string="View Schedule" method="view_schedule"/>
             <item string="View Cycle Daily" method="view_cycle_daily"/>
+            <item string="To Draft" method="to_draft" states="done" />
         </button>
     </head>
 
@@ -55,7 +56,6 @@
     </tabs>
     <foot>
         <button string="Validate" type="success" method="validate" icon="ok" states="draft" />
-        <button string="To Draft" type="default" method="to_draft" icon="repeat" states="done" />
     </foot>
     <related>
         <field name="hd_cases"/>
diff --git a/netforce_clinic/layouts/clinic_cycle_monthly_form.xml b/netforce_clinic/layouts/clinic_cycle_monthly_form.xml
index c5b1f55..f987de1 100644
--- a/netforce_clinic/layouts/clinic_cycle_monthly_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_monthly_form.xml
@@ -10,19 +10,15 @@
             <field name="name"/>
             <field name="lines" nolabel="1">
                 <list>
-                    <field name="date"/>
                     <field name="staff_id"/>
                     <field name="level_id"/>
                     <field name="type"/>
-                    <field name="qty" onchange="onchange_line"/>
-                    <field name="amount"/>
+                    <field name="amount" onchange="onchange_line"/>
                 </list>
                 <form>
-                    <field name="date"/>
                     <field name="staff_id"/>
                     <field name="level_id"/>
                     <field name="type"/>
-                    <field name="qty"/>
                     <field name="amount"/>
                 </form>
             </field>
diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml
index 66849ae..df4230b 100644
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_form.xml
@@ -45,18 +45,21 @@
             </field>
         </tab>
         <tab string="Expenses">
-            <field name="lines" count="3" nolabel="1">
-                <list>
-                    <field name="type"/>
-                    <field name="product_id" onchange="onchange_product"/>
-                    <field name="description"/>
-                    <field name="qty" onchange="onchange_line"/>
-                    <field name="uom_id"/>
-                    <field name="price" onchange="onchange_line"/>
-                    <field name="amount" onchange="onchange_line"/>
-                </list>
-            </field>
-            <group span="8" form_layout="stacked" attrs='{"invisible":[["amount","=",0]]}'>
+            <group span="12" form_layout="stacked">
+                <field name="lines" count="3" nolabel="1">
+                    <list>
+                        <field name="type"/>
+                        <field name="product_id" onchange="onchange_product"/>
+                        <field name="description"/>
+                        <field name="qty" onchange="onchange_line"/>
+                        <field name="uom_id"/>
+                        <field name="price" onchange="onchange_line"/>
+                        <field name="amount" onchange="onchange_line"/>
+                    </list>
+                </field>
+            </group>
+            <group span="8" form_layout="stacked">
+                <field name="invoice_policy"/>
             </group>
             <group span="4" columns="1">
                 <field name="total"/>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index b610016..c88433f 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -52,12 +52,12 @@
         <header string="LABOR COST"/>
         <item string="Nurse Fee Summary" action="clinic_report_nurse_fee_sum"/>
         <item string="Nurse Fee Detail" action="clinic_report_nurse_fee_detail"/>
-        <!--<item string="Special Nurse" action="clinic_report_nurse_special"/>-->
     </item>
     <item string="Settings">
         <item string="Branch" action="clinic_branch"/>
         <item string="Departments" action="clinic_department"/>
         <item string="Nationalities" action="clinic_nation"/>
+        <item string="Period" action="clinic_period"/>
         <item string="Clinic Settings" action="clinic_setting"/>
     </item>
 </menu>
diff --git a/netforce_clinic/layouts/clinic_period_form.xml b/netforce_clinic/layouts/clinic_period_form.xml
new file mode 100644
index 0000000..379d896
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_period_form.xml
@@ -0,0 +1,22 @@
+<form model="clinic.period">
+    <head>
+        <button string="Options" dropdown="1">
+            <item string="Copy" method="copy"/>
+        </button>
+    </head>
+    <group form_layout="stacked">
+        <field name="name" span="3"/>
+        <field name="date_start" span="3"/>
+        <field name="duration" span="3"/>
+        <field name="nmonth" span="3"/>
+        <field name="lines" nolabel="1">
+            <list>
+                <field name="date_start"/>
+                <field name="date_stop"/>
+            </list>
+        </field>
+    </group>
+    <foot>
+        <button string="Generate" type="default" icon="arrow-right" method="gen_period"/>
+    </foot>
+</form>
diff --git a/netforce_clinic/layouts/clinic_period_list.xml b/netforce_clinic/layouts/clinic_period_list.xml
new file mode 100644
index 0000000..6fe5833
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_period_list.xml
@@ -0,0 +1,3 @@
+<list model="clinic.period">
+    <field name="name"/>
+</list>
diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml
index 178f76b..a13d1e0 100644
--- a/netforce_clinic/layouts/clinic_setting.xml
+++ b/netforce_clinic/layouts/clinic_setting.xml
@@ -1,6 +1,7 @@
 <form model="clinic.setting" title="Clinic Settings">
     <tabs>
         <tab string="HD Case">
+            <separator string="Expenes"/>
             <field name="products" nolabel="1">
                 <list>
                     <field name="patient_type"/>
@@ -8,7 +9,8 @@
                     <field name="product_id" onchange="onchange_product"/>
                     <field name="description"/>
                     <field name="uom_id"/>
-                    <field name="qty" onchange="onchange_product"/>
+                    <field name="price" onchange="onchange_setting_line"/>
+                    <field name="qty" onchange="onchange_setting_line"/>
                     <field name="amount"/>
                 </list>
                 <form>
@@ -17,10 +19,22 @@
                     <field name="product_id"/>
                     <field name="description"/>
                     <field name="uom_id"/>
+                    <field name="price"/>
                     <field name="qty"/>
                     <field name="amount"/>
                 </form>
             </field>
+            <separator string="Invoice Policy"/>
+            <field name="invoice_policies" nolabel="1">
+                <list>
+                    <field name="patient_type"/>
+                    <field name="invoice_policy"/>
+                </list>
+                <form>
+                    <field name="patient_type"/>
+                    <field name="invoice_policy"/>
+                </form>
+            </field>
         </tab>
         <tab string="Labor Cost">
             <separator string="Nurse"/>
@@ -44,17 +58,22 @@
             <separator string="Doctor"/>
             <field name="cost_per_case"/>
         </tab>
-        <!--<tab string="Testing">-->
-        <!--<group form_layout="stacked">-->
-        <!--<field name="file" span="3"/>-->
-        <!--<newline/>-->
-        <!--<button string="Make Visit" method="make_visit" span="2"/>-->
-        <!--<newline/>-->
-        <!--<button string="Make HD Case" method="make_done" span="2"/>-->
-        <!--<newline/>-->
-        <!--<button string="Complete HD Case" method="make_complete" span="2"/>-->
-        <!--</group>-->
-        <!--</tab>-->
+        <tab string="Period">
+            <field name="period_id"/>
+        </tab>
+
+        <tab string="Import Testing">
+            <group form_layout="stacked">
+                <field name="file" span="3"/>
+                <newline/>
+                <button string="Make Visit" method="make_visit" span="2"/>
+                <newline/>
+                <button string="Make HD Case" method="make_done" span="2"/>
+                <newline/>
+                <button string="Complete HD Case" method="make_complete" span="2"/>
+            </group>
+        </tab>
+
     </tabs>
     <foot>
     </foot>
diff --git a/netforce_clinic/layouts/clinic_staff_form.xml b/netforce_clinic/layouts/clinic_staff_form.xml
index 4514f6f..41d6821 100644
--- a/netforce_clinic/layouts/clinic_staff_form.xml
+++ b/netforce_clinic/layouts/clinic_staff_form.xml
@@ -42,6 +42,7 @@
             <field name="cycle_id"/>
             <field name="wage"/>
             <field name="max_cycle"/>
+            <field name="check_max_cycle"/>
         </tab>
         <tab string="Note">
             <field name="note" nolabel="1"/>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 1ea8fa6..94c15bf 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -2,6 +2,7 @@ from . import utils
 from . import setting
 from . import setting_product
 from . import setting_level
+from . import setting_policy
 from . import cause_chronic
 from . import comorbidity
 from . import department
@@ -63,3 +64,5 @@ from . import report_discontinue_patient
 from . import report_nurse_fee_sum
 from . import report_nurse_fee_detail
 from . import branch
+from . import period
+from . import period_line
diff --git a/netforce_clinic/models/cycle_daily.py b/netforce_clinic/models/cycle_daily.py
index 512fb3c..1cabe78 100644
--- a/netforce_clinic/models/cycle_daily.py
+++ b/netforce_clinic/models/cycle_daily.py
@@ -3,7 +3,6 @@ import time
 from netforce.model import Model, fields, get_model
 from netforce.access import get_active_company, get_active_user
 from netforce.utils import get_data_path
-from netforce.database import get_connection
 
 class CycleDaily(Model):
     _name="clinic.cycle.daily"
@@ -55,18 +54,17 @@ class CycleDaily(Model):
         for line in obj.lines:
             staff=line.staff_id
             level=line.level_id
-            qty=line.qty
-            amt=line.amount
+            amt=line.amount or 0.0
+            qty=line.qty or 0
             if not all_vals.get(staff.id):
                 all_vals[staff.id]={
                     'level_id': level.id,
                     'type': line.type,
-                    'date': obj.date,
                     'qty': 0,
                     'amount': 0,
                 }
-            all_vals[staff.id]['qty']+=qty
             all_vals[staff.id]['amount']+=amt
+            all_vals[staff.id]['qty']+=qty
         lines=[]
         for staff_id, vals in all_vals.items():
             vals.update({'staff_id': staff_id})
@@ -80,9 +78,31 @@ class CycleDaily(Model):
         if res:
             mid=res[0]['id']
             monthly=mobj.browse(mid)
+            # find other cycle daily and summary salary of staff
+            for daily in monthly.cycle_dailies:
+                # don't include amount the same date
+                if daily.date==obj.date:
+                    continue
+                for line in daily.lines:
+                    amt=line.amount or 0.0
+                    qty=line.qty or 0
+                    staff=line.staff_id
+                    vals=all_vals.get(staff.id,None)
+                    if vals:
+                        vals['amount']+=amt
+
+            lines=[]
+            for staff_id, vals in all_vals.items():
+                vals.update({'staff_id': staff_id})
+                lines.append(('create',vals))
+
+            # update staff amount
+            staff_ids=all_vals.keys()
             for line in monthly.lines:
-                if line.date==obj.date:
+                staff=line.staff_id 
+                if staff.id in staff_ids:
                     line.delete()
+
             monthly.write({
                 'lines': lines,
             })
diff --git a/netforce_clinic/models/cycle_item.py b/netforce_clinic/models/cycle_item.py
index b114e36..b0d77ce 100644
--- a/netforce_clinic/models/cycle_item.py
+++ b/netforce_clinic/models/cycle_item.py
@@ -118,18 +118,31 @@ class CycleItem(Model):
         levels={}
         for line in obj.lines:
             level=line.level_id
-            levels[level.id]=line.amount or 0
+            levels[level.id]={
+                'amount': line.amount or 0,
+                'qty': line.qty,
+                'level_id': level.id,
+            }
 
         lines=[]
         # cost's nurses
         for nr in obj.nurses:
             nurse=nr.nurse_id
             level=nr.level_id
+            vals=levels.get(level.id)
+            rate,amt,qty=0.0,0.0,0
+            level_id=level.id
+            if vals:
+                level_id=vals['level_id']
+                amt=vals['amount']
+                qty=vals['qty']
+                if qty:
+                    rate=amt/qty
             lines.append(('create',{
                 'cycle_id': obj.cycle_id.id,
                 'staff_id': nurse.id,
-                'level_id': nurse.level_id.id,
-                'rate': levels.get(level.id, 0.0),
+                'level_id': level_id,
+                'rate': rate,
                 'type': 'nurse',
                 'qty': 1,
             }))
diff --git a/netforce_clinic/models/cycle_monthly_line.py b/netforce_clinic/models/cycle_monthly_line.py
index 50a3cf5..456ca15 100644
--- a/netforce_clinic/models/cycle_monthly_line.py
+++ b/netforce_clinic/models/cycle_monthly_line.py
@@ -7,6 +7,13 @@ class CycleMonthlyLine(Model):
     _name="clinic.cycle.monthly.line"
     _string="Cycle Monthly Line"
     
+    def _get_max_cycle(self,ids,context={}):
+        res={}
+        for obj in self.browse(ids):
+            staff=obj.staff_id
+            res[obj.id]=staff.max_cycle
+        return res
+
     _fields={
         "cycle_monthly_id": fields.Many2One("clinic.cycle.monthly","Cycle Monthly"),
         'staff_id': fields.Many2One("clinic.staff", "Staff"),
@@ -17,6 +24,7 @@ class CycleMonthlyLine(Model):
         'amount': fields.Float("Amount"),
         'company_id': fields.Many2One("company","Company"),
         "type": fields.Selection([('staff','Staff'),("doctor","Doctor"),('nurse','Nurse')],"Type",required=True),
+        'max_cycle': fields.Float('Max Cycle',function="_get_max_cycle"),
     }
 
     _defaults={
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 3f2d93b..d3d76f2 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -79,6 +79,7 @@ class HDCase(Model):
         "total_nurse": fields.Integer("Total Nurse",function="get_staff",function_multi=True),
         'doctor_id': fields.Many2One("clinic.staff","Doctor",domain=[['type','=','doctor']],function="get_staff",function_multi=True),
         'nu': fields.Char("N/U"),
+        "invoice_policy": fields.Selection([("fee","Only fee"),("fee_med","Fee & Medicine")],"Invoice Policy"),
     }
 
     def _get_number(self,context={}):
@@ -711,13 +712,19 @@ class HDCase(Model):
             for st_prod in st.products:
                 if patient.type==st_prod.patient_type:
                     prod=st_prod.product_id
+                    price=st_prod.price
+                    qty=st_prod.qty
+                    amt=st_prod.amount
+                    if not amt:
+                        amt=qty*price
                     vals['lines'].append(('create',{
                         'product_id': prod.id,
                         'uom_id': st_prod.uom_id.id,
                         'type': st_prod.type,
                         'description': st_prod.description,
-                        'qty': st_prod.qty,
-                        'amount': st_prod.amount,
+                        'price': price,
+                        'qty': qty,
+                        'amount': amt,
                     }))
 
         categ_name=utils.PATIENT_TYPE.get(patient.type)
diff --git a/netforce_clinic/models/hd_case_line.py b/netforce_clinic/models/hd_case_line.py
index b32a08c..79c6f96 100644
--- a/netforce_clinic/models/hd_case_line.py
+++ b/netforce_clinic/models/hd_case_line.py
@@ -10,7 +10,7 @@ class Hdcaseline(Model):
         "uom_id": fields.Many2One("uom","UOM",required=True,search=True),
         "price":fields.Float("Price"),
         "amount":fields.Float("Amount"),
-        "type": fields.Selection([("fee","Fee"),("others","Others")],"Type",required=True),
+        "type": fields.Selection([("fee","Fee"),('medicine','Medicine'),("others","Others")],"Type",required=True),
     }
     
     _defaults={
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index f29971b..c7039eb 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -232,7 +232,7 @@ class Patient(Model):
                         'partner_id': partner_id,
                     })
                     del vals['addresses']
-                print("create address for %s"%obj.name, ' ', addr_vals)
+                    print("create address for %s"%obj.name, ' ', addr_vals)
 
             if obj.rm_remain_visit:
                 visit_ids=get_model('clinic.visit').search([['patient_id','=',obj.id],['state','=','draft']])
diff --git a/netforce_clinic/models/period.py b/netforce_clinic/models/period.py
new file mode 100644
index 0000000..108ee34
--- /dev/null
+++ b/netforce_clinic/models/period.py
@@ -0,0 +1,50 @@
+from datetime import datetime, timedelta
+import time
+
+from netforce.model import Model, fields
+
+class Period(Model):
+    _name="clinic.period"
+    _string="Period"
+    
+    _fields={
+        "name": fields.Char("Name",required=True,search=True),
+        'date_start': fields.Date("Start Date",required=True),
+        'duration': fields.Integer("Day in Period",required=True),
+        'nmonth': fields.Integer("Number of Month",required=True),
+        'lines': fields.One2Many("clinic.period.line","period_id", "Lines"),
+    }
+    
+    def _get_start(self,context={}):
+        year=time.strftime("%Y")
+        return '%s-01-01'%year
+
+    _defaults={
+        'name': lambda *a: time.strftime("%Y"),
+        'date_start': _get_start,
+        'duration': 30,
+        'nmonth': 12,
+    }
+
+    def gen_period(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        for line in obj.lines:
+            line.delete()
+        fmt="%Y-%m-%d"
+        start=obj.date_start
+        lines=[]
+        for i in range(obj.nmonth):
+            start=datetime.strptime(start,fmt)
+            stop=start+timedelta(days=obj.duration)
+            lines.append(('create',{
+                'date_start': start.strftime(fmt),
+                'date_stop': stop.strftime(fmt),
+            }))
+            print(i+1, ' ', start.strftime(fmt), ' ', stop.strftime(fmt))
+            stop=stop+timedelta(days=1)
+            start=stop.strftime(fmt)
+        obj.write({
+            'lines': lines,
+        })
+
+Period.register()
diff --git a/netforce_clinic/models/period_line.py b/netforce_clinic/models/period_line.py
new file mode 100644
index 0000000..11bbb90
--- /dev/null
+++ b/netforce_clinic/models/period_line.py
@@ -0,0 +1,20 @@
+from netforce.model import Model, fields
+
+class PeriodLine(Model):
+    _name="clinic.period.line"
+    _string="Period Line"
+
+    _fields={
+        "period_id": fields.Many2One("clinic.period", "Period"),
+        #'date_start': fields.Date("Date Start"),
+        #'date_stop': fields.Date("Date Stop"),
+        'date_start': fields.Char("Date Start"),
+        'date_stop': fields.Char("Date Stop"),
+        'state': fields.Selection([['draft','Draft'],['done','Done']],"State"),
+    }
+    
+    _defaults={
+        'state': 'draft',
+    }
+
+PeriodLine.register()
diff --git a/netforce_clinic/models/report_nurse_fee_sum.py b/netforce_clinic/models/report_nurse_fee_sum.py
index 9b60fc6..ded5d2d 100644
--- a/netforce_clinic/models/report_nurse_fee_sum.py
+++ b/netforce_clinic/models/report_nurse_fee_sum.py
@@ -79,9 +79,11 @@ class ReportNurseFeeSum(Model):
             if nurse_id:
                 if nurse_id!=nurse.id:
                     continue
+            #level=nurse.level_id
+            #level_name=level and level.name or ""
             line={
                 'nurse_id': nurse.id,
-                'nurse_name': nurse.name or '',
+                'nurse_name': '%s'%(nurse.name),
                 'sub_lines': [],
             }
             total_amt=0.0
diff --git a/netforce_clinic/models/setting.py b/netforce_clinic/models/setting.py
index e3f84af..4a4851f 100644
--- a/netforce_clinic/models/setting.py
+++ b/netforce_clinic/models/setting.py
@@ -16,8 +16,10 @@ class ClinicSetting(Model):
         'file': fields.File("File"),
         'levels': fields.One2Many("clinic.setting.level","setting_id","Levels"),
         'products': fields.One2Many("clinic.setting.product","setting_id","Products"),
+        'invoice_policies': fields.One2Many("clinic.setting.policy","setting_id","Invoice Policies"),
         'cost_per_case': fields.Float("Cost Per Case"),
         'company_id': fields.Many2One("company", 'Company'),
+        'period_id': fields.Many2One("clinic.period","Period"),
     }
 
     _defaults={
@@ -160,7 +162,6 @@ class ClinicSetting(Model):
             # prevent timeout
             if count > 10:
                 break
-            #print(date)
             visit=get_visit(date=date,state='draft')
             print(date, '  ', visit)
             if visit:
@@ -170,35 +171,9 @@ class ClinicSetting(Model):
                 #allow37=line['allow37']
                 hct=line.get('hct')
                 medical=line.get('medical') or line.get("eponame") or ""
-                medical_cost=line.get('medical_cost') or line.get('allow37') or 0.0
-                inject_service=line.get('inject_service') or line.get("epoadm29") or ""
                 vals={
                     'hct': hct and hct or 0,
-                    'lines': [],
                 }
-                if medical:
-                    prods=get_model("product").search_browse([['name','=',medical]])
-                    if prods:
-                        prod=prods[0]
-                        vals['lines'].append(('create',{
-                            'type': 'other',
-                            'product_id': prod.id,
-                            'description': prod.name,
-                            'uom_id': prod.uom_id.id,
-                            'qty': 1,
-                            'price': medical_cost,
-                            'amount': medical_cost,
-                        }))
-                if inject_service:
-                    vals['lines'].append(('create',{
-                        'type': 'other',
-                        'product_id': 55, #XXX
-                        'description': prod.name,
-                        'uom_id': prod.uom_id.id,
-                        'qty': 1,
-                        'price': medical_cost,
-                        'amount': medical_cost,
-                    }))
                 hd_case=get_model("clinic.hd.case").browse(hd_case_id)
                 hd_case.write(vals) 
                 count+=1
@@ -235,7 +210,6 @@ class ClinicSetting(Model):
                 inject_service=line.get('inject_service') or line.get("EPOadm29") or ""
                 vals={
                     'hct': hct and hct or 0,
-                    'lines': [],
                 }
                 if medical:
                     prods=get_model("product").search_browse([['name','=',medical]])
@@ -304,9 +278,21 @@ class ClinicSetting(Model):
                     raise Exception("Not found uom 'Unit'")
             line['uom_id']=uom.id
             line['description']=prod.name
+            price=prod.sale_price or 0.0
+            line['price']=price
             qty=line['qty'] or 0
-            amt=qty*(prod.sale_price or 0.0)
+            amt=qty*price
             line['amount']=amt
         return data
 
+    def onchange_setting_line(self,context={}):
+        data=context['data']
+        path=context['path']
+        line=get_data_path(data,path,parent=True)
+        qty=line['qty'] or 0
+        price=line['price'] or 0
+        amt=qty*price
+        line['amount']=amt
+        return data
+
 ClinicSetting.register()
diff --git a/netforce_clinic/models/setting_policy.py b/netforce_clinic/models/setting_policy.py
new file mode 100644
index 0000000..a7c7cea
--- /dev/null
+++ b/netforce_clinic/models/setting_policy.py
@@ -0,0 +1,13 @@
+from netforce.model import Model, fields, get_model
+
+class SettingPolicy(Model):
+    _name="clinic.setting.policy"
+    _string="Setting Policy"
+
+    _fields={
+        "setting_id": fields.Many2One("clinic.setting","Setting"),
+        "patient_type": fields.Selection([("sc","Social Security"),("uc","UC"),("others","Others")],"Type",required=True),
+        "invoice_policy": fields.Selection([("fee","Only fee"),("fee_med","Fee & Medicine")],"Invoice Policy"),
+    }
+
+SettingPolicy.register()
diff --git a/netforce_clinic/models/setting_product.py b/netforce_clinic/models/setting_product.py
index f5faf70..b610f2e 100644
--- a/netforce_clinic/models/setting_product.py
+++ b/netforce_clinic/models/setting_product.py
@@ -6,11 +6,12 @@ class SettingProduct(Model):
 
     _fields={
         "setting_id": fields.Many2One("clinic.setting","Setting"),
-        "type": fields.Selection([("fee","Fee"),("others","Others")],"Type",required=True),
+        "type": fields.Selection([("fee","Fee"),('medicine','Medicine'),("others","Others")],"Type",required=True),
         "patient_type": fields.Selection([("sc","Social Security"),("uc","UC"),("others","Others")],"Patient Type",required=True),
         'uom_id': fields.Many2One("uom","UOM", required=True),
         "product_id": fields.Many2One("product","Product"),
         'description': fields.Char("Description"),
+        'price': fields.Float("Price"),
         'qty': fields.Integer("Qty"),
         'amount': fields.Float("Amount"),
     }
diff --git a/netforce_clinic/models/staff.py b/netforce_clinic/models/staff.py
index bc93a45..61a5b78 100644
--- a/netforce_clinic/models/staff.py
+++ b/netforce_clinic/models/staff.py
@@ -92,6 +92,7 @@ class Staff(Model):
         'date': fields.Date("Register Date"),
         'wage': fields.Float("Wage", function="_get_base",function_multi=True),
         'max_cycle': fields.Integer("Max Cycle", function="_get_base",function_multi=True),
+        'check_max_cycle': fields.Boolean("Check Max Cycle"),
         'hire_date': fields.Date("Hire Date"),
         'resign_date': fields.Date("Resign Date"),
         "documents": fields.One2Many("document","related_id","Documents"),
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index aa966b1..3d3732d 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -214,8 +214,13 @@ class Visit(Model):
         visits=self.search_browse([['patient_id','=',patient_id]],order="number desc")
         if visits:
             visit=visits[0]
-            data['doctor_id']=visit.doctor_id.id
-            data['department_id']=visit.department_id.id
+            doctor=visit.doctor_id
+            department=visit.department_id
+            if not department:
+                patient=get_model("clinic.patient").browse(patient_id)
+                department=patient.department_id
+            data['doctor_id']=doctor.id
+            data['department_id']=department.id
         else:
             data['doctor_id']=None
             data['department_id']=None
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 375e468..57e3908 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,3 +1,20 @@
+=====
+first:
+    match payment
+second:
+    record with period
+        - setting 
+            - set current period
+        - master data
+            - period
+                - lines
+                    date_from , date_to
+        - fee nurse sum report
+            - can select by period
+        - cycle daily
+            - confirm
+                - submit according period
+
 ======
 DROP TABLE clinic_cycle_dialy_line;
 drop table clinic_cycle_item_line;