[MERGE] Merged trunk.

bzr revid: jra@tinyerp.com-20121015095749-yglvi7gur28q1vqu
2012-10-15 15:27:49 +05:30
parent 9c2d7b4d6a 7f23ad5de5
commit ee077e0c7e
163 changed files with 3266 additions and 2526 deletions
@@ -300,7 +300,6 @@ class account_account(osv.osv):
            if aml_query.strip():
                wheres.append(aml_query.strip())
            filters = " AND ".join(wheres)
-            _logger.debug('Filters: %s',(filters))
            # IN might not work ideally in case there are too many
            # children_and_consolidated, in that case join on a
            # values() e.g.:
@@ -316,7 +315,6 @@ class account_account(osv.osv):
                       " GROUP BY l.account_id")
            params = (tuple(children_and_consolidated),) + query_params
            cr.execute(request, params)
-            _logger.debug('Status: %s',(cr.statusmessage))

            for row in cr.dictfetchall():
                accounts[row['id']] = row
@@ -14,8 +14,8 @@
                                <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
                            </group>
                            <group>
-                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                                <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" />
+                                <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
                            </group>
                        </group>
                    </page>
@@ -163,7 +163,7 @@
          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
        </td>
        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
        </td>
        <td>
          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
@@ -187,7 +187,7 @@
            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
          </td>
          <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
          </td>
          <td>
            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
@@ -211,7 +211,7 @@
              <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
            </td>
            <td>
-              <para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]]</para>
            </td>
            <td>
              <para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
@@ -224,7 +224,7 @@
          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
        </td>
        <td>
-          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
        </td>
      </tr>
    </blockTable>
@@ -245,7 +245,7 @@
            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </para>
          </td>
          <td>
-            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
          </td>
        </tr>
      </blockTable>
@@ -266,7 +266,7 @@
              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
            </td>
            <td>
-              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]</para>
            </td>
          </tr>
        </blockTable>
@@ -290,7 +290,7 @@
                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
              </td>
              <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]</para>
              </td>
            </tr>
          </blockTable>
@@ -164,7 +164,7 @@
          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
        </td>
        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
        </td>
        <td>
          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
@@ -188,7 +188,7 @@
            <para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
          </td>
          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]</para>
          </td>
          <td>
            <para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
@@ -212,7 +212,7 @@
              <para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] </para>
            </td>
            <td>
-              <para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(move_a['balance'], currency_obj = company.currency_id)]]</para>
            </td>
            <td>
              <para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
@@ -63,8 +63,12 @@ class account_analytic_journal_report(osv.osv_memory):
        if context is None:
            context = {}
        res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
+        if not context.has_key('active_ids'):
+            journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
+        else:
+            journal_ids = context.get('active_ids')
        if 'analytic_account_journal_id' in fields:
-            res.update({'analytic_account_journal_id': context.get('active_ids',[])})
+            res.update({'analytic_account_journal_id': journal_ids})
        return res

 account_analytic_journal_report()
@@ -5,7 +5,7 @@
        <field name="name">analytic.entries.report.tree</field>
        <field name="model">analytic.entries.report</field>
        <field name="arch" type="xml">
-            <tree string="Analytic Entries Analysis">
+            <tree string="Analytic Entries Analysis" create="false">
                <field name="date" invisible="1"/>
                <field name="year" invisible="1"/>
                <field name="day" invisible="1"/>
@@ -5,7 +5,7 @@
        <field name="name">account.entries.report.tree</field>
        <field name="model">account.entries.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:move_state == 'draft';black:move_state == 'posted'" string="Entries Analysis">
+            <tree colors="blue:move_state == 'draft';black:move_state == 'posted'" create="false" string="Entries Analysis">
                <field name="date" invisible="1"/>
                <field name="date_created" invisible="1"/>
                <field name="date_maturity" invisible="1"/>
@@ -5,7 +5,7 @@
        <field name="name">account.invoice.report.tree</field>
        <field name="model">account.invoice.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Invoices Analysis">
+            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false" string="Invoices Analysis">
                <field name="date" invisible="1"/>
                <field name="user_id" invisible="1"/>
                <field name="year" invisible="1"/>
@@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse):
        super(Overdue, self).__init__(cr, uid, name, context=context)
        self.localcontext.update( {
            'time': time,
-            'adr_get': self._adr_get,
            'getLines': self._lines_get,
            'tel_get': self._tel_get,
            'message': self._message,
        })
        self.context = context
-    def _adr_get(self, partner, type):
-        res = []
-        res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-        addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
-        adr_id = addresses and addresses[type] or False
-        result = {
-                  'name': False,
-                  'street': False,
-                  'street2': False,
-                  'city': False,
-                  'zip': False,
-                  'state_id':False,
-                  'country_id': False,
-                 }
-        if adr_id:
-            result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
-            result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
-            result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
-            return result
-
-        res.append(result)
-        return res

    def _tel_get(self,partner):
        if not partner:
@@ -126,15 +126,10 @@
    <blockTable colWidths="286.0,224.0" style="Tableau2">
      <tr>
        <td>
-          <para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
        </td>
        <td>
          <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
-          <para style="terp_default_9">[[ addr['street'] ]]</para>
-          <para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
-          <para style="terp_default_9">[[ addr['state_id'] or removeParentNode('para')]]</para>
-          <para style="terp_default_9">[[ addr['country_id'] ]]</para>
+          <para style="terp_default_9">[[ display_address(o.partner_id)] ]]</para>
          <para style="terp_default_9">
            <font color="white"> </font>
          </para>
@@ -216,7 +211,7 @@
            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
          </td>
          <td>
-            <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') &gt; formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') &gt; formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]]</para>
          </td>
          <td>
            <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@@ -241,7 +236,7 @@
          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
        </td>
        <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]]</para>
        </td>
        <td>
          <para style="terp_default_9">
@@ -261,7 +256,7 @@
          <para style="terp_default_Bold_9">Balance :</para>
        </td>
        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]</para>
        </td>
        <td>
          <para style="terp_default_8">
@@ -5,7 +5,7 @@
        <field name="name">account.treasury.report.tree</field>
        <field name="model">account.treasury.report</field>
        <field name="arch" type="xml">
-            <tree string="Treasury Analysis">
+            <tree string="Treasury Analysis" create="false">
                <field name="date" invisible="1"/>
                <field name="fiscalyear_id"/>
                <field name="period_id"/>
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 08:45+0000\n"
+"PO-Revision-Date: 2012-10-12 23:19+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
+"X-Generator: Launchpad (build 16137)\n"

 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -471,7 +471,7 @@ msgstr "Analyt. Verrechnungsvorlage"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr "Kurzbezeichnung"
+msgstr "Verteilungs-Schlüssel"

 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -526,6 +526,8 @@ msgid ""
 "analytic accounts for each plan set. Then, you must attach a plan set to "
 "your account journals."
 msgstr ""
+"Für jede Kostenrechnung muss ein Stammkonto definiert werden. Dann muss ein "
+"Plan definiert werden"

 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -6,7 +6,7 @@
        <field name="name">asset.asset.report.tree</field>
        <field name="model">asset.asset.report</field>
        <field name="arch" type="xml">
-            <tree string="Assets">
+            <tree string="Assets" create="false">
                <field name="name" invisible="1"/>
                <field name="asset_id" invisible="1"/>
                <field name="asset_category_id" invisible="1"/>
@@ -1,13 +1,8 @@
 <?xml version="1.0" ?>
 <openerp>
    <data>
-    <!-- budget form and tree view from account module *********************************** -->
-        <record id="action_account_budget_post_tree" model="ir.actions.act_window">
-            <field name="name">Budgets</field>
-            <field name="res_model">account.budget.post</field>
-            <field name="view_type">tree</field>
-        </record>
-        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
+
+        <menuitem name="Budgets" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>

        <!--
    Budgets
@@ -32,7 +32,6 @@ class report_print_check(report_sxw.rml_parse):
            'time': time,
            'get_lines': self.get_lines,
            'fill_stars' : self.fill_stars,
-            'get_zip_line': self.get_zip_line,
        })
    def fill_stars(self, amount):
        amount = amount.replace('Dollars','')
@@ -41,25 +40,6 @@ class report_print_check(report_sxw.rml_parse):
            return ' '.join([amount,'*'*stars])

        else: return amount
-
-    def get_zip_line(self, address):
-        '''
-        Get the address line
-        '''
-        ret = ''
-        if address:
-            if address.city:
-                ret += address.city
-            if address.state_id:
-                if address.state_id.name:
-                    if ret:
-                        ret += ', '
-                    ret += address.state_id.name
-            if address.zip:
-                if ret:
-                    ret += ' '
-                ret += address.zip
-        return ret
    
    def get_lines(self, voucher_lines):
        result = []
@@ -281,10 +281,7 @@
              </td>
              <td>
                <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
-                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
+                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
              </td>
            </tr>
          </blockTable>
@@ -237,10 +237,7 @@
              </td>
              <td>
                <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
-                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
+                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
              </td>
            </tr>
          </blockTable>
@@ -153,9 +153,7 @@
              </td>
              <td>
                <para style="P9">[[ voucher.partner_id.name ]] </para>
-                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
-                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
+                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
              </td>
              <td>
                <para/>
@@ -30,7 +30,6 @@ class report_rappel(report_sxw.rml_parse):
        self.localcontext.update({
            'time': time,
            'ids_to_objects': self._ids_to_objects,
-            'adr_get': self._adr_get,
            'getLines': self._lines_get,
            'get_text': self._get_text
        })
@@ -43,11 +42,6 @@ class report_rappel(report_sxw.rml_parse):
                all_lines.append(line)
        return all_lines

-    def _adr_get(self, stat_line, type):
-        res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-        adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
-        return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}]
-
    def _lines_get(self, stat_by_partner_line):
        pool = pooler.get_pool(self.cr.dbname)
        moveline_obj = pool.get('account.move.line')
@@ -129,15 +129,10 @@
    <blockTable colWidths="298.0,234.0" style="Tableau2">
      <tr>
        <td>
-          <para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
        </td>
        <td>
          <para style="terp_default_9">[[ o.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ a['street'] or '']]</para>
-          <para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ a['zip'] or '' ]] [[ a['city'] or '' ]]</para>
-          <para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
+          <para style="terp_default_9">[[ display_address(o.partner_id) or '']]</para>
          <para style="terp_default_9">
            <font color="white"> </font>
          </para>
@@ -256,10 +256,10 @@
            <para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
          </td>
          <td>
-            <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
+            <para style="terp_default_Right_9">[[formatLang(line.amount, currency_obj= user.company_id.currency_id) or '-' ]] </para>
          </td>
          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency, currency_obj= line.currency)]]</para>
          </td>
        </tr>
      </blockTable>
@@ -275,10 +275,10 @@
          <para style="terp_default_Bold_9">Total:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
        </td>
        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
        </td>
      </tr>
    </blockTable>
@@ -32,7 +32,6 @@ class payment_order(report_sxw.rml_parse):
            'time': time,
            'get_invoice_name': self._get_invoice_name,
            'get_company_currency': self._get_company_currency,
-            'get_company_currency_symbol': self._get_company_currency_symbol,
            'get_amount_total_in_currency': self._get_amount_total_in_currency,
            'get_amount_total': self._get_amount_total,
            'get_account_name': self._get_account_name,
@@ -72,12 +71,8 @@ class payment_order(report_sxw.rml_parse):
        user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False

-    def _get_company_currency_symbol(self):
-        pool = pooler.get_pool(self.cr.dbname)
-        user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
-        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False

-    def _get_account_name(self, bank_id):
+    def _get_account_name(self,bank_id):
        if bank_id:
            pool = pooler.get_pool(self.cr.dbname)
            value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id])
