diff --git a/addons/account/account.py b/addons/account/account.py
index 33002de6b2d..c3cd13a8115 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -287,20 +287,20 @@ class account_account(osv.osv):
             sums = {}
             while brs:
                 current = brs[0]
-                can_compute = True
-                for child in current.child_id:
-                    if child.id not in sums:
-                        can_compute = False
-                        try:
-                            brs.insert(0, brs.pop(brs.index(child)))
-                        except ValueError:
-                            brs.insert(0, child)
-                if can_compute:
-                    brs.pop(0)
-                    for fn in field_names:
-                        sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
-                        if current.child_id:
-                            sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
+#                can_compute = True
+#                for child in current.child_id:
+#                    if child.id not in sums:
+#                        can_compute = False
+#                        try:
+#                            brs.insert(0, brs.pop(brs.index(child)))
+#                        except ValueError:
+#                            brs.insert(0, child)
+#                if can_compute:
+                brs.pop(0)
+                for fn in field_names:
+                    sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
+                    if current.child_id:
+                        sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
             res = {}
             null_result = dict((fn, 0.0) for fn in field_names)
             for id in ids:
@@ -627,10 +627,13 @@ class account_journal(osv.osv):
         return super(account_journal, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-        if 'company_id' in vals:
-            move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
-            if move_lines:
-                raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
+        if context is None:
+            context = {}
+        for journal in self.browse(cr, uid, ids, context=context):
+            if 'company_id' in vals and journal.company_id.id != vals['company_id']:
+                move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
+                if move_lines:
+                    raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
     def create_sequence(self, cr, uid, vals, context=None):
@@ -722,7 +725,7 @@ class account_journal(osv.osv):
 
         res = {}
 
-        view_id = type_map.get(type, 'general')
+        view_id = type_map.get(type, 'account_journal_view')
 
         user = user_pool.browse(cr, uid, uid)
         if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
@@ -2677,7 +2680,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             tax_template_ref[tax.id] = new_tax
 
         #deactivate the parent_store functionnality on account_account for rapidity purpose
-        self.pool._init = True
+        ctx = context and context.copy() or {}
+        ctx['defer_parent_store_computation'] = True
 
         children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
         children_acc_template.sort()
@@ -2705,17 +2709,16 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'tax_ids': [(6,0,tax_ids)],
                 'company_id': company_id,
             }
-            new_account = obj_acc.create(cr, uid, vals)
+            new_account = obj_acc.create(cr, uid, vals, context=ctx)
             acc_template_ref[account_template.id] = new_account
         #reactivate the parent_store functionnality on account_account
-        self.pool._init = False
         self.pool.get('account.account')._parent_store_compute(cr)
 
         for key,value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
                 obj_acc_tax.write(cr, uid, [key], {
-                    'account_collected_id': acc_template_ref[value['account_collected_id']],
-                    'account_paid_id': acc_template_ref[value['account_paid_id']],
+                    'account_collected_id': acc_template_ref.get(value['account_collected_id'], False),
+                    'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
                 })
 
         # Creating Journals Sales and Purchase
@@ -2856,7 +2859,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'name': tmp,
                 'currency_id': line.currency_id and line.currency_id.id or False,
                 'code': new_code,
-                'type': 'other',
+                'type': 'liquidity',
                 'user_type': account_template.user_type and account_template.user_type.id or False,
                 'reconcile': True,
                 'parent_id': acc_template_ref[ref_acc_bank.id] or False,
@@ -2878,7 +2881,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['name']= vals['name']
             vals_journal['code']= _('BNK') + str(current_num)
             vals_journal['sequence_id'] = seq_id
-            vals_journal['type'] = 'cash'
+            vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
             vals_journal['company_id'] =  company_id
             vals_journal['analytic_journal_id'] = analitical_journal_bank
 
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a8d8044a6c2..e24e763ff56 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -31,9 +31,9 @@ class account_analytic_line(osv.osv):
     _columns = {
         'product_uom_id': fields.many2one('product.uom', 'UoM'),
         'product_id': fields.many2one('product.product', 'Product'),
-        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
-        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
-        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
+        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
         'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index ab2f72e92dd..e96b8b1f0fb 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -432,7 +432,7 @@ class account_bank_statement_line(osv.osv):
     _columns = {
         'name': fields.char('Communication', size=64, required=True),
         'date': fields.date('Date', required=True),
-        'amount': fields.float('Amount'),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
             ('supplier','Supplier'),
             ('customer','Customer'),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c6542758952..f8f482dfdda 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -302,7 +302,7 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="7" colspan="4" groups="base.group_user">
+                                <group col="8" colspan="4" groups="base.group_user">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
@@ -310,6 +310,7 @@
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print"/>
                                 </group>
                             </group>
                         </page>
@@ -473,7 +474,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
+            <field name="help">This menu helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -499,7 +500,7 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
+            <field name="help">A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index ad31f87d6ae..22ab46a1775 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -6,22 +6,23 @@
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>
-        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
-        <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
-        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
+        <menuitem id="menu_partners" name="Partners" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
+        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
             groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="9" groups="group_account_user,group_account_manager"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
-        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="6"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="13"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="14" groups="group_account_manager"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
@@ -29,7 +30,7 @@
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
 
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 02c5abcb130..5674567ffcf 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -308,7 +308,7 @@ class account_move_line(osv.osv):
                     FROM account_move_line l1, account_move_line l2
                     WHERE l2.account_id = l1.account_id
                       AND l1.id <= l2.id
-                      AND l2.id IN %%s AND """ + \
+                      AND l2.id IN %s AND """ + \
                 self._query_get(cr, uid, obj='l1', context=c) + \
                 " GROUP BY l2.id"
 
@@ -433,7 +433,7 @@ class account_move_line(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
         'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
-        'partner_id': fields.many2one('res.partner', 'Partner', select=1),
+        'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
         'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
         'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
                                 store = {
@@ -763,7 +763,7 @@ class account_move_line(osv.osv):
             if 'comment' in context and context['comment']:
                 libelle = context['comment']
             else:
-                libelle = 'Write-Off'
+                libelle = _('Write-Off')
             writeoff_lines = [
                 (0, 0, {
                     'name': libelle,
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 2b1a403e461..bf17e607e24 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -18,7 +18,8 @@
             rml="account/report/account_print_invoice.rml"
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
-            attachment_use="1"/>
+            attachment_use="1"
+            multi="True"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f2b4da6ea23..2b12b6f91c5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -76,7 +76,7 @@
             <field name="name">Fiscal Years</field>
             <field name="res_model">account.fiscalyear</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="help">Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011  would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them.</field>
         </record>
         <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting" sequence="8" />
@@ -143,7 +143,7 @@
             <field name="name">Periods</field>
             <field name="res_model">account.period</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_draft': 1}</field>
             <field name="help">Here, you can define a period, an interval of time between successive closings of the books of your company. An accounting period typically is a month or a quarter, corresponding to the tax year used by the business. Create and manage them from here and decide whether a period should be left open or closed depending on your company's activities over a specific period.</field>
         </record>
@@ -698,7 +698,7 @@
             <field name="name">Draft statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>
         </record>
@@ -946,7 +946,14 @@
                                   <field groups="base.group_extended" name="child_depend"/>
                                   <field groups="base.group_extended" name="sequence"/>
                                   <field groups="base.group_extended" name="include_base_amount"/>
-                                  <field groups="base.group_extended" colspan="4" name="child_ids"/>
+                                  <field groups="base.group_extended" colspan="4" name="child_ids">
+                                      <tree string="Account Tax">
+                                          <field name="sequence"/>
+					                      <field name="name"/>
+					                      <field name="price_include" groups="base.group_extended"/>
+					                      <field name="description"/>
+					                 </tree>
+					             </field>
                           </group>
                         </page>
                         <page groups="base.group_extended" string="Special Computation">
@@ -1163,7 +1170,7 @@
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
+                        <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter
                             icon="terp-dolar_ok!"
@@ -1209,6 +1216,7 @@
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_posted': 1}</field>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
@@ -1729,7 +1737,7 @@
             <field name="name">Recurring Models</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_model_search"/>
         </record>
         <menuitem
@@ -2153,7 +2161,8 @@
                         <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
                          <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                          <separator orientation="vertical"/>
-                         <field name="code"/>
+                        <field name="code"/>
+                        <field name="name"/>
                         <field name="parent_id"/>
                         <field name="type"/>
                         <field name="user_type"/>
@@ -2171,7 +2180,7 @@
             <field name="name">Account Templates</field>
             <field name="res_model">account.account.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_template_search"/>
         </record>
 
@@ -2194,13 +2203,13 @@
                     <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
                     <group>
-                    <field name="property_account_receivable"/>
-                    <field name="property_account_payable"/>
-                    <field name="property_account_expense_categ" />
-                    <field name="property_account_income_categ"/>
-                    <field name="property_account_expense"/>
-                    <field name="property_account_income"/>
-                    <field name="property_reserve_and_surplus_account"/>
+                    <field name="property_account_receivable" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_payable" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_expense_categ" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
+                    <field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_reserve_and_surplus_account" />
                     </group>
                 </form>
             </field>
@@ -2251,7 +2260,7 @@
             <field name="name">Chart of Accounts Templates</field>
             <field name="res_model">account.chart.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
         </record>
 
         <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
@@ -2406,7 +2415,7 @@
             <field name="name">Tax Code Templates</field>
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_tax_code_template_search"/>
         </record>
         <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
@@ -2437,7 +2446,7 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
@@ -2745,5 +2754,19 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
             groups="group_account_user,group_account_manager"/>
 
+        <record id="action_partner_all" model="ir.actions.act_window">
+            <field name="name">Partners</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner</field>
+            <field name="view_type">form</field>
+            <field name="filter" eval="True"/>
+        </record>
+
+        <menuitem id="menu_partners_partners"
+                name="Partners"
+                parent="menu_partners"
+                action="action_partner_all"
+                sequence="1"/>
+
     </data>
 </openerp>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index bcedc3fa491..93bcc7724be 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -68,7 +68,7 @@
 
         <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
+        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
 
 
     </data>
diff --git a/addons/account/company.py b/addons/account/company.py
index 72b3dbcb6aa..a3886cdf14e 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -37,9 +37,10 @@ class res_company(osv.osv):
     }
 
     _defaults = {
-        'overdue_msg': 'Would your payment have been carried \
-out after this mail was sent, please consider the present one as \
-void. Do not hesitate to contact our accounting department'
+        'overdue_msg': 'Please note that the following payments are now due. If your payment \
+                        has been sent, kindly forward your payment details. If payment will be \
+                        delayed further, please contact us to discuss. \
+                        \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
     }
 
 res_company()
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index e2391e102d2..2a9f24e953c 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -964,11 +964,6 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1859,7 +1854,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
+msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
 msgstr ""
 
 #. module: account
@@ -2543,11 +2538,6 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 9dce3186393..5f66354c5f6 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -95,6 +95,25 @@ class account_installer(osv.osv_memory):
         'bank_accounts_id': _get_default_accounts,
         'charts': _get_default_charts
     }
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        configured_cmp = []
+        unconfigured_cmp = []
+        cmp_select = []
+        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
+        cr.execute("SELECT company_id FROM account_account WHERE account_account.parent_id IS NULL")
+        for r in cr.fetchall():
+            configured_cmp.append(r[0])
+        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
+        if unconfigured_cmp:
+            for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp):
+                cmp_select.append((line.id,line.name))
+            for field in res['fields']:
+               if field == 'company_id':
+                   res['fields'][field]['domain'] = unconfigured_cmp
+                   res['fields'][field]['selection'] = cmp_select
+        return res
 
     def on_change_tax(self, cr, uid, id, tax):
         return {'value': {'purchase_tax': tax}}
@@ -200,7 +219,8 @@ class account_installer(osv.osv_memory):
             tax_template_ref[tax.id] = new_tax
 
         #deactivate the parent_store functionnality on account_account for rapidity purpose
-        self.pool._init = True
+        ctx = context and context.copy() or {}
+        ctx['defer_parent_store_computation'] = True
 
         children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context)
         children_acc_template.sort()
@@ -229,7 +249,7 @@ class account_installer(osv.osv_memory):
                 'tax_ids': [(6, 0, tax_ids)],
                 'company_id': company_id.id,
             }
-            new_account = obj_acc.create(cr, uid, vals, context=context)
+            new_account = obj_acc.create(cr, uid, vals, context=ctx)
             acc_template_ref[account_template.id] = new_account
             if account_template.name == 'Bank Current Account':
                 b_vals = {
@@ -243,8 +263,7 @@ class account_installer(osv.osv_memory):
                     'tax_ids': [(6,0,tax_ids)],
                     'company_id': company_id.id,
                 }
-                bank_account = obj_acc.create(cr, uid, b_vals, context=context)
-
+                bank_account = obj_acc.create(cr, uid, b_vals, context=ctx)
 
                 view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
                 view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
@@ -314,7 +333,7 @@ class account_installer(osv.osv_memory):
                         'parent_id': bank_account,
                         'company_id': company_id.id
                     }
-                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=context)
+                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx)
                     vals_seq_child = {
                         'name': _(vals_bnk['name'] + ' ' + 'Journal'),
                         'code': 'account.journal',
@@ -348,7 +367,6 @@ class account_installer(osv.osv_memory):
                     code_cnt += 1
 
         #reactivate the parent_store functionality on account_account
-        self.pool._init = False
         obj_acc._parent_store_compute(cr)
 
         for key, value in todo_dict.items():
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 57178c03c72..b6d8fcb9de0 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -268,21 +268,21 @@ class account_invoice(osv.osv):
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
-                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
         'amount_tax': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Tax',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
-                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
         'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Total',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
-                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -302,7 +302,7 @@ class account_invoice(osv.osv):
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
                 'account.invoice.tax': (_get_invoice_tax, None, 50),
-                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 50),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 50),
                 'account.move.line': (_get_invoice_from_line, None, 50),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             },
@@ -1313,6 +1313,7 @@ class account_invoice_line(osv.osv):
         if context is None:
             context = {}
         company_id = context.get('company_id',False)
+        tax_obj = self.pool.get('account.tax')
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
@@ -1396,23 +1397,20 @@ class account_invoice_line(osv.osv):
             a = res.product_tmpl_id.property_account_expense.id
             if not a:
                 a = res.categ_id.property_account_expense_categ.id
-
         a = fpos_obj.map_account(cr, uid, fpos, a)
         if a:
             result['account_id'] = a
 
         if type in ('out_invoice', 'out_refund'):
-            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         else:
-            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+        tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-
-#        if not name:
         result['name'] = res.partner_ref
 
         domain = {}
@@ -1443,11 +1441,21 @@ class account_invoice_line(osv.osv):
         return res_final
 
     def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+        warning = {}
+        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
         if 'uos_id' in res['value']:
             del res['value']['uos_id']
         if not uom:
             res['value']['price_unit'] = 0.0
+        if product and uom:
+            prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
+            prod_uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
+            if prod.uom_id.category_id.id != prod_uom.category_id.id:
+                 warning = {
+                    'title': _('Warning!'),
+                    'message': _('You selected an Unit of Measure which is not compatible with the product.')
+            }
+            return {'value': res['value'], 'warning': warning}
         return res
 
     def move_line_get(self, cr, uid, invoice_id, context=None):
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 69c0df65014..e0a2b18756b 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -337,7 +337,7 @@
             <field name="name">Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
         <menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index f9697710f8f..45d7e107180 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -84,11 +84,12 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                 }
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
+                acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                 if disp_acc == 'bal_movement':
-                    if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0:
+                    if round(res['credit'], acc_digit) > 0  or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
                         self.result_acc.append(res)
                 elif disp_acc == 'bal_solde':
