From 4c2541d7a363a372cf7c08e5c3bc14da8a7fc8f5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 11:32:29 +0530
Subject: [PATCH 01/10] [IMP]change name over 3 module and improve view

bzr revid: sgo@tinyerp.com-20120622060229-o0al0w0jxz19fd9k
---
 addons/analytic/analytic_view.xml                       | 2 +-
 addons/analytic_contract_expense_project/__openerp__.py | 2 +-
 addons/analytic_contract_hr_expense/__openerp__.py      | 2 +-
 addons/analytic_contract_project/__openerp__.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index d094b6059c0..f19eaf114f4 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <sheet string="Analytic Account">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name"/>
                         </h1>
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
index fc9c2bc4307..fb84b7016e4 100644
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Contracts Management',
+    'name': 'Contract on Hr expense with Project',
     'version': '1.1',
     'category': 'Sales Management',
     'description': """
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
index 53c7ac5804f..47de651da87 100644
--- a/addons/analytic_contract_hr_expense/__openerp__.py
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Contracts Management',
+    'name': 'Contracts on Hr expense',
     'version': '1.1',
     'category': 'Sales Management',
     'description': """
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
index 778d7d4e821..ccf712dc987 100644
--- a/addons/analytic_contract_project/__openerp__.py
+++ b/addons/analytic_contract_project/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Contract Management In Project",
+    "name" : "Contract On Project",
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",

From 95cd61d1f560885bf3161ed49c9779e172fe8643 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 14:40:08 +0530
Subject: [PATCH 02/10] [IMP]improve view of contract and open chatter
 notification added when state changed

bzr revid: sgo@tinyerp.com-20120622091008-uy805uph0hz4vk0h
---
 .../account_analytic_analysis.py              |  1 -
 .../account_analytic_analysis_view.xml        |  2 +-
 addons/analytic/analytic.py                   | 15 ++++++++-
 addons/analytic/analytic_view.xml             |  6 ++--
 .../hr_timesheet_invoice.py                   | 32 ++++++++++++++++---
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index c4ae080434f..0ac783a8c5c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -494,7 +494,6 @@ class account_analytic_account(osv.osv):
         res['value']['pricelist_id'] = template.pricelist_id.id
         res['value']['description'] = template.description
         return res
-
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index a607643f1ec..70f4d49440f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,7 +23,7 @@
                 <xpath expr='//field[@name="type"]' position='after'>
                     <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
-                <xpath expr='//field[@name="date"]' position="after" version="7.0">
+                <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
                         <field name="quantity_max" class="oe_form_inline"/> / Remaining:
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index cb5ab3ede0f..35acc4a8508 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -272,7 +272,20 @@ class account_analytic_account(osv.osv):
         else:
             account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)
-
+    
+    def create(self, cr, uid, vals, context=None):
+        contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if contract:
+            self.create_send_note(cr, uid, [contract], context=context)
+        return contract
+    # ------------------------------------------------
+    # OpenChatter methods and notifications
+    # ------------------------------------------------
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+            self.message_append_note(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            
 account_analytic_account()
 
 
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index f19eaf114f4..4fa01a92204 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -29,8 +29,10 @@
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
                                 <group name="master">
                                     <group string="Validity" name="contract">
-                                        <field name="date_start"/>
-                                        <field name="date"/>
+                                        <label string="Duration"/>
+                                        <div name="duration">
+                                            <field name="date_start"/> - <field name="date"/>
+                                        </div>
                                     </group>
                                     <group name="project">
                                         <separator string="Project Management" name="project_sep" invisible="1"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 48282a83bb4..8701210e5f8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -94,16 +94,40 @@ class account_analytic_account(osv.osv):
         return res
 
     def set_close(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'close'}, context=context)
+        self.write(cr, uid, ids, {'state':'close'}, context=context)
+        self.set_close_send_note(cr, uid, ids, context)
+        return True
 
     def set_cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        self.set_cancel_send_note(cr, uid, ids, context)
+        return True
 
     def set_open(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'open'}, context=context)
