From 5baeb8152c024e843149ad0324a957dd5e1443fb Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Wed, 22 Apr 2015 20:26:22 +0700 Subject: [PATCH] xxxxx --- netforce_clinic/fixme.txt | 19 +------------------ netforce_clinic/models/hd_case.py | 3 +++ netforce_clinic/models/shop.py | 3 +++ setup.py | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/netforce_clinic/fixme.txt b/netforce_clinic/fixme.txt index 884a30b..dd99dd0 100644 --- a/netforce_clinic/fixme.txt +++ b/netforce_clinic/fixme.txt @@ -1,18 +1 @@ -dom=[['patient_id.field_bool','=',True]] => not working -pattern id card: 3 3013 00180 19 0 - --edit hdcase -1. description not show because permission - ---- receipt -- -date should be the same -> ok -force to print table for 1 page ->ok - !!! bug: - print multi page - ----- visit --- -- check duplicate visit -- run script to take department to patient - ---- visit board -- hide branch and department according to user profile +attr multi_company=True not working diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py index fb122c9..45b12dd 100644 --- a/netforce_clinic/models/hd_case.py +++ b/netforce_clinic/models/hd_case.py @@ -797,6 +797,9 @@ class HDCase(Model): "location_from_id": wh_loc_id, "location_to_id": cust_loc_id, } + #XXX whare house in profile product + if prod.location_id: + line_vals['location_from_id']=prod.location_id.id pick_vals["lines"].append(("create",line_vals)) if not pick_vals["lines"]: return { diff --git a/netforce_clinic/models/shop.py b/netforce_clinic/models/shop.py index 3e987fe..7b483ce 100644 --- a/netforce_clinic/models/shop.py +++ b/netforce_clinic/models/shop.py @@ -425,6 +425,9 @@ class Shop(Model): "location_from_id": wh_loc_id, "location_to_id": cust_loc_id, } + #XXX whare house in profile product + if prod.location_id: + line_vals['location_from_id']=prod.location_id.id pick_vals["lines"].append(("create",line_vals)) if not pick_vals["lines"]: return { diff --git a/setup.py b/setup.py index fc7b7e0..a21e3ec 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from netforce.setup import setup