merge from master

2014-08-21 14:35:10 +07:00 · 2014-08-21 14:35:10 +07:00 · bb971b374d
parent 681715b5ed 41e2c71832
commit bb971b374d
28 changed files with 2 additions and 13 deletions
--- a/clinic.egg-info/PKG-INFO
+++ b/clinic.egg-info/PKG-INFO
@ -1,10 +0,0 @@
 Metadata-Version: 1.0
 Name: clinic
 Version: 0.1.0
 Summary: Ratchawat Clinic module
 Home-page: UNKNOWN
 Author: UNKNOWN
 Author-email: UNKNOWN
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
--- a/clinic.egg-info/dependency_links.txt
+++ b/clinic.egg-info/dependency_links.txt
@ -1 +0,0 @@
--- a/clinic.egg-info/top_level.txt
+++ b/clinic.egg-info/top_level.txt
@ -1 +0,0 @@
 clinic
--- a/clinic/actions/clinic_visit_cal_widget.xml
+++ b/clinic/actions/clinic_visit_cal_widget.xml
@ -2,4 +2,5 @@
    <field name="view_cls">calendar_view</field>
    <field name="string">Visits</field>
    <field name="model">clinic.visit</field>
    <field name="widget">1</field>
 </action>
--- a/clinic/controllers/pycache/init.cpython-32.pyc
+++ b/clinic/controllers/pycache/init.cpython-32.pyc
--- a/clinic/layouts/clinic_board.xml
+++ b/clinic/layouts/clinic_board.xml
@ -1,5 +1,5 @@
 <board>
    <hpanel>
-        <widget action="clinic_visit_cal_widget" string="Visits Calendar"/>
+        <widget action="clinic_visit_cal_widget" string="Visits Calendar" span="12"/>
    </hpanel>
 </board>
--- a/clinic/models/pycache/clinic_patients.cpython-32.pyc
+++ b/clinic/models/pycache/clinic_patients.cpython-32.pyc
--- a/clinic/models/pycache/competitor.cpython-32.pyc
+++ b/clinic/models/pycache/competitor.cpython-32.pyc
--- a/clinic/models/pycache/convert_lead.cpython-32.pyc
+++ b/clinic/models/pycache/convert_lead.cpython-32.pyc
--- a/clinic/models/pycache/lead_analysis.cpython-32.pyc
+++ b/clinic/models/pycache/lead_analysis.cpython-32.pyc
--- a/clinic/models/pycache/opport_analysis.cpython-32.pyc
+++ b/clinic/models/pycache/opport_analysis.cpython-32.pyc
--- a/clinic/models/pycache/opport_compet.cpython-32.pyc
+++ b/clinic/models/pycache/opport_compet.cpython-32.pyc
--- a/clinic/models/pycache/pricelist_add.cpython-32.pyc
+++ b/clinic/models/pycache/pricelist_add.cpython-32.pyc
--- a/clinic/models/pycache/rch_patient.cpython-32.pyc
+++ b/clinic/models/pycache/rch_patient.cpython-32.pyc
--- a/clinic/models/pycache/report_sale.cpython-32.pyc
+++ b/clinic/models/pycache/report_sale.cpython-32.pyc
--- a/clinic/models/pycache/sale_analysis.cpython-32.pyc
+++ b/clinic/models/pycache/sale_analysis.cpython-32.pyc
--- a/clinic/models/pycache/sale_cost.cpython-32.pyc
+++ b/clinic/models/pycache/sale_cost.cpython-32.pyc
--- a/clinic/models/pycache/sale_coupon.cpython-32.pyc
+++ b/clinic/models/pycache/sale_coupon.cpython-32.pyc
--- a/clinic/models/pycache/sale_coupon_count.cpython-32.pyc
+++ b/clinic/models/pycache/sale_coupon_count.cpython-32.pyc
--- a/clinic/models/pycache/sale_lead.cpython-32.pyc
+++ b/clinic/models/pycache/sale_lead.cpython-32.pyc
--- a/clinic/models/pycache/sale_opportunity.cpython-32.pyc
+++ b/clinic/models/pycache/sale_opportunity.cpython-32.pyc
--- a/clinic/models/pycache/sale_order.cpython-32.pyc
+++ b/clinic/models/pycache/sale_order.cpython-32.pyc
--- a/clinic/models/pycache/sale_order_line.cpython-32.pyc
+++ b/clinic/models/pycache/sale_order_line.cpython-32.pyc
--- a/clinic/models/pycache/sale_quot.cpython-32.pyc
+++ b/clinic/models/pycache/sale_quot.cpython-32.pyc
--- a/clinic/models/pycache/sale_quot_line.cpython-32.pyc
+++ b/clinic/models/pycache/sale_quot_line.cpython-32.pyc
--- a/clinic/models/pycache/sale_stage.cpython-32.pyc
+++ b/clinic/models/pycache/sale_stage.cpython-32.pyc
--- a/clinic/models/pycache/sale_target.cpython-32.pyc
+++ b/clinic/models/pycache/sale_target.cpython-32.pyc
--- a/clinic/models/pycache/utils.cpython-32.pyc
+++ b/clinic/models/pycache/utils.cpython-32.pyc