+        self.write(cr, uid, ids, {'state':'open'}, context=context)
+        self.set_open_send_note(cr, uid, ids, context)
+        return True
 
     def set_pending(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        self.set_pending_send_note(cr, uid, ids, context)
+        return True
+    
+    def set_open_send_note(self, cr, uid, ids, context=None):
+        message = _("Contract has been <b>opened</b>.")
+        return self.message_append_note(cr, uid, ids, body=message, context=context)
+    
+    def set_close_send_note(self, cr, uid, ids, context=None):
+        message = _("Contract has been <b>closed</b>.")
+        return self.message_append_note(cr, uid, ids, body=message, context=context)
+    
+    def set_cancel_send_note(self, cr, uid, ids, context=None):
+        message = _("Contract has been <b>cancelled</b>.")
+        return self.message_append_note(cr, uid, ids, body=message, context=context)
+
+    def set_pending_send_note(self, cr, uid, ids, context=None):
+        message = _("Contract has been <b>pending</b>.")
+        return self.message_append_note(cr, uid, ids, body=message, context=context)
 
 account_analytic_account()
 

From 352e054068d74c296475c285361964bfb86b4e32 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 10:37:53 +0530
Subject: [PATCH 03/10] [IMP]change the place of fields for better view and add
 note for details

bzr revid: sgo@tinyerp.com-20120625050753-lhe0p8xnp5r2g6zp
---
 .../account_analytic_analysis_view.xml            | 15 +++++++++++----
 .../analytic_contract_project.py                  | 11 ++++++++++-
 .../hr_timesheet_invoice/hr_timesheet_invoice.py  |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 70f4d49440f..cc1d674ca0a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -30,14 +30,21 @@
                         <field name="remaining_hours" class="oe_form_inline"/>
                     </div>
                 </xpath>
-                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
-                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
-                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                 <xpath expr="//field[@name='use_timesheets']" position="replace">
+                    <group colspan="2" col="4">
+                        <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
+                        <field name="to_invoice" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
                     </group>
                 </xpath>
+                <xpath expr="//group[@name='invoice_on_timesheets']" position="replace"/>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
+                    <group>
+                        <group>
+                            <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                        </group>
+                        <group></group>
+                    </group>
                     <table width="100%%">
                         <tr>
                             <th></th>
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
index 12e307c5a81..9ddc75ecf8d 100644
--- a/addons/analytic_contract_project/analytic_contract_project.py
+++ b/addons/analytic_contract_project/analytic_contract_project.py
@@ -70,5 +70,14 @@ class project_project(osv.osv):
             'context': view_context,
             'nodestroy': True,
         }
-
 project_project()
+
+class task(osv.osv):
+    _inherit = "project.task"
+    
+    def create(self, cr, uid, vals, context=None):
+        task_id = super(task, self).create(cr, uid, vals, context=context)
+        task_browse = self.browse(cr,uid,task_id,context)
+        self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task has been <b>created</b>."), context=context)
+        return task_id
+task()
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 8701210e5f8..87539de9a08 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -69,7 +69,7 @@ class account_analytic_account(osv.osv):
             help="Keep empty if this contract is not limited to a total fixed price."),
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invocing Ratio',
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invocing Ratio',
             help="Fill this field if you plan to automatically generate invoices based " \
             "on the costs in this analytic account: timesheets, expenses, ..." \
             "You can configure an automatic invoice rate on analytic accounts."),

From 96a764266971591dd502c7e0d155da4a8a30e715 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 11:31:50 +0530
Subject: [PATCH 04/10] [IMP]resolve error for company_id

bzr revid: sgo@tinyerp.com-20120625060150-lhyleic791qg97ao
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 76dccebd1d3..f429ef602a2 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -309,7 +309,7 @@
                         <field name="code"/>
                         <field name="type"/>
                         <field name="active"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="company_id"/>
                     </group>
                 </form>
             </field>

From fdc196343fea5f14eed500c93999bddb009871ba Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 12:02:33 +0530
Subject: [PATCH 05/10] [IMP]improve code and add tooltip on task_management

bzr revid: sgo@tinyerp.com-20120625063233-9w7pf3eg16ok4kyj
---
 .../analytic_contract_hr_expense.py                             | 2 +-
 addons/project/project.py                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 6baa857c0f6..8f24f12808b 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -123,7 +123,7 @@ class account_analytic_account(osv.osv):
         if template_id and 'value' in res:
             template = self.browse(cr, uid, template_id, context=context)
             res['value']['charge_expenses'] = template.charge_expenses
-            res['value']['expense_max'] = template.expense_max
+            res['value']['est_expenses'] = template.est_expenses
         return res
 
     def open_hr_expense(self, cr, uid, ids, context=None):