-                    if  res['balance'] != 0:
+                    if round(res['balance'], acc_digit) != 0:
                         self.result_acc.append(res)
                 else:
                     self.result_acc.append(res)
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index db75eff0dcf..8816d702118 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -136,15 +136,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         'level': account.level,
                         'balance':account.balance,
                     }
+                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                     if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += account.balance
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
-                        if account.credit > 0 or account.debit > 0 or account.balance > 0:
+                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account_dict)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if account.balance != 0:
+                        if round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account_dict)
                     else:
                         accounts_temp.append(account_dict)
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b925c115a54..949a4c934db 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -78,7 +78,7 @@
                             domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
                             help="Customer Invoices And Refunds"/>
                     <filter icon="terp-personal"
-                            string="supplier"
+                            string="Supplier"
                             separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
                             help="Supplier Invoices And Refunds"/>
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 4dfe08c0bac..0797d544f9b 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -157,7 +157,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 9198edf7105..d9d6226904a 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -106,15 +106,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
             accounts_temp = []
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
+                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                     if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += abs(account.debit - account.credit)
                     if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += abs(account.debit - account.credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if account.credit > 0 or account.debit > 0 or account.balance > 0:
+                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if  account.balance != 0:
+                        if round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account)
                     else:
                         accounts_temp.append(account)
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 347a82e33c2..5f429270e29 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -79,7 +79,7 @@
          <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 56213c7cc71..b7775c48c8d 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -72,8 +72,8 @@
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,0,0,0
-"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
@@ -116,3 +116,5 @@
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
+"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
+"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index f4c360cd253..e8f0e432d69 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -33,8 +33,9 @@ class account_chart(osv.osv_memory):
                                     help = 'Keep empty for all open fiscal years'),
         'period_from': fields.many2one('account.period', 'Start period'),
         'period_to': fields.many2one('account.period', 'End period'),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required = True),
+        'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                         ('all', 'All Entries'),
+                                        ], 'Target Moves', required = True),
     }
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
@@ -92,7 +93,7 @@ class account_chart(osv.osv_memory):
         return result
 
     _defaults = {
-        'target_move': 'all'
+        'target_move': 'posted'
     }
 
 account_chart()
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index c7adb387724..2c10f83eee4 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -21,7 +21,7 @@
 
 from lxml import etree
 
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 import tools
 
@@ -29,7 +29,16 @@ class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
     _description = "Move journal"
 
-    def _get_period(self, cr, uid, context=None):
+    _columns = {
+       'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                        ('all', 'All Entries'),
+                                        ], 'Target Moves', required=True),
+    }
+
+    _defaults = {
+        'target_move': 'posted'
+    }
+    def _get_period(self, cr, uid, context={}):
         """
         Return  default account period value
         """
@@ -93,6 +102,8 @@ class account_move_journal(osv.osv_memory):
         view = """<?xml version="1.0" encoding="utf-8"?>
         <form string="Standard entries">
             <separator string="Open Journal Items !" colspan="4"/>
+            <field name="target_move" />
+            <newline/>
             <group colspan="4" >
                 <label width="300" string="Journal: %s"/>
                 <newline/>
@@ -132,6 +143,7 @@ class account_move_journal(osv.osv_memory):
 
         journal_id = self._get_journal(cr, uid, context)
         period_id = self._get_period(cr, uid, context)
+        target_move = self.read(cr, uid, ids, [])[0]['target_move']
 
         name = _("Journal Items")
         if journal_id:
@@ -156,23 +168,26 @@ class account_move_journal(osv.osv_memory):
                 }
                 period_pool.create(cr, uid, res,context=context)
 
-            ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)],context=context)
+            ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
             period = period_pool.browse(cr, uid, ids[0], context=context)
             name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
 
         result = data_pool.get_object_reference(cr, uid, 'account', 'view_account_move_line_filter')
         res_id = result and result[1] or False
+        move = 0
+        if target_move == 'posted':
+            move = 1
         return {
             'name': name,
             'view_type': 'form',
             'view_mode': 'tree,graph,form',
             'res_model': 'account.move.line',
             'view_id': False,
-            'context': "{'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
+            'context': "{'search_default_posted': %d, 'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, journal_id, period_id),
             'type': 'ir.actions.act_window',
             'search_view_id': res_id
         }
 
 account_move_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 307272f42ab..eeb77f708e0 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -38,8 +38,9 @@ class account_common_report(osv.osv_memory):
         'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
         'date_from': fields.date("Start Date"),
         'date_to': fields.date("End Date"),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+        'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                         ('all', 'All Entries'),
+                                        ], 'Target Moves', required=True),
 
         }
 
@@ -101,7 +102,7 @@ class account_common_report(osv.osv_memory):
             'journal_ids': _get_all_journal,
             'filter': 'filter_no',
             'chart_account_id': _get_account,
-            'target_move': 'all',
+            'target_move': 'posted',
     }
 
     def _build_contexts(self, cr, uid, ids, data, context=None):
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 80bc7a8030e..9e02931f34d 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -31,8 +31,9 @@ class account_tax_chart(osv.osv_memory):
        'period_id': fields.many2one('account.period', \
                                     'Period',  \
                                     ),
-       'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+       'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                        ('all', 'All Entries'),
+                                        ], 'Target Moves', required=True),
     }
 
     def _get_period(self, cr, uid, context=None):
@@ -72,7 +73,7 @@ class account_tax_chart(osv.osv_memory):
 
     _defaults = {
         'period_id': _get_period,
-        'target_move': 'all'
+        'target_move': 'posted'
     }
 
 account_tax_chart()
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 6e00c6b587d..5a021d4d104 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -59,6 +59,7 @@ of distribution models.
     'depends'   : ['account', 'account_analytic_default'],
     'init_xml'  : [],
     'update_xml': [
+        'security/account_analytic_plan_security.xml',
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
         'account_analytic_plans_report.xml',
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 6d8a06755d6..f3cec96bbe1 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -244,7 +244,7 @@ class account_analytic_plan_instance_line(osv.osv):
     _description = "Analytic Instance Line"
     _columns = {
         'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),
         'rate': fields.float('Rate (%)', required=True),
     }
     _defaults = {
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 67b25ae6013..74f268db168 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -97,19 +97,21 @@ class crossovered_analytic(report_sxw.rml_parse):
 
         self.final_list = children_list
         selected_ids = line_pool.search(self.cr, self.uid, [('account_id', 'in' ,self.final_list)])
+        
+        res['ref_qty'] = 0.0
+        res['ref_amt'] = 0.0
+        self.base_amount = 0.0
+        
         if selected_ids:
             query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
                     WHERE aal.account_id = aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
 
             self.cr.execute(query)
             info=self.cr.dictfetchall()
-
             res['ref_qty'] = info[0]['qty']
             res['ref_amt'] = info[0]['amt']
             self.base_amount = info[0]['amt']
-        res['ref_qty'] = 0.0
-        res['ref_amt'] = 0.0
-        self.base_amount = 0.0
+        
         result.append(res)
         return result
 
diff --git a/addons/account_analytic_plans/security/account_analytic_plan_security.xml b/addons/account_analytic_plans/security/account_analytic_plan_security.xml
new file mode 100644
index 00000000000..1c379bb0f30
--- /dev/null
+++ b/addons/account_analytic_plans/security/account_analytic_plan_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="base.user_root" model="res.users">
+            <field name="groups_id" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 40efe00dae4..4eaca49e2ca 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -31,7 +31,7 @@ class account_crossovered_analytic(osv.osv_memory):
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
-        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
+        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=True),
         'empty_line': fields.boolean('Dont show empty lines'),
     }
     _defaults = {
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index f6e7c7e3990..66cee057d29 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -181,7 +181,7 @@ class crossovered_budget_lines(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             if line.theoritical_amount <> 0.00:
-                res[line.id] = float(line.practical_amount or 0.0 / line.theoritical_amount) * 100
+                res[line.id] = float((line.practical_amount or 0.0) / line.theoritical_amount) * 100
             else:
                 res[line.id] = 0.00
         return res
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 02080a2bc2e..86551866d4a 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -45,7 +45,7 @@
             <field name="view_id" ref="view_budget_post_tree"/>
             <field name="search_view_id" ref="view_budget_post_search"/>
         </record>
-        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
+        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="6"/>
         <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/>
         <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/>
 
@@ -131,7 +131,6 @@
                                     <field name="date_to"/>
                                     <field name="paid_date" select="1"/>
                                     <field name="planned_amount" select="1"/>
-                                    <field name="analytic_account_id"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index d0543d72242..7c1a830d3f8 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -39,7 +39,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="6"/>
+        <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="7"/>
 
         <record id="view_payment_mode_search" model="ir.ui.view">
             <field name="name">payment.mode.search</field>
@@ -88,7 +88,7 @@
             <field name="name">Payment Mode</field>
             <field name="res_model">payment.mode</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,search</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_payment_mode_search"/>
         </record>
 
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index cac06bb472a..f99189a8444 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -37,10 +37,12 @@ class account_payment_populate_statement(osv.osv_memory):
         res = super(account_payment_populate_statement, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         line_ids = line_obj.search(cr, uid, [
             ('move_line_id.reconcile_id', '=', False),
-            ('bank_statement_line_id', '=', False),])
+            ('bank_statement_line_id', '=', False),
+            ('move_line_id.state','=','valid')])
         line_ids.extend(line_obj.search(cr, uid, [
             ('move_line_id.reconcile_id', '=', False),
-            ('order_id.mode', '=', False)]))
+            ('order_id.mode', '=', False),
+            ('move_line_id.state','=','valid')]))
         domain = '[("id", "in", '+ str(line_ids)+')]'
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='lines']")
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9dc496c5ec6..570bfb1d8b7 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -23,8 +23,8 @@ import time
 from lxml import etree
 
 import netsvc
-from osv import fields
-from osv import osv
+from osv import osv, fields
+import decimal_precision as dp
 from tools.translate import _
 
 class account_move_line(osv.osv):
@@ -117,6 +117,11 @@ class account_voucher(osv.osv):
         if context is None: context = {}
         return context.get('narration', False)
 
+    def _get_amount(self, cr, uid, context=None):
+        if context is None:
+            context= {}
+        return context.get('amount', 0.0)
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
@@ -150,18 +155,29 @@ class account_voucher(osv.osv):
             res['arch'] = etree.tostring(doc)
         return res
 
+    def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
+        debit = credit = 0.0
+        for l in line_dr_ids:
+            debit += l['amount']
+        for l in line_cr_ids:
+            credit += l['amount']
+        return abs(amount - abs(credit - debit))
+
+    def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount):
+        line_dr_ids = [x[2] for x in line_dr_ids]
+        line_cr_ids = [x[2] for x in line_cr_ids]
+        return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
+
     def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
         res = {}
+        debit = credit = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            debit= credit = 0.0
-            if voucher.line_dr_ids:
-                for line in voucher.line_dr_ids:
-                    debit += line.amount_unreconciled
-            if voucher.line_cr_ids:
-                for line in voucher.line_cr_ids:
-                    credit += line.amount_unreconciled
-            res[voucher.id] = abs(voucher.amount - abs(credit - debit))
+            for l in voucher.line_dr_ids:
+                debit += l.amount
+            for l in voucher.line_cr_ids:
+                credit += l.amount
+            res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
         return res
 
     _name = 'account.voucher'
@@ -199,8 +215,8 @@ class account_voucher(osv.osv):
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
-        'amount': fields.float('Total', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
+        'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
         'number': fields.char('Number', size=32, readonly=True,),
         'move_id':fields.many2one('account.move', 'Account Entry'),
@@ -215,14 +231,13 @@ class account_voucher(osv.osv):
         'pre_line':fields.boolean('Previous Payments ?', required=False),
         'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}),
         'payment_option':fields.selection([
-                                           ('without_writeoff', 'Without Write-off'),
-                                           ('with_writeoff', 'With Write-off'),
-                                           ], 'Payment Option', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+                                           ('without_writeoff', 'Keep Open'),
+                                           ('with_writeoff', 'Reconcile with Write-Off'),
+                                           ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', readonly=True, states={'draft': [('readonly', False)]}),
-        'comment': fields.char('Comment', size=64, readonly=True, states={'draft': [('readonly', False)]}),
-        'analytic_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Writeoff Amount', type='float', readonly=True),
+        'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
+        'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True),
     }
     _defaults = {
         'period_id': _get_period,
@@ -231,6 +246,7 @@ class account_voucher(osv.osv):
         'currency_id': _get_currency,
         'reference': _get_reference,
         'narration':_get_narration,
+        'amount': _get_amount,
         'type':_get_type,
         'state': 'draft',
         'pay_now': 'pay_later',
@@ -239,7 +255,7 @@ class account_voucher(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
         'tax_id': _get_tax,
         'payment_option': 'without_writeoff',
-        'comment': 'Write-Off',
+        'comment': _('Write-Off'),
     }
 
     def compute_tax(self, cr, uid, ids, context=None):
@@ -395,13 +411,17 @@ class account_voucher(osv.osv):
 
         @return: Returns a dict which contains new values, and context
         """
+        if context is None:
+            context = {}
         if not journal_id:
             return {}
 
-        if context is None:
-            context = {}
-        currency_pool = self.pool.get('res.currency')
         line_pool = self.pool.get('account.voucher.line')
+        line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
+        if line_ids:
+            line_pool.unlink(cr, uid, line_ids)
+
+        currency_pool = self.pool.get('res.currency')
         move_line_pool = self.pool.get('account.move.line')
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
@@ -474,13 +494,13 @@ class account_voucher(osv.osv):
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
                 continue
 
-            orignal_amount = line.credit or line.debit or 0.0
+            original_amount = line.credit or line.debit or 0.0
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
-                'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, orignal_amount),
+                'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount),
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled)
@@ -504,6 +524,7 @@ class account_voucher(osv.osv):
                 default['value']['pre_line'] = 1
             elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
                 default['value']['pre_line'] = 1
+            default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
 
         return default
 
@@ -687,7 +708,7 @@ class account_voucher(osv.osv):
             for line in inv.line_ids:
                 if not line.amount:
                     continue
-                amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.amount)
+                amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount)
                 move_line = {
                     'journal_id': inv.journal_id.id,
                     'period_id': inv.period_id.id,
@@ -730,16 +751,20 @@ class account_voucher(osv.osv):
                 if line.move_line_id.id:
                     rec_ids = [master_line, line.move_line_id.id]
                     rec_list_ids.append(rec_ids)
-            writeoff_account_id = False
-            writeoff_journal_id = False
-            writeoff_period_id = inv.period_id.id,
-            comment = False
 
             if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
                 diff = line_total
+                account_id = False
+                if inv.payment_option == 'with_writeoff':
+                    account_id = inv.writeoff_acc_id.id
+                elif inv.type in ('sale', 'receipt'):
+#                if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'):
+                    account_id = inv.partner_id.property_account_receivable.id
+                else:
+                    account_id = inv.partner_id.property_account_payable.id
                 move_line = {
                     'name': name,
-                    'account_id': False,
+                    'account_id': account_id,
                     'move_id': move_id,
                     'partner_id': inv.partner_id.id,
                     'date': inv.date,
@@ -748,24 +773,8 @@ class account_voucher(osv.osv):
                     'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1) or 0.0,
                     'currency_id': company_currency <> current_currency and current_currency or False,
                 }
-                account_id = False
-                if inv.type in ('sale', 'receipt'):
-#                if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'):
-                    account_id = inv.partner_id.property_account_receivable.id
-                else:
-                    account_id = inv.partner_id.property_account_payable.id
-                move_line['account_id'] = account_id
 
                 move_line_pool.create(cr, uid, move_line)
-            for rec_ids in rec_list_ids:
-                if len(rec_ids) >= 2:
-                    if inv.payment_option == 'with_writeoff':
-                        writeoff_account_id = inv.writeoff_acc_id.id
-                        writeoff_journal_id = inv.writeoff_journal_id.id
-                        comment = inv.comment
-                        move_line_pool.reconcile(cr, uid, rec_ids, 'manual', writeoff_account_id, writeoff_period_id, writeoff_journal_id, context)
-                    else:
-                        move_line_pool.reconcile_partial(cr, uid, rec_ids)
 
             self.write(cr, uid, [inv.id], {
                 'move_id': move_id,
@@ -773,6 +782,9 @@ class account_voucher(osv.osv):
                 'number': name,
             })
             move_pool.post(cr, uid, [move_id], context={})
+            for rec_ids in rec_list_ids:
+                if len(rec_ids) >= 2:
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -824,7 +836,7 @@ class account_voucher_line(osv.osv):
         'account_id':fields.many2one('account.account','Account', required=True),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'untax_amount':fields.float('Untax Amount'),
-        'amount':fields.float('Amount', digits=(14,2)),
+        'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
@@ -832,7 +844,7 @@ class account_voucher_line(osv.osv):
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
         'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Originial Amount', store=True),
         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