@@ -219,7 +219,7 @@
            <para style="terp_default_9_30cm">[[ p['pname'] ]]</para>
          </td>
          <td>
-            <para style="terp_default_Right_9">[[ p['amount'] ]] [[ voucher.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]]</para>
          </td>
        </tr>
        <tr>
@@ -323,7 +323,7 @@
          </para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold">[[ voucher.amount ]] [[ voucher.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]]</para>
        </td>
      </tr>
    </blockTable>
@@ -6,7 +6,7 @@
        <field name="name">sale.receipt.report.tree</field>
        <field name="model">sale.receipt.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Sales Receipt Analysis">
+            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false"  string="Sales Receipt Analysis">
                <field name="date" invisible="1"/>
                <field name="user_id" invisible="1"/>
                <field name="year" invisible="1"/>
@@ -145,7 +145,7 @@
            <field name="name">audittrail.log.tree</field>
            <field name="model">audittrail.log</field>
            <field name="arch" type="xml">
-                <tree string="AuditTrail Logs">
+                <tree string="AuditTrail Logs" create="false">
                    <field name="timestamp"/>
                    <field name="name"/>
                    <field name="object_id"/>
@@ -21,7 +21,7 @@ class res_users(osv.Model):
    }

    _sql_constraints = [
-        ('uniq_users_oauth_provider_oauht_uid', 'unique(auth_provider_id, auth_uid)', 'OAuth UID must be unique per provider'),
+        ('uniq_users_oauth_provider_oauth_uid', 'unique(oauth_provider_id, oauth_uid)', 'OAuth UID must be unique per provider'),
    ]

    def auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None):
@@ -416,7 +416,7 @@ openerp.base_import = function (instance) {
                            '</div>'
                        ].join('')
                    },
-                })).get(0).scrollIntoView();
+                }));
        },
    });
    // FSM-ize DataImport
@@ -777,7 +777,6 @@ class crm_lead(base_stage, format_address, osv.osv):
            'default_user_id': uid,
            'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
            'default_email_from': opportunity.email_from,
-            'default_state': 'open',
            'default_name': opportunity.name,
        }
        return res
@@ -105,7 +105,23 @@
                                <field name="allow_unlink"/>
                            </group>
                            <separator string="Team Members"/>
-                            <field name="member_ids"/>
+                            <field name="member_ids" widget="many2many_kanban">
+                                <kanban quick_create="false" create="true">
+                                    <field name="name"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div style="position: relative">
+                                                <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                <div class="oe_module_vignette">
+                                                    <div class="oe_module_desc">
+                                                        <field name="name"/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
                        </page>
                        <page string="Stages">
                            <separator string="Select Stages for this Sales Team"/>
@@ -8,7 +8,7 @@
            <field name="name">crm.lead.report.tree</field>
            <field name="model">crm.lead.report</field>
            <field name="arch" type="xml">
-            <tree string="Leads Analysis">
+            <tree string="Leads Analysis" create="false">
                <field name="creation_year" invisible="1"/>
                <field name="creation_month" invisible="1"/>
                <field name="creation_day" invisible="1"/>
@@ -130,7 +130,7 @@
            <field name="name">crm.lead.report.tree</field>
            <field name="model">crm.lead.report</field>
            <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " string="Opportunities Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " create="false" string="Opportunities Analysis">
                <field name="creation_year" invisible="1"/>
                <field name="creation_month" invisible="1"/>
                <field name="creation_day" invisible="1"/>
@@ -8,7 +8,7 @@
            <field name="name">crm.phonecall.report.tree</field>
            <field name="model">crm.phonecall.report</field>
            <field name="arch" type="xml">
-                <tree string="Phone calls">
+                <tree string="Phone calls" create="false">
                    <field name="name" invisible="1"/>
                    <field name="month" invisible="1"/>
                    <field name="section_id" invisible="1"/>
@@ -32,6 +32,13 @@ class crm_configuration(osv.osv_memory):
        'group_fund_raising': fields.boolean("Manage Fund Raising",
            implied_group='crm.group_fund_raising',
            help="""Allows you to trace and manage your activities for fund raising."""),
+        'module_crm_claim':fields.boolean("Manage Customer Claims",
+            help="""Allows you to track your customers/suppliers claims and grievances.
+                    This installs the module crm_claim."""),
+        'module_crm_helpdesk':fields.boolean("Manage Helpdesk and Support",
+            help="""Allows you to communicate with Customer,  process Customer query, and provide better help and support. This installs the module crm_helpdesk."""),
+        
+        
    }

 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -7,6 +7,22 @@
            <field name="model">sale.config.settings</field>
            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
            <field name="arch" type="xml">
+	            <div name="config_sale" position="before">
+	                <separator string="After-Sale Services"/>
+                    <group>
+                        <label for="id" string="Features"/>
+                        <div>
+                            <div>
+                                <field name="module_crm_claim" class="oe_inline"/>
+                                <label for="module_crm_claim"/>
+                            </div>
+                            <div>
+                                <field name="module_crm_helpdesk" class="oe_inline"/>
+                                <label for="module_crm_helpdesk"/>
+                            </div>
+                        </div>
+                    </group>
+	            </div>
                <group name="On Mail Client" version="7.0" position="after">
                    <group>
                        <label for="id" string="On Mail Server"/>
@@ -25,8 +25,10 @@
    'version': '1.0',
    'category': 'Customer Relationship Management',
    'description': """
-This modules allows you to track your customers/suppliers claims and grievances.
+
+Manage Customer Claims.
 ================================================================================
+This application allows you to track your customers/suppliers claims and grievances.

 It is fully integrated with the email gateway so that you can create
 automatically new claims based on incoming emails.
@@ -8,7 +8,7 @@
            <field name="name">crm.claim.report.tree</field>
            <field name="model">crm.claim.report</field>
            <field name="arch" type="xml">
-               <tree string="Claims">
+               <tree string="Claims" create="false">
                    <field name="name" invisible="1"/>
                    <field name="month" invisible="1"/>
                    <field name="section_id" invisible="1"/>
@@ -8,7 +8,7 @@
            <field name="name">crm.helpdesk.report.tree</field>
            <field name="model">crm.helpdesk.report</field>
            <field name="arch" type="xml">
-                <tree string="Helpdesk">
+                <tree string="Helpdesk" create="false">
                    <field name="name" invisible="1"/>
                    <field name="month" invisible="1"/>
                    <field name="section_id" invisible="1"/>
@@ -65,7 +65,7 @@
            <field name="name">crm.lead.assign.report.tree</field>
            <field name="model">crm.lead.report.assign</field>
            <field name="arch" type="xml">
-            <tree string="Opportunities Assignment Analysis">
+            <tree string="Opportunities Assignment Analysis" create="false">
                <field name="year" invisible="1"/>
                <field name="month" invisible="1"/>
                <field name="date_assign" invisible="1"/>
@@ -41,7 +41,7 @@
            <field name="name">crm.partner.assign.report.tree</field>
            <field name="model">crm.partner.report.assign</field>
            <field name="arch" type="xml">
-            <tree string="Opportunities Assignment Analysis">
+            <tree string="Opportunities Assignment Analysis" create="false">
                <field name="partner_id" invisible="1"/>
                <field name="country_id" invisible="1"/>
                <field name="grade_id" invisible="1"/>
@@ -36,8 +36,7 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo

 class document_file(osv.osv):
    _inherit = 'ir.attachment'
-    _rec_name = 'datas_fname'
-
+    _rec_name = 'name'

    def _attach_parent_id(self, cr, uid, ids=None, context=None):
        """Migrate ir.attachments to the document module.
@@ -149,29 +148,12 @@ class document_file(osv.osv):
    _sql_constraints = [
        # filename_uniq is not possible in pure SQL
    ]
-    def _check_duplication(self, cr, uid, vals, ids=None, op='create'):
-        name = vals.get('name', False)
-        parent_id = vals.get('parent_id', False)
-        res_model = vals.get('res_model', False)
-        res_id = vals.get('res_id', 0)
-        if op == 'write':
-            for file in self.browse(cr, uid, ids): # FIXME fields_only
-                if not name:
-                    name = file.name
-                if not parent_id:
-                    parent_id = file.parent_id and file.parent_id.id or False
-                if not res_model:
-                    res_model = file.res_model and file.res_model or False
-                if not res_id:
-                    res_id = file.res_id and file.res_id or 0
-                res = self.search(cr, uid, [('id', '<>', file.id), ('name', '=', name), ('parent_id', '=', parent_id), ('res_model', '=', res_model), ('res_id', '=', res_id)])
-                if len(res):
-                    return False
-        if op == 'create':
-            res = self.search(cr, uid, [('name', '=', name), ('parent_id', '=', parent_id), ('res_id', '=', res_id), ('res_model', '=', res_model)])
-            if len(res):
-                return False
-        return True
+
+    def onchange_file(self, cr, uid, ids, datas_fname=False, context=None):
+        res = {'value':{}}
+        if datas_fname:
+            res['value'].update({'name': datas_fname})
+        return res

    def check(self, cr, uid, ids, mode, context=None, values=None):
        """Check access wrt. res_model, relax the rule of ir.attachment parent
@@ -219,8 +201,6 @@ class document_file(osv.osv):
        res = self.search(cr, uid, [('id', 'in', ids)])
        if not len(res):
            return False
-        if not self._check_duplication(cr, uid, vals, ids, 'write'):
-            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))

        # if nodes call this write(), they must skip the code below
        from_node = context and context.get('__from_node', False)
@@ -286,22 +266,8 @@ class document_file(osv.osv):
        else:
            if vals.get('file_size'):
                del vals['file_size']
-        result = self._check_duplication(cr, uid, vals)
-        if not result:
-            domain = [
-                ('res_id', '=', vals['res_id']),
-                ('res_model', '=', vals['res_model']),
-                ('datas_fname', '=', vals['datas_fname']),
-            ]
-            attach_ids = self.search(cr, uid, domain, context=context)
-            super(document_file, self).write(cr, uid, attach_ids,
-                                             {'datas' : vals['datas']},
-                                             context=context)
-            result = attach_ids[0]
-        else:
-            #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-            result = super(document_file, self).create(cr, uid, vals, context)
-        return result
+
+        return super(document_file, self).create(cr, uid, vals, context)

    def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
        """ A helper to retrieve the associated partner from any res_model+id
@@ -228,6 +228,9 @@
        <field name="priority" eval="1"/>
        <field name="inherit_id" ref="base.view_attachment_form"/>
        <field name="arch" type="xml">
+            <xpath expr="//field[@name='datas_fname']" position="replace">
+                <field name="datas_fname" invisible="1" on_change="onchange_file(datas_fname)"/>
+            </xpath>
            <field name="url" position="after">
                <field name="user_id"/>
            </field>
@@ -338,15 +341,6 @@
        <field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/>
    </record>

-    <record model="ir.ui.view" id="view_attachment_form_inherit">
-        <field name="name">ir.attachment.view.inherit</field>
-        <field name="model">ir.attachment</field>
-        <field name="inherit_id" ref="base.view_attachment_form"/>
-        <field name="arch" type="xml">
-            <field name="datas_fname" position = "replace" >
-            </field>
-        </field>
-    </record>

    <record model="ir.ui.view" id="view_process_node_form_inherit1">
        <field name="name">process.node.form</field>
@@ -4,14 +4,8 @@ import textwrap
 import simplejson
 import werkzeug.wrappers

-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-    import openerp.addons.web.controllers.main as webmain
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-    import web.controllers.main as webmain
+import openerp.addons.web.http as openerpweb
+import openerp.addons.web.controllers.main as webmain

 class EDI(openerpweb.Controller):
    # http://hostname:8069/edi/view?db=XXXX&token=XXXXXXXXXXX