diff --git a/addons/project/project.py b/addons/project/project.py
index a6626aae5d1..ab02cc870bb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1219,7 +1219,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Management'),
+        'use_tasks': fields.boolean('Tasks Management',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 

From 0089d9aa36828dc60adaf55433a738fdd8e6f9c6 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 14:05:41 +0530
Subject: [PATCH 06/10] [IMP]remove error for company_id

bzr revid: sgo@tinyerp.com-20120625083541-ehlfmgfpnmxu4100
---
 addons/account/account_analytic_line.py |  2 +-
 addons/account/project/project_view.xml | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 280b813380f..285ff3b45ec 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -63,7 +63,7 @@ class account_analytic_line(osv.osv):
 
     # Compute the cost based on the price type define into company
     # property_valuation_price_type property
-    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
+    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity,
             unit=False, journal_id=False, context=None):
         if context==None:
             context={}
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index f429ef602a2..1947f2c4d0f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -164,9 +164,9 @@
                     <field name="name"/>
                     <field name="journal_id" invisible="context.get('to_invoice', False)"/>
                     <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount,product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount,product_uom_id)" sum="Total Quantity"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount,product_uom_id)" invisible="not context.get('to_invoice', False)"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
@@ -241,16 +241,16 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="account_id"/>
-                        <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                        <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                         <field name="journal_id"/>
-                        <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                        <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
-                        <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                        <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                        <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id, journal_id)"/>
+                        <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                         <field invisible="True" name="general_account_id"/>
                         <field name="amount"/>
                         <field name="currency_id" />
                         <field name="amount_currency" />
-                        <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                 </form>
             </field>
@@ -309,7 +309,7 @@
                         <field name="code"/>
                         <field name="type"/>
                         <field name="active"/>
-                        <field name="company_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                 </form>
             </field>

From ab2b318ed1e3b50ccb3a78f1e9143e8399211ba5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 18:47:02 +0530
Subject: [PATCH 07/10] [IMP]remove extra field pricelist_id

bzr revid: sgo@tinyerp.com-20120625131702-poktv983s43k8f59
---
 addons/sale/sale_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0238f28d4da..e98e471cca3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -142,7 +142,6 @@
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="client_order_ref"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
                     <notebook>

From d78377e90d125852b8d140cf4e16654d07b0a9f3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 25 Jun 2012 14:58:50 +0200
Subject: [PATCH 08/10] [FIX] account: correct way to fix the error on
 on_change product of analytic lines (company_id was not defined)

bzr revid: qdp-launchpad@openerp.com-20120625125850-ay9wr8zw0sf6qukf
---
 addons/account/project/project_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 1947f2c4d0f..be5d7e343e1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -19,6 +19,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="type" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -71,6 +72,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -170,6 +172,7 @@
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>

From ea842f4554b41c7f8cadf250480ba364c25f7927 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 25 Jun 2012 17:55:40 +0200
Subject: [PATCH 09/10] [REF] code review

bzr revid: qdp-launchpad@openerp.com-20120625155540-n0e5lm0rhytsk22t
---
 .../account_analytic_analysis_view.xml        | 18 ++++-------
 addons/analytic/analytic_view.xml             |  4 +--
 .../analytic_contract_project.py              |  4 +--
 .../hr_timesheet_invoice.py                   | 30 ++++++-------------
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index cc1d674ca0a..be7af1d4139 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -26,25 +26,17 @@
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
-                        <field name="quantity_max" class="oe_form_inline"/> / Remaining:
-                        <field name="remaining_hours" class="oe_form_inline"/>
+                        <field name="quantity_max" class="oe_form_inline"/> / Remaining: <field name="remaining_hours" class="oe_form_inline"/>
                     </div>
                 </xpath>
-                 <xpath expr="//field[@name='use_timesheets']" position="replace">
-                    <group colspan="2" col="4">
-                        <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
-                        <field name="to_invoice" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
+                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
+                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
                     </group>
                 </xpath>
-                <xpath expr="//group[@name='invoice_on_timesheets']" position="replace"/>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
-                    <group>
-                        <group>
-                            <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                        </group>
-                        <group></group>
-                    </group>
                     <table width="100%%">
                         <tr>
                             <th></th>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 4fa01a92204..1ff623eff5c 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -29,9 +29,9 @@
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
                                 <group name="master">
                                     <group string="Validity" name="contract">