-        'company_id': fields.related('voucher_id','company_id', relation='res.company', string='Company', store=True),
+        'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True),
     }
     _defaults = {
         'name': ''
@@ -873,7 +885,7 @@ class account_voucher_line(osv.osv):
 
         @return: Returns a dict that contains default values for fields
         """
-        if context is None: 
+        if context is None:
             context = {}
         journal_id = context.get('journal_id', False)
         partner_id = context.get('partner_id', False)
@@ -962,6 +974,17 @@ class account_bank_statement_line(osv.osv):
                 res[line.id] = 0.0
         return res
 
+    def _check_amount(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            if obj.voucher_id:
+                if not (obj.amount == obj.voucher_id.amount):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line', ['amount']),
+    ]
+
     _columns = {
         'amount_reconciled': fields.function(_amount_reconciled,
             string='Amount reconciled', method=True, type='float'),
@@ -981,4 +1004,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher_report.xml b/addons/account_voucher/account_voucher_report.xml
index 785fd91df73..8af204efbbe 100644
--- a/addons/account_voucher/account_voucher_report.xml
+++ b/addons/account_voucher/account_voucher_report.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <report id="report_account_voucher"
+   <!--     <report id="report_account_voucher"
             string="Voucher"
             model="account.voucher"
             name="voucher.cash_receipt.drcr"
@@ -9,7 +9,7 @@
             groups="base.group_extended"
             auto="False"
             header = "False"
-            menu="True"/>
+            menu="True"/> -->
 
         <report id="report_account_voucher_print"
             string="Voucher Print"
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 0511a8325d5..c41356f3973 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -70,8 +70,21 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <separator string="Journal Items" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field> 
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 19e18ce07c4..9421681b8ee 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -406,7 +406,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -520,7 +520,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -657,7 +657,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -750,7 +750,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "supplier Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index 2983628da26..13d2ae4737e 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
 msgstr "Πληρωμή Πωλητή"
 
 #. module: account_voucher
@@ -539,8 +539,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
-msgstr "Πωλητής"
+msgid "Supplier"
+msgstr "προμηθευτής"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -676,7 +676,7 @@ msgstr "Πληροφορίες Πώλησης"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index bab2fbf2f09..76bbd0121dd 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -433,8 +433,8 @@ msgstr "Romper conciliación"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
-msgstr "Pago del vendedor"
+msgid "Supplier Payment"
+msgstr "Pago del Proveedor"
 
 #. module: account_voucher
 #: view:account.invoice:0
@@ -551,8 +551,8 @@ msgstr "¿Auditoría completa?"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
-msgstr "Vendedor"
+msgid "Supplier"
+msgstr "Proveedor"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -688,8 +688,8 @@ msgstr "Información de ventas"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
-msgstr "Abrir entradas diario de vendedores"
+msgid "Open Supplier Journal Entries"
+msgstr "Abrir entradas diario de Proveedors"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
@@ -781,8 +781,8 @@ msgstr "Cancelado"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
-msgstr "Facturas de vendedor y transacciones de salida"
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr "Facturas de Proveedor y transacciones de salida"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index fd18fc67954..b48a962c406 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index e7fe7ee9413..deefb9acd38 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -439,7 +439,7 @@ msgstr "Romper conciliación"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr "Pago a Proveedor"
 
 #. module: account_voucher
@@ -561,7 +561,7 @@ msgstr "Revisión Completa ?"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: account_voucher
@@ -698,7 +698,7 @@ msgstr "Información de Ventas"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr "Abrir asientos de diario de proveedor"
 
 #. module: account_voucher
@@ -791,7 +791,7 @@ msgstr "Cancelado"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
 msgstr "Facturas de Proveedor y transacciones pendientes"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index aa1ffac428a..e74f9b5047d 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -435,7 +435,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -553,7 +553,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -690,7 +690,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index a27f2ab0d5a..c055f9a5c43 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -676,7 +676,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -769,7 +769,7 @@ msgstr "Annulé"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 87ff1b7934c..a67ae0a4646 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 200dd6e231b..30f75df2fd0 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 6e63d7fe498..cd50cb8ce0a 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index ece22b907a0..8f776459004 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr "Pagamenti fornitori"
 
 #. module: account_voucher
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -676,7 +676,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 88f0f0c10d0..20292b6cac7 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -676,7 +676,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index b6deac88c02..593ef2d31c1 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index ca4b63e5ed7..7f7c6ae4a91 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index f754ee99f01..1638a22bbb8 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index a7dadb4d870..b53fcdb08ec 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -676,7 +676,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 76957a5552e..f6fb6e59244 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index c4cfe274b23..048c3b0f3c5 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,8 +538,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
-msgstr "Vendedor"
+msgid "Supplier"
+msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -675,7 +675,7 @@ msgstr "Informação de vendas"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -865,6 +865,11 @@ msgid ""
 "that are linked to those transactions because they will not be disable"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index c0ab44e4043..940b99845ff 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 95c1e4052f9..e664d845b61 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 8aa5407aab6..3a93633c858 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -420,7 +420,7 @@ msgstr "Отмена сверки"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr "Информация о продажах"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -768,7 +768,11 @@ msgstr "Отменено"
 
 #. module: account_voucher
 #: view:account.voucher:0
+<<<<<<< TREE
+msgid "Supplier Invoices and Outstanding transactions"
+=======
 msgid "Vendor Invoices and Outstanding transactions"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 8baed750f2e..15ff62659ab 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index 5dea3b9eb69..e813d2ee70f 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -676,7 +676,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 9f032bbe352..291ac0f0445 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -427,7 +427,7 @@ msgstr "Poništavanje zatvaranja"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr "Placanja Proizvodjaca"
 
 #. module: account_voucher
@@ -545,7 +545,7 @@ msgstr "Pregled KOmpletan?"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr "proizvođač"
 
 #. module: account_voucher
@@ -682,7 +682,7 @@ msgstr "Informacije Prodaje"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr "Otvori Dnevnik Proizvodjaca"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index ab18d56c54a..21f37e90c3d 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -539,8 +539,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
-msgstr ""
+msgid "Supplier"
+msgstr "proizvođač"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -676,8 +676,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
-msgstr ""
+msgid "Open Supplier Journal Entries"
+msgstr "Otvori Dnevnik Proizvodjaca"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index ad730d0e368..7b67f096340 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 74492575e2d..6bfcd2de898 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index 11099ea19b1..e2358d15a3f 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index da6740eb180..571307ade0d 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -421,7 +421,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -676,7 +676,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index f1d561d35b5..528c3b15d0c 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 50964f292a9..2634ab2d875 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -538,7 +538,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr ""
 
 #. module: account_voucher
@@ -675,7 +675,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml
index 173f5e3f075..c4492ec6ed0 100755
--- a/addons/account_voucher/report/account_voucher_print.rml
+++ b/addons/account_voucher/report/account_voucher_print.rml
@@ -327,56 +327,5 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="154.0,108.0,118.0,144.0" style="Table5">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Receiver's Signature</para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">Authorised Signatory</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0d960e72f96..b47fa46bb7e 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -88,7 +88,7 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Supplier"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
@@ -105,8 +105,8 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
-                                <tree string="Open Vendor Journal Entries" editable="bottom">
+                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
+                                <tree string="Open Supplier Journal Entries" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -119,7 +119,7 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
                                 <tree string="Open Customer Journal Entries" editable="bottom">
                                     <field name="move_line_id"/>
                                     <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
@@ -151,7 +151,7 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Supplier"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
@@ -169,7 +169,7 @@
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="line_dr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
-                                <tree string="Vendor Invoices and Outstanding transactions" editable="bottom">
+                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -198,22 +198,18 @@
                             <group col="2" colspan="1">
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
-                                    <field name="payment_option" required="1"/>
                                     <field name="writeoff_amount"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                    <field name="payment_option" required="1"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                           domain="[('type','=','liquidity')]"/>
-                                         <!-- should select income accounts only. Or use the journal for this ? -->
-                                    <field name="writeoff_journal_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"/>
+                                           domain="[('type','=','other')]"/>
                                     <field name="comment"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <separator string="Other Information" colspan="2"/>
                                 <group col="4" colspan="1">
                                   <field name="date" select="1" on_change="onchange_date(date)"/>
                                   <field name="currency_id" invisible="True"/>
@@ -227,8 +223,21 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <separator string="Journal Items" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field>
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
@@ -243,7 +252,7 @@
         </record>
 
         <record id="action_vendor_payment" model="ir.actions.act_window">
-            <field name="name">Vendor Payment</field>
+            <field name="name">Supplier Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
@@ -295,7 +304,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -309,7 +318,7 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
                                 <tree string="Credits" editable="bottom">
                                     <field name="move_line_id"/>
                                     <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
@@ -330,10 +339,7 @@
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                           domain="[('type','=','liquidity')]"/>
-                                         <!-- should select income accounts only. Or use the journal for this ? -->
-                                    <field name="writeoff_journal_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"/>
+                                           domain="[('type','=','other')]"/>
                                     <field name="comment"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
@@ -354,8 +360,21 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <separator string="Journal Items" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field> 
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index a0d61e00a12..2800511a8e0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -86,7 +86,7 @@
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
             <field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
             <field name="view_id" ref="view_vendor_receipt_form"/>
-            <field name="target">new</field>
+            <field name="target">current</field>
         </record>
 
         <record model="ir.ui.view" id="view_sale_receipt_form">
@@ -133,7 +133,7 @@
                                 </group>
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
                                     <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
@@ -144,8 +144,21 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <separator string="Journal Items" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field> 
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
@@ -154,7 +167,7 @@
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -200,7 +213,7 @@
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment'), ('partner_id','=',partner_id)]</field>
             <field name="context">{'type':'payment', 'partner_id': partner_id, 'default_reference':reference}</field>
             <field name="view_id" ref="view_vendor_payment_form"/>
-            <field name="target">new</field>
+            <field name="target">current</field>
         </record>
         <record model="ir.ui.view" id="view_purchase_receipt_form">
             <field name="name">account.voucher.purchase.form</field>
@@ -240,7 +253,7 @@
                                 </group>
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
                                     <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
@@ -251,15 +264,30 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <separator string="Journal Items" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field> 
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+                        <group attrs="{'invisible':[('state','!=','posted')]}">
+                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                        </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 1da95285c24..1c0c00bd662 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -38,7 +38,7 @@
                 <form string="Import Entries">
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
-                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False)]"/>
+                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
                     </group>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index e1c17cfacd5..f87df6200d6 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -206,7 +206,7 @@ class account_analytic_line(osv.osv):
         'date': fields.date('Date', required=True, select=1),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index e7c4a70469f..f84309012cd 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -1028,7 +1028,7 @@ class res_partner(osv.osv):
         if len(vat) not in(9, 10):
             return False
 
-        if int(vat[0:2]) == 0 and len(vat) == 10:
+        if int(vat[0:2]) in (0, 10, 20) and len(vat) == 10:
             return True
 
         if len(vat) == 10:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4a8b9c089fc..8d6d1b5b9b5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -536,7 +536,7 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16,2 )), 
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7aefcc3fb60..c2222bf162e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -38,7 +38,7 @@ CRM_LEAD_PENDING_STATES = (
 class crm_lead(crm_case, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
-    _description = "Lead"
+    _description = "Lead/Opportunity"
     _order = "date_action, priority, id desc"
     _inherit = ['mailgate.thread','res.partner.address']
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index ce3235772ee..b903a25b759 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -133,7 +133,7 @@
             <field name="arch" type="xml">
                 <group name="logistics" position="inside">
                     <field name="id" invisible="True"/>
-                    <field name="carrier_id" context="{'order_id':active_id}"/>
+                    <field name="carrier_id" context="{'order_id':active_id or False}"/>
                 </group>
             </field>
         </record>
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index ee9295eb5d4..8589ee88201 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -26,7 +26,7 @@ from osv import fields,osv
 class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
-        'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on picking."),
+        'carrier_id':fields.many2one("delivery.carrier", "Delivery Method", help="Complete this field if you plan to invoice the shipping based on picking."),
         'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 8a53ddad805..7c400ecf40e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -149,8 +149,8 @@ class hr_employee(osv.osv):
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
-        'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
-        'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
+        'work_phone': fields.char('Work Phone', size=32, readonly=False),
+        'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
         'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, readonly=True, help="It is linked with manager of Department"),
@@ -160,9 +160,15 @@ class hr_employee(osv.osv):
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
         'photo': fields.binary('Photo'),
-        'passport_id':fields.char('Passport', size=64)
+        'passport_id':fields.char('Passport No', size=64)
     }
 
+    def onchange_address_id(self, cr, uid, ids, address, context=None):
+        if address:
+            address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)
+            return {'value': {'work_email': address.email, 'work_phone': address.phone}}
+        return {'value': {}}
+
     def onchange_company(self, cr, uid, ids, company, context=None):
         address_id = False
         if company:
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bc01d38d1a4..076c207f850 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -56,7 +56,7 @@
                                 <separator string="Contact Information" colspan="2"/>
                                 <field name="address_home_id" colspan="2"/>
                                 <field name="partner_id" invisible="1" />
-                                <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
+                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" domain="[('partner_id', '=', partner_id)]"/>
                                 <field name="work_phone"/>
                                 <field name="work_email" widget="email" />
                                 <field name="work_location"/>
@@ -340,7 +340,7 @@
                             <field name="requirements" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Employee">
-                            <field name="employee_ids" colspan='4' nolabel="1"  mode="tree,form"/>
+                            <field name="employee_ids" colspan='4' nolabel="1" widget="many2many" mode="tree,form"/>
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 58631761fa9..d00f69bc0de 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -34,8 +34,8 @@ class hr_evaluation_plan(osv.osv):
         'name': fields.char("Evaluation Plan", size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
-        'month_first': fields.integer('Next Evaluation After'),
-        'month_next': fields.integer('After the Date of Start'),
+        'month_first': fields.integer('First Evaluation in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
+        'month_next': fields.integer('Periodicity of Evaluations (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
         'active': fields.boolean('Active')
     }
     _defaults = {
@@ -101,7 +101,7 @@ class hr_employee(osv.osv):
     _inherit="hr.employee"
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
-        'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"),
+        'evaluation_date': fields.date('Next Evaluation Date', help="The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."),
     }
 
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index acec2f3a240..bc9c1cc36e4 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -154,23 +154,23 @@ class hr_expense_expense(osv.osv):
                     'invoice_line_tax_id': tax_id and [(6, 0, tax_id)] or False,
                     'account_analytic_id': l.analytic_account.id,
                 }))
-            if not exp.employee_id.address_id:
-                raise osv.except_osv(_('Error !'), _('The employee must have a working address'))
-            acc = exp.employee_id.address_id.partner_id.property_account_payable.id
-            payment_term_id = exp.employee_id.address_id.partner_id.property_payment_term.id
+            if not exp.employee_id.address_home_id:
+                raise osv.except_osv(_('Error !'), _('The employee must have a Home address'))
+            acc = exp.employee_id.address_home_id.partner_id.property_account_payable.id
+            payment_term_id = exp.employee_id.address_home_id.partner_id.property_payment_term.id
             inv = {
                 'name': exp.name,
                 'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
                 'type': 'in_invoice',
-                'partner_id': exp.employee_id.address_id.partner_id.id,
-                'address_invoice_id': exp.employee_id.address_id.id,
-                'address_contact_id': exp.employee_id.address_id.id,
+                'partner_id': exp.employee_id.address_home_id.partner_id.id,
+                'address_invoice_id': exp.employee_id.address_home_id.id,
+                'address_contact_id': exp.employee_id.address_home_id.id,
                 'origin': exp.name,
                 'invoice_line': lines,
                 'currency_id': exp.currency_id.id,
                 'payment_term': payment_term_id,
-                'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
+                'fiscal_position': exp.employee_id.address_home_id.partner_id.property_account_position.id
             }
             if payment_term_id:
                 to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
@@ -240,13 +240,19 @@ class hr_expense_line(osv.osv):
     _order = "sequence, date_value desc"
 
     def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+        if context is None:
+            ctx = {}
+        else:
+            # we only want to update it locally
+            ctx = context.copy()
+
         res = {}
         if product_id:
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             res['name'] = product.name
             # Compute based on pricetype of employee company
-            context['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
-            amount_unit = product.price_get('standard_price', context)[product.id]
+            ctx['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
+            amount_unit = product.price_get('standard_price', ctx)[product.id]
             res['unit_amount'] = amount_unit
             if not uom_id:
                 res['uom_id'] = product.uom_id.id
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 314e053ac12..8fe5da805b4 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -230,6 +230,7 @@ class hr_holidays(osv.osv):
                     list_ids = [ lr.id for lr in record.linked_request_ids]
                     self.holidays_cancel(cr, uid, list_ids)
                     self.unlink(cr, uid, list_ids)
+        return True
 
     def _check_date(self, cr, uid, ids, context=None):
         for rec in self.read(cr, uid, ids, ['number_of_days_temp', 'date_from','date_to', 'type']):
@@ -289,17 +290,23 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_validate2(self, cr, uid, ids, *args):
+        obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         vals = {'state':'validate1'}
         self.check_holidays(cr, uid, ids)
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
         else:
             raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
+        # Second Time Validate all the leave requests of the category
+        for leave_id in self._get_category_leave_ids(cr, uid, ids):
+            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
         return self.write(cr, uid, ids, vals)
 
     def holidays_validate(self, cr, uid, ids, *args):
         obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         data_holiday = self.browse(cr, uid, ids)
         self.check_holidays(cr, uid, ids)
         vals = {'state':'validate'}
@@ -324,19 +331,28 @@ class hr_holidays(osv.osv):
                    'holiday_id': record.id
                      }
                 self._create_resource_leave(cr, uid, vals)
-            elif record.holiday_type == 'category' and record.type == 'remove':
+            elif record.holiday_type == 'category':
+                # Create leave/allocation request for employees in the category
                 emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
+                leave_ids = []
                 for emp in obj_emp.browse(cr, uid, emp_ids):
                     vals = {
-                       'name': record.name,
-                       'date_from': record.date_from,
-                       'date_to': record.date_to,
-                       'calendar_id': emp.calendar_id.id,
-                       'company_id': emp.company_id.id,
-                       'resource_id': emp.resource_id.id,
-                       'holiday_id':record.id
-                         }
-                    self._create_resource_leave(cr, uid, vals)
+                    'name': record.name,
+                    'type': record.type,
+                    'holiday_type': 'employee',
+                    'holiday_status_id': record.holiday_status_id.id,
+                    'date_from': record.date_from,
+                    'date_to': record.date_to,
+                    'notes': record.notes,
+                    'number_of_days_temp': record.number_of_days_temp,
+                    'parent_id': record.id,
+                    'employee_id': emp.id
+                    }
+                    leave_ids.append(self.create(cr, uid, vals, context=None))
+                    # Confirm and validate all the leave requests of the category
+                    for leave_id in leave_ids:
+                        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
+                        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
@@ -362,14 +378,19 @@ class hr_holidays(osv.osv):
             if record.holiday_type == 'employee' and record.employee_id:
                 user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
 
-            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })
+            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id})
         return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
+        obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         vals = {'state': 'refuse'}
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        ids2 = obj_emp.search(cr, uid, [('user_id','=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
+        # Refuse all the leave requests of the category
+        for leave_id in self._get_category_leave_ids(cr, uid, ids):
+            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'refuse', cr)
         self.write(cr, uid, ids, vals)
         return True
 
@@ -380,6 +401,9 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
+        wf_service = netsvc.LocalService("workflow")
+        for leave_id in self._get_category_leave_ids(cr, uid, ids):
+            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'draft', cr)
         return self.write(cr, uid, ids, {'state': 'draft'})
 
     def check_holidays(self, cr, uid, ids):
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 7d66f25b445..0725e34f0f9 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -38,7 +38,8 @@
     'depends': [
         'hr',
         'hr_contract',
-        'hr_holidays'
+        'hr_holidays',
+        'decimal_precision',
     ],
     'init_xml': [
     ],
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 2319b3a352c..bd3ffad3065 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -312,7 +312,7 @@ class hr_contract(osv.osv):
     _description = 'Employee Contract'
     _columns = {
         'permit_no': fields.char('Work Permit No', size=256, required=False, readonly=False),
-        'passport_id': fields.many2one('hr.passport', 'Passport', required=False),
+        'passport_id': fields.many2one('hr.passport', 'Passport No', required=False),
         'visa_no': fields.char('Visa No', size=64, required=False, readonly=False),
         'visa_expire': fields.date('Visa Expire Date'),
         'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure'),
@@ -1430,7 +1430,7 @@ class hr_employee(osv.osv):
         return vals
 
     _columns = {
-        'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
+        'passport_id':fields.many2one('hr.passport', 'Passport No', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'otherid': fields.char('Other Id', size=64),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1c792c5ba6f..8ecd991ce8d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -87,18 +87,6 @@
         <!-- End Passport Views -->
 
         <!-- Employee View -->
-        <record id="view_employee_bank_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" invisible="context.get('display_partner', False)"/>
-                </field>
-            </field>
-        </record>
-        
         <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
@@ -251,9 +239,9 @@
                 </field>
             </field>
         </record>
-        
+
         <!-- End Employee View -->
-        
+
         <!-- Contract View -->
         <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
@@ -407,12 +395,12 @@
 							<separator string="Validation" colspan="2"/>
 								<newline/>
 							<field name="active" />
-								<newline/>							
+								<newline/>
 							<field name="double_validation"/>
 								<newline/>
 							<field name="limit"/>
 			  	</group>
-				<group colspan="2">						
+				<group colspan="2">
 					<separator colspan="2" string="Payroll Configurtion"/><newline/>
 					<field name="type"/><newline/>
 					<field name="head_id"/><newline/>
@@ -1088,7 +1076,7 @@
                 </form>
             </field>
         </record>
-        
+
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index a19b2c67291..420dcb5a114 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -7,21 +7,5 @@
             <field name="type">general</field>
         </record>
 
-        <record id="product_consultant" model="product.product">
-            <field name="list_price">75.0</field>
-            <field name="standard_price">30.0</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
-            <field name="name">Service on Timesheet</field>
-            <field name="categ_id" ref="product.cat0"/>
-            <field name="type">service</field>
-            <field eval="False" name="purchase_ok"/>
-        </record>
-
-        <record id="hr.employee" model="hr.employee">
-            <field name="product_id" ref="product_consultant"/>
-            <field name="journal_id" ref="analytic_journal"/>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index e7ba5c91342..caaaef12f01 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -2,6 +2,21 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="product_consultant" model="product.product">
+            <field name="list_price">75.0</field>
+            <field name="standard_price">30.0</field>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="name">Service on Timesheet</field>
+            <field name="categ_id" ref="product.cat0"/>
+            <field name="type">service</field>
+            <field eval="False" name="purchase_ok"/>
+        </record>
+
+        <record id="hr.employee" model="hr.employee">
+            <field name="product_id" ref="product_consultant"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
         <!-- complete our example employee -->
         <record id="hr.employee1" model="hr.employee">
             <field name="product_id" ref="product_consultant"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 4878a6634b2..8f1ef4ef261 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -23,6 +23,7 @@ import time
 
 from osv import osv, fields
 from tools.translate import _
+
 #
 # Create an final invoice based on selected timesheet lines
 #
@@ -79,7 +80,7 @@ class final_invoice_create(osv.osv_memory):
                     date_due = pterm_list[-1]
 
             curr_invoice = {
-                'name': time.strftime('%D')+' - '+account.name,
+                'name': time.strftime('%d/%m/%Y')+' - '+account.name,
                 'partner_id': account.partner_id.id,
                 'address_contact_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
                 'address_invoice_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 075a68907ae..f11f1331415 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -92,7 +92,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     date_due = pterm_list[-1]
 
             curr_invoice = {
-                'name': time.strftime('%D')+' - '+account.name,
+                'name': time.strftime('%d/%m/%Y')+' - '+account.name,
                 'partner_id': account.partner_id.id,
                 'address_contact_id': res_partner_obj.address_get(cr, uid,
                     [account.partner_id.id], adr_pref=['contact'])['contact'],
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index e3ddd4fed6a..6c7c5618311 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -273,7 +273,7 @@ class hr_timesheet_sheet(osv.osv):
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}),
+        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True,),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Draft'),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 08fda12c073..a65a7578800 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -132,8 +132,8 @@
                         <field name="state"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_manager"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index c321e69f4a5..57c45a0cf93 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -2913,17 +2913,25 @@
             <field name="user_type" ref="user_type_view"/>
             <field ref="a40" name="parent_id"/>
         </record>
+        <record id="a_recv" model="account.account.template">
+            <field name="name">Clients</field>
+            <field name="code">4000</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="user_type_tiers_receiv"/>
+            <field eval="True" name="reconcile"/>
+            <field ref="a400" name="parent_id"/>
+        </record>
         <record id="a4007" model="account.account.template">
             <field name="name">Rabais, remises, ristournes à accorder et autres notes de crédit à établir</field>
             <field name="code">4007</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a400" name="parent_id"/>
         </record>
         <record id="a4008" model="account.account.template">
             <field name="name">Créances résultant de livraisons de biens</field>
             <field name="code">4008</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a400" name="parent_id"/>
         </record>
@@ -2934,26 +2942,24 @@
             <field name="user_type" ref="user_type_view"/>
             <field ref="a40" name="parent_id"/>
         </record>
-        <record id="a_recv" model="account.account.template">
+        <record id="a4010" model="account.account.template">
             <field name="name">Effets à recevoir</field>
             <field name="code">4010</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
-            <field eval="True" name="reconcile"/>
             <field ref="a401" name="parent_id"/>
         </record>
-
         <record id="a4013" model="account.account.template">
             <field name="name">Effets à l'encaissement</field>
             <field name="code">4013</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a401" name="parent_id"/>
         </record>
         <record id="a4015" model="account.account.template">
             <field name="name">Effets à l'escompte</field>
             <field name="code">4015</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a401" name="parent_id"/>
         </record>
@@ -2967,21 +2973,21 @@
         <record id="a4020" model="account.account.template">
             <field name="name">Entreprises liées</field>
             <field name="code">4020</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a402" name="parent_id"/>
         </record>
         <record id="a4021" model="account.account.template">
             <field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">4021</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a402" name="parent_id"/>
         </record>
         <record id="a4022" model="account.account.template">
             <field name="name">Administrateurs et gérants d'entreprise</field>
             <field name="code">4022</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a402" name="parent_id"/>
         </record>
@@ -2995,63 +3001,63 @@
         <record id="a4030" model="account.account.template">
             <field name="name">Entreprises liées</field>
             <field name="code">4030</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a403" name="parent_id"/>
         </record>
         <record id="a4031" model="account.account.template">
             <field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">4031</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a403" name="parent_id"/>
         </record>
         <record id="a4032" model="account.account.template">
             <field name="name">Administrateurs et gérants de l'entreprise</field>
             <field name="code">4032</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a403" name="parent_id"/>
         </record>
         <record id="a404" model="account.account.template">
             <field name="name">Produits à recevoir</field>
             <field name="code">404</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a40" name="parent_id"/>
         </record>
         <record id="a405" model="account.account.template">
             <field name="name">Clients : retenues sur garanties</field>
             <field name="code">405</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a40" name="parent_id"/>
         </record>
         <record id="a406" model="account.account.template">
             <field name="name">Acomptes versés</field>
             <field name="code">406</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a40" name="parent_id"/>
         </record>
         <record id="a407" model="account.account.template">
             <field name="name">Créances douteuses</field>
             <field name="code">407</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a40" name="parent_id"/>
         </record>
         <record id="a408" model="account.account.template">
             <field name="name">Compensation clients</field>
             <field name="code">408</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a40" name="parent_id"/>
         </record>
         <record id="a409" model="account.account.template">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">409</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a40" name="parent_id"/>
         </record>
@@ -3072,14 +3078,14 @@
         <record id="a4100" model="account.account.template">
             <field name="name">Appels de fonds</field>
             <field name="code">4100</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a410" name="parent_id"/>
         </record>
         <record id="a4101" model="account.account.template">
             <field name="name">Actionnaires défaillants</field>
             <field name="code">4101</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a410" name="parent_id"/>
         </record>
@@ -3128,21 +3134,21 @@
         <record id="a4111" model="account.account.template">
             <field name="name">T.V.A. déductible</field>
             <field name="code">4111</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a411" name="parent_id"/>
         </record>
         <record id="a4112" model="account.account.template">
             <field name="name">Compte courant administration T.V.A.</field>
             <field name="code">4112</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a411" name="parent_id"/>
         </record>
         <record id="a4118" model="account.account.template">
             <field name="name">Taxe d'égalisation due</field>
             <field name="code">4118</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a411" name="parent_id"/>
         </record>
@@ -3156,28 +3162,28 @@
         <record id="a4120" model="account.account.template">
             <field name="name">à 4124 Impôts belges sur le résultat</field>
             <field name="code">4120</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a412" name="parent_id"/>
         </record>
         <record id="a4125" model="account.account.template">
             <field name="name">à 4127 Autres impôts belges</field>
             <field name="code">4125</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a412" name="parent_id"/>
         </record>
         <record id="a4128" model="account.account.template">
             <field name="name">Impôts étrangers</field>
             <field name="code">4128</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a412" name="parent_id"/>
         </record>
         <record id="a414" model="account.account.template">
             <field name="name">Produits à recevoir</field>
             <field name="code">414</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a41" name="parent_id"/>
         </record>
@@ -3191,42 +3197,42 @@
         <record id="a4160" model="account.account.template">
             <field name="name">Associés</field>
             <field name="code">4160</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
         <record id="a4161" model="account.account.template">
             <field name="name">Avances et prêts au personnel</field>
             <field name="code">4161</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
         <record id="a4162" model="account.account.template">
             <field name="name">Compte courant des associés en S.P.R.L.</field>
             <field name="code">4162</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
         <record id="a4163" model="account.account.template">
             <field name="name">Compte courant des administrateurs et gérants</field>
             <field name="code">4163</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
         <record id="a4164" model="account.account.template">
             <field name="name">Créances sur sociétés apparentées</field>
             <field name="code">4164</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
         <record id="a4166" model="account.account.template">
             <field name="name">Emballages et matériel à rendre</field>
             <field name="code">4166</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
@@ -3240,42 +3246,42 @@
         <record id="a41670" model="account.account.template">
             <field name="name">Subsides à recevoir</field>
             <field name="code">41670</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a4167" name="parent_id"/>
         </record>
         <record id="a41671" model="account.account.template">
             <field name="name">Autres créances</field>
             <field name="code">41671</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a4167" name="parent_id"/>
         </record>
         <record id="a4168" model="account.account.template">
             <field name="name">Rabais, ristournes, remises à obtenir et autres avoirs non encore reçus</field>
             <field name="code">4168</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a416" name="parent_id"/>
         </record>
         <record id="a417" model="account.account.template">
             <field name="name">Créances douteuses</field>
             <field name="code">417</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a41" name="parent_id"/>
         </record>
         <record id="a418" model="account.account.template">
             <field name="name">Cautionnements versés en numéraires</field>
             <field name="code">418</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a41" name="parent_id"/>
         </record>
         <record id="a419" model="account.account.template">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">419</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_receiv"/>
             <field ref="a41" name="parent_id"/>
         </record>
@@ -3296,14 +3302,14 @@
         <record id="a4200" model="account.account.template">
             <field name="name">Convertibles</field>
             <field name="code">4200</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a420" name="parent_id"/>
         </record>
         <record id="a4201" model="account.account.template">
             <field name="name">Non convertibles</field>
             <field name="code">4201</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a420" name="parent_id"/>
         </record>
@@ -3317,14 +3323,14 @@
         <record id="a4210" model="account.account.template">
             <field name="name">Convertibles</field>
             <field name="code">4210</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a421" name="parent_id"/>
         </record>
         <record id="a4211" model="account.account.template">
             <field name="name">Non convertibles</field>
             <field name="code">4211</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a421" name="parent_id"/>
         </record>
@@ -3338,14 +3344,14 @@
         <record id="a4220" model="account.account.template">
             <field name="name">Financement de biens immobiliers</field>
             <field name="code">4220</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a422" name="parent_id"/>
         </record>
         <record id="a4221" model="account.account.template">
             <field name="name">Financement de biens mobiliers</field>
             <field name="code">4221</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a422" name="parent_id"/>
         </record>
@@ -3359,28 +3365,28 @@
         <record id="a4230" model="account.account.template">
             <field name="name">Dettes en compte</field>
             <field name="code">4230</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a423" name="parent_id"/>
         </record>
         <record id="a4231" model="account.account.template">
             <field name="name">Promesses</field>
             <field name="code">4231</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a423" name="parent_id"/>
         </record>
         <record id="a4232" model="account.account.template">
             <field name="name">Crédits d'acceptation</field>
             <field name="code">4232</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a423" name="parent_id"/>
         </record>
         <record id="a424" model="account.account.template">
             <field name="name">Autres emprunts</field>
             <field name="code">424</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a42" name="parent_id"/>
         </record>
@@ -3394,21 +3400,21 @@
         <record id="a4250" model="account.account.template">
             <field name="name">Fournisseurs</field>
             <field name="code">4250</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a425" name="parent_id"/>
         </record>
         <record id="a4251" model="account.account.template">
             <field name="name">Effets à payer</field>
             <field name="code">4251</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a425" name="parent_id"/>
         </record>
         <record id="a426" model="account.account.template">
             <field name="name">Cautionnements reçus en numéraires</field>
             <field name="code">426</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a42" name="parent_id"/>
         </record>
@@ -3422,28 +3428,28 @@
         <record id="a4290" model="account.account.template">
             <field name="name">Entreprises liées</field>
             <field name="code">4290</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a429" name="parent_id"/>
         </record>
         <record id="a4291" model="account.account.template">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">4291</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a429" name="parent_id"/>
         </record>
         <record id="a4292" model="account.account.template">
             <field name="name">Administrateurs, gérants, associés</field>
             <field name="code">4292</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a429" name="parent_id"/>
         </record>
         <record id="a4299" model="account.account.template">
             <field name="name">Autres dettes</field>
             <field name="code">4299</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a429" name="parent_id"/>
         </record>
@@ -3457,35 +3463,35 @@
         <record id="a430" model="account.account.template">
             <field name="name">Etablissements de crédit. Emprunts en compte à terme fixe</field>
             <field name="code">430</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a43" name="parent_id"/>
         </record>
         <record id="a431" model="account.account.template">
             <field name="name">Etablissements de crédit. Promesses</field>
             <field name="code">431</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a43" name="parent_id"/>
         </record>
         <record id="a432" model="account.account.template">
             <field name="name">Etablissements de crédit. Crédits d'acceptation</field>
             <field name="code">432</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a43" name="parent_id"/>
         </record>
         <record id="a433" model="account.account.template">
             <field name="name">Etablissements de crédit. Dettes en compte courant</field>
             <field name="code">433</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a43" name="parent_id"/>
         </record>
         <record id="a439" model="account.account.template">
             <field name="name">Autres emprunts</field>
             <field name="code">439</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a43" name="parent_id"/>
         </record>
@@ -3521,7 +3527,7 @@
         <record id="a44001" model="account.account.template">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">44001</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4400" name="parent_id"/>
         </record>
@@ -3535,35 +3541,35 @@
         <record id="a44010" model="account.account.template">
             <field name="name">Fournisseurs belges</field>
             <field name="code">44010</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4401" name="parent_id"/>
         </record>
         <record id="a44011" model="account.account.template">
             <field name="name">Fournisseurs CEE</field>
             <field name="code">44011</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4401" name="parent_id"/>
         </record>
         <record id="a44012" model="account.account.template">
             <field name="name">Fournisseurs importation</field>
             <field name="code">44012</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4401" name="parent_id"/>
         </record>
         <record id="a4402" model="account.account.template">
             <field name="name">Dettes envers les coparticipants</field>
             <field name="code">4402</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a440" name="parent_id"/>
         </record>
         <record id="a4403" model="account.account.template">
             <field name="name">Fournisseurs - retenues de garanties</field>
             <field name="code">4403</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a440" name="parent_id"/>
         </record>
@@ -3584,14 +3590,14 @@
         <record id="a44100" model="account.account.template">
             <field name="name">Entreprises liées</field>
             <field name="code">44100</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4410" name="parent_id"/>
         </record>
         <record id="a44101" model="account.account.template">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">44101</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4410" name="parent_id"/>
         </record>
@@ -3605,42 +3611,42 @@
         <record id="a44110" model="account.account.template">
             <field name="name">Fournisseurs belges</field>
             <field name="code">44110</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4411" name="parent_id"/>
         </record>
         <record id="a44111" model="account.account.template">
             <field name="name">Fournisseurs CEE</field>
             <field name="code">44111</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4411" name="parent_id"/>
         </record>
         <record id="a44112" model="account.account.template">
             <field name="name">Fournisseurs importation</field>
             <field name="code">44112</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4411" name="parent_id"/>
         </record>
         <record id="a444" model="account.account.template">
             <field name="name">Factures à recevoir</field>
             <field name="code">444</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a44" name="parent_id"/>
         </record>
         <record id="a446" model="account.account.template">
             <field name="name">Acomptes reçus</field>
             <field name="code">446</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a44" name="parent_id"/>
         </record>
         <record id="a448" model="account.account.template">
             <field name="name">Compensations fournisseurs</field>
             <field name="code">448</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a44" name="parent_id"/>
         </record>
@@ -3661,21 +3667,21 @@
         <record id="a4501" model="account.account.template">
             <field name="name">à 4504 Impôts sur le résultat</field>
             <field name="code">4501</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a450" name="parent_id"/>
         </record>
         <record id="a4505" model="account.account.template">
             <field name="name">à 4507 Autres impôts en Belgique</field>
             <field name="code">4505</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a450" name="parent_id"/>
         </record>
         <record id="a4508" model="account.account.template">
             <field name="name">Impôts à l'étranger</field>
             <field name="code">4508</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a450" name="parent_id"/>
         </record>
@@ -3724,21 +3730,21 @@
         <record id="a4511" model="account.account.template">
             <field name="name">T.V.A. déductible</field>
             <field name="code">4511</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a451" name="parent_id"/>
         </record>
         <record id="a4512" model="account.account.template">
             <field name="name">Compte courant administration T.V.A.</field>
             <field name="code">4512</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a451" name="parent_id"/>
         </record>
         <record id="a4518" model="account.account.template">
             <field name="name">Taxe d'égalisation due</field>
             <field name="code">4518</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a451" name="parent_id"/>
         </record>
@@ -3752,7 +3758,7 @@
         <record id="a4520" model="account.account.template">
             <field name="name">Autres impôts sur le résultat</field>
             <field name="code">4520</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a452" name="parent_id"/>
         </record>
@@ -3766,35 +3772,35 @@
         <record id="a45250" model="account.account.template">
             <field name="name">Précompte immobilier</field>
             <field name="code">45250</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4525" name="parent_id"/>
         </record>
         <record id="a45251" model="account.account.template">
             <field name="name">Impôts communaux à payer</field>
             <field name="code">45251</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4525" name="parent_id"/>
         </record>
         <record id="a45252" model="account.account.template">
             <field name="name">Impôts provinciaux à payer</field>
             <field name="code">45252</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4525" name="parent_id"/>
         </record>
         <record id="a45253" model="account.account.template">
             <field name="name">Autres impôts et taxes à payer</field>
             <field name="code">45253</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4525" name="parent_id"/>
         </record>
         <record id="a4528" model="account.account.template">
             <field name="name">Impôts et taxes à l'étranger</field>
             <field name="code">4528</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a452" name="parent_id"/>
         </record>
@@ -3808,35 +3814,35 @@
         <record id="a4530" model="account.account.template">
             <field name="name">Précompte professionnel retenu sur rémunérations</field>
             <field name="code">4530</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a453" name="parent_id"/>
         </record>
         <record id="a4531" model="account.account.template">
             <field name="name">Précompte professionnel retenu sur tantièmes</field>
             <field name="code">4531</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a453" name="parent_id"/>
         </record>
         <record id="a4532" model="account.account.template">
             <field name="name">Précompte mobilier retenu sur dividendes attribués</field>
             <field name="code">4532</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a453" name="parent_id"/>
         </record>
         <record id="a4533" model="account.account.template">
             <field name="name">Précompte mobilier retenu sur intérêts payés</field>
             <field name="code">4533</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a453" name="parent_id"/>
         </record>
         <record id="a4538" model="account.account.template">
             <field name="name">Autres précomptes retenus</field>
             <field name="code">4538</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a453" name="parent_id"/>
         </record>
@@ -3850,35 +3856,35 @@
         <record id="a4540" model="account.account.template">
             <field name="name">Arriérés</field>
             <field name="code">4540</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a454" name="parent_id"/>
         </record>
         <record id="a4541" model="account.account.template">
             <field name="name">1er trimestre</field>
             <field name="code">4541</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a454" name="parent_id"/>
         </record>
         <record id="a4542" model="account.account.template">
             <field name="name">2ème trimestre</field>
             <field name="code">4542</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a454" name="parent_id"/>
         </record>
         <record id="a4543" model="account.account.template">
             <field name="name">3ème trimestre</field>
             <field name="code">4543</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a454" name="parent_id"/>
         </record>
         <record id="a4544" model="account.account.template">
             <field name="name">4ème trimestre</field>
             <field name="code">4544</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a454" name="parent_id"/>
         </record>
@@ -3892,28 +3898,28 @@
         <record id="a4550" model="account.account.template">
             <field name="name">Administrateurs, gérants et commissaires</field>
             <field name="code">4550</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a455" name="parent_id"/>
         </record>
         <record id="a4551" model="account.account.template">
             <field name="name">Direction</field>
             <field name="code">4551</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a455" name="parent_id"/>
         </record>
         <record id="a4552" model="account.account.template">
             <field name="name">Employés</field>
             <field name="code">4552</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a455" name="parent_id"/>
         </record>
         <record id="a4553" model="account.account.template">
             <field name="name">Ouvriers</field>
             <field name="code">4553</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a455" name="parent_id"/>
         </record>
@@ -3927,21 +3933,21 @@
         <record id="a4560" model="account.account.template">
             <field name="name">Direction</field>
             <field name="code">4560</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a456" name="parent_id"/>
         </record>
         <record id="a4561" model="account.account.template">
             <field name="name">Employés</field>
             <field name="code">4561</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a456" name="parent_id"/>
         </record>
         <record id="a4562" model="account.account.template">
             <field name="name">Ouvriers</field>
             <field name="code">4562</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a456" name="parent_id"/>
         </record>
@@ -3955,21 +3961,21 @@
         <record id="a4590" model="account.account.template">
             <field name="name">Provision pour gratifications de fin d'année</field>
             <field name="code">4590</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a459" name="parent_id"/>
         </record>
         <record id="a4591" model="account.account.template">
             <field name="name">Départs de personnel</field>
             <field name="code">4591</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a459" name="parent_id"/>
         </record>
         <record id="a4592" model="account.account.template">
             <field name="name">Oppositions sur rémunérations</field>
             <field name="code">4592</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a459" name="parent_id"/>
         </record>
@@ -3983,49 +3989,49 @@
         <record id="a45930" model="account.account.template">
             <field name="name">Assurance loi</field>
             <field name="code">45930</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4593" name="parent_id"/>
         </record>
         <record id="a45931" model="account.account.template">
             <field name="name">Assurance salaire garanti </field>
             <field name="code">45931</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4593" name="parent_id"/>
         </record>
         <record id="a45932" model="account.account.template">
             <field name="name">Assurance groupe </field>
             <field name="code">45932</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4593" name="parent_id"/>
         </record>
         <record id="a45933" model="account.account.template">
             <field name="name">Assurances individuelles</field>
             <field name="code">45933</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4593" name="parent_id"/>
         </record>
         <record id="a4594" model="account.account.template">
             <field name="name">Caisse d'assurances sociales pour travailleurs indépendants</field>
             <field name="code">4594</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a459" name="parent_id"/>
         </record>
         <record id="a4597" model="account.account.template">
             <field name="name">Dettes et provisions sociales diverses</field>
             <field name="code">4597</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a459" name="parent_id"/>
         </record>
         <record id="a46" model="account.account.template">
             <field name="name">ACOMPTES RECUS SUR COMMANDES</field>
             <field name="code">46</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4" name="parent_id"/>
         </record>
@@ -4039,28 +4045,28 @@
         <record id="a470" model="account.account.template">
             <field name="name">Dividendes et tantièmes d'exercices antérieurs</field>
             <field name="code">470</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a47" name="parent_id"/>
         </record>
         <record id="a471" model="account.account.template">
             <field name="name">Dividendes de l'exercice</field>
             <field name="code">471</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a47" name="parent_id"/>
         </record>
         <record id="a472" model="account.account.template">
             <field name="name">Tantièmes de l'exercice</field>
             <field name="code">472</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a47" name="parent_id"/>
         </record>
         <record id="a473" model="account.account.template">
             <field name="name">Autres allocataires</field>
             <field name="code">473</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a47" name="parent_id"/>
         </record>
@@ -4074,49 +4080,49 @@
         <record id="a480" model="account.account.template">
             <field name="name">Obligations et coupons échus</field>
             <field name="code">480</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
         <record id="a481" model="account.account.template">
             <field name="name">Actionnaires - capital à rembourser</field>
             <field name="code">481</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
         <record id="a482" model="account.account.template">
             <field name="name">Participation du personnel à payer</field>
             <field name="code">482</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
         <record id="a483" model="account.account.template">
             <field name="name">Acomptes reçus d'autres tiers à moins d'un an</field>
             <field name="code">483</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
         <record id="a486" model="account.account.template">
             <field name="name">Emballages et matériel consignés</field>
             <field name="code">486</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
         <record id="a488" model="account.account.template">
             <field name="name">Cautionnements reçus en numéraires</field>
             <field name="code">488</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
         <record id="a489" model="account.account.template">
             <field name="name">Autres dettes diverses</field>
             <field name="code">489</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a48" name="parent_id"/>
         </record>
@@ -4130,7 +4136,7 @@
         <record id="a490" model="account.account.template">
             <field name="name">Charges à reporter</field>
             <field name="code">490</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a49" name="parent_id"/>
         </record>
@@ -4151,21 +4157,21 @@
         <record id="a49100" model="account.account.template">
             <field name="name">Ristournes, rabais à obtenir</field>
             <field name="code">49100</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4910" name="parent_id"/>
         </record>
         <record id="a49101" model="account.account.template">
             <field name="name">Commissions à obtenir</field>
             <field name="code">49101</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4910" name="parent_id"/>
         </record>
         <record id="a49102" model="account.account.template">
             <field name="name">Autres produits d'exploitation</field>
             <field name="code">49102</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4910" name="parent_id"/>
         </record>
@@ -4179,21 +4185,21 @@
         <record id="a49110" model="account.account.template">
             <field name="name">Intérêts courus et non échus sur prêts et débits</field>
             <field name="code">49110</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4911" name="parent_id"/>
         </record>
         <record id="a49111" model="account.account.template">
             <field name="name">Autres produits financiers</field>
             <field name="code">49111</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a4911" name="parent_id"/>
         </record>
         <record id="a492" model="account.account.template">
             <field name="name">Charges à imputer</field>
             <field name="code">492</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a49" name="parent_id"/>
         </record>
@@ -4207,14 +4213,14 @@
         <record id="a4930" model="account.account.template">
             <field name="name">Produits d'exploitation à reporter</field>
             <field name="code">4930</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a493" name="parent_id"/>
         </record>
         <record id="a4931" model="account.account.template">
             <field name="name">Produits financiers à reporter</field>
             <field name="code">4931</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a493" name="parent_id"/>
         </record>
@@ -4228,21 +4234,21 @@
         <record id="a4990" model="account.account.template">
             <field name="name">Compte d'attente</field>
             <field name="code">4990</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a499" name="parent_id"/>
         </record>
         <record id="a4991" model="account.account.template">
             <field name="name">Compte de répartition périodique des charges</field>
             <field name="code">4991</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a499" name="parent_id"/>
         </record>
         <record id="a4999" model="account.account.template">
             <field name="name">Transferts d'exercice</field>
             <field name="code">4999</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tiers_payable"/>
             <field ref="a499" name="parent_id"/>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 041515da436..91af27db4ad 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -87,7 +87,7 @@ class marketing_campaign(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'object_id': fields.many2one('ir.model', 'Resource', required=True,
-                                      help="Choose the model on which you want \
+                                      help="Choose the resource on which you want \
 this campaign to be run"),
         'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
                                             domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3909540c710..e86434b93fa 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -67,7 +67,7 @@ class mrp_workcenter(osv.osv):
 
         if product_id:
             cost = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            value = {'costs_hour' :cost.standard_price}
+            value = {'costs_hour': cost.standard_price}
         return {'value': value}
 
 mrp_workcenter()
@@ -111,8 +111,8 @@ class mrp_routing_workcenter(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing work centers."),
         'cycle_nbr': fields.float('Number of Cycles', required=True,
-            help="Number of iterations this work center has to do in the specified operation of the routing."),
-        'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work center to achieve the operation of the specified routing."),
+            help="Number of iterations this work Center has to do in the specified operation of the routing."),
+        'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work Center to achieve the operation of the specified routing."),
         'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True, ondelete='cascade',
              help="Routing indicates all the workcenters used, for how long and/or cycles." \
                 "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
@@ -664,7 +664,7 @@ class mrp_production(osv.osv):
         """
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id, context=context)
-        
+
         final_product_todo = []
 
         produced_qty = 0
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index 390186e3d10..157674fdb10 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/i18n/ar.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index 04976878fa6..0ad2362f409 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index 2bef268aaef..103699ee04e 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/i18n/bs.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index 0b677dcd681..bd4fbb1032a 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index 2d426f9cba5..e5b66d3aaa7 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/i18n/cs.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index d6ba1ac3c9e..d15d9cedeaf 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 7688c7e190d..70ec48da774 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/i18n/el.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index bfc9ac647ee..38801fde47d 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -1266,7 +1266,7 @@ msgstr "Pago punto de venta"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
 msgstr "Salidas de caja"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index 6355a79ea5a..2fa5fef4f10 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index e96515dcf23..d9f11f4b3df 100644
