audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] account_statement_ext_point_of_sale: Fix PEP8

Browse Source
This commit is contained in:
Pedro M. Baeza
2014-08-04 17:53:54 +02:00
parent d0a06fd532
commit 66af054fa3
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
account_statement_ext_point_of_sale/point_of_sale.py
View File

@@ -18,8 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.addons.point_of_sale.point_of_sale import pos_session as std_pos_session
from openerp.osv import orm, osv
from openerp.addons.point_of_sale.point_of_sale import pos_session as \
std_pos_session
from openerp.osv import orm
from openerp.tools.translate import _
if not hasattr(std_pos_session, '_prepare_bank_statement'):
@@ -34,7 +35,8 @@ if not hasattr(std_pos_session, '_prepare_bank_statement'):
# which _inherit pos.session
#
# This change has been proposed for merging to fix lp:125375
def mp_prepare_bank_statement(self, cr, uid, pos_config, journal, context=None):
def mp_prepare_bank_statement(self, cr, uid, pos_config, journal,
context=None):
bank_values = {
'journal_id': journal.id,
'user_id': uid,
@@ -47,9 +49,9 @@ if not hasattr(std_pos_session, '_prepare_bank_statement'):
config_id = values.get('config_id', False) or context.get(
'default_config_id', False)
if not config_id:
raise osv.except_osv(_('Error!'),
_("You should assign a Point of Sale to your session."))
raise orm.except_orm(
_('Error!'),
_("You should assign a Point of Sale to your session."))
# journal_id is not required on the pos_config because it does not
# exists at the installation. If nothing is configured at the
# installation we do the minimal configuration. Impossible to do in
@@ -62,26 +64,27 @@ if not hasattr(std_pos_session, '_prepare_bank_statement'):
cr, uid, ['journal_id'], context=context)['journal_id']
if jid:
jobj.write(
cr, uid, [pos_config.id], {'journal_id': jid}, context=context)
cr, uid, [pos_config.id], {'journal_id': jid},
context=context)
else:
raise osv.except_osv(_('error!'),
_("Unable to open the session. You have to assign a sale journal to your point of sale."))
raise orm.except_orm(
_('error!'),
_("Unable to open the session. You have to assign a sale "
"journal to your point of sale."))
# define some cash journal if no payment method exists
if not pos_config.journal_ids:
journal_proxy = self.pool.get('account.journal')
cashids = journal_proxy.search(
cr, uid, [('journal_user', '=', True), ('type', '=', 'cash')], context=context)
cr, uid, [('journal_user', '=', True),
('type', '=', 'cash')], context=context)
if not cashids:
cashids = journal_proxy.search(
cr, uid, [('type', '=', 'cash')], context=context)
if not cashids:
cashids = journal_proxy.search(
cr, uid, [('journal_user', '=', True)], context=context)
jobj.write(
cr, uid, [pos_config.id], {'journal_ids': [(6, 0, cashids)]})
pos_config = jobj.browse(cr, uid, config_id, context=context)
bank_statement_ids = []
for journal in pos_config.journal_ids:
@@ -90,42 +93,39 @@ if not hasattr(std_pos_session, '_prepare_bank_statement'):
statement_id = self.pool.get('account.bank.statement').create(
cr, uid, bank_values, context=context)
bank_statement_ids.append(statement_id)
values.update({
'name': pos_config.sequence_id._next(),
'statement_ids': [(6, 0, bank_statement_ids)],
'config_id': config_id
})
return super(std_pos_session, self).create(cr, uid, values, context=context)
return super(std_pos_session, self).create(cr, uid, values,
context=context)
std_pos_session._prepare_bank_statement = mp_prepare_bank_statement
std_pos_session.create = mp_create
class pos_session(orm.Model):
class PosSession(orm.Model):
_inherit = 'pos.session'
def _prepare_bank_statement(self, cr, uid, pos_config, journal, context=None):
""" Override the function _mp_create. To add the bank profile to the statement
Function That was previously added to pos.session model using monkey patching
def _prepare_bank_statement(self, cr, uid, pos_config, journal,
context=None):
""" Override the function _mp_create. To add the bank profile to the
statement.
Function That was previously added to pos.session model using monkey
patching.
"""
bank_values = super(pos_session, self)._prepare_bank_statement(cr, uid,
pos_config,
journal, context)
user_obj = self.pool.get('res.users')
profile_obj = self.pool.get('account.statement.profile')
bank_values = super(PosSession, self)._prepare_bank_statement(
cr, uid, pos_config, journal, context)
user_obj = self.pool['res.users']
profile_obj = self.pool['account.statement.profile']
user = user_obj.browse(cr, uid, uid, context=context)
defaults = self.pool['account.bank.statement'].default_get(cr, uid,
['profile_id',
'period_id'],
context=context)
profile_ids = profile_obj.search(cr, uid,
[('company_id', '=', user.company_id.id),
('journal_id', '=', bank_values['journal_id'])],
context=context)
defaults = self.pool['account.bank.statement'].default_get(
cr, uid, ['profile_id', 'period_id'], context=context)
profile_ids = profile_obj.search(
cr, uid, [('company_id', '=', user.company_id.id),
('journal_id', '=', bank_values['journal_id'])],
context=context)
if profile_ids:
defaults['profile_id'] = profile_ids[0]
bank_values.update(defaults)