audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] Replace deprecated workflow calls

Browse Source
This commit is contained in:
Pedro M. Baeza
2014-10-07 11:51:19 +02:00
parent b1b07a417c
commit 7d3b61dbec
9 changed files with 11 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
account_banking_payment_export/models/account_payment.py
View File

@@ -23,8 +23,7 @@
#
##############################################################################
from openerp import models, fields, api, exceptions, _
from openerp import netsvc
from openerp import models, fields, api, exceptions, workflow, _
class PaymentOrder(models.Model):
@@ -70,8 +69,7 @@ class PaymentOrder(models.Model):
_('You can only combine payment orders of the same '
'type'))
# process manual payments
wf_service = netsvc.LocalService('workflow')
for order_id in self.ids:
wf_service.trg_validate(self.env.uid, 'payment.order',
order_id, 'done', self.env.cr)
workflow.trg_validate(self.env.uid, 'payment.order',
order_id, 'done', self.env.cr)
return {}

7
account_banking_payment_export/wizard/bank_payment_manual.py
View File

@@ -27,7 +27,7 @@
bank transfers.
"""
from openerp import models, api, netsvc
from openerp import models, api, workflow
class PaymentManual(models.TransientModel):
@@ -36,8 +36,7 @@ class PaymentManual(models.TransientModel):
@api.multi
def button_ok(self):
wf_service = netsvc.LocalService('workflow')
for order_id in self.env.context.get('active_ids', []):
wf_service.trg_validate(self.env.uid, 'payment.order', order_id,
'done', self.env.cr)
workflow.trg_validate(self.env.uid, 'payment.order', order_id,
'done', self.env.cr)
return {'type': 'ir.actions.act_window_close'}

5
account_banking_sepa_credit_transfer/wizard/export_sepa.py
View File

@@ -23,7 +23,7 @@
from openerp.osv import orm, fields
from openerp.tools.translate import _
from openerp import netsvc
from openerp import workflow
from lxml import etree
@@ -273,7 +273,6 @@ class banking_export_sepa_wizard(orm.TransientModel):
self.pool['banking.export.sepa'].write(
cr, uid, sepa_export.file_id.id, {'state': 'sent'},
context=context)
wf_service = netsvc.LocalService('workflow')
for order in sepa_export.payment_order_ids:
wf_service.trg_validate(uid, 'payment.order', order.id, 'done', cr)
workflow.trg_validate(uid, 'payment.order', order.id, 'done', cr)
return {'type': 'ir.actions.act_window_close'}

5
account_banking_sepa_direct_debit/wizard/export_sdd.py
View File

@@ -23,7 +23,7 @@
from openerp.osv import orm, fields
from openerp.tools.translate import _
from openerp import netsvc
from openerp import workflow
from datetime import datetime
from lxml import etree
@@ -422,9 +422,8 @@ class banking_export_sdd_wizard(orm.TransientModel):
self.pool.get('banking.export.sdd').write(
cr, uid, sepa_export.file_id.id, {'state': 'sent'},
context=context)
wf_service = netsvc.LocalService('workflow')
for order in sepa_export.payment_order_ids:
wf_service.trg_validate(uid, 'payment.order', order.id, 'done', cr)
workflow.trg_validate(uid, 'payment.order', order.id, 'done', cr)
mandate_ids = [line.sdd_mandate_id.id for line in order.line_ids]
self.pool['sdd.mandate'].write(
cr, uid, mandate_ids,

2
account_direct_debit/models/account_move_line.py
View File

@@ -27,7 +27,7 @@ from openerp.osv import fields, orm
class AccountMoveLine(orm.Model):
_inherit = "account.move.line"
def _amount_to_receive(self, cr, uid, ids, name, arg={}, context=None):
def _amount_to_receive(self, cr, uid, ids, name, arg=None, context=None):
"""Return the amount still to receive regarding all the debit orders
(excepting canceled orders).
This is the reverse from amount_to_pay() in

59
account_payment_partner/__openerp__.py
View File

@@ -51,62 +51,3 @@ be filtered per Payment Mode.
'demo': ['demo/partner_demo.xml'],
'installable': True,
}
from openerp import models, fields, api, exceptions
from datetime import datetime
class CrmLead(models.Model):
_inherit = 'crm.lead'
@api.one
@api.constrains('state', 'code')
def _check_code(self):
if self.state == 'won':
if not self.code:
raise exceptions.Warning('Debe poner un código cuando la etapa se pasa a ganado.')
@api.constrains('state', 'code')
def _check_code(self):
for record in self:
if record.state == 'won':
if not record.code:
raise exceptions.Warning('Debe poner un código cuando la etapa se pasa a ganado.')
def do_something(self, vals):
pass
def create(self, vals):
# Complementar valores del create
rec_id = super(CrmLead, self).create(vals)
# Crear registros accesorios
analytic_acc_obj = self.env['account.analytic.account']
analytic_acc_obj.create({'name': vals['name'],
'type': 'project',
'date': datetime.now(),
'project_id': rec_id})
analytic_accs = analytic_acc_obj.search([('type', '=', 'project')],
order='partner_id', limit=1)
analytic_accs.write({'partner_id': 1})
return rec_id
def copy(self, default):
default['name'] = self.name + " (copia)"
return super(CrmLead, self).copy(default)
def search(self, domain):
return {1: {''}, 2: {} }
@api.one
def unlink(self):
if self.state in ('to_invoice', 'done'):
raise exceptions.Warning('No se puede borrar un pedido confirmado.')
super(CrmLead, self).unlink()
return True
def write(self, vals):
if vals.get('state') == 'won':
for record in self:
if not record.code and not vals.get('code'):
raise exceptions.Warning('Debe poner un código cuando la etapa se pasa a ganado.')
return super(CrmLead, self).write(vals)

2
account_payment_partner/models/account_invoice.py
View File

@@ -26,8 +26,6 @@ from openerp import models, fields, api
class AccountInvoice(models.Model):
_inherit = 'account.invoice'
type = fields.Selection('out', 'in')
payment_mode_id = fields.Many2one('payment.mode', string="Payment Mode",
domain="[('type', '=', type)]")

38
account_payment_partner/views/account_invoice.xml
View File

@@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <alexis.delattre@akretion.com>
The licence is in the file __openerp__.py
-->
<openerp>
<data>
<record id="invoice_form" model="ir.ui.view">
<field name="name">account_payment_partner.invoice_form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form" />
<field name="arch" type="xml">
<field name="partner_bank_id" position="after">
<field name="payment_mode_id"/>
</field>
</field>
</record>
<record id="invoice_supplier_form" model="ir.ui.view">
<field name="name">account_payment_partner.invoice_supplier_form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form" />
<field name="arch" type="xml">
<field name="partner_bank_id" position="after">
<field name="payment_mode_id"/>
</field>
</field>
</record>
</data>
</openerp>

31
account_payment_partner/views/partner.xml
View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <alexis.delattre@akretion.com>
The licence is in the file __openerp__.py
-->
<openerp>
<data>
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">account_partner_payment.partner_form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="account.view_partner_property_form" />
<field name="arch" type="xml">
<field name="property_payment_term" position="after">
<field name="customer_payment_mode"
attrs="{'invisible': [('customer', '=', False)]}"/>
</field>
<field name="property_supplier_payment_term" position="after">
<field name="supplier_payment_mode"
attrs="{'invisible': [('supplier', '=', False)]}"/>
</field>
</field>
</record>
</data>
</openerp>