--- a/addons/point_of_sale/i18n/es_EC.po
+++ b/addons/point_of_sale/i18n/es_EC.po
@@ -276,6 +276,11 @@ msgstr "Dates"
 msgid "Max Discount(%)"
 msgstr "Max Discount(%)"
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr "Sortie de caisse"
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index 7898efc3db1..9263144b098 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.po
@@ -294,6 +294,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index cd54faa033c..eee9bf1f5a2 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index bf1eb64f7a9..377972b9af9 100644
--- a/addons/point_of_sale/i18n/hi.po
+++ b/addons/point_of_sale/i18n/hi.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 40d3c847046..0725196e774 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index a13330328da..f3affe6e206 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index c8c5d384668..24d7e252fd4 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index f20cc49d548..65bd298c8fd 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 91b09653a6f..f578797a759 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/i18n/ko.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 64b4f0d18f8..fb8f9aa0d72 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index f476d55e9f5..16f2c781cb3 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/i18n/mn.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index 745551703d8..87187143e48 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 3e7efcbd3fc..733ed2a1ab5 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.po
@@ -276,11 +276,15 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
-
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index 0f6f5bd6fb0..171803f71a6 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/i18n/pl.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 51312468261..f490d80e071 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -1258,7 +1258,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index df1545e4c7c..9dd5fb154a4 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.po
@@ -276,6 +276,11 @@ msgstr "Datas"
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index f2adbe4a87b..dede1dc2d08 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 07538704428..0f3e83842a4 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index f25a971c7df..07f84f65e9e 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index 790a612f13e..d7f2a3b5cc4 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/i18n/sl.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index 13846a83501..95e08e8b49d 100644
--- a/addons/point_of_sale/i18n/sq.po
+++ b/addons/point_of_sale/i18n/sq.po
@@ -277,6 +277,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 99c890a8983..479f9da1352 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -277,6 +277,11 @@ msgstr "Datumi"
 msgid "Max Discount(%)"
 msgstr "Max Popust(%)"
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr "Gotovina Van"
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index eee53599f88..69f5581b7f4 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/i18n/tlh.po
@@ -276,6 +276,11 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 7e1b11f03b9..c0a8145a11c 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -276,11 +276,17 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
 
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 3204913915e..e857d239276 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.po
@@ -276,11 +276,17 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
 
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index ce6e444364e..b5e1a770b9f 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/i18n/vi.po
@@ -277,11 +277,17 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr "Chiết khấu tối đa (%)"
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
 
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index dc5087b57c1..889a42397d3 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -276,11 +276,17 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
 
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index e48c31783dc..cfa1f2f5dec 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/i18n/zh_HK.po
@@ -277,11 +277,17 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
 
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index 4a2cd47b0c8..0ed629718e1 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.po
@@ -276,11 +276,17 @@ msgstr ""
 msgid "Max Discount(%)"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
 msgstr ""
 
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index fa2de26f4e8..167f9658185 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -159,12 +159,13 @@ class pos_order(osv.osv):
                 'amount_return':0.0,
                 'amount_tax':0.0,
             }