@@ -39,7 +39,7 @@
                            attrs="{'invisible':[('use_template','=',False)]}"
                            on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                    </xpath>
-                    <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
+                    <xpath expr="//button[@name='dummy']" position="before">
                        <button icon="/email_template/static/src/img/email_template.png"
                            type="object" name="toggle_template" string=""
                            help="Use a message template"
@@ -267,25 +267,18 @@ class event_event(osv.osv):
            return {'value': dic}

    def on_change_address_id(self, cr, uid, ids, address_id, context=None):
-        values = {
-            'street' : False,
-            'street2' : False,
-            'city' : False,
-            'zip' : False,
-            'country_id' : False,
-            'state_id' : False,
-        }
-        if isinstance(address_id, (long, int)):
-            address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
-            values.update({
-                'street' : address.street,
-                'street2' : address.street2,
-                'city' : address.city,
-                'country_id' : address.country_id and address.country_id.id,
-                'state_id' : address.state_id and address.state_id.id,
-                'zip' : address.zip,
-            })
-
+        values = {}
+        if not address_id:
+            return values
+        address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
+        values.update({
+            'street' : address.street,
+            'street2' : address.street2,
+            'city' : address.city,
+            'country_id' : address.country_id and address.country_id.id or False,
+            'state_id' : address.state_id and address.state_id.id or False,
+            'zip' : address.zip,
+        })
        return {'value' : values}


@@ -116,30 +116,28 @@
                            <label for="name" class="oe_edit_only"/>
                            <h1><field name="name"/></h1>
                        </div>
-                        <div>
+                        <group>
                            <group>
-                                <group>
-                                    <label for="address_id" string="Location"/>
-                                    <div>
-                                        <field name="address_id" on_change="on_change_address_id(address_id)" />
-                                        <field name="street" placeholder="Street..."/>
-                                        <field name="street2"/>
-                                        <div class="address_format">
-                                            <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
-                                            <field name="zip" placeholder="ZIP" style="width: 20%%"/>
-                                        </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
-                                    </div>
-                                </group>
-                                <group>
-                                    <field name="type" on_change="onchange_event_type(type,context)"/>
-                                    <field name="date_begin"/>
-                                    <field name="date_end"/>
-                                    <field name="company_id" groups="base.group_multi_company"/>
-                                </group>
+                                <label for="address_id" string="Location"/>
+                                   <div>
+                                       <field name="address_id" on_change="on_change_address_id(address_id)" />
+                                       <field name="street" placeholder="Street..."/>
+                                       <field name="street2"/>
+                                       <div class="address_format">
+                                           <field name="city" placeholder="City" style="width: 40%%"/>
+                                           <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                           <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                       </div>    
+                                       <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+                                   </div>
                            </group>
-                        </div>
+                            <group>
+                                <field name="type" on_change="onchange_event_type(type,context)" />
+                                <field name="date_begin"/>
+                                <field name="date_end"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
                        <notebook>
                            <page string="Email Configuration" groups="base.group_no_one">
                                <group>
@@ -284,13 +282,13 @@
                            <t t-if="record.register_avail.raw_value != 0">
                              <t t-if="!record.is_subscribed.raw_value">
                                <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
+                                <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
                                    <span >Subscribe</span>
                                </button>
                              </t>
                            </t>
                            <t t-if="record.is_subscribed.raw_value">
-                              <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
+                              <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
                                <span>Subscribed</span>
                                <span class="unsubscribe">Unsubscribe</span>
                              </button>
@@ -23,16 +23,16 @@ from osv import fields, osv
 import tools

 class report_event_registration(osv.osv):
-
    _name = "report.event.registration"
    _description = "Events Analysis"
    _auto = False
    _columns = {
        'event_date': fields.char('Event Start Date', size=64, readonly=True),
        'year': fields.char('Year', size=4, readonly=True),
-        'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'month': fields.selection([
+            ('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'),
+            ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
        'event_id': fields.many2one('event.event', 'Event', required=True),
        'draft_state': fields.integer(' # No of Draft Registrations', size=20),
        'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
@@ -48,17 +48,18 @@ class report_event_registration(osv.osv):
        'company_id': fields.many2one('res.company', 'Company', readonly=True),
    }
    _order = 'event_date desc'
+
    def init(self, cr):
        """
-        initialize the sql view for the event registration
-        cr -- the cursor
+        Initialize the sql view for the event registration
        """
        tools.drop_view_if_exists(cr, 'report_event_registration')
-        cr.execute("""
-         CREATE OR REPLACE view report_event_registration AS (
-                SELECT
-                event_id,
-                r.id,
+
+        # TOFIX this request won't select events that have no registration
+        cr.execute(""" CREATE VIEW report_event_registration AS (
+            SELECT
+                e.id::char || '/' || coalesce(r.id::char,'') AS id,
+                e.id AS event_id,
                e.user_id AS user_id,
                r.user_id AS user_id_registration,
                r.name AS name_registration,
@@ -72,23 +73,21 @@ class report_event_registration(osv.osv):
                CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
                e.type AS event_type,
                e.register_max AS register_max,
-                e.state AS  event_state,
-                r.state AS  registration_state
-                FROM
+                e.state AS event_state,
+                r.state AS registration_state
+            FROM
                event_event e
+                LEFT JOIN event_registration r ON (e.id=r.event_id)

-                LEFT JOIN
-                    event_registration r ON (e.id=r.event_id)
-
-               GROUP BY
+            GROUP BY
                event_id,
                user_id_registration,
-                e.id,
                r.id,
                registration_state,
                r.nb_register,
-                event_type, e.id, e.date_begin, e.main_speaker_id,
-                e.register_max,event_id, e.user_id,e.company_id,
+                event_type,
+                e.id,
+                e.date_begin,
                e.user_id,
                event_state,
                e.company_id,
@@ -97,9 +96,8 @@ class report_event_registration(osv.osv):
                month,
                e.register_max,
                name_registration
-
-              )
-                """)
+        )
+        """)

 report_event_registration()

@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
-   <data>
+    <data>

-    <!-- report , event on registration... start -->
+        <!-- Report, event on registration -->
        <record model="ir.ui.view" id="report_event_registration_tree">
            <field name="name">report.event.registration.tree</field>
            <field name="model">report.event.registration</field>
            <field name="arch" type="xml">
-                <tree colors="blue:event_state == 'draft';black:event_state == 'confirm';gray:event_state in('done','cancel')" string="Events Analysis">
+                <tree colors="blue:event_state == 'draft';black:event_state == 'confirm';gray:event_state in('done','cancel')" create="false" string="Events Analysis">
                    <field name="event_date" invisible="1"/>
                    <field name="user_id" invisible="1"/>
                    <field name="speaker_id" invisible="1"/>
@@ -28,7 +28,6 @@
            </field>
        </record>

-
        <record model ="ir.ui.view" id="report_event_registration_graph">
            <field name="name">report.event.registration.graph</field>
            <field name="model">report.event.registration</field>
@@ -42,8 +41,7 @@
            </field>
        </record>

-              <!-- Event on Registration search view -->
-
+        <!-- Event on Registration search view -->
        <record model="ir.ui.view" id="view_report_event_registration_search">
            <field name="name">report.event.registration.search</field>
            <field name="model">report.event.registration</field>
@@ -82,28 +80,28 @@
            </field>
        </record>

-        <record  model="ir.actions.act_window" id="action_report_event_registration">
+        <record model="ir.actions.act_window" id="action_report_event_registration">
            <field name="name">Events Analysis</field>
            <field name="res_model">report.event.registration</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,graph</field>
            <field name="search_view_id" ref="view_report_event_registration_search"/>
-            <field name="context">{"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
+            <field name="context">{"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, "group_by_no_leaf":1, "group_by":[]}</field>
        </record>

-       <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
+        <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
            <field name="sequence" eval="1"/>
            <field name="view_mode">tree</field>
            <field name="view_id" ref="report_event_registration_tree"/>
            <field name="act_window_id" ref="action_report_event_registration"/>
-       </record>
+        </record>

-       <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">
+        <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">
            <field name="sequence" eval="2"/>
            <field name="view_mode">graph</field>
            <field name="view_id" ref="report_event_registration_graph"/>
            <field name="act_window_id" ref="action_report_event_registration"/>
-       </record>
+        </record>

        <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="30" groups="event.group_event_manager" name="Events"/>
        <menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
@@ -43,4 +43,10 @@
    width:256px;
    border: 1px solid #eeeeee;
 }
+.oe_unsubscribe, .oe_unsubscribe_button:hover span {
+   display: none;
+ }
+.oe_unsubscribe_button:hover .oe_unsubscribe {
+   display: inline;
+ }

@@ -6,10 +6,10 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
             <field name="arch" type="xml">
-                <field name="purchase_ok" position="before">
+                <div name="options" position="inside">
                    <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                    <label for="event_ok"/>
-                </field>
+                </div>
                <field name='default_code' position='before'>
                    <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                </field>
@@ -27,7 +27,6 @@
    'category': 'Tools',
    'installable': True,
    'auto_install': False,
-    'web': True,
    'js': ['static/src/js/gdocs.js'],
    'data': [
        'security/ir.model.access.csv',
@@ -26,8 +26,11 @@ try:
    from gdata.client import RequestError
    from gdata.docs.service import DOCUMENT_LABEL
    import gdata.auth
+    from gdata.docs.data import Resource
 except ImportError:
-    raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
+    import logging
+    _logger = logging.getLogger(__name__)
+    _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")

 class google_docs_ir_attachment(osv.osv):
    _inherit = 'ir.attachment'
@@ -8,9 +8,10 @@
            <field name="name">google_docs.config.tree</field>
            <field name="model">google.docs.config</field>
            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
+                <tree string="Google Docs Configuration">
                    <field name="model_id"/>
-                </group>
+                    <field name="name_template"/>
+                </tree>
            </field>
        </record>

@@ -18,11 +19,25 @@
            <field name="name">google_docs.config.form</field>
            <field name="model">google.docs.config</field>
            <field name="arch" type="xml">
-            <group colspan='4'>
-                <field name="model_id"/>
-                <field name='gdocs_resource_id'/>
-                <field name='name_template'/>
-            </group>
+                <form string="Google Docs Configuration" version="7.0">
+                <group>
+                    <field name="model_id"/>
+                    <label for='gdocs_resource_id'/>
+                    <div>
+                        <field name='gdocs_resource_id'/>
+                        <p class="oe_grey">
+This is the id of the template document, on google side. You can find it thanks to its URL:
+<ul>
+<li>for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`</li>
+<li>for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`</li>
+<li>for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`</li>
+<li>for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`</li>
+</ul>
+                        </p>
+                    </div>
+                    <field name='name_template'/>
+                </group>
+                </form>
            </field>
        </record>

@@ -334,13 +334,10 @@
                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                    </header>
                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                            <field name="department_id" class="oe_inline"/>
-                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                        </h1>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name" class="oe_inline"/></h1>
+                        </div>
                        <group>
                            <group>
                                <field name="no_of_employee" groups="base.group_user"/>
@@ -349,7 +346,7 @@
                            </group>
                            <group>
                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                                <field name="department_id"/>                            </group>
                        </group>
                        <div>
                            <label for="description"/>
@@ -6,7 +6,7 @@
        <field name="name">hr.evaluation.report.tree</field>
        <field name="model">hr.evaluation.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')"
+            <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')" create="false"
             string="Appraisal Analysis">
                <field name="create_date" invisible="1"/>
                <field name="employee_id" invisible="1"/>
@@ -243,7 +243,7 @@ class product_product(osv.osv):
        data_obj = self.pool.get('ir.model.data')
        cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
        categ_id = data_obj.browse(cr, uid, cat_id).res_id
-        res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+        res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }}
        return res

 product_product()