-                                        <label string="Duration"/>
+                                        <label for="date_start" string="Duration"/>
                                         <div name="duration">
-                                            <field name="date_start"/> - <field name="date"/>
+                                            <field name="date_start" class="oe_form_inline"/> - <field name="date" class="oe_form_inline"/>
                                         </div>
                                     </group>
                                     <group name="project">
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
index 9ddc75ecf8d..6221617637e 100644
--- a/addons/analytic_contract_project/analytic_contract_project.py
+++ b/addons/analytic_contract_project/analytic_contract_project.py
@@ -77,7 +77,7 @@ class task(osv.osv):
     
     def create(self, cr, uid, vals, context=None):
         task_id = super(task, self).create(cr, uid, vals, context=context)
-        task_browse = self.browse(cr,uid,task_id,context)
-        self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task has been <b>created</b>."), context=context)
+        task_browse = self.browse(cr, uid, task_id, context=context)
+        self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
         return task_id
 task()
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 87539de9a08..81b6325f4fa 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -69,7 +69,7 @@ class account_analytic_account(osv.osv):
             help="Keep empty if this contract is not limited to a total fixed price."),
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invocing Ratio',
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio',
             help="Fill this field if you plan to automatically generate invoices based " \
             "on the costs in this analytic account: timesheets, expenses, ..." \
             "You can configure an automatic invoice rate on analytic accounts."),
@@ -95,39 +95,27 @@ class account_analytic_account(osv.osv):
 
     def set_close(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'close'}, context=context)
-        self.set_close_send_note(cr, uid, ids, context)
+        message = _("Contract has been <b>closed</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
         return True
 
     def set_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
-        self.set_cancel_send_note(cr, uid, ids, context)
+        message = _("Contract has been <b>cancelled</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
         return True
 
     def set_open(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
-        self.set_open_send_note(cr, uid, ids, context)
+        message = _("Contract has been <b>opened</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
         return True
 
     def set_pending(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
-        self.set_pending_send_note(cr, uid, ids, context)
+        message = _("Contract has been set as <b>pending</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
         return True
-    
-    def set_open_send_note(self, cr, uid, ids, context=None):
-        message = _("Contract has been <b>opened</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
-    
-    def set_close_send_note(self, cr, uid, ids, context=None):
-        message = _("Contract has been <b>closed</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
-    
-    def set_cancel_send_note(self, cr, uid, ids, context=None):
-        message = _("Contract has been <b>cancelled</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
-
-    def set_pending_send_note(self, cr, uid, ids, context=None):
-        message = _("Contract has been <b>pending</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
 
 account_analytic_account()
 

From c5a2dc79b6a0575662569cc80320dc03101c6490 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 25 Jun 2012 18:15:30 +0200
Subject: [PATCH 10/10] [REV] reverted revision 6996 and 6997.... wtf???

bzr revid: qdp-launchpad@openerp.com-20120625161530-csputpf82i8yp5ua
---
 addons/account/account_analytic_line.py |  2 +-
 addons/account/project/project_view.xml | 18 +++++++++---------
 addons/sale/sale_view.xml               |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 285ff3b45ec..280b813380f 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -63,7 +63,7 @@ class account_analytic_line(osv.osv):
 
     # Compute the cost based on the price type define into company
     # property_valuation_price_type property
-    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity,
+    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
             unit=False, journal_id=False, context=None):
         if context==None:
             context={}
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index be5d7e343e1..55b1f66b87b 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -166,9 +166,9 @@
                     <field name="name"/>
                     <field name="journal_id" invisible="context.get('to_invoice', False)"/>
                     <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount,product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount,product_uom_id)" sum="Total Quantity"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount,product_uom_id)" invisible="not context.get('to_invoice', False)"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
@@ -244,16 +244,16 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="account_id"/>
-                        <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                        <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                         <field name="journal_id"/>
-                        <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                        <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id, journal_id)"/>
-                        <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                        <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                        <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+                        <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                         <field invisible="True" name="general_account_id"/>
                         <field name="amount"/>
                         <field name="currency_id" />
                         <field name="amount_currency" />
-                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     </group>
                 </form>
             </field>
@@ -312,7 +312,7 @@
                         <field name="code"/>
                         <field name="type"/>
                         <field name="active"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="company_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e98e471cca3..0238f28d4da 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -142,6 +142,7 @@
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="client_order_ref"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
                     <notebook>