-            val = 0.0
+            val = val1 = 0.0
             cur = order.pricelist_id.currency_id
             for payment in order.statement_ids:
                 res[order.id]['amount_paid'] +=  payment.amount
                 res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
             for line in order.lines:
+                val1 += line.price_subtotal_incl
                 if order.price_type != 'tax_excluded':
                     res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
@@ -174,7 +175,8 @@ class pos_order(osv.osv):
                 elif line.qty != 0.0:
                     for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.qty,  line.product_id, line.order_id.partner_id)['taxes']:
                         val += c.get('amount', 0.0)
-                    res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
+            res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
+            res[order.id]['amount_total'] = res[order.id]['amount_tax'] + cur_obj.round(cr, uid, cur, val1)
         return res
 
     def _sale_journal_get(self, cr, uid, context=None):
@@ -248,7 +250,7 @@ class pos_order(osv.osv):
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_total': fields.function(_amount_total, method=True, string='Total'),
+        'amount_total': fields.function(_amount_all, method=True, string='Total', multi='all'),
         'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_return': fields.function(_amount_all, 'Returned', method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
@@ -991,14 +993,10 @@ class pos_order_line(osv.osv):
                     if line.qty == 0.0:
                         res[line.id][f] = 0.0
                         continue
-                    computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
-                    for tax in computed_taxes:
-                        tax_amount += tax['amount']
-                    if line.discount!=0.0:
-                        res[line.id][f] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-                    else:
-                        res[line.id][f] = line.price_unit * line.qty
-                    res[line.id][f] += tax_amount
+                    price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+                    computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, price, line.qty)
+                    cur = line.order_id.pricelist_id.currency_id
+                    res[line.id][f] = self.pool.get('res.currency').round(cr, uid, cur, computed_taxes['total'])
         return res
 
     def price_by_product_multi(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 3bd817b1797..4647b1e66a7 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.box.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sortie de caisse">
+                <form string="Output Operation">
 				    	<separator string="Please fill these fields for entries to the box:" colspan="4"/>
 				    	<field name="name"/>
 				    	<field name="journal_id"/>
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 9d495f86ef9..3a6e3336472 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -214,7 +214,6 @@ class procurement_order(osv.osv):
         report = []
         offset = 0
         ids = [1]
-        newdate = datetime.today()
         if automatic:
             self.create_automatic_op(cr, uid, context=context)
         while ids:
@@ -241,7 +240,7 @@ class procurement_order(osv.osv):
                     if op.product_id.type not in ('consu'):
                         if op.procurement_draft_ids:
                         # Check draft procurement related to this order point
-                            pro_ids = map(lambda x:x.id, op.procurement_draft_ids or [])
+                            pro_ids = [x.id for x in op.procurement_draft_ids]
                             cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
                             procure_datas = cr.dictfetchall()
                             to_generate = qty
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b92abe65dd2..0ff14a6ca10 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -92,13 +92,12 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Base Prices" colspan="2"/>
+                                <field groups="base.group_extended" name="cost_method"/>
                                 <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                 <field name="list_price"/>
                                 <newline/>
                                 <field name="price_margin" groups="product.group_product_variant"/>
                                 <field name="price_extra" groups="product.group_product_variant"/>
-                                <newline/>
-                                <field groups="base.group_extended" name="cost_method"/>
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index c1430566abe..61137a5e51e 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -49,6 +49,8 @@ class product_margin(osv.osv_memory):
 
             @return:
         """
+        if context is None:
+            context = {}
         mod_obj = self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
         id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
@@ -62,9 +64,14 @@ class product_margin(osv.osv_memory):
         #get the current product.margin object to obtain the values from it
         product_margin_obj = self.browse(cr, uid, ids, context=context)[0]
 
+        context = {'invoice_state' : product_margin_obj.invoice_state}
+        if product_margin_obj.from_date:
+            context.update({'date_from': product_margin_obj.from_date})
+        if product_margin_obj.to_date:
+            context.update({'date_to': product_margin_obj.to_date})
         return {
             'name': _('Product Margins'),
-            'context':{'date_from':product_margin_obj.from_date,'date_to':product_margin_obj.to_date,'invoice_state' : product_margin_obj.invoice_state},
+            'context': context,
             'view_type': 'form',
             "view_mode": 'tree,form,graph',
             'res_model':'product.product',
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index da8d84e364f..efda3d91136 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -8,16 +8,16 @@
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1" />
 
-        <menuitem id="menu_purhase_config_purchase" name="Configuration"
+        <menuitem id="menu_purchase_config_purchase" name="Configuration"
             parent="base.menu_purchase_root" sequence="100"/>
 
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
-            parent="menu_purhase_config_purchase" sequence="2"/>
+            parent="menu_purchase_config_purchase" sequence="2"/>
 
         <menuitem
             action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
-            parent="menu_purhase_config_purchase" sequence="1"/>
+            parent="menu_purchase_config_purchase" sequence="1"/>
 
 
         <!--supplier addresses action-->
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 6978a0bb072..bf7d238790a 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -27,7 +27,7 @@
     The base module to manage quotations and sales orders.
 
     * Workflow with validation steps:
-        - Quotation -> Sale order -> Invoice
+        - Quotation -> Sales order -> Invoice
     * Invoicing methods:
         - Invoice on order (before or after shipping)
         - Invoice on delivery
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index 6ed2db9718e..dbffb3f7ade 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -101,7 +101,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,picking_ids:0
 msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 9c3e1758484..e2c016966d8 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -981,7 +981,7 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is the list of picking list that have been generated for this invoice"
+msgid "This is a list of picking that has been generated for this sale order"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index 2af015b607a..a6c08c8f151 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/i18n/sr@latin.po
@@ -1098,8 +1098,8 @@ msgstr "Naruceno Dana"
 #. module: sale
 #: help:sale.order,picking_ids:0
 msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj račun"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index eb4386304ac..b688f2aeb7f 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -20,8 +20,8 @@
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirmed sale order to invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Sales Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Confirmed sales order to invoice.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="account.process_process_invoiceprocess0"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -32,8 +32,8 @@
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Sales Order Requisition&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Drives procurement orders for every sales order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
             <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@@ -45,7 +45,7 @@
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Draft state of sale order&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Draft state of sales order&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -55,7 +55,7 @@
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Sales Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Drives procurement and invoicing&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='manual'&quot;&quot;&quot;" name="model_states"/>
@@ -67,7 +67,7 @@
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;One Procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;One Procurement order for each sales order line and for each of the components.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="procurement.process_process_procurementprocess0"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
@@ -136,7 +136,7 @@
         <record id="process_transition_confirmquotation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The salesman confirms the quotation. The state of the sale order becomes 'In progress' or 'Manual in progress'.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_quotation0"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
@@ -145,7 +145,7 @@
         <record id="process_transition_saleprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
         </record>
@@ -153,7 +153,7 @@
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
@@ -186,15 +186,15 @@
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;For every sales order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
 
         <record id="process_transition_saleinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;From a sale order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Depending on the Invoicing control of the sale order, the invoice can be based on delivered or on ordered quantities. Thus, a sale order can generates an invoice or a delivery order as soon as it is confirmed by the salesman.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a sales order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_order0"/>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e3e9f6c599b..a789ad287f3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -30,7 +30,7 @@ import netsvc
 
 class sale_shop(osv.osv):
     _name = "sale.shop"
-    _description = "Sale Shop"
+    _description = "Sales Shop"
     _columns = {
         'name': fields.char('Shop Name', size=64, required=True),
         'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True),
@@ -47,7 +47,7 @@ sale_shop()
 
 class sale_order(osv.osv):
     _name = "sale.order"
-    _description = "Sale Order"
+    _description = "Sales Order"
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -190,7 +190,7 @@ class sale_order(osv.osv):
         'name': fields.char('Order Reference', size=64, required=True,
             readonly=True, states={'draft': [('readonly', False)]}, select=True),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'origin': fields.char('Source document', size=64, help="Reference of the document that generated this sale order request."),
+        'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
             ('draft', 'Quotation'),
@@ -201,41 +201,41 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
         'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
-        'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale order is confirmed"),
+        'create_date': fields.date('Creation Date', readonly=True, help="Date on which sales order is created."),
+        'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sales order is confirmed."),
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
-        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sale order"),
+        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
         'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
-        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sale order"),
+        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
 
-        'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction"),
+        'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
         'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
             'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
             ('prepaid', 'Payment Before Delivery'),
             ('manual', 'Shipping & Manual Invoice'),
-            ('postpaid', 'Invoice on Order After Delivery'),
-            ('picking', 'Invoice from Delivery'),
+            ('postpaid', 'Invoice On Order After Delivery'),
+            ('picking', 'Invoice From The Picking'),
         ], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
                     help="""The Shipping Policy is used to synchronise invoice and delivery operations.
-  - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
+  - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
   - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
-  - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
-  - The 'Invoice from the picking' choice is used to create an invoice during the picking process."""),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current sale order"),
-        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sale order"),
+  - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
+  - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."""),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist for current sales order."),
+        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
-        'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
-        'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
-        'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"),
+        'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
+        'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is a list of picking that has been generated for this sales order."),
+        'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
-            fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid"),
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
         'note': fields.text('Notes'),
 
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
@@ -243,19 +243,19 @@ class sale_order(osv.osv):
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
-            multi='sums', help="The amount without tax"),
+            multi='sums', help="The amount without tax."),
         'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
-            multi='sums', help="The tax amount"),
+            multi='sums', help="The tax amount."),
         'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
-            multi='sums', help="The total amount"),
+            multi='sums', help="The total amount."),
 
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
@@ -284,7 +284,7 @@ class sale_order(osv.osv):
             if s['state'] in ['draft', 'cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sales Order(s) which are already confirmed !'))
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
     def onchange_shop_id(self, cr, uid, ids, shop_id):
@@ -310,7 +310,7 @@ class sale_order(osv.osv):
             wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
             wf_service.trg_create(uid, 'sale.order', inv_id, cr)
         for (id,name) in self.name_get(cr, uid, ids):
-            message = _("The sale order '%s' has been set in draft state.") %(name,)
+            message = _("The sales order '%s' has been set in draft state.") %(name,)
             self.log(cr, uid, id, message)
         return True
 
@@ -367,7 +367,7 @@ class sale_order(osv.osv):
 
     #FIXME: the method should return the list of invoices created (invoice_ids)
     # and not the id of the last invoice created (res). The problem is that we
-    # cannot change it directly since the method is called by the sale order
+    # cannot change it directly since the method is called by the sales order
     # workflow and I suppose it expects a single id...
     def _inv_get(self, cr, uid, order, context=None):
         return {}
@@ -382,7 +382,7 @@ class sale_order(osv.osv):
         journal_ids = journal_obj.search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], limit=1)
         if not journal_ids:
             raise osv.except_osv(_('Error !'),
-                _('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
+                _('There is no sales journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
         a = order.partner_id.property_account_receivable.id
         pay_term = order.payment_term and order.payment_term.id or False
         invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
@@ -548,7 +548,7 @@ class sale_order(osv.osv):
                 if vals:
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], vals, context=context)
             #
-            # Update the sale order state.
+            # Update the sales order state.
             #
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state': 'progress'}, context=context)
@@ -559,26 +559,33 @@ class sale_order(osv.osv):
         if context is None:
             context = {}
         sale_order_line_obj = self.pool.get('sale.order.line')
+        proc_obj = self.pool.get('procurement.order')
         for sale in self.browse(cr, uid, ids, context=context):
             for pick in sale.picking_ids:
                 if pick.state not in ('draft', 'cancel'):
                     raise osv.except_osv(
-                        _('Could not cancel sale order !'),
-                        _('You must first cancel all picking attached to this sale order.'))
+                        _('Could not cancel sales order !'),
+                        _('You must first cancel all picking attached to this sales order.'))
+                if pick.state == 'cancel':
+                    for mov in pick.move_lines:
+                        proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
+                        if proc_ids:
+                            for proc in proc_ids:
+                                wf_service.trg_validate(uid, 'procurement.order', proc, 'button_check', cr)
             for r in self.read(cr, uid, ids, ['picking_ids']):
                 for pick in r['picking_ids']:
                     wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
             for inv in sale.invoice_ids:
                 if inv.state not in ('draft', 'cancel'):
                     raise osv.except_osv(
-                        _('Could not cancel this sale order !'),
-                        _('You must first cancel all invoices attached to this sale order.'))
+                        _('Could not cancel this sales order !'),
+                        _('You must first cancel all invoices attached to this sales order.'))
             for r in self.read(cr, uid, ids, ['invoice_ids']):
                 for inv in r['invoice_ids']:
                     wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
             sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line],
                     {'state': 'cancel'})
-            message = _("The sale order '%s' has been cancelled.") % (sale.name,)
+            message = _("The sales order '%s' has been cancelled.") % (sale.name,)
             self.log(cr, uid, sale.id, message)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
@@ -590,7 +597,7 @@ class sale_order(osv.osv):
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
             self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
-            message = _("The quotation '%s' has been converted to a sale order.") % (o.name,)
+            message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
             self.log(cr, uid, o.id, message)
         return True
 
@@ -643,6 +650,8 @@ class sale_order(osv.osv):
     def action_ship_create(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         picking_id = False
+        move_obj = self.pool.get('stock.move')
+        proc_obj = self.pool.get('procurement.order')
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for order in self.browse(cr, uid, ids, context={}):
             proc_ids = []
@@ -694,6 +703,7 @@ class sale_order(osv.osv):
                         'note': line.notes,
                         'company_id': order.company_id.id,
                     })
+
                 if line.product_id:
                     proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'name': line.name,
@@ -714,6 +724,15 @@ class sale_order(osv.osv):
                     })
                     proc_ids.append(proc_id)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
+                    if order.state == 'shipping_except':
+                        for pick in order.picking_ids:
+                            for move in pick.move_lines:
+                                if move.state == 'cancel':
+                                    mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
+                                    if mov_ids:
+                                        for mov in move_obj.browse(cr, uid, mov_ids):
+                                            move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                                            proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
 
             val = {}
             for proc_id in proc_ids:
@@ -724,6 +743,7 @@ class sale_order(osv.osv):
 
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
+                val['shipped'] = False
 
                 if (order.order_policy == 'manual'):
                     for line in order.order_line:
@@ -812,11 +832,11 @@ class sale_order_line(osv.osv):
         return res
 
     _name = 'sale.order.line'
-    _description = 'Sale Order Line'
+    _description = 'Sales Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
         'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
@@ -839,12 +859,12 @@ class sale_order_line(osv.osv):
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
-                help='* The \'Draft\' state is set when the related sale order in draft state. \
-                    \n* The \'Confirmed\' state is set when the related sale order is confirmed. \
-                    \n* The \'Exception\' state is set when the related sale order is set as exception. \
-                    \n* The \'Done\' state is set when the sale order line has been picked. \
-                    \n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
-        'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
+                help='* The \'Draft\' state is set when the related sales order in draft state. \
+                    \n* The \'Confirmed\' state is set when the related sales order is confirmed. \
+                    \n* The \'Exception\' state is set when the related sales order is set as exception. \
+                    \n* The \'Done\' state is set when the sales order line has been picked. \
+                    \n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
+        'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
@@ -938,12 +958,12 @@ class sale_order_line(osv.osv):
     def button_cancel(self, cr, uid, ids, context=None):
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
-                raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
+                raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sales order line that has already been invoiced !'))
             for move_line in line.move_ids:
                 if move_line.state != 'cancel':
                     raise osv.except_osv(
-                            _('Could not cancel sale order line!'),
-                            _('You must first cancel stock moves attached to this sale order line.'))
+                            _('Could not cancel sales order line!'),
+                            _('You must first cancel stock moves attached to this sales order line.'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def button_confirm(self, cr, uid, ids, context=None):
@@ -986,7 +1006,7 @@ class sale_order_line(osv.osv):
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
         if not  partner_id:
-            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
+            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sales form !\nPlease set one customer before choosing a product.'))
         warning = {}
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
@@ -1098,7 +1118,7 @@ class sale_order_line(osv.osv):
             warning = {
                 'title': 'No Pricelist !',
                 'message':
-                    'You have to select a pricelist or a customer in the sale form !\n'
+                    'You have to select a pricelist or a customer in the sales form !\n'
                     'Please set one before choosing a product.'
                 }
         else:
@@ -1132,10 +1152,12 @@ class sale_order_line(osv.osv):
         return res
 
     def unlink(self, cr, uid, ids, context=None):
-        """Allows to delete sale order lines in draft,cancel states"""
+        if context is None:
+            context = {}
+        """Allows to delete sales order lines in draft,cancel states"""
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ['draft', 'cancel']:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !') %(rec.state,))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))
         return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
 
 sale_order_line()
@@ -1158,7 +1180,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')
-        ], 'Steps To Deliver a Sale Order', required=True,
+        ], 'Steps To Deliver a Sales Order', required=True,
            help="By default, OpenERP is able to manage complex routing and paths "\
            "of products in your warehouse and partner locations. This will configure "\
            "the most common and simple methods to deliver products to the customer "\
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index f2ebe3af020..655dfc3b9bf 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -5,10 +5,10 @@
     Requests Links
     -->
         <record id="req_link_sale_order" model="res.request.link">
-            <field name="name">Sale Order</field>
+            <field name="name">Sales Order</field>
             <field name="object">sale.order</field>
         </record>
-        
+
         <!--
     Resource: sale.shop
     -->
@@ -18,8 +18,8 @@
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
             <field model="res.company" name="company_id" search="[]"/>
         </record>
-        
+
         <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
index 8a500a9395c..dadd1942940 100644
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -4,12 +4,12 @@
 
         <!-- Sequences for sale.order -->
         <record id="seq_type_sale_order" model="ir.sequence.type">
-            <field name="name">Sale Order</field>
+            <field name="name">Sales Order</field>
             <field name="code">sale.order</field>
         </record>
 
         <record id="seq_sale_order" model="ir.sequence">
-            <field name="name">Sale Order</field>
+            <field name="name">Sales Order</field>
             <field name="code">sale.order</field>
             <field name="prefix">SO</field>
             <field name="padding">3</field>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 95a23024412..421cb36c440 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -33,28 +33,28 @@
             <field name="type">make_to_stock</field>
         </record>
 
-        <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sale order is correctly computed">
+        <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sales order is correctly computed">
             <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed"/>
         </assert>
 
         <workflow action="order_confirm" model="sale.order" ref="test_order_1"/>
 
-        <assert id="test_order_1" model="sale.order" string="the sale order is now in 'Manual in progress' state">
+        <assert id="test_order_1" model="sale.order" string="the sales order is now in 'Manual in progress' state">
             <test expr="state">manual</test>
         </assert>
 
         <workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_root"/>
 
-        <assert id="test_order_1" model="sale.order" string="the sale order is now in progress">
+        <assert id="test_order_1" model="sale.order" string="the sales order is now in progress">
             <test expr="state">progress</test>
         </assert>
 
         <!-- Treat generated invoice -->
-        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a corresponding invoice">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order has now a corresponding invoice">
             <test expr="len(invoice_ids) == 1"/>
         </assert>
 
-        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's has the same amount and is currently a draft">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order's has the same amount and is currently a draft">
             <test expr="invoice_ids[0].amount_untaxed == amount_untaxed"/>
             <test expr="invoice_ids[0].amount_total == amount_total"/>
             <test expr="invoice_ids[0].state">draft</test>
@@ -75,16 +75,16 @@
             <value eval="ref('account.bank_journal')"/>
         </function>
 
-        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's invoice is now paid">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order's invoice is now paid">
             <test expr="invoice_ids[0].state">paid</test>
         </assert>
 
         <!-- Treat generated picking -->
-        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending picking">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order has now a correspending picking">
             <test expr="len(picking_ids) == 1"/>
         </assert>
 
-        <assert id="test_order_1" model="sale.order" severity="error" string="the sale order's picking will be sent to the good address and is already confirmed">
+        <assert id="test_order_1" model="sale.order" severity="error" string="the sales order's picking will be sent to the good address and is already confirmed">
             <test expr="picking_ids[0].address_id == partner_shipping_id"/>
             <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
         </assert>
@@ -94,7 +94,7 @@
             <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/>
         </function>
 
-        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's picking is now assigned">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order's picking is now assigned">
             <test expr="picking_ids[0].state">assigned</test>
         </assert>
 
@@ -107,14 +107,14 @@
             <value eval="obj(ref('test_order_1')).picking_ids[0].id" model="sale.order"/>
         </workflow>
 
-        <assert id="test_order_1" model="sale.order" string="the sale order's picking is now done">
+        <assert id="test_order_1" model="sale.order" string="the sales order's picking is now done">
             <test expr="picking_ids[0].state">done</test>
         </assert>
 
         <!-- Run all schedulers -->
         <function model="procurement.order" name="run_scheduler"/>
 
-        <assert id="test_order_1" model="sale.order" string="the sale order is now done">
+        <assert id="test_order_1" model="sale.order" string="the sales order is now done">
             <test expr="state">done</test>
         </assert>
     </data>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c83f1cd3e45..ef03df4fe53 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -14,7 +14,7 @@
             <field name="model">sale.shop</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sale Shop">
+                <form string="Sales Shop">
                     <field name="name" select="1"/>
                     <field name="warehouse_id" required="1" select="1" widget="selection"/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
@@ -30,7 +30,7 @@
             <field name="model">sale.shop</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sale Shop">
+                <tree string="Sales Shop">
                     <field name="name"/>
                     <field name="warehouse_id"/>
                     <field name="pricelist_id"/>
@@ -122,7 +122,7 @@
                                 groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
-                                <form string="Sale Order Lines">
+                                <form string="Sales Order Lines">
                                     <notebook>
                                         <page string="Order Line">
                                             <field colspan="4"
@@ -245,8 +245,9 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
-                            <separator colspan="4" string="Related Invoices"/>
+                            <separator colspan="4" string="Invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
+                            <separator colspan="4" string="Packings"/>
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -430,7 +431,7 @@
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sale Order Lines related to a Sales Order of mine"/>
+                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
@@ -474,7 +475,7 @@
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     </field>
                     <newline />
                     <group expand="0" string="Group By..." colspan="9" col="8">
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index e41f87cce79..923c91fb3aa 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -51,3 +51,5 @@
 "access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
 "access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
+"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,0,0,0
+"access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 42208e1cfd9..fea84e019c4 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -24,7 +24,7 @@ from osv import osv, fields
 class stock_move(osv.osv):
     _inherit = 'stock.move'
     _columns = {
-        'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True, readonly=True),
+        'sale_line_id': fields.many2one('sale.order.line', 'Sales Order Line', ondelete='set null', select=True, readonly=True),
     }
 
     def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