@@ -196,10 +196,10 @@
            <field name="model">product.product</field>
            <field name="inherit_id" ref="product.product_normal_form_view"/>
            <field name="arch" type="xml">
-                <field name="purchase_ok" position="before">
+                <div name="options" position="inside">
                    <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
                    <label for="hr_expense_ok"/>
-                </field>
+                </div>
            </field>
        </record>

@@ -231,7 +231,7 @@
            <para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
          </td>
          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] </para>
          </td>
        </tr>
        <tr>
@@ -277,7 +277,7 @@
          <para style="terp_tblheader_Details">Total:</para>
        </td>
        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
        </td>
      </tr>
    </blockTable>
@@ -6,7 +6,7 @@
        <field name="name">hr.expense.report.tree</field>
        <field name="model">hr.expense.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" string="Expenses Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" create="false" string="Expenses Analysis">
                <field name="employee_id" invisible="1"/>
                <field name="user_id" invisible="1"/>
                <field name="year" invisible="1"/>
@@ -9,6 +9,7 @@ access_product_template_hr_expense_user,product.template.hr.expense.user,product
 access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
 access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
 access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,0,0,0
 access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
 access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
 access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
@@ -353,6 +353,32 @@

        <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>

+        <record model="ir.actions.act_window" id="request_approve_allocation">
+            <field name="name">Allocation Requests to Approve</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday_allocation_tree"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <menuitem parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
+
        <record model="ir.actions.act_window" id="open_company_allocation">
            <field name="name">Leaves Summary</field>
            <field name="res_model">hr.holidays</field>
@@ -206,7 +206,7 @@
            <para style="P2">[[ formatLang(r['amount']) ]]</para>
          </td>
          <td>
-            <para style="P3">[[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+            <para style="P3">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]</para>
          </td>
        </tr>
      </blockTable>
@@ -222,7 +222,7 @@
          <para style="P15">Total:</para>
        </td>
        <td>
-          <para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+          <para style="P11">[[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]</para>
        </td>
      </tr>
    </blockTable>
@@ -197,7 +197,8 @@
          </para>
        </td>
        <td>
-          <para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+          <para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+                           [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
        </td>
      </tr>
    </blockTable>
@@ -293,7 +294,7 @@
            <para style="P4">[[ formatLang(p.amount) ]]</para>
          </td>
          <td>
-            <para style="P5">[[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+            <para style="P5">[[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]</para>
          </td>
        </tr>
      </blockTable>
@@ -234,7 +234,8 @@
          </para>
        </td>
        <td>
-          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+                           [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
        </td>
      </tr>
    </blockTable>
@@ -334,7 +335,7 @@
            <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
          </td>
          <td>
-            <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+            <para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
          </td>
        </tr>
      </blockTable>
@@ -391,7 +392,7 @@
            <para style="P5">[[ formatLang(r['amount']) ]]</para>
          </td>
          <td>
-            <para style="P6">[[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
+            <para style="P6">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
          </td>
        </tr>
      </blockTable>
@@ -36,7 +36,7 @@ class hr_payslip(osv.osv):

    _columns = {
        'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
-        'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
+        'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
        'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
    }

@@ -215,7 +215,7 @@ class hr_payslip_run(osv.osv):
    _inherit = 'hr.payslip.run'
    _description = 'Payslip Run'
    _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
+        'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
    }

    def _get_default_journal(self, cr, uid, context=None):
@@ -297,7 +297,6 @@ class hr_applicant(base_stage, osv.Model):
        res['context'] = {
            'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
            'default_user_id': uid,
-            'default_state': 'open',
            'default_name': applicant.name,
            'default_categ_ids': category and [category.id] or False,
        }
@@ -289,7 +289,8 @@
                            </div>
                            <div class="oe_kanban_content" tooltip="kanban-tooltip">
                                <div>
-                                    <b><field name="name"/></b><br/>
+                                    <t t-if="record.partner_name.raw_value"><b><field name="partner_name"/></b><br/></t>
+                                    <i><field name="name"/></i><br/>
                                    <field name="job_id"/><br/>
                                    <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
@@ -342,8 +343,8 @@
                        attrs="{'invisible':[('survey_id','=',False)]}"/>
                </div>
            </field>
-            <xpath expr="/form/sheet/h1" version="7.0" position="after">
-                <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
+            <xpath expr="//div[@class='oe_title']" version="7.0" position="after">
+                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
                    <field name="alias_id" invisible="1" required="0"/>
                    <label for="alias_name" class="oe_edit_only"/>
                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
@@ -5,7 +5,7 @@
        <field name="name">hr.recruitment.report.tree</field>
        <field name="model">hr.recruitment.report</field>
        <field name="arch" type="xml">
-            <tree string="Recruitment Analysis">
+            <tree string="Recruitment Analysis" create="false">
                <field name="date" invisible="1"/>
                <field name="user_id" invisible="1"/>
                <field name="job_id"/>
@@ -135,6 +135,8 @@ class account_analytic_line(osv.osv):
    def _default_general_account(self, cr, uid, context=None):
        proxy = self.pool.get('hr.employee')
        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if not record_ids:
+            raise osv.except_osv(_('Error!'), _('Please create an employee associated to this user.'))
        employee = proxy.browse(cr, uid, record_ids[0], context=context)
        if employee.product_id and employee.product_id.property_account_income:
            return employee.product_id.property_account_income.id
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-10-12 23:22+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
+"X-Generator: Launchpad (build 16137)\n"

 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -769,7 +769,7 @@ msgstr "Menge"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr "Datum/Kurzbez."
+msgstr "Dat/Kurzb."

 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,general_account_id:0
@@ -15,7 +15,7 @@
            <field name="name">hr.timesheet.report.tree</field>
            <field name="model">hr.timesheet.report</field>
            <field name="arch" type="xml">
-                <tree string="Timesheet Analysis">
+                <tree string="Timesheet Analysis" create="false">
                    <field name="year" invisible="1"/>
                    <field name="month" invisible="1"/>
                    <field name="date" invisible="1"/>
@@ -35,7 +35,7 @@ class hr_timesheet_current_open(osv.osv_memory):

        user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
        if not len(user_ids):
-            raise osv.except_osv(_('Error!'), _('Please define employee for your user!'))
+            raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
        ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)

        if len(ids) > 1:
@@ -108,7 +108,7 @@
            <para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
          </td>
          <td>
-            <para style="terp_default_Right_9">[[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l['amount'], currency_obj=company.currency_id) ]]</para>
          </td>
        </tr>
      </blockTable>
@@ -129,7 +129,7 @@
          <para style="terp_tblheader_General_Right">Total:</para>
        </td>
        <td>
-          <para style="terp_tblheader_General_Right">[[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_General_Right">[[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]</para>
        </td>
      </tr>
    </blockTable>
@@ -290,9 +290,7 @@
            <tr>
              <td>
                <para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
-                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street or '_' ]]</para>
-                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street2 or '' ]]</para>
-                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]</para>
+                <para style="terp_default_Bold_8">[[display_address(o.employee_id.address_home_id) or '_' ]]</para>
              </td>
            </tr>
          </blockTable>
@@ -6,7 +6,7 @@
        <field name="name">payment.advice.report.tree</field>
        <field name="model">payment.advice.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " string="Advices Analysis">
+            <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " create="false" string="Advices Analysis">
                <field name="nbr" sum="# Payment Lines"/>
                <field name="name" invisible="1"/>
                <field name="employee_id" invisible="1"/>
@@ -6,7 +6,7 @@
        <field name="name">payslip.report.tree</field>
        <field name="model">payslip.report</field>
        <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state == 'done';gray:state == 'cancel' " string="Payslip Analysis">
+            <tree colors="blue:state == 'draft';black:state == 'done';gray:state == 'cancel' " create="false" string="Payslip Analysis">
                <field name="nbr" sum="# Payslip Lines"/>
                <field name="name"/>
                <field name="employee_id" invisible="1"/>
@@ -234,7 +234,7 @@
              </para>
            </td>
            <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13],currency_obj= company.currency_id)]] </para>
            </td>
          </tr>
        </blockTable>
@@ -248,43 +248,43 @@
            <para style="terp_tblheader_Details">Total</para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]</para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
          </td>
          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), currency_obj = company.currency_id)]]</para>
          </td>
        </tr>
      </blockTable>
@@ -478,7 +478,7 @@
                </para>
              </td>
              <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13],currency_obj= company.currency_id) ]] </para>
              </td>
            </tr>
          </blockTable>
@@ -571,7 +571,7 @@
                </para>
              </td>
              <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13],currency_obj= company.currency_id) ]] </para>
              </td>
            </tr>
          </blockTable>
@@ -247,7 +247,7 @@
            <para style="P5">[[ line['acc_no'] ]]</para>
          </td>
          <td>
-            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
          </td>
          <td>
            <para style="P5">[[ line['debit_credit'] ]]</para>
@@ -296,7 +296,7 @@
            <para style="P5">[[ line['ifsc_code'] ]]</para>
          </td>
          <td>
-            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
          </td>
          <td>
            <para style="P5">[[ line['debit_credit'] ]]</para>
@@ -321,7 +321,7 @@
          <para style="P4"/>
        </td>
        <td>
-          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
        </td>
        <td>
          <para style="P4">
@@ -347,7 +347,7 @@
          <para style="P4"/>
        </td>
        <td>
-          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
        </td>
        <td>
          <para style="P4">
@@ -234,7 +234,7 @@
          </para>
        </td>
        <td>
-          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
        </td>
      </tr>
    </blockTable>
@@ -334,7 +334,7 @@
            <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
          </td>
          <td>
-            <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+            <para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
          </td>
        </tr>
      </blockTable>
@@ -137,7 +137,7 @@
            </para>
          </td>
          <td>
-            <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para>
+            <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]]</u></para>
          </td>
        </tr>
      </blockTable>
@@ -155,7 +155,7 @@
              <para style="terp_default_9">[[ lines.descript]]</para>
            </td>
            <td>
-              <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+              <para style="terp_default_9_right">[[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]]</para>
            </td>
          </tr>
        </blockTable>
@@ -172,7 +172,7 @@
          <para style="terp_tbl_detail_header">Total :</para>
        </td>
        <td>
-          <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+          <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]]</para>
        </td>
      </tr>
    </blockTable>
@@ -134,6 +134,7 @@ class mail_message(osv.Model):
        'subtype_id': fields.many2one('mail.message.subtype', 'Subtype'),
        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', string='Votes',
            help='Users that voted for this message'),
+        'is_private': fields.boolean('Private message'),
    }

    def _needaction_domain_get(self, cr, uid, context=None):
@@ -150,6 +151,7 @@ class mail_message(osv.Model):
        'date': lambda *a: fields.datetime.now(),
        'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
        'body': '',
+        'is_private': True,
    }

    #------------------------------------------------------
@@ -220,127 +222,12 @@ class mail_message(osv.Model):
            'unread': msg.unread and msg.unread['unread'] or False
        }

