Skip to content
Extraits de code Groupes Projets
Valider 0232cd50 rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[MIG] Migration -> 13.0

parent 7a608a7f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!1Refactor reports
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{ {
'name': 'Le Filament - Training', 'name': 'Le Filament - Training',
'version': '10.0.1.0', 'version': '13.0.1.0.0',
'summary': 'Training sessions managment', 'summary': 'Training sessions managment',
'license': 'AGPL-3', 'license': 'AGPL-3',
'author': 'LE FILAMENT', 'author': 'LE FILAMENT',
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
'security/training_security.xml', 'security/training_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'data/training_data.xml', 'data/training_data.xml',
'views/account_invoice_view.xml', 'views/account_move_view.xml',
'views/assets.xml', 'views/assets.xml',
'views/partner_view.xml', 'views/partner_view.xml',
'views/sale_order_view.xml', 'views/sale_order_view.xml',
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# © 2019 Le Filament (<http://www.le-filament.com>) # © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import account_invoice from . import account_move
from . import partner from . import partner
from . import sale_order from . import sale_order
from . import training_course from . import training_course
......
...@@ -6,7 +6,7 @@ from odoo import models, fields ...@@ -6,7 +6,7 @@ from odoo import models, fields
class AccountInvoiceTraining(models.Model): class AccountInvoiceTraining(models.Model):
_inherit = ['account.invoice'] _inherit = ['account.move']
training_id = fields.Many2one( training_id = fields.Many2one(
comodel_name='training.training', comodel_name='training.training',
......
...@@ -86,7 +86,7 @@ class Training(models.Model): ...@@ -86,7 +86,7 @@ class Training(models.Model):
inverse_name='training_id', inverse_name='training_id',
string='Commandes',) string='Commandes',)
invoice_ids = fields.One2many( invoice_ids = fields.One2many(
comodel_name='account.invoice', comodel_name='account.move',
inverse_name='training_id', inverse_name='training_id',
string='Factures',) string='Factures',)
state = fields.Selection( state = fields.Selection(
...@@ -123,7 +123,6 @@ class Training(models.Model): ...@@ -123,7 +123,6 @@ class Training(models.Model):
}) })
return record return record
@api.multi
def write(self, vals): def write(self, vals):
record = super(Training, self).write(vals) record = super(Training, self).write(vals)
if vals.get('course_id', False): if vals.get('course_id', False):
...@@ -171,23 +170,19 @@ class Training(models.Model): ...@@ -171,23 +170,19 @@ class Training(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Buttons # Buttons
# ------------------------------------------------------ # ------------------------------------------------------
@api.multi
def action_valid(self): def action_valid(self):
for training in self: for training in self:
training.state = 'current' training.state = 'current'
training.agreement_number = self.env['ir.sequence'].next_by_code('training.training') training.agreement_number = self.env['ir.sequence'].next_by_code('training.training')
@api.multi
def action_done(self): def action_done(self):
for training in self: for training in self:
training.state = 'done' training.state = 'done'
@api.multi
def action_draft(self): def action_draft(self):
for training in self: for training in self:
training.state = 'draft' training.state = 'draft'
@api.multi
def _get_trainers(self): def _get_trainers(self):
for training in self: for training in self:
trainers = training.session_ids.mapped('user_id') trainers = training.session_ids.mapped('user_id')
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<!-- Client Form View --> <!-- Client Form View -->
<record id="account_invoice_training_form_view" model="ir.ui.view"> <record id="account_invoice_training_form_view" model="ir.ui.view">
<field name="name">Invoice Training Form View</field> <field name="name">Invoice Training Form View</field>
<field name="model">account.invoice</field> <field name="model">account.move</field>
<field name="inherit_id" ref="account.invoice_form"/> <field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml" > <field name="arch" type="xml" >
<xpath expr="//page[@name='other_info']/group/group[2]" position="inside"> <xpath expr="//page[@name='other_info']/group/group[2]" position="inside">
<field <field
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<odoo> <odoo>
<data> <data>
<template id="training_assets" inherit_id="web.report_assets_editor"> <template id="training_assets" inherit_id="web.report_assets_common">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/> <link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/>
</xpath> </xpath>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<field name="model">sale.order</field> <field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/> <field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml" > <field name="arch" type="xml" >
<xpath expr="//group[@name='sale_pay']" position="inside"> <xpath expr="//group[@name='sale_info']" position="inside">
<field <field
name="training_id" name="training_id"
domain="['|', ('customer_id', '=', partner_id), ('opco_id', '=', partner_id)]" domain="['|', ('customer_id', '=', partner_id), ('opco_id', '=', partner_id)]"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter