address

netforce_clinic/models/fin_setting.py

@@ -12,18 +12,25 @@ class Settings(Model):
 
     def get_default_address(self,ids,context={}):
         branch_id=None
+        user_id=get_active_user()
         if context.get("branch_id"):
             branch_id=context['branch_id'] 
         else:
-            user_id=get_active_user()
             user=get_model("base.user").browse(user_id)
             branch_id=user.branch_id.id
+        print("branch_id ", branch_id, 'user_id ', user_id)
         vals={}
         for obj in self.browse(ids):
             vals[obj.id]=obj.addresses and obj.addresses[0].id or None
             if branch_id:
                 branch=get_model("clinic.branch").browse(branch_id)
                 vals[obj.id]=branch.addresses and branch.addresses[0].id or None
+                add=branch.addresses[0]
+                print('='*50)
+                print(add.company)
+                print(add.address)
+                print(add.address1)
+                print('='*50)
         return vals
 
 Settings.register()

netforce_clinic/models/hd_case.py

@@ -1065,16 +1065,6 @@ class HDCase(Model):
             context['branch_id']=hdcase.branch_id.id
         st=get_model('settings').browse(1,context=context)
         cst=get_model('clinic.setting').browse(1)
-        comp_addr=''
-        if st.default_address_id:
-            comp_addr='\n'.join([
-                st.default_address_id.address or "",
-                st.default_address_id.city or "",
-                st.default_address_id.postal_code or "",
-                st.default_address_id.country_id.name or "",
-                st.default_address_id.phone and "Phone: %s"%st.default_address_id.phone or "",
-                st.default_address_id.fax and "Fax: %s"%st.default_address_id.fax or ""
-            ])
         cust=payment.partner_id
         cust_name=cust.name or ''
         cust_addr=''
@@ -1112,9 +1102,17 @@ class HDCase(Model):
         comp_name=comp.name or ""
         if st.default_address_id.company:
             comp_name=st.default_address_id.company or ""
+        add=st.default_address_id
         data={
             'comp_name': comp_name,
-            'comp_addr': comp_addr or '',
+            'add_address': add.address or '',
+            'add_address2': add.address2 or '',
+            'add_province_name': add.province_id.name or '',
+            'add_district_name': add.district_id.name or '',
+            'add_city': add.city or '',
+            'add_postal_code': add.postal_code or '',
+            'add_phone': add.phone or '',
+            'add_fax': add.fax or '',
             'tax_no': st.tax_no or '',
             'number': payment.number or '',
             'ref': payment.ref,

netforce_clinic/models/select_company.py

@@ -168,11 +168,14 @@ class SelectCompany(Model):
         department_name=''
         if obj.branch:
             for branch in get_model("clinic.branch").search_browse([["name","=",obj.branch]]):
-                user=get_model("base.user").browse(user_id)
                 user.write({
                     'branch_id': branch.id,
                 })
-        elif obj.department:
+        else:
+            user.write({
+                'branch_id': None,
+            })
+        if obj.department:
             department_name=obj.department
             # set to main profile of that user
             for dpt in get_model("clinic.department").search_browse([["name","=",obj.department]]):

netforce_clinic/models/shop.py

@@ -501,16 +501,6 @@ class Shop(Model):
         context['branch_id']=shop.branch_id.id
         st=get_model('settings').browse(1,context=context)
         cst=get_model('clinic.setting').browse(1)
-        comp_addr=''
-        if st.default_address_id:
-            comp_addr='\n'.join([
-                st.default_address_id.address or "",
-                st.default_address_id.city or "",
-                st.default_address_id.postal_code or "",
-                st.default_address_id.country_id.name or "",
-                st.default_address_id.phone and "Phone: %s"%st.default_address_id.phone or "",
-                st.default_address_id.fax and "Fax: %s"%st.default_address_id.fax or ""
-            ])
         cust=shop.contact_id
         cust_name=cust.name or ''
         cust_addr=''
@@ -558,9 +548,18 @@ class Shop(Model):
             for inv in shop.invoices:
                 number=inv.number or ""
                 ref=shop.number or ""
+
+        add=st.default_address_id
         data={
             'comp_name': comp_name,
-            'comp_addr': comp_addr or '',
+            'add_address': add.address or '',
+            'add_address2': add.address2 or '',
+            'add_province_name': add.province_id.name or '',
+            'add_district_name': add.district_id.name or '',
+            'add_city': add.city or '',
+            'add_postal_code': add.postal_code or '',
+            'add_phone': add.phone or '',
+            'add_fax': add.fax or '',
             'tax_no': st.tax_no or '',
             'number': number,
             'ref': ref,