-    def message_read_tree_get_expandable(self, cr, uid, parent_message, last_message, domain=[], current_level=0, level=0, context=None):
-        """ . """
-        base_domain = [('id', '<', last_message['id'])]
-        if parent_message and current_level < level:
-            base_domain += [('parent_id', '=', parent_message['id'])]
-        elif parent_message:
-            base_domain += [('id', 'child_of', parent_message['id']), ('id', '!=', parent_message['id'])]
-        if domain:
-            base_domain += domain
-        extension = {   'type': 'expandable',
-                        'domain': base_domain,
-                        'thread_level': current_level,
-                        'context': context,
-                        'id': -1,
-                        }
-        return extension
-
-    def message_read_tree_flatten(self, cr, uid, parent_message, messages, domain=[], level=0, current_level=0, context=None, limit=None, add_expandable=True):
-        """ Given a tree with several roots of following structure :
-            [   {'id': 1, 'child_ids': [
-                    {'id': 11, 'child_ids': [...] },],
-                {...}   ]
-            Flatten it to have a maximum number of levels, 0 being flat and
-            sort messages in a level according to a key of the messages.
-            Perform the flattening at leafs if above the maximum depth, then get
-            back in the tree.
-            :param context: ``sort_key``: key for sorting (id by default)
-            :param context: ``sort_reverse``: reverser order for sorting (True by default)
+    def _message_read_expandable(self, cr, uid, tree, result, message_loaded, domain, context, parent_id, limit):
        """
-        def _flatten(msg_dict):
-            """ from    {'id': x, 'child_ids': [{child1}, {child2}]}
-                get     [{'id': x, 'child_ids': []}, {child1}, {child2}]
-            """
-            child_ids = msg_dict.pop('child_ids', [])
-            msg_dict['child_ids'] = []
-            return [msg_dict] + child_ids
-
-        context = context or {}
-        limit = limit or self._message_read_limit
-
-        # Depth-first flattening
-        for message in messages:
-            if message.get('type') == 'expandable':
-                continue
-            message['child_ids'] = self.message_read_tree_flatten(cr, uid, message, message['child_ids'], domain, level, current_level + 1, context=context, limit=limit)
-            for child in message['child_ids']:
-                if child.get('type') == 'expandable':
-                    continue
-                message['child_nbr'] += child['child_nbr']
-        # Flatten if above maximum depth
-        if current_level < level:
-            return_list = messages
-        else:
-            return_list = [flat_message for message in messages for flat_message in _flatten(message)]
-
-        # Add expandable
-        return_list = sorted(return_list, key=itemgetter(context.get('sort_key', 'id')), reverse=context.get('sort_reverse', True))
-        if return_list and current_level == 0 and add_expandable:
-            expandable = self.message_read_tree_get_expandable(cr, uid, parent_message, return_list and return_list[-1] or parent_message, domain, current_level, level, context=context)
-            return_list.append(expandable)
-        elif return_list and current_level <= level and add_expandable:
-            expandable = self.message_read_tree_get_expandable(cr, uid, parent_message, return_list and return_list[-1] or parent_message, domain, current_level, level, context=context)
-            return_list.append(expandable)
-        return return_list
-
-    def message_read(self, cr, uid, ids=False, domain=[], level=0, context=None, parent_id=False, limit=None):
-        """ Read messages from mail.message, and get back a structured tree
-            of messages to be displayed as discussion threads. If IDs is set,
-            fetch these records. Otherwise use the domain to fetch messages.
-            After having fetch messages, their parents will be added to obtain
-            well formed threads.
-
-            :param domain: optional domain for searching ids
-            :param level: level of threads to display, 0 being flat
-            :param limit: number of messages to fetch
-            :param parent_id: if parent_id reached, stop searching for
-                further parents
-            :return list: list of trees of messages
+        create the expandable message for all parent message read
+        this function is used by message_read
        """

-        message_loaded = context and context.get('message_loaded') or [0]
-
-        # don't read the message display by .js, in context message_loaded list
-        if context and context.get('message_loaded'):
-            domain += [ ['id','not in',message_loaded] ];
-
-        limit = limit or self._message_read_limit
-        context = context or {}
-
-        tree = []
-        result = []
-        record = None
-
-        # select ids
-        if ids:
-            for msg in self.browse(cr, uid, ids, context=context):
-                result.append(self._message_dict_get(cr, uid, msg, context=context))
-            return result
-
-        # key: ID, value: record
-        ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit)
-        for msg in self.browse(cr, uid, ids, context=context):
-            # if not in record and not in message_loded list
-            if msg.id not in tree and msg.id not in message_loaded :
-                record = self._message_dict_get(cr, uid, msg, context=context)
-                tree.append(msg.id)
-                result.append(record)
-
-            while msg.parent_id and msg.parent_id.id != parent_id:
-                parent_id = msg.parent_id.id
-                if msg.parent_id.id not in tree:
-                    msg = msg.parent_id
-                    tree.append(msg.id)
-                    # if not in record and not in message_loded list
-                    if msg.id not in message_loaded :
-                        record = self._message_dict_get(cr, uid, msg, context=context)
-                        result.append(record)
-
-        result = sorted(result, key=lambda k: k['id'])
-
-
        tree_not = []   
        # expandable for not show message
        for id_msg in tree:
@@ -367,10 +254,12 @@ class mail_message(osv.Model):
                            'parent_id': id_msg,
                            'id':  id_min
                        })
+                    id_min=None
+                    id_max=None
                    nb=0
            if nb>0:
                result.append({
-                    'domain': [['id','>=',id_min],['parent_id','=',id_msg]],
+                    'domain': [['id','>=',id_min],['id','<=',id_max],['parent_id','=',id_msg]],
                    'nb_messages': nb,
                    'type': 'expandable', 
                    'parent_id': id_msg, 
@@ -395,6 +284,73 @@ class mail_message(osv.Model):

        return result

+    def message_read(self, cr, uid, ids=False, domain=[], level=0, context=None, parent_id=False, limit=None):
+        """ Read messages from mail.message, and get back a structured tree
+            of messages to be displayed as discussion threads. If IDs is set,
+            fetch these records. Otherwise use the domain to fetch messages.
+            After having fetch messages, their parents will be added to obtain
+            well formed threads.
+
+            :param domain: optional domain for searching ids
+            :param limit: number of messages to fetch
+            :param parent_id: if parent_id reached, stop searching for
+                further parents
+            :return list: list of trees of messages
+        """
+        message_loaded = context and context.get('message_loaded') or [0]
+
+        # don't read the message display by .js, in context message_loaded list
+        if context and context.get('message_loaded'):
+            domain += [ ['id','not in',message_loaded] ];
+
+        limit = limit or self._message_read_limit
+        context = context or {}
+
+        tree = []
+        result = []
+        record = None
+
+        # select ids
+        if ids and ids!=[None]:
+            for msg in self.browse(cr, uid, ids, context=context):
+                result.append(self._message_dict_get(cr, uid, msg, context=context))
+            return result
+
+        # key: ID, value: record
+        ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit)
+        for msg in self.browse(cr, uid, ids, context=context):
+            # if not in record and not in message_loded list
+            if msg.id not in tree and msg.id not in message_loaded :
+                record = self._message_dict_get(cr, uid, msg, context=context)
+                tree.append(msg.id)
+                result.append(record)
+
+            while msg.parent_id and msg.parent_id.id != parent_id:
+                parent_id = msg.parent_id.id
+                if msg.parent_id.id not in tree:
+                    msg = msg.parent_id
+                    tree.append(msg.id)
+                    # if not in record and not in message_loded list
+                    if msg.id not in message_loaded :
+                        record = self._message_dict_get(cr, uid, msg, context=context)
+                        result.append(record)
+
+        result = sorted(result, key=lambda k: k['id'])
+
+        result = self._message_read_expandable(cr, uid, tree, result, message_loaded, domain, context, parent_id, limit)
+
+        return result
+
+    def user_free_attachment(self, cr, uid, context=None):
+        attachment_list = []
+
+        attachment = self.pool.get('ir.attachment')
+        attachment_ids = attachment.search(cr, uid, [('res_model','=',''),('create_uid','=',uid)])
+        if len(attachment_ids):
+            attachment_list = [{'id': attach.id, 'name': attach.name, 'date': attach.create_date} for attach in attachment.browse(cr, uid, attachment_ids, context=context)]
+
+        return attachment_list
+
    #------------------------------------------------------
    # Email api
    #------------------------------------------------------
@@ -525,11 +481,9 @@ class mail_message(osv.Model):
            self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
        return super(mail_message, self).unlink(cr, uid, ids, context=context)

-    def _notify(self, cr, uid, newid, context=None):
+    def _notify_followers(self, cr, uid, newid, message, context=None):
        """ Add the related record followers to the destination partner_ids.
-            Call mail_notification.notify to manage the email sending
        """
-        message = self.browse(cr, uid, newid, context=context)
        partners_to_notify = set([])
        # message has no subtype_id: pure log message -> no partners, no one notified
        if not message.subtype_id:
@@ -550,6 +504,14 @@ class mail_message(osv.Model):
                self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context)
            partners_to_notify |= extra_notified

+    def _notify(self, cr, uid, newid, context=None):
+        """ Add the related record followers to the destination partner_ids if is not a private message.
+            Call mail_notification.notify to manage the email sending
+        """
+        message = self.browse(cr, uid, newid, context=context)
+        if message and (message.is_private!=False and message.is_private!=None):
+            self._notify_followers(cr, uid, newid, message, context=context)
+        
        # add myself if I wrote on my wall, 
        # unless remove myself author
        if ((message.model=="res.partner" and message.res_id==message.author_id.id)):
@@ -88,21 +88,21 @@
            <field name="name">Inbox</field>
            <field name="tag">mail.wall</field>
            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner'} }&quot;"/>
        </record>

        <record id="action_mail_archives_feeds" model="ir.actions.client">
            <field name="name">Archives</field>
            <field name="tag">mail.wall</field>
            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', False)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner'} }&quot;"/>
        </record>

        <record id="action_mail_sent_feeds" model="ir.actions.client">
            <field name="name">Sent</field>
            <field name="tag">mail.wall</field>
            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner'} }&quot;"/>
        </record>
    </data>
 </openerp>
@@ -623,11 +623,10 @@ class mail_thread(osv.AbstractModel):
            :param str subject: optional subject
            :param str type: mail_message.type
            :param int parent_id: optional ID of parent message in this thread
