From 08758c950e4d90f95fee6007c9fffd3adc5323da Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 5 Feb 2009 12:35:49 +0530
Subject: [PATCH] Corrections

bzr revid: jvo@tinyerp.com-20090205070549-zxs98m4l0di1st70
---
 addons/account/invoice.py                                     | 2 +-
 addons/account/wizard/wizard_account_chart.py                 | 2 +-
 .../account_balance/wizard/wizard_account_balance_report.py   | 2 +-
 addons/sale/sale.py                                           | 4 ++--
 addons/stock/stock_view.xml                                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a79bf281723..edb44b623e8 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -632,7 +632,7 @@ class account_invoice(osv.osv):
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
             if journal.centralisation:
                 raise osv.except_osv(_('UserError'),
-                        _('Can not create invoice move on centralised journal'))
+                        _('Cannot create invoice move on centralised journal'))
             move = {'ref': inv.number, 'line_id': line, 'journal_id': journal_id, 'date': date}
             period_id=inv.period_id and inv.period_id.id or False
             if not period_id:
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
index 46df6357473..f60dfdcf0a2 100644
--- a/addons/account/wizard/wizard_account_chart.py
+++ b/addons/account/wizard/wizard_account_chart.py
@@ -27,7 +27,7 @@ class wizard_account_chart(wizard.interface):
     _account_chart_arch = '''<?xml version="1.0"?>
     <form string="Account charts">
         <field name="fiscalyear"/>
-        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal year)"/>
+        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
         <field name="target_move"/>
     </form>'''
 
diff --git a/addons/account_balance/wizard/wizard_account_balance_report.py b/addons/account_balance/wizard/wizard_account_balance_report.py
index 97c827c5bb2..0f3280cb553 100644
--- a/addons/account_balance/wizard/wizard_account_balance_report.py
+++ b/addons/account_balance/wizard/wizard_account_balance_report.py
@@ -37,7 +37,7 @@ dates_form = '''<?xml version="1.0"?>
     <notebook tabpos="up">
         <page string="Report Options">
             <separator string="Select Fiscal Year(s)(Maximum Three Years)" colspan="4"/>
-            <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal year)"/>
+            <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
             <field name="fiscalyear" colspan="5" nolabel="1"/>
             <field name="landscape" colspan="4"/>
             <field name="show_columns" colspan="4"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 297dfffa630..a0a5be7c82c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -803,7 +803,7 @@ class sale_order_line(osv.osv):
     def button_cancel(self, cr, uid, ids, context={}):
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
-                raise osv.except_osv(_('Invalid action !'), _('You can not cancel a sale order line that has already been invoiced !'))
+                raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
         return self.write(cr, uid, ids, {'state':'cancel'})
 
     def button_confirm(self, cr, uid, ids, context={}):
@@ -847,7 +847,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):
         if not  partner_id:
-            raise osv.except_osv(_('No Partner !'), _('You have to select a partner in the sale form !\nPlease set one partner before choosing a product.'))
+            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.'))
         warning={}
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 52a3e091c5e..c7e5aa8d0a3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -740,7 +740,7 @@
         <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery"/>
 
         <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
-            <field name="name">Futur Delivery Orders</field>
+            <field name="name">Future Delivery Orders</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>