@@ -37,7 +37,7 @@ stock_move()
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     _columns = {
-        'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True),
+        'sale_id': fields.many2one('sale.order', 'Sales Order', ondelete='set null', select=True),
     }
     _defaults = {
         'sale_id': False
@@ -97,7 +97,7 @@ class stock_picking(osv.osv):
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
         sale_line_obj = self.pool.get('sale.order.line')
         if move_line.sale_line_id:
-            sale_line_obj.write(cursor, user, [move_line.sale_line_id.id], 
+            sale_line_obj.write(cursor, user, [move_line.sale_line_id.id],
                                     {
                                         'invoiced': True,
                                         'invoice_lines': [(4, invoice_line_id)],
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 4075c523cb9..238982f46cb 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -12,7 +12,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="stock_move_sale" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -24,7 +24,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <!--
         <act_window
             domain="[('sale_id', '=', active_id)]"
@@ -33,14 +33,14 @@
             res_model="stock.picking"
             src_model="sale.order"
             context="{'contact_display': 'partner'}" />
-       
+
        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="stock.view_picking_out_tree"/>
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
-        
+
         <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -48,9 +48,9 @@
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
         -->
-        
-        <!-- Adding Sale Order Reference to outgoing picking -->
-        
+
+        <!-- Adding Sales Order Reference to outgoing picking -->
+
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
             <field name="name">Outgoing picking Inherited</field>
             <field name="model">stock.picking</field>
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index b17b12c1e8f..de845b5b34d 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -108,7 +108,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'})
 
         if not invoices:
-            raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
+            raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
 
         return {}
 
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 774759c82c7..6562af09258 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <record id="view_sale_order_line_make_invoice" model="ir.ui.view">
-            <field name="name">Sale OrderLine Make Invoice</field>
+            <field name="name">Sales OrderLine Make Invoice</field>
             <field name="model">sale.order.line.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -23,7 +23,7 @@
             <field name="view_id" ref="view_sale_order_line_make_invoice"/>
             <field name="target">new</field>
         </record>
-        
+
         <record model="ir.values" id="sale_order_line_make_invoice">
             <field name="model_id" ref="sale.model_sale_order_line" />
             <field name="object" eval="1" />
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index f414c2475d5..55047d011e5 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -24,7 +24,7 @@ import netsvc
 
 class sale_make_invoice(osv.osv_memory):
     _name = "sale.make.invoice"
-    _description = "Sale Make Invoice"
+    _description = "Sales Make Invoice"
     _columns = {
         'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'),
         'invoice_date': fields.date('Invoice Date'),
@@ -32,16 +32,16 @@ class sale_make_invoice(osv.osv_memory):
     _defaults = {
         'grouped': False
     }
-    
+
     def view_init(self, cr, uid, fields_list, context=None):
         if context is None:
             context = {}
-        record_id = context and context.get('active_id', False)     
+        record_id = context and context.get('active_id', False)
         order = self.pool.get('sale.order').browse(cr, uid, record_id, context=context)
         if order.state == 'draft':
-            raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
+            raise osv.except_osv(_('Warning !'),'You can not create invoice when sales order is not confirmed.')
         return False
-    
+
     def make_invoices(self, cr, uid, ids, context=None):
         order_obj = self.pool.get('sale.order')
         mod_obj = self.pool.get('ir.model.data')
@@ -53,11 +53,11 @@ class sale_make_invoice(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
         for id in context.get(('active_ids'), []):
             wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
-            
+
         for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context):
             for i in o.invoice_ids:
                 newinv.append(i.id)
-        
+
         res = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_invoice_filter')
 
         return {
@@ -69,9 +69,9 @@ class sale_make_invoice(osv.osv_memory):
             'view_id': False,
             'context': "{'type': 'out_refund'}",
             'type': 'ir.actions.act_window',
-            'search_view_id': res and res[1] or False                
+            'search_view_id': res and res[1] or False
         }
 
-sale_make_invoice()        
+sale_make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 29e87259903..4b1e4511021 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -23,7 +23,7 @@ from tools.translate import _
 
 class sale_advance_payment_inv(osv.osv_memory):
     _name = "sale.advance.payment.inv"
-    _description = "Sale Advance Payment Invoice"
+    _description = "Sales Advance Payment Invoice"
     _columns = {
         'product_id': fields.many2one('product.product', 'Advance Product', required=True,
             help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
@@ -61,7 +61,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 if sale.order_policy == 'postpaid':
                     raise osv.except_osv(
                         _('Error'),
-                        _("You cannot make an advance on a sale order \
+                        _("You cannot make an advance on a sales order \
                              that is defined as 'Automatic Invoice after delivery'."))
                 val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
                         uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
@@ -136,7 +136,7 @@ sale_advance_payment_inv()
 
 class sale_open_invoice(osv.osv_memory):
     _name = "sale.open.invoice"
-    _description = "Sale Open Invoice"
+    _description = "Sales Open Invoice"
 
     def open_invoice(self, cr, uid, ids, context=None):
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 506177d08f4..cdb5893a6f3 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -28,7 +28,7 @@ class crm_make_sale(osv.osv_memory):
     """ Make sale  order for crm """
 
     _name = "crm.make.sale"
-    _description = "Make sale"
+    _description = "Make sales"
 
     def _selectPartner(self, cr, uid, context=None):
         """
@@ -59,9 +59,9 @@ class crm_make_sale(osv.osv_memory):
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of crm make sale' ids
+        @param ids: List of crm make sales' ids
         @param context: A standard dictionary for contextual values
-        @return: Dictionary value of created sale order.
+        @return: Dictionary value of created sales order.
         """
         if context is None:
             context = {}
@@ -73,7 +73,7 @@ class crm_make_sale(osv.osv_memory):
 
         for make in self.browse(cr, uid, ids, context=context):
             partner = make.partner_id
-            partner_addr = partner_obj.address_get(cr, uid, [partner.id], 
+            partner_addr = partner_obj.address_get(cr, uid, [partner.id],
                     ['default', 'invoice', 'delivery', 'contact'])
             pricelist = partner.property_product_pricelist.id
             fpos = partner.property_account_position and partner.property_account_position.id or False
@@ -82,23 +82,23 @@ class crm_make_sale(osv.osv_memory):
                 if not partner and case.partner_id:
                     partner = case.partner_id
                     fpos = partner.property_account_position and partner.property_account_position.id or False
-                    partner_addr = partner_obj.address_get(cr, uid, [partner.id], 
+                    partner_addr = partner_obj.address_get(cr, uid, [partner.id],
                             ['default', 'invoice', 'delivery', 'contact'])
                     pricelist = partner.property_product_pricelist.id
                 if False in partner_addr.values():
                     raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!'))
 
                 vals = {
-                    'origin': _('Opportunity: %s') % str(case.id), 
-                    'section_id': case.section_id and case.section_id.id or False, 
-                    'shop_id': make.shop_id.id, 
-                    'partner_id': partner.id, 
-                    'pricelist_id': pricelist, 
-                    'partner_invoice_id': partner_addr['invoice'], 
-                    'partner_order_id': partner_addr['contact'], 
-                    'partner_shipping_id': partner_addr['delivery'], 
-                    'date_order': time.strftime('%Y-%m-%d'), 
-                    'fiscal_position': fpos, 
+                    'origin': _('Opportunity: %s') % str(case.id),
+                    'section_id': case.section_id and case.section_id.id or False,
+                    'shop_id': make.shop_id.id,
+                    'partner_id': partner.id,
+                    'pricelist_id': pricelist,
+                    'partner_invoice_id': partner_addr['invoice'],
+                    'partner_order_id': partner_addr['contact'],
+                    'partner_shipping_id': partner_addr['delivery'],
+                    'date_order': time.strftime('%Y-%m-%d'),
+                    'fiscal_position': fpos,
                 }
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
@@ -115,22 +115,22 @@ class crm_make_sale(osv.osv_memory):
                 return {}
             if len(new_ids)<=1:
                 value = {
-                    'domain': str([('id', 'in', new_ids)]), 
-                    'view_type': 'form', 
-                    'view_mode': 'form', 
-                    'res_model': 'sale.order', 
-                    'view_id': False, 
-                    'type': 'ir.actions.act_window', 
+                    'domain': str([('id', 'in', new_ids)]),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'sale.order',
+                    'view_id': False,
+                    'type': 'ir.actions.act_window',
                     'res_id': new_ids and new_ids[0]
                 }
             else:
                 value = {
-                    'domain': str([('id', 'in', new_ids)]), 
-                    'view_type': 'form', 
-                    'view_mode': 'tree,form', 
-                    'res_model': 'sale.order', 
-                    'view_id': False, 
-                    'type': 'ir.actions.act_window', 
+                    'domain': str([('id', 'in', new_ids)]),
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'res_model': 'sale.order',
+                    'view_id': False,
+                    'type': 'ir.actions.act_window',
                     'res_id': new_ids
                 }
             return value
@@ -141,14 +141,14 @@ class crm_make_sale(osv.osv_memory):
         return shop and shop[0] or False
 
     _columns = {
-        'shop_id': fields.many2one('sale.shop', 'Shop', required=True), 
-        'partner_id': fields.many2one('res.partner', 'Customer', required=True), 
-        'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'), 
+        'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
+        'partner_id': fields.many2one('res.partner', 'Customer', required=True),
+        'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
     }
     _defaults = {
-         'shop_id': _get_shop_id, 
-         'close': True, 
-         'partner_id': _selectPartner, 
+         'shop_id': _get_shop_id,
+         'close': True,
+         'partner_id': _selectPartner,
     }
 
 crm_make_sale()
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 37fc05fd066..54a3f7afd95 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Sales & Purchases',
     'description': """
-    The sale journal modules allows you to categorise your
+    The sales journal modules allows you to categorise your
     sales and deliveries (picking lists) between different journals.
     This module is very helpful for bigger companies that
     works by departments.
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index b8490c02fc9..f8db8d5d868 100755
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -27,7 +27,7 @@
     This module provides features to improve the layout of the Sales Order.
 
     It gives you the possibility to
-        * order all the lines of an sale order
+        * order all the lines of a sales order
         * add titles, comment lines, sub total lines
         * draw horizontal lines and put page breaks
 
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index f5b036d143f..853783c218d 100755
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -31,7 +31,7 @@ class sale_order_line(osv.osv):
             if line.layout_type == 'article':
                 return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context)
         return res
-    
+
     def invoice_line_create(self, cr, uid, ids, context=None):
         new_ids = []
         list_seq = []
@@ -101,7 +101,7 @@ class sale_order_line(osv.osv):
         return super(sale_order_line, self).copy(cr, uid, id, default, context)
 
     _order = "order_id, sequence asc"
-    _description = "Sale Order line"
+    _description = "Sales Order line"
     _inherit = "sale.order.line"
     _columns = {
         'layout_type': fields.selection([
@@ -112,7 +112,7 @@ class sale_order_line(osv.osv):
                 ('line', 'Separator Line'),
                 ('break', 'Page Break'),]
             ,'Layout Type', select=True, required=True),
-        'sequence': fields.integer('Sequence Number'),
+        'sequence': fields.integer('Layout Sequence'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
         'product_uom': fields.many2one('product.uom', 'Product UoM'),
@@ -153,4 +153,4 @@ class sale_order(osv.osv):
 
 sale_order()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 3eac7eb1f3f..af901928037 100755
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -4,18 +4,6 @@
              <record id="sale.action_order_line_tree2" model="ir.actions.act_window">
                <field name="domain">[('layout_type','=', 'article')]</field>
              </record>
-		<record model="ir.ui.view" id="view_order_line_form2_inherit_1">
-			<field name="name">sale.order.line.form2.inherit_1</field>
-			<field name="model">sale.order.line</field>
-			<field name="inherit_id" ref="sale.view_order_line_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/group/field[@name='name']" position="before">
-					<field name="layout_type" select="1" on_change="onchange_sale_order_line_view(layout_type)" />
-					<field name="sequence"/>
-				</xpath>
-			</field>
-		</record>
 
 		<record model="ir.ui.view" id="view_order_form_inherit_1">
 			<field name="name">sale.order.form.inherit_1</field>
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index cd327834185..97fd3b29cef 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -64,7 +64,7 @@ class sale_order(osv.osv):
         return result
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price"),
+        'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
     }
 
 sale_order()
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index e9eb4cbba92..9c3404ada74 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Sales & MRP',
     'description': """
-    This module provides facility to the user to install mrp and sale modules
+    This module provides facility to the user to install mrp and sales modules
     at a time. It is basically used when we want to keep track of production
     orders generated from sales order.
     It adds sales name and sales Reference on production order
@@ -35,7 +35,7 @@
     'depends': ['mrp', 'sale'],
     'init_xml': [],
     'update_xml': [
-        'security/sale_mrp_security.xml',          
+        'security/sale_mrp_security.xml',
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index cea62f19fa0..ae1df1eb946 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -26,7 +26,7 @@ class mrp_production(osv.osv):
     _inherit = 'mrp.production'
 
     def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context=None):
-        """ Finds reference of sale order for production order.
+        """ Finds reference of sales order for production order.
         @param field_names: Names of fields.
         @param arg: User defined arguments
         @return: Dictionary of values.
@@ -70,8 +70,8 @@ class mrp_production(osv.osv):
         return res
 
     _columns = {
-        'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
-        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
+        'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
+        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
     }
 
 mrp_production()
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index 5a66d8111de..ff6e85645f8 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Sale Order Dates',
+    'name': 'Sales Order Dates',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
     'description': """
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index d5d3eeca405..60595903ab8 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -54,9 +54,9 @@ class sale_order_dates(osv.osv):
         return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"),
-        'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales"),
-        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created"),
+        'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
+        'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales."),
+        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
     }
 
 sale_order_dates()
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 72f1bb58efd..c28dadead65 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1941,10 +1941,10 @@ class stock_move(osv.osv):
         journal_id = accounts['stock_journal']
 
         if acc_dest == acc_variation:
-            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product is same.'))
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same.'))
 
         if acc_src == acc_variation:
-            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product is same.'))
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same.'))
 
         if not acc_src:
             raise osv.except_osv(_('Error!'),  _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
@@ -2463,7 +2463,7 @@ class stock_inventory(osv.osv):
         return self.pool.get('stock.move').create(cr, uid, move_vals)
 
     def action_done(self, cr, uid, ids, context=None):
-        """ Finished the inventory
+        """ Finish the inventory
         @return: True
         """
         if context is None:
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 9b3e126edcc..00ffda73565 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -26,51 +26,60 @@
             <field name="name">Physical Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-stock</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_locations_partner" model="stock.location">
             <field name="name">Partner Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-partner</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_locations_virtual" model="stock.location">
             <field name="name">Virtual Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-mrp</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_scrapped" model="stock.location">
             <field name="name">Scrapped</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="scrap_location">True</field>
             <field name="usage">inventory</field>
+            <field name="company_id"></field>
         </record>
 
         <record id="location_inventory" model="stock.location">
             <field name="name">Inventory loss</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">inventory</field>
+            <field name="company_id"></field>
         </record>
         <record id="location_procurement" model="stock.location">
             <field name="name">Procurements</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">procurement</field>
+            <field name="company_id"></field>
         </record>
         <record id="location_production" model="stock.location">
             <field name="name">Production</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">production</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_suppliers" model="stock.location">
             <field name="name">Suppliers</field>
             <field name="location_id" ref="stock_location_locations_partner"/>
             <field name="usage">supplier</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_customers" model="stock.location">
             <field name="name">Customers</field>
             <field name="location_id" ref="stock_location_locations_partner"/>
             <field name="usage">customer</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_company" model="stock.location">
-            <field model="res.company" name="name" search="[]" use="name"/>
+            <field name="name" model="res.company" search="[]" use="name"/>
             <field name="usage">view</field>
             <field name="location_id" ref="stock_location_locations"/>
         </record>