-            :param tuple(str,str) attachments: list of attachment tuples in the form
+            :param tuple(str,str) attachments or list id: list of attachment tuples in the form
                ``(name,content)``, where content is NOT base64 encoded
            :return: ID of newly created mail.message
        """
-
        context = context or {}
        attachments = attachments or []
        assert (not thread_id) or isinstance(thread_id, (int, long)) or \
@@ -635,7 +634,7 @@ class mail_thread(osv.AbstractModel):
        if isinstance(thread_id, (list, tuple)):
            thread_id = thread_id and thread_id[0]

-        attachment_ids = []
+        attachment_ids=[]
        for name, content in attachments:
            if isinstance(content, unicode):
                content = content.encode('utf-8')
@@ -679,6 +678,13 @@ class mail_thread(osv.AbstractModel):
            'attachment_ids': attachment_ids,
            'subtype_id': subtype_id,
        })
+
+        # if the parent is private, the message must be private
+        if parent_id:
+            msg = messages.browse(cr, uid, parent_id, context=context)
+            if msg.is_private:
+                values["is_private"] = msg.is_private
+
        # Avoid warnings about non-existing fields
        for x in ('from', 'to', 'cc'):
            values.pop(x, None)
@@ -691,10 +697,23 @@ class mail_thread(osv.AbstractModel):

    def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
-        added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
-                        subtype=subtype, parent_id=parent_id, attachments=attachments, context=context)
-        added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
+        # if the user write on his wall
+        if self._name=='res.partner' and not thread_id:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            thread_id = user.partner_id.id

+        added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
+                        subtype=subtype, parent_id=parent_id, context=context)
+
+        attachment_ids=[]
+        if attachments:
+            ir_attachment = self.pool.get('ir.attachment')
+            attachment_ids = ir_attachment.search(cr, 1, [('res_model', '=', ""), ('res_id', '=', ""), ('user_id', '=', uid), ('id', 'in', attachments)], context=context)
+            if attachment_ids:
+                self.pool.get('ir.attachment').write(cr, 1, attachment_ids, { 'res_model': self._name, 'res_id': thread_id }, context=context)
+                self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]} )
+          
+        added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
        return added_message

    def get_message_subtypes(self, cr, uid, ids, context=None):
@@ -20,13 +20,13 @@
        </record>
        <record id="mail_archivesfeeds" model="ir.ui.menu">
          <field name="name">Archives</field>
-          <field name="sequence" eval="11"/>
+          <field name="sequence" eval="12"/>
          <field name="action" ref="action_mail_archives_feeds"/>
          <field name="parent_id" ref="mail_feeds"/>
        </record>
        <record id="mail_sentfeeds" model="ir.ui.menu">
          <field name="name">Sent</field>
-          <field name="sequence" eval="12"/>
+          <field name="sequence" eval="13"/>
          <field name="action" ref="action_mail_sent_feeds"/>
          <field name="parent_id" ref="mail_feeds"/>
        </record>
@@ -82,9 +82,13 @@
    overflow: auto;
 }

+.openerp .oe_mail_record_wall {
+    margin: auto;
+    width: 560px;
+}
+
 .openerp .oe_mail_record_wall > .oe_mail_wall_threads {
    float: left;
-    width: 560px;
 }

 .openerp div.oe_mail_recthread_aside {
@@ -145,6 +149,10 @@
    z-index: 5;
 }
 .openerp .oe_mouse_subtypes .oe_recthread_subtypes {
+    background: #fff;
+    padding: 2px;
+    border: 1px solid #aaaaaa;
+    border-top: 0px;
    position: absolute;
    z-index: 2;
 }
@@ -160,7 +168,6 @@
 /* ------------------------------------------------------------ */

 .openerp div.oe_mail_thread_action {
-    display: none;
    white-space: normal;
    padding: 8px;
    z-index:5;
@@ -173,16 +180,6 @@
    clear: both; 
 }

-/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
-.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea {
-    width: 474px;
-    height: 60px;
-    padding: 4px;
-    font-size: 12px;
-    border: 1px solid #cccccc;
-}
-
 /* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
 .openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
@@ -206,6 +203,10 @@
    margin-left: 66px;
 }

+.openerp li.oe_mail_thread_msg {
+    width: 560px;
+}
+
 .openerp div.oe_thread_placeholder li.oe_mail_thread_msg:last-child {
    margin-bottom: 8px;
 }
@@ -223,13 +224,18 @@

 .openerp li.oe_mail_thread_msg.oe_mail_read,
 .openerp li.oe_mail_thread_msg.oe_mail_read div {
-    background-color: #F0F0F0;
+    border-left: #F0F0F0;
 }
 .openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread,
 .openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread div {
    background-color: #F6F6F6;
 }

+.openerp li.oe_mail_thread_msg.oe_mail_unread>div>ul>li.oe_unread,
+.openerp li.oe_mail_thread_msg.oe_mail_read>div>ul>li.oe_read {
+    display: none;
+}
+
 .openerp li.oe_mail_thread_msg > div:after {
    content: "";
    display: block;
@@ -247,7 +253,7 @@
 .openerp .oe_mail_msg_email {
    padding: 8px;
    background: white;
-    border-top: 1px solid #ebebeb;
+    position: relative;
 }

 .openerp .oe_mail_msg_notification:after, 
@@ -259,7 +265,7 @@
 }

 .openerp div.oe_mail_msg_content {
-    float: right;
+    float: left;
    position: relative;
    width: 486px;
 }
@@ -309,76 +315,6 @@
    display: none;
 }

-/* ------------------------------------------------------------ */
-/* mail.compose.message form view & OpenERP hacks
-/* ------------------------------------------------------------ */
-
-/* form_view: delete white background */
-.openerp .oe_mail_msg_content div.oe_formview {
-    background-color: transparent;
-}
-
-.openerp .oe_mail_msg_content div.oe_form_nosheet {
-    margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_group {
-    margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_field,
-.openerp .oe_mail_msg_content div.oe_form_field {
-    padding: 0px;
-}
-
-.openerp .oe_mail_msg_content td.oe_form_group_cell {
-    vertical-align: bottom;
-}
-
-/* subject: change width */
-.openerp .oe_mail_msg_content .oe_form .oe_form_field input {
-    width: 472px;
-}
-
-/* body_html: cleditor */
-.openerp .oe_mail_msg_content div.cleditorMain {
-    border: 1px solid #cccccc;
-}
-
-/* destination_partner_ids */
-.openerp .oe_mail_msg_content div.text-core {
-    height: 22px !important;
-    width: 472px;
-}
-
-/* buttons */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
-    padding: 1px;
-}
-
-/* attachment button: override of openerp values */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file {
-    display: inline-block;
-    width: 24px;
-    height: 24px;
-    margin: 2px;
-}
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file button {
-    margin: 0px;
-}
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons input.oe_form_binary_file {
-    bottom: 0px;
-    top: auto;
-    left: auto;
-    right: 28px;
-    height: 26px;
-    width: 26px;
-    min-width: 22px;
-    font-size: 0px;
-    margin: 0px;
-    padding: 0px;
-}
-
 /* ------------------------------------------------------------ */
 /* Messages layout
 /* ------------------------------------------------------------ */
@@ -413,39 +349,27 @@
 }

 /* Dropdown menu */
-/*.openerp .oe_mail_msg_content .oe_dropdown_toggle {
-    position: absolute;
-    top: 0px;
-    right: 3px;
-}*/

-.openerp .oe_mail .oe_semantic_html_override {
+.openerp .oe_mail ul.oe_mail_thread_display ul.oe_mail_thread_display {
    position: relative;
+    border-left: 1px #DDD dashed;
 }

 .openerp .oe_mail ul.oe_header {
    position: absolute;
    right: 3px;
    top: -6px;
-    display: none;
    z-index: 10;
-    height: 18px;
 }

 .openerp .oe_mail ul.oe_header a {
    text-decoration: none;
 }

-.openerp .oe_mail .oe_semantic_html_override:hover > ul.oe_header {
-    display: block;
-}
-
 .openerp .oe_mail ul.oe_header>li {
    display: inline-block;
-}
-
-.openerp .oe_mail_msg_content .oe_dropdown_arrow:after {
-    border-top: 4px solid #404040;
+    height: 20px;
+    text-align: right;
 }

 /* Message footer */
@@ -465,16 +389,36 @@

 /* Attachments list */
 .openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
-    display: none;
    width: 100%;
-    border-top: 1px solid #CCC;
    margin: .5em 0 0 0;
    padding: .5em 0;
    list-style-position: inside;
 }
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments.oe_hidden {
+    display: none;
+}
 .openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
    float: none;
+    height: 20px;
+    line-height: 20px;
    margin: 0;
    padding: 0;
    list-style-type: square;
 }
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process {
+    float: right;
+    width: 200px;
+    height: 16px;
+}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process div {
+    float: left;
+    width: 38px;
+    height: 16px;
+    margin-right: 2px;
+    background: #66FF66;
+}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process span {
+    color: #aaaaaa;
+    position: absolute;
+}
+
@@ -1,12 +1,166 @@
 /* ------------------------------ */
-/* Compose Message Wizard Form */
+/* Compose Message */
 /* ------------------------------ */

-.openerp .oe_mail_compose_message_icons {
-    text-align: right;
+.openerp .oe_mail_msg_content .oe_mail_compose_message_footer {
+    height: 24px;
 }

-.openerp .oe_mail_compose_message_icons img {
-    width: 20px;
-    height: 20px;
+.openerp .oe_mail_msg_content .oe_mail_compose_message_footer button.oe_mail_compose_message_button_send {
+    float: left;
 }
+
+.openerp .oe_mail .oe_mail_compose_textarea
+{
+   display: none;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header,
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_footer,
+{
+    position: relative;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel {
+    position: absolute;
+    right: -8px;
+    top: -8px;
+}
+.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel:first-of-type {
+    display:none;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea button.oe_full {
+    float: right;
+    position: relative;
+    right: -10px;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message : list_recipients
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail .oe_mail_list_recipients {
+    display: inline;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_all_follower {
+    color: blue;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_partner_follower a {
+    color: red;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_hidden,
+.openerp .oe_mail .oe_mail_list_recipients .oe_more_hidden {
+    display: none;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message : attachment
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail .oe_attachment_file  {
+    display: inline-block;
+}
+
+.openerp .oe_mail .oe_attachment_file .oe_add  {
+    float: left;
+    width: 24px;
+    height: 24px;
+    position: relative;
+    z-index: 10;
+    left: +2px;
+    top: +7px;
+    overflow: hidden;
+}
+
+/* attachment button: override of openerp values */
+.openerp .oe_mail .oe_attachment_file .oe_add button,
+.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
+    position: absolute;
+    bottom: +0px;
+    left: +0px;
+    height: 24px;
+    width: 24px;
+    margin: 0px;
+    padding: 0px;
+}
+.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
+    z-index:2;
+    width: 300px;
+    left: -100px;
+    background: transparent;
+    border: 0;
+    color: transparent;
+}
+.openerp .oe_mail .oe_attachment_file .oe_add button span {
+    position: relative;
+    bottom: +4px;
+    font-size: 30px;
+}
+
+.openerp .oe_mail .oe_mail_msg_attachments input {
+    visibility: hidden;
+}
+
+.openerp .oe_mail .oe_mail_compose_attachment_list {
+    clear: both;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message
+/* ------------------------------------------------------------ */
+
+
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
+.openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text,
+.openerp .oe_mail div.oe_mail_compose_message_body textarea.field_text {
+    width: 100%;
+    min-height: 120px;
+    height: auto;
+    padding: 4px;
+    font-size: 12px;
+    border: 1px solid #cccccc;
+}
+
+/* not top textarea */
+.openerp .oe_mail.oe_semantic_html_override .oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text {
+    height: 60px;
+}
+
+/* form_view: delete white background */
+.openerp .oe_mail_msg_content div.oe_formview {
+    background-color: transparent;
+}
+
+.openerp .oe_mail_msg_content div.oe_form_nosheet {
+    margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_group {
+    margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_field,
+.openerp .oe_mail_msg_content div.oe_form_field {
+    padding: 0px;
+}
+
+.openerp .oe_mail_msg_content td.oe_form_group_cell {
+    vertical-align: bottom;
+}
+
+/* subject: change width */
+.openerp .oe_mail_msg_content .oe_form .oe_form_field input[type='text'] {
+    width: 472px;
+}
+
+/* body_html: cleditor */
+.openerp .oe_mail_msg_content div.cleditorMain {
+    border: 1px solid #cccccc;
+}
+
+/* destination_partner_ids */
+.openerp .oe_mail_msg_content div.text-core {
+    height: 22px !important;
+    width: 472px;
+}
@@ -40,6 +40,7 @@ openerp_mail_followers = function(session, mail) {
            this._check_visibility();
            this.reinit();
            this.bind_events();
+            this.display_subtypes();
        },

        _check_visibility: function() {
@@ -53,31 +54,15 @@ openerp_mail_followers = function(session, mail) {

        bind_events: function() {
            var self = this;
-            this.$('div.oe_mouse_subtypes')
-                .on('mouseover', function () {
-                    $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
-                    self.display_subtypes();
-                })
-                .on('mouseleave', function () {
-                    $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
-                    self.display_subtypes();
-                });
-
            this.$('button.oe_follower')
                .on('click', function () {
                    if($(this).hasClass('oe_notfollow'))
                        self.do_follow();
                    else
                        self.do_unfollow();
-                })
-                .on('mouseover', function () {
-                    $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
-                })
-                .on('mouseleave', function () {
-                    $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
                });

-            this.$el.on('click', 'ul.oe_subtypes input', function () { self.do_update_subscription(); })
+            this.$el.on('click', 'ul.oe_subtypes input', self.do_update_subscription );

            this.$el.on('click', 'button.oe_invite', function(event) {
                action = {
@@ -173,7 +158,8 @@ openerp_mail_followers = function(session, mail) {

        set_subtypes:function(data){
            var self = this;
-            var records = data[this.view.datarecord.id].message_subtype_data;
+            var records = (data[this.view.datarecord.id] || data[null]).message_subtype_data;
+
            _(records).each(function (record, record_name) {
                record.name = record_name;
                record.followed = record.followed || undefined;
@@ -194,16 +180,10 @@ openerp_mail_followers = function(session, mail) {
        },
        
        do_follow: function () {
-            var self =this;
            _(this.$('.oe_msg_subtype_check')).each(function(record){
                $(record).attr('checked','checked');
            });
-            var context = new session.web.CompoundContext(this.build_context(), {});
-            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, undefined, context]).pipe(function(value_){
-                    self.read_value(value_);
-                    if(!self.$('.oe_recthread_subtypes').is(":visible"))
-                        self.display_subtypes(true);
-                });
+            this.do_update_subscription();
        },
        
        do_unfollow: function () {
@@ -211,23 +191,28 @@ openerp_mail_followers = function(session, mail) {
                $(record).attr('checked',false);
            });
            var context = new session.web.CompoundContext(this.build_context(), {});
-            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('read_value'));
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context]).pipe(this.proxy('read_value'));
        },

-        do_update_subscription: function () {
-            var context = new session.web.CompoundContext(this.build_context(), {});
+        do_update_subscription: function (event) {
            var self = this;

            var checklist = new Array();
-            _(this.$('.oe_msg_subtype_check')).each(function(record){
+            _(this.$('.oe_mail_recthread_actions input[type="checkbox"]')).each(function(record){
                if($(record).is(':checked')) {
                    checklist.push(parseInt($(record).data('id')))}
            });

            if(!checklist.length)
                return this.do_unfollow();
-            else
-                return this.ds_model.call('message_subscribe_users',[[self.view.datarecord.id], undefined, checklist, context]).pipe(this.proxy('read_value'));
+            else{
+                var context = new session.web.CompoundContext(this.build_context(), {});
+                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context]).pipe(function(value_){
+                        self.read_value(value_);
+                        self.display_subtypes(true);
+                    });
+            }
+
        },

    });
@@ -1,11 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>

+    <!--
+        mail.compose_message template
+        This template holds the composition form to write a note or send
+        an e-mail. It contains by default a textarea, that will be replaced
+        by another composition form in the main wall composition form, or
+        for main thread composition form in document form view.
+        -->
+    <t t-name="mail.compose_message">
+        <div class="oe_mail_compose_textarea">
+            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
+            <div class="oe_mail_msg_content">
+                <!-- contains the composition form -->
+                <!-- default content: old basic textarea -->
+                <div class="oe_mail_post_header">
+                    <t t-call="mail.thread.list_recipients"/>
+                    <a class="oe_cancel oe_e">X</a>
+                </div>
+                <textarea class="field_text" placeholder="Add your comment here..."/>
+                <div class="oe_mail_post_footer">
+                    <div class="oe_mail_compose_attachment_list"/>
+                    <button class="oe_full">Full mail message</button>
+                    <button class="oe_post">Post message</button>
+                    <t t-call="mail.compose_message.add_attachment"/>
+                </div>
+            </div>
+            <div class="oe_clear"/>
+        </div>
+    </t>
+
+    <!--
+        mail.compose_message.add_attachment template
+        Small template to be inserted in the composition for add attachments
+        -->
+    <t t-name="mail.compose_message.add_attachment">
+        <div class="oe_attachment_file">
+            <div class="oe_add">
+                <!-- uploader of file -->
+                <button><span class="oe_e">p</span></button>
+                <t t-call="HiddenInputFile">
+                    <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                    <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+                    <input type="hidden" name="model" value=""/>
+                    <input type="hidden" name="id" value="0"/>
+                    <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                </t>
+            </div>
+        </div>
+    </t>
+
+    <!--
+        mail.thread.message.attachments template
+        Template used to display attachments in a mail.message
+        -->
+    <t t-name="mail.thread.message.attachments">
+        <ul t-attf-class="oe_mail_msg_attachments #{widget.attachment_ids[0] and widget.options.thread.show_attachment_link?'':'oe_hidden'}">
+            <t t-foreach="widget.attachment_ids" t-as="attachment">
+                <li>
+                    <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
+                        <div class="oe_upload_in_process">
+                            <span>Upload in progress...</span>
+                            <div t-attf-style="{attachment.percent_loaded&gt;0?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;20?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;40?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;60?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;80?'':'display:none;'}"/>
+                        </div>
+                        <t t-raw="attachment.name || attachment.filename"/>
+                    </span>
+                    <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                        <t t-raw="attachment.name || attachment.filename"/>
+                    </a>
+                    <t t-if="widget.options.thread.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
+                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
+                    </t>
+
+                </li>
+            </t>
+        </ul>
+    </t>
+
+    <t t-name="mail.thread.message.private">
+        <div>
+            <span class="oe_placeholder_checkbox_private"/>
+            <span class="oe_send_private">This email is private.</span>
+            <span class="oe_send_public">I wrote for contacts and all my followers.</span>
+        </div>
+    </t>
+
+    <!--
+        template to the recipients list
+        -->
+    <t t-name="mail.thread.list_recipients">
+        <div class="oe_mail_list_recipients">
+            Post to: 
+            <span t-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
+            <t t-set="inc" t-value="0"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            </t>
+            <t t-if="widget.partner_ids.length>=3">
+                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
+                <a class="oe_more_hidden">&lt;&lt;&lt;</a>
+            </t>
+        </div>
+    </t>
+
    <!-- 
        wall main template
        Template used to display the communication history in the wall.
        -->
-    <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
+    <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manag
+        er_current">
        <table class="oe_view_manager_header">
          <colgroup>
            <col width="33%"/>
@@ -25,21 +132,30 @@
                </td>
                <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
            </tr>
+            <tr class="oe_header_row">
+                <td colspan="2">
+                    <button type="button" class="oe_write_full oe_highlight">
+                        Compose a new message
+                    </button>
+                    <button type="button" class="oe_write_onwall" help="Your followers can read this message">
+                        Write to your followers
+                    </button>
+                </td>
+            </tr>
          </tbody>
        </table>
-        <ul class="oe_mail_wall_threads">
-            <!-- contains threads -->
-        </ul>
+        <!-- placeholder for the wall threads -->
+        <div class="oe_mail_wall_threads"/>
        <div class="oe_mail_wall_aside">
                <!-- contains currently nothing -->
        </div>
    </div>

    <!--
-        wall_thread_container template for the wall
-        Each discussion thread is contained inside this template
+        display message on the wall when there are no message
        -->
-    <li t-name="mail.wall_thread_container" class="oe_mail_wall_thread">
+    <li t-name="mail.wall_no_message" class="oe_wall_no_message">
+        You have no messages
    </li>

    <!--
@@ -54,39 +170,6 @@
        </ul>
    </div>

-    <!--
-        mail.compose_message template
-        This template holds the composition form to write a note or send
-        an e-mail. It contains by default a textarea, that will be replaced
-        by another composition form in the main wall composition form, or
-        for main thread composition form in document form view.
-        -->
-    <t t-name="mail.compose_message">
-        <div class="oe_mail_compose_textarea">
-            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <!-- contains the composition form -->
-                <!-- default content: old basic textarea -->
-                <textarea placeholder="Add your comment here..."/>
-            </div>
-            <div class="oe_clear"/>
-        </div>
-    </t>
-
-    <!--
-        mail.compose_message.add_attachment template
-        Small template to be inserted in the composition form to add attachments
-        -->
-    <t t-name="mail.compose_message.add_attachment">
-        <t t-call="HiddenInputFile">
-            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-            <input type="hidden" name="model" t-att-value="widget.form_view.model"/>
-            <input type="hidden" name="id" t-att-value="widget.form_view.datarecord.id || 0"/>
-            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
-        </t>
-    </t>
-
    <!--
        thread template
        This template holds a thread of comments. It begins with an actions
@@ -96,7 +179,6 @@
    <div t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
        <div class="oe_mail_thread_action">
            <!-- contains the composition box (form + image) -->
-            <t t-call="mail.compose_message"/>
        </div>
        <ul class="oe_mail_thread_display">
            <!-- contains the threads -->
@@ -104,16 +186,15 @@
    </div>

    <!-- default layout -->
-    <li t-name="mail.thread.message" t-attf-class="oe_mail oe_mail_thread_msg #{widget.unread?'oe_mail_unread':'oe_mail_read'}" t-attf-data-msg_id="{widget.id}">
+    <li t-name="mail.thread.message" t-attf-class="oe_mail oe_mail_thread_msg #{widget.unread?'oe_mail_unread':'oe_mail_read'}">
        <div t-attf-class="oe_mail_msg_#{widget.type} oe_semantic_html_override">
            <!-- message actions (read/unread, reply, delete...) -->
            <ul class="oe_header">
                <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li>
-                <li t-if="!widget.options.thread.display_on_flat and widget.unread" title="Read"><a class="oe_read oe_e">W</a></li>
-                <li t-if="!widget.options.thread.display_on_flat and !widget.unread" title="Set back to unread"><a class="oe_unread oe_e">h</a></li>
-                <li t-if="!widget.options.message.show_reply_by_email" title="Reply"><a class="oe_reply oe_e">)</a></li>
-                <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_e" title="Reply by mail">)</a></li>
-                <t t-if="(widget.options.message.show_reply || widget.options.message.show_reply_by_email || (widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email')">
+                <li t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
+                <li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
+                <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
+                <t t-if="(widget.is_author and widget.options.message.show_dd_delete) or widget.type == 'email'">
                    <li>
                        <span class="oe_dropdown_toggle">
                            <a class="oe_e" title="More options">í</a>
@@ -123,8 +204,6 @@
                                <li t-if="display['show_hide']">
                                    <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a>
                                </li> -->
-                                <li t-if="widget.options.message.show_reply" title="Reply"><a class="oe_reply oe_full_reply">Full reply</a></li>
-                                <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_full_reply" title="Reply by mail">Full reply</a></li>
                                <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{widget.id}" >Details</a></li>
                            </ul>
                        </span>
@@ -145,7 +224,6 @@
                    <ul class="oe_mail_msg_footer">
                        <li t-if="widget.author_id"><a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a></li>
                        <li><span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span></li>
-                        
                        <li t-if="widget.attachment_ids.length > 0">
                            <a class="oe_mail_msg_view_attachments">
                                <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
@@ -155,7 +233,7 @@
                    </ul>
                    <div class="oe_clear"/>
                    <div class="oe_mail_msg_body">
-                        <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and widget.options.thread._parents.length&lt;=widget.options.thread.thread_level and widget.model!='res.partner'">
+                        <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and !widget.options.thread.thread_level and !widget.options.thread.display_on_flat and widget.model!='res.partner'">
                            <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
                        </t>
                        <t t-raw="widget.body"/>
@@ -171,7 +249,7 @@
    </li>

    <!-- expandable message layout -->
-    <li t-name="mail.thread.expandable" t-attf-class="oe_mail oe_mail_thread_msg oe_mail_unread" t-attf-data-thread_id="{widget.id}">
+    <li t-name="mail.thread.expandable" class="oe_mail oe_mail_thread_msg oe_mail_unread">
        <div t-attf-class="oe_mail_msg_#{widget.type} oe_semantic_html_override">
            <div class="oe_mail_msg_content oe_mail_msg_more_message">
                <a class="oe_mail_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
@@ -179,23 +257,6 @@
        </div>
    </li>

-    <!--
-        mail.thread.message.attachments template
-        Template used to display attachments in a mail.message
-        -->
-    <t t-name="mail.thread.message.attachments">
-        <ul class="oe_mail_msg_attachments">
-            <t t-foreach="record.attachment_ids" t-as="attachment">
-                <li>
-                    <a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
-                    <t t-if="record.show_attachment_delete">
-                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
-                    </t>
-                </li>
-            </t>
-        </ul>
-    </t>
-
    <!-- mail.thread.message.vote
        Template used to display Like/Unlike in a mail.message
    -->
@@ -215,7 +276,7 @@
        <button t-attf-class="oe_mail_msg_vote oe_tag">
            <span>
                <t t-if="!widget.has_voted">Agree</t>
-                <t t-if="widget.has_voted">Unagree</t>
+                <t t-if="widget.has_voted">Undo</t>
            </span>
        </button>
    </span>
@@ -13,9 +13,9 @@
                    <span class="oe_unfollow">Unfollow</span>
                    <span class="oe_following">Following</span>
                </button>
-                <div class="oe_recthread_subtypes">
-                    <ul class="oe_subtypes"></ul>
-                </div>
+            </div>
+            <div class="oe_recthread_subtypes">
+                <ul class="oe_subtypes"></ul>
            </div>
        </div>
        <div class="oe_grey">
@@ -529,109 +529,6 @@ class test_mail(TestMailMockups):
        self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
        self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')

-    # FP Note: to be reviewed to be more generic, not depending on the algorythm of
-    #          message_read
-    #def test_30_message_read(self):
-    #    """ Tests designed for message_read. """
-    #    # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
-    #    # It will be updated as soon as we have fixed specs !
-    #    cr, uid = self.cr, self.uid
-    #    group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
-    #    def _compare_structures(struct1, struct2, n=0):
-    #        # print '%scompare structure' % ('\t' * n)
-    #        # self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
-
-    #        for x in range(len(struct1)):
-    #            if struct1[x].get('type') == 'expandable':
-    #                continue
-    #            # print '%s' % ('\t' * n), struct1[x]['id'], struct1[x]['child_nbr'], struct2[x]['id'], struct2[x].get('child_nbr', 'XX'), struct1[x].get('subject') or ''
-    #            self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
-    #            _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
-    #        # print '%send compare' % ('\t' * n)
-
-    #    # ----------------------------------------
-    #    # CASE1: Flattening test
-    #    # ----------------------------------------
-
-    #    # Create dummy message structure
-    #    import copy
-    #    tree = [{'id': 2, 'child_nbr': 1, 'child_ids': [
-    #                {'id': 6, 'child_nbr': 1, 'child_ids': [
-    #                    {'id': 8, 'child_nbr': 0, 'child_ids': []},
-    #                    ]},
-    #                ]},
-    #            {'id': 1, 'child_nbr': 3, 'child_ids':[
-    #                {'id': 7, 'child_nbr': 1, 'child_ids': [
-    #                    {'id': 9, 'child_nbr': 0, 'child_ids': []},
-    #                    ]},
-    #                {'id': 4, 'child_nbr': 2, 'child_ids': [
-    #                    {'id': 10, 'child_nbr': 0, 'child_ids': []},
-    #                    {'id': 5, 'child_nbr': 0, 'child_ids': []},
-    #                    ]},
-    #                {'id': 3, 'child_nbr': 0, 'child_ids': []},
-    #                ]},
-    #            ]
-    #    # Test: completely flat
-    #    new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 0, limit=15, add_expandable=False)
-    #    _compare_structures(new_tree, new_tree)
-    #    self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat')
-    #    # Test: 1 thread level
-    #    tree_test = [{'id': 2, 'child_ids': [
-    #                    {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []},
-    #                ]},
-    #                {'id': 1, 'child_ids': [
-    #                    {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []},
-    #                    {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []},
-    #                    {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []},
-    #                ]},
-    #                ]
-    #    new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 1, limit=15, add_expandable=False)
-    #    _compare_structures(new_tree, tree_test)
-    #    # Test: 2 thread levels
-    #    new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 2, limit=15, add_expandable=False)
-    #    _compare_structures(new_tree, tree)
-
-    #    # ----------------------------------------
-    #    # CASE2: message_read test
-    #    # ----------------------------------------
-
-    #    # 1. Add a few messages to pigs group
-    #    msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
-    #    msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
-    #    msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
-    #    msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
-    #    msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
-    #    msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
-
-    #    # Test: read all messages flat
-    #    tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
-    #                    {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
-    #                    {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
-    #    tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=0, limit=15)
-    #    _compare_structures(tree, tree_test)
-    #    # Test: read with 1 level of thread
-    #    tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
-    #                {'id': msgid1, 'child_ids': [
-    #                    {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
-    #                    {'id': msgid2, 'child_ids': []},
-    #                ]},
-    #                ]
-    #    tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=1, limit=15)
-    #    _compare_structures(tree, tree_test)
-    #    # Test: read with 2 levels of thread
-    #    tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
-    #                {'id': msgid1, 'child_ids': [
-    #                    {'id': msgid3, 'child_ids': []},
-    #                    {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
-    #                ]},
-    #                ]
-    #    tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=2, limit=15)
-    #    _compare_structures(tree, tree_test)
-
-    #    # 2. Test expandables
-    #    # TDE FIXME: add those tests when expandables are specified and implemented
-
    def test_40_needaction(self):
        """ Tests for mail.message needaction. """
        cr, uid = self.cr, self.uid
@@ -223,7 +223,6 @@ class mail_compose_message(osv.TransientModel):
            email(s), rendering any template patterns on the fly if needed. """
        if context is None:
            context = {}
