[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101018053340-91whv0hocvv156sa

diff --cc addons/account/account.py
Simple merge

diff --cc addons/account/account_bank_statement.py
Simple merge

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/account/installer.py
Simple merge

diff --cc addons/account/project/project_view.xml
index dab220b,9a48215..02536fc
--- 1/addons/account/project/project_view.xml
--- 2/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@@ -129,10 -129,10 +129,10 @@@
              <field name="view_type">tree</field>
              <field name="view_id" ref="view_account_analytic_account_tree"/>
              <field name="domain">[('parent_id','=',False)]</field>
-             <field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
+             <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
          </record>
  
 -        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
 +        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
  
          <record id="view_account_analytic_line_form" model="ir.ui.view">
              <field name="name">account.analytic.line.form</field>

diff --cc addons/account/security/ir.model.access.csv
Simple merge

diff --cc addons/account_voucher/__openerp__.py
Simple merge

diff --cc addons/account_voucher/account_voucher.py
index abe0e5e,a59b36a..6cbedf1
--- 1/addons/account_voucher/account_voucher.py
--- 2/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@@ -917,5 -917,3 +917,5 @@@ class account_bank_statement_line(osv.o
          return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
  
  account_bank_statement_line()
 +
- # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
++# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:=======

diff --cc addons/hr_payroll/report/rml_parse.py
Simple merge

diff --cc addons/hr_payroll_account/__openerp__.py
Simple merge

diff --cc addons/hr_payroll_account/hr_payroll_account.py
Simple merge

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/sale/wizard/sale_make_invoice_advance.py
Simple merge

diff --cc addons/sale_journal/sale_journal.py
index f94d9a9,09902b2..00c3a77
--- 1/addons/sale_journal/sale_journal.py
--- 2/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@@ -253,12 -72,10 +72,11 @@@ class sale(osv.osv)
      }
      def action_ship_create(self, cr, uid, ids, *args):
          result = super(sale, self).action_ship_create(cr, uid, ids, *args)
 +        obj_stock_pick = self.pool.get('stock.picking')
          for order in self.browse(cr, uid, ids, context={}):
              pids = [ x.id for x in order.picking_ids]
-             obj_stock_pick.write(cr, uid, pids, {
-                 'invoice_type_id': order.invoice_type_id.id,
-                 'sale_journal_id': order.journal_id.id
+             self.pool.get('stock.picking').write(cr, uid, pids, {
+                 'invoice_type_id': order.invoice_type_id and order.invoice_type_id.id or False,
              })
          return result