diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 430e1597e9dffce4186be04b2d2c6f174efa116c..4cc2ed897860e2dda2452cfb7b437d11f468fd09 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -142,7 +142,7 @@ class account_bank_statement(osv.osv): 'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10), 'account.bank.statement.line': (_get_statement, ['amount'], 10), }, - string="Balance", help='Balance as calculated based on Starting Balance and transaction lines'), + string="Computed Balance", help='Balance as calculated based on Starting Balance and transaction lines'), 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), 'line_ids': fields.one2many('account.bank.statement.line', 'statement_id', 'Statement lines', diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index a74053bc694739401193c5f4767f72b337c4f76b..7e9b6e2407c00c98a946ea07b216e5f72c069c72 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -197,7 +197,7 @@ class account_cash_statement(osv.osv): 'account.bank.statement.line': (_get_statement, ['amount'], 10), }), 'closing_date': fields.datetime("Closed On"), - 'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Balance', help="Closing balance based on cashBox"), + 'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Closing Balance', help="Closing balance based on cashBox"), 'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'), 'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'), 'user_id': fields.many2one('res.users', 'Responsible', required=False), @@ -312,7 +312,7 @@ class account_cash_statement(osv.osv): if journal_type == 'bank': return super(account_cash_statement, self).balance_check(cr, uid, cash_id, journal_type, context) if not self._equal_balance(cr, uid, cash_id, context): - raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !')) + raise osv.except_osv(_('Error !'), _('The closing balance should be the same than the computed balance !')) return True def statement_close(self, cr, uid, ids, journal_type='bank', context=None): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index ee6a6fa143078927f25cb3520a57fcbb22e49514..e5dbbedb9de48ab78d97d975193075daf0e76c02 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2638,8 +2638,8 @@ action = pool.get('res.config').next(cr, uid, [], context) </group> <group col="2" colspan="2"> <separator string="Closing Balance" colspan="4"/> - <field name="balance_end" string="Calculated Balance"/> - <field name="balance_end_cash" string="CashBox Balance"/> + <field name="balance_end"/> + <field name="balance_end_cash"/> </group> </group> <group col="8" colspan="4"> diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py index 873f35f024d0e1d8e5d6899295e260e2c8b5c45f..0b417d8b1cfb44e4364c1d2ae11d1a30f253bfc5 100644 --- a/addons/point_of_sale/wizard/pos_box_entries.py +++ b/addons/point_of_sale/wizard/pos_box_entries.py @@ -42,6 +42,8 @@ def get_journal(self, cr, uid, context=None): obj_ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', j_ids)], context=context) res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context) res = [(r['journal_id']) for r in res] + if not len(res): + raise osv.except_osv(_('Error !'), _('You do not have any open cash register. You must create a payment method or open a cash register.')) res.insert(0, ('', '')) return res