[MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-improvements-dbr

bzr revid: apa@tinyerp.com-20120607091907-wj78t81ntqrdovle

addons/account/project/project_view.xml

@@ -59,7 +59,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="code"/>
                     <field name="debit"/>
                     <field name="credit"/>

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -467,7 +467,7 @@ class account_analytic_account(osv.osv):
         'charge_expenses' : fields.boolean('Charge Expenses'),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
-        'template_id':fields.many2one('account.analytic.account', 'Template Of Contract'),
+        'template_id':fields.many2one('account.analytic.account', 'Template of Contract'),
         'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"),
         'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'),
         'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"), 

addons/analytic/analytic.py

@@ -178,11 +178,12 @@ class account_analytic_account(osv.osv):
             }, string='Currency', type='many2one', relation='res.currency'),
     }
     
-    def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
         res={}
         if partner_id:
             part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
-            res['name'] = part.name
+            if not name:
+                res['name'] = part.name
             if part.user_id:res['user_id'] = part.user_id.id
         return {'value': res}
 

addons/analytic/analytic_view.xml

@@ -11,11 +11,11 @@
                     <sheet string="Analytic account" layout="auto">
                         <group colspan="4" col="4" class="oe_form_group_label_border">
                             <field name="name" string="Contract/Project Name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
+                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" required="True"/>
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                            <field name="type" select="2"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">

addons/hr_timesheet_invoice/hr_timesheet_invoice.py

@@ -77,8 +77,8 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
-    def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
-        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, context=context)
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, name, context=context)
         part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:res['value']['pricelist_id'] = pricelist

addons/project/project.py

@@ -78,7 +78,7 @@ class project(osv.osv):
                members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
            else:
                members = project_id.members or False
-           select = vals.get('privacy_visility') or project_id.privacy_visility or False
+           select = vals.get('privacy_visibility') or project_id.privacy_visibility or False
            if select=='follower' and members:
                member_list = [member.id for member in members]
                followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
@@ -220,7 +220,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visility', select=True),
+        'privacy_visibility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
      }
     
     def dummy(self, cr, uid, ids, context):

addons/project/project_view.xml

@@ -46,7 +46,7 @@
                             <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                            <field name="privacy_visility"/>
+                            <field name="privacy_visibility"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->
@@ -627,12 +627,6 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
-<!--                <xpath expr='//separator[@name="description"]' position='before'>
-                    <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
-                        <separator colspan="4" string="Team"/>
-                        <field name="members" colspan="4" nolabel="1"/>
-                    </group>
-                </xpath>-->
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
                 </xpath>