openerp-dev-web team mailing list archive

["Priyesh \(Open ERP\)" <pso@xxxxxxxxxxx>]

Priyesh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-addons-pso into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-addons-pso/+merge/57649

Usability Improvements.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-addons-pso/+merge/57649
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-bug-addons-pso into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

=== modified file 'account_payment/account_payment.py'
--- account_payment/account_payment.py	2011-02-28 06:09:22 +0000
+++ account_payment/account_payment.py	2011-04-14 10:17:12 +0000
@@ -328,7 +328,7 @@
             required=True, help='Payment amount in the partner currency'),
         'currency': fields.many2one('res.currency','Partner Currency', required=True),
         'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),
-        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank account'),
+        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank Account'),
         'order_id': fields.many2one('payment.order', 'Order', required=True,
             ondelete='cascade', select=True),
         'partner_id': fields.many2one('res.partner', string="Partner", required=True, help='The Ordering Customer'),

=== modified file 'hr_attendance/hr_attendance.py'
--- hr_attendance/hr_attendance.py	2011-02-01 15:50:23 +0000
+++ hr_attendance/hr_attendance.py	2011-04-14 10:17:12 +0000
@@ -29,7 +29,7 @@
     _description = "Action Reason"
     _columns = {
         'name': fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
-        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
+        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action Type"),
     }
     _defaults = {
         'action_type': 'sign_in',
@@ -137,7 +137,7 @@
 
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
-                res['name'] = dt   
+                res['name'] = dt
         id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2011-02-23 14:34:55 +0000
+++ point_of_sale/point_of_sale.py	2011-04-14 10:17:12 +0000
@@ -267,7 +267,7 @@
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
                                 ('tax_excluded','Tax excluded')],
-                                 'Price method', required=True),
+                                 'Price Method', required=True),
         'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),