-        print '**', context
        active_ids = context.get('active_ids')

        for wizard in self.browse(cr, uid, ids, context=context):
@@ -16,13 +16,11 @@
                        <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
                                context="{'force_email':True}"
                                on_change="onchange_partner_ids(partner_ids)"/>
+                        <field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/>
                    </group>
                    <notebook>
                        <page string="Body">
-                            <field name="body_text" nolabel="1"
-                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
-                            <field name="body" nolabel="1"
-                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
+                            <field name="body" nolabel="1"/>
                        </page>
                        <page string="Attachments">
                            <field name="attachment_ids" colspan="4" nolabel="1"/>
@@ -32,10 +30,10 @@
                        <button string="Send" name="send_mail" type="object" class="oe_highlight"  />
                        or
                        <button string="Cancel" class="oe_link" special="cancel" />
-                        <div class="oe_right">
+                        <!--div class="oe_right">
                            <button string="" name="toggle_content_subtype" type="object" icon="/mail/static/src/img/formatting.png" 
                                help="Toggle advanced formatting mode"/>
-                        </div>
+                        </div-->
                    </footer>
                </form>
            </field>
@@ -68,6 +66,7 @@
                                context="{'force_email':True}"
                                on_change="onchange_partner_ids(partner_ids)"
                                class="oe_mail_compose_message_partner_ids"/>
