# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+
import time
from osv import osv, fields
import netsvc
-
-class payment_type(osv.osv):
- _name= 'payment.type'
- _description= 'Payment Type'
- _columns= {
- 'name': fields.char('Name', size=64, required=True, help='Payment Type'),
- 'code': fields.char('Code', size=64, required=True, help='Specifies the Code for Payment Type'),
- 'suitable_bank_types': fields.many2many('res.partner.bank.type',
- 'bank_type_payment_type_rel',
- 'pay_type_id', 'bank_type_id',
- 'Suitable bank types')
- }
-
-payment_type()
+from tools.translate import _
class payment_mode(osv.osv):
_name= 'payment.mode'
_description= 'Payment Mode'
- _columns= {
+ _columns = {
'name': fields.char('Name', size=64, required=True, help='Mode of Payment'),
'bank_id': fields.many2one('res.partner.bank', "Bank account",
required=True,help='Bank Account for the Payment Mode'),
'journal': fields.many2one('account.journal', 'Journal', required=True,
- domain=[('type', '=', 'cash')], help='Cash Journal for the Payment Mode'),
+ domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
'company_id': fields.many2one('res.company', 'Company', required=True),
- 'type': fields.many2one('payment.type', 'Payment type', required=True, help='Select the Payment Type for the Payment Mode.'),
}
_defaults = {
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
}
- def suitable_bank_types(self, cr, uid, payment_code=None, context={}):
+
+ def suitable_bank_types(self, cr, uid, payment_code=None, context=None):
"""Return the codes of the bank type that are suitable
for the given payment type code"""
if not payment_code:
return []
- cr.execute(""" select t.code
- from res_partner_bank_type t
- join bank_type_payment_type_rel r on (r.bank_type_id = t.id)
- join payment_type pt on (r.pay_type_id = pt.id)
- join payment_mode pm on (pm.type = pt.id)
- where pm.id = %s """, [payment_code])
+ cr.execute(""" SELECT pb.state
+ FROM res_partner_bank pb
+ JOIN payment_mode pm ON (pm.bank_id = pb.id)
+ WHERE pm.id = %s """, [payment_code])
return [x[0] for x in cr.fetchall()]
payment_mode()
return res
_columns = {
- 'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
- 'reference': fields.char('Reference', size=128, required=1, states={'done':[('readonly',True)]}),
- 'mode': fields.many2one('payment.mode','Payment mode', select=True, required=1, states={'done':[('readonly',True)]}, help='Select the Payment Mode to be applied.'),
+ 'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+ 'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
+ 'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
'state': fields.selection([
('draft', 'Draft'),
- ('open','Confirmed'),
- ('cancel','Cancelled'),
- ('done','Done')], 'State', select=True,
+ ('open', 'Confirmed'),
+ ('cancel', 'Cancelled'),
+ ('done', 'Done')], 'State', select=True,
help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
- 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done':[('readonly',True)]}),
- 'total': fields.function(_total, string="Total", method=True,
- type='float'),
- 'user_id': fields.many2one('res.users', 'User', required=True, states={'done':[('readonly',True)]}),
+ 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
+ 'total': fields.function(_total, string="Total", method=True, type='float'),
+ 'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
'date_prefered': fields.selection([
('now', 'Directly'),
('due', 'Due date'),
('fixed', 'Fixed date')
- ], "Preferred date", change_default=True, required=True, states={'done':[('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+ ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
'date_created': fields.date('Creation date', readonly=True),
'date_done': fields.date('Execution date', readonly=True),
}
_defaults = {
'user_id': lambda self,cr,uid,context: uid,
- 'state': lambda *a: 'draft',
- 'date_prefered': lambda *a: 'due',
+ 'state': 'draft',
+ 'date_prefered': 'due',
'date_created': lambda *a: time.strftime('%Y-%m-%d'),
'reference': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'payment.order'),
}
def set_to_draft(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state':'draft'})
+ self.write(cr, uid, ids, {'state': 'draft'})
wf_service = netsvc.LocalService("workflow")
for id in ids:
+ wf_service.trg_delete(uid, 'payment.order', id, cr)
wf_service.trg_create(uid, 'payment.order', id, cr)
return True
def action_open(self, cr, uid, ids, *args):
+ ir_seq_obj = self.pool.get('ir.sequence')
+
for order in self.read(cr, uid, ids, ['reference']):
if not order['reference']:
- reference = self.pool.get('ir.sequence').get(cr, uid, 'payment.order')
- self.write(cr, uid, order['id'],{'reference':reference})
+ reference = ir_seq_obj.get(cr, uid, 'payment.order')
+ self.write(cr, uid, order['id'], {'reference':reference})
+ return True
+
+ def action_cancel(self, cr, uid, ids, *args):
+ for order in self.browse(cr, uid, ids):
+ for line in order.line_ids:
+ if line.bank_statement_line_id:
+ raise osv.except_osv(_('Warning !'),
+ _("Payment order line '%s' is already imported in Bank statement '%s' (id: %s).") % (
+ line.name, line.bank_statement_line_id.statement_id.name,
+ line.bank_statement_line_id.statement_id.id))
+ self.write(cr, uid, ids, {'state': 'cancel'})
return True
- def set_done(self, cr, uid, id, *args):
- self.write(cr,uid,id,{'date_done': time.strftime('%Y-%m-%d'),
- 'state': 'done',})
+ def set_done(self, cr, uid, ids, *args):
wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'payment.order', id, 'done', cr)
+ self.write(cr, uid, ids, {'date_done': time.strftime('%Y-%m-%d')})
+ wf_service.trg_validate(uid, 'payment.order', ids[0], 'done', cr)
return True
def copy(self, cr, uid, id, default={}, context=None):
default.update({
- 'state':'draft',
+ 'state': 'draft',
'line_ids': [],
'reference': self.pool.get('ir.sequence').get(cr, uid, 'payment.order')
})
return super(payment_order, self).copy(cr, uid, id, default, context=context)
+ def write(self, cr, uid, ids, vals, context=None):
+ if context is None:
+ context = {}
+ payment_line_obj = self.pool.get('payment.line')
+ payment_line_ids = []
+
+ if (vals.get('date_prefered', False) == 'fixed' and not vals.get('date_scheduled', False)) or vals.get('date_scheduled', False):
+ for order in self.browse(cr, uid, ids, context=context):
+ for line in order.line_ids:
+ payment_line_ids.append(line.id)
+ payment_line_obj.write(cr, uid, payment_line_ids, {'date': vals.get('date_scheduled', False)}, context=context)
+ elif vals.get('date_prefered', False) == 'due':
+ vals.update({'date_scheduled': False})
+ for order in self.browse(cr, uid, ids, context=context):
+ for line in order.line_ids:
+ payment_line_obj.write(cr, uid, [line.id], {'date': line.ml_maturity_date}, context=context)
+ elif vals.get('date_prefered', False) == 'now':
+ vals.update({'date_scheduled': False})
+ for order in self.browse(cr, uid, ids, context=context):
+ for line in order.line_ids:
+ payment_line_ids.append(line.id)
+ payment_line_obj.write(cr, uid, payment_line_ids, {'date': False}, context=context)
+ return super(payment_order, self).write(cr, uid, ids, vals, context=context)
+
payment_order()
class payment_line(osv.osv):
_name = 'payment.line'
_description = 'Payment Line'
-
def translate(self, orig):
return {
"due_date": "date_maturity",
def info_owner(self, cr, uid, ids, name=None, args=None, context=None):
if not ids: return {}
+ partner_zip_obj = self.pool.get('res.partner.zip')
+
result = {}
info=''
for line in self.browse(cr, uid, ids, context=context):
- owner=line.order_id.mode.bank_id.partner_id
- result[line.id]=False
+ owner = line.order_id.mode.bank_id.partner_id
+ result[line.id] = False
if owner.address:
for ads in owner.address:
- if ads.type=='default':
- st=ads.street and ads.street or ''
- st1=ads.street2 and ads.street2 or ''
+ if ads.type == 'default':
+ st = ads.street and ads.street or ''
+ st1 = ads.street2 and ads.street2 or ''
if 'zip_id' in ads:
- zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+ zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
else:
- zip=ads.zip and ads.zip or ''
- city= ads.city and ads.city or ''
- zip_city= zip + ' ' + city
- cntry= ads.country_id and ads.country_id.name or ''
- info=owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
- result[line.id]=info
+ zip = ads.zip and ads.zip or ''
+ city = ads.city and ads.city or ''
+ zip_city = zip + ' ' + city
+ cntry = ads.country_id and ads.country_id.name or ''
+ info = owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+ result[line.id] = info
break
return result
def info_partner(self, cr, uid, ids, name=None, args=None, context=None):
if not ids: return {}
+ partner_zip_obj = self.pool.get('res.partner.zip')
result = {}
- info=''
+ info = ''
+
for line in self.browse(cr, uid, ids, context=context):
- result[line.id]=False
+ result[line.id] = False
if not line.partner_id:
break
partner = line.partner_id.name or ''
if line.partner_id.address:
for ads in line.partner_id.address:
- if ads.type=='default':
- st=ads.street and ads.street or ''
- st1=ads.street2 and ads.street2 or ''
+ if ads.type == 'default':
+ st = ads.street and ads.street or ''
+ st1 = ads.street2 and ads.street2 or ''
if 'zip_id' in ads:
- zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+ zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
else:
- zip=ads.zip and ads.zip or ''
- city= ads.city and ads.city or ''
- zip_city= zip + ' ' + city
- cntry= ads.country_id and ads.country_id.name or ''
- info=partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
- result[line.id]=info
+ zip = ads.zip and ads.zip or ''
+ city = ads.city and ads.city or ''
+ zip_city = zip + ' ' + city
+ cntry = ads.country_id and ads.country_id.name or ''
+ info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+ result[line.id] = info
break
return result
def select_by_name(self, cr, uid, ids, name, args, context=None):
if not ids: return {}
-
partner_obj = self.pool.get('res.partner')
+
cr.execute("""SELECT pl.id, ml.%s
- from account_move_line ml
- inner join payment_line pl
- on (ml.id = pl.move_line_id)
- where pl.id IN %%s"""% self.translate(name),
+ FROM account_move_line ml
+ INNER JOIN payment_line pl
+ ON (ml.id = pl.move_line_id)
+ WHERE pl.id IN %%s"""% self.translate(name),
(tuple(ids),))
res = dict(cr.fetchall())
if context is None:
context = {}
res = {}
+
for line in self.browse(cursor, user, ids, context=context):
ctx = context.copy()
ctx['date'] = line.order_id.date_done or time.strftime('%Y-%m-%d')
line.amount_currency, context=ctx)
return res
- def _value_date(self, cursor, user, ids, name, args, context=None):
- if not ids:
- return {}
- res = {}
- for line in self.browse(cursor, user, ids, context=context):
- if line.order_id.date_prefered == 'fixed':
- res[line.id] = line.order_id.date_scheduled
- elif line.order_id.date_prefered == 'due':
- res[line.id] = line.due_date or time.strftime('%Y-%m-%d')
- else:
- res[line.id] = time.strftime('%Y-%m-%d')
- return res
+ def _get_currency(self, cr, uid, context=None):
+ user_obj = self.pool.get('res.users')
+ currency_obj = self.pool.get('res.currency')
+ user = user_obj.browse(cr, uid, uid, context=context)
- def _get_currency(self, cr, uid, context):
- user = self.pool.get('res.users').browse(cr, uid, uid)
if user.company_id:
return user.company_id.currency_id.id
else:
- return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
+ return currency_obj.search(cr, uid, [('rate', '=', 1.0)])[0]
+
+ def _get_date(self, cr, uid, context=None):
+ if context is None:
+ context = {}
+ payment_order_obj = self.pool.get('payment.order')
+ date = False
+
+ if context.get('order_id') and context['order_id']:
+ order = payment_order_obj.browse(cr, uid, context['order_id'], context=context)
+ if order.date_prefered == 'fixed':
+ date = order.date_scheduled
+ else:
+ date = time.strftime('%Y-%m-%d')
+ return date
def _get_ml_inv_ref(self, cr, uid, ids, *a):
- res={}
+ res = {}
for id in self.browse(cr, uid, ids):
res[id.id] = False
if id.move_line_id:
return res
def _get_ml_maturity_date(self, cr, uid, ids, *a):
- res={}
+ res = {}
for id in self.browse(cr, uid, ids):
if id.move_line_id:
res[id.id] = id.move_line_id.date_maturity
else:
- res[id.id] = ""
+ res[id.id] = False
return res
def _get_ml_created_date(self, cr, uid, ids, *a):
- res={}
+ res = {}
for id in self.browse(cr, uid, ids):
if id.move_line_id:
res[id.id] = id.move_line_id.date_created
else:
- res[id.id] = ""
+ res[id.id] = False
return res
_columns = {
'name': fields.char('Your Reference', size=64, required=True),
'communication': fields.char('Communication', size=64, required=True, help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"),
'communication2': fields.char('Communication 2', size=64, help='The successor message of Communication.'),
- 'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id','=', False), ('account_id.type', '=','payable')], help='This Entry Line will be referred for the information of the ordering customer.'),
- 'amount_currency': fields.float('Amount in Partner Currency', digits=(16,2),
+ 'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id', '=', False), ('account_id.type', '=', 'payable')], help='This Entry Line will be referred for the information of the ordering customer.'),
+ 'amount_currency': fields.float('Amount in Partner Currency', digits=(16, 2),
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),
'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"),
- 'create_date': fields.datetime('Created' , readonly=True),
+ 'create_date': fields.datetime('Created', readonly=True),
'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True),
'bank_statement_line_id': fields.many2one('account.bank.statement.line', 'Bank statement line')
}
_defaults = {
'name': lambda obj, cursor, user, context: obj.pool.get('ir.sequence'
).get(cursor, user, 'payment.line'),
- 'state': lambda *args: 'normal',
+ 'state': 'normal',
'currency': _get_currency,
'company_currency': _get_currency,
+ 'date': _get_date,
}
_sql_constraints = [
('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
]
def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
- data={}
+ data = {}
+ move_line_obj = self.pool.get('account.move.line')
- data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False
+ data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False
if move_line_id:
- line = self.pool.get('account.move.line').browse(cr, uid, move_line_id)
- data['amount_currency']=line.amount_to_pay
+ line = move_line_obj.browse(cr, uid, move_line_id, context=context)
+ data['amount_currency'] = line.amount_to_pay
res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency,
company_currency, context)
if res:
data['amount'] = res['value']['amount']
- data['partner_id']=line.partner_id.id
+ data['partner_id'] = line.partner_id.id
temp = line.currency_id and line.currency_id.id or False
if not temp:
if line.invoice:
data['currency'] = temp
# calling onchange of partner and updating data dictionary
- temp_dict=self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type)
+ temp_dict = self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type)
data.update(temp_dict['value'])
- data['reference']=line.ref
+ data['reference'] = line.ref
data['date_created'] = line.date_created
- data['communication']=line.ref
+ data['communication'] = line.ref
if date_prefered == 'now':
#no payment date => immediate payment
data['date'] = line.date_maturity
elif date_prefered == 'fixed':
data['date'] = date_scheduled
-
return {'value': data}
def onchange_amount(self, cr, uid, ids, amount, currency, cmpny_currency, context=None):
if (not amount) or (not cmpny_currency):
- return {'value': {'amount':False}}
+ return {'value': {'amount': False}}
res = {}
currency_obj = self.pool.get('res.currency')
company_amount = currency_obj.compute(cr, uid, currency, cmpny_currency, amount)
return {'value': res}
def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None):
- data={}
- data['info_partner']=data['bank_id']=False
+ data = {}
+ partner_zip_obj = self.pool.get('res.partner.zip')
+ partner_obj = self.pool.get('res.partner')
+ payment_mode_obj = self.pool.get('payment.mode')
+ data['info_partner'] = data['bank_id'] = False
if partner_id:
- part_obj=self.pool.get('res.partner').browse(cr, uid, partner_id)
- partner=part_obj.name or ''
+ part_obj = partner_obj.browse(cr, uid, partner_id, context=context)
+ partner = part_obj.name or ''
if part_obj.address:
for ads in part_obj.address:
- if ads.type=='default':
- st=ads.street and ads.street or ''
- st1=ads.street2 and ads.street2 or ''
+ if ads.type == 'default':
+ st = ads.street and ads.street or ''
+ st1 = ads.street2 and ads.street2 or ''
if 'zip_id' in ads:
- zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
+ zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
else:
- zip=ads.zip and ads.zip or ''
- city= ads.city and ads.city or ''
- zip_city= zip + ' ' + city
+ zip = ads.zip and ads.zip or ''
+ city = ads.city and ads.city or ''
+ zip_city = zip + ' ' + city
- cntry= ads.country_id and ads.country_id.name or ''
- info=partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+ cntry = ads.country_id and ads.country_id.name or ''
+ info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
- data['info_partner']=info
+ data['info_partner'] = info
if part_obj.bank_ids and payment_type:
- bank_type = self.pool.get('payment.mode').suitable_bank_types(cr, uid, payment_type, context=context)
+ bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context)
for bank in part_obj.bank_ids:
if bank.state in bank_type:
data['bank_id'] = bank.id
break
-
return {'value': data}
def fields_get(self, cr, uid, fields=None, context=None):
res['communication2'].setdefault('states', {})
res['communication2']['states']['structured'] = [('readonly', True)]
res['communication2']['states']['normal'] = [('readonly', False)]
-
return res
payment_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
projects / odoo / odoo.git / blobdiff