+                        <!--field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/-->
                        <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                placeholder="Add attachments..." invisible="1"
                                class="oe_mail_compose_message_attachment_ids"/>
@@ -5,7 +5,7 @@
        <field name="name">campaign.analysis.tree</field>
        <field name="model">campaign.analysis</field>
        <field name="arch" type="xml">
-            <tree string="Marketing Reports">
+            <tree string="Marketing Reports" create="false">
                <field name="year" invisible="1"/>
                <field name="month" invisible="1"/>
                <field name="day" invisible="1"/>
@@ -8,7 +8,7 @@
            <field name="name">report.membership.tree</field>
            <field name="model">report.membership</field>
            <field name="arch" type="xml">
-                <tree colors="blue:membership_state == 'draft';black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " string="Membership">
+                <tree colors="blue:membership_state == 'draft';black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " create="false" string="Membership">
                    <field name="partner_id"/>
                    <field name="membership_state"/>
                    <field name="associate_member_id" invisible="1"/>
@@ -29,7 +29,7 @@
    'sequence': 18,
    'summary': 'Manufacturing Orders, Bill of Materials, Routing',
    'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
-    'depends': ['procurement', 'stock', 'resource', 'purchase', 'product','process'],
+    'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'],
    'description': """
 Manage the Manufacturing process in OpenERP
 ===========================================
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-22 07:45+0000\n"
+"PO-Revision-Date: 2012-10-12 23:20+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
-"X-Generator: Launchpad (build 15944)\n"
+"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
+"X-Generator: Launchpad (build 16137)\n"

 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -956,7 +956,7 @@ msgstr "Bezeichnung Arbeitsplatz"
 #. module: mrp
 #: field:mrp.routing,code:0
 msgid "Code"
-msgstr "Kurzbezeichnung"
+msgstr "Kurzbez."

 #. module: mrp
 #: report:mrp.production.order:0
@@ -952,6 +952,7 @@
            <data>
                <xpath expr="//field[@name='move_id']" position="before">
                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+                    <field name="production_id" attrs="{'invisible': [('production_id','=',False)]}"/>
                </xpath>
                <xpath expr="//field[@name='close_move']" position="after">
                    <group colspan="4"  groups="product.group_mrp_properties">
@@ -961,21 +962,21 @@
               </data>
            </field>
        </record>
-        <record id="product.product_normal_form_supply_view" model="ir.ui.view">
+        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
            <field name="name">product.normal.form.mrp.inherit</field>
            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
            <field name="arch" type="xml">
                <xpath expr="//field[@name='supply_method']" position="attributes">
                    <attribute name="invisible">False</attribute>
                </xpath>
                <group name="procurement_help" position="inside">
-                    <p attrs="{'invisible': [('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                    <p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
                        When you sell this product, OpenERP will trigger <b>a manufacturing
                        order</b> using the bill of materials assigned to this product.
                        The delivery order will be ready once the production is done.
                    </p>
-</group>
+                </group>
            </field>
        </record>

@@ -1037,6 +1038,7 @@
        <record model="ir.actions.act_window" id="product_open_bom">
            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
            <field name="name">Bill of Materials</field>
+            <field name="domain">[('bom_id','=',False)]</field>
            <field name="res_model">mrp.bom</field>
        </record>

@@ -1050,7 +1052,5 @@
                </xpath>
            </field>
        </record>
-
-
    </data>
 </openerp>
@@ -31,6 +31,7 @@ class procurement_order(osv.osv):
    _columns = {
        'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
        'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+        'production_id': fields.many2one('mrp.production', 'Manufacturing Order'),
    }
    
    def check_produce_product(self, cr, uid, procurement, context=None):
@@ -95,16 +96,22 @@ class procurement_order(osv.osv):
                'move_prod_id': res_id,
                'company_id': procurement.company_id.id,
            })
+            
            res[procurement.id] = produce_id
-            self.write(cr, uid, [procurement.id], {'state': 'running'})
-            self.running_send_note(cr, uid, ids, context=context)
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})   
            bom_result = production_obj.action_compute(cr, uid,
                    [produce_id], properties=[x.id for x in procurement.property_ids])
            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
            if res_id:
                move_obj.write(cr, uid, [res_id],
                        {'location_id': procurement.location_id.id})
+        self.production_order_create_note(cr, uid, ids, context=context)
        return res
+
+    def production_order_create_note(self, cr, uid, ids, context=None):
+        for procurement in self.browse(cr, uid, ids, context=context):
+            body = _("Manufacturing Order created.")
+            self.message_post(cr, uid, [procurement.id], body=body, context=context)
    
 procurement_order()

--- a/Show More
+++ b/Show More