Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Port hr_expense_sequence to v10
- Loading branch information
1 parent
8d6a3b7
commit de25704
Showing
9 changed files
with
115 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,14 @@ | ||
# -*- encoding: utf-8 -*- | ||
############################################################################## | ||
# For copyright and license notices, see __openerp__.py file in root directory | ||
############################################################################## | ||
# -*- coding: utf-8 -*- | ||
|
||
from . import models | ||
from openerp import SUPERUSER_ID | ||
from odoo import api, SUPERUSER_ID | ||
|
||
|
||
def assign_old_sequences(cr, registry): | ||
expense_obj = registry['hr.expense.expense'] | ||
sequence_obj = registry['ir.sequence'] | ||
expense_ids = expense_obj.search(cr, SUPERUSER_ID, [], order="id") | ||
for expense_id in expense_ids: | ||
expense_obj.write(cr, SUPERUSER_ID, expense_id, | ||
{'number': sequence_obj.get( | ||
cr, SUPERUSER_ID, 'hr.expense')}) | ||
with api.Environment.manage(): | ||
env = api.Environment(cr, SUPERUSER_ID, {}) | ||
expense_obj = env['hr.expense.sheet'] | ||
sequence_obj = env['ir.sequence'] | ||
for expense in expense_obj.search([], order='id'): | ||
expense.write({ | ||
'number': sequence_obj.next_by_code('hr.expense.sheet')}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
<?xml version="1.0"?> | ||
<openerp> | ||
<data noupdate="1"> | ||
<odoo noupdate="1"> | ||
|
||
<record model="ir.sequence.type" id="seq_type_expense"> | ||
<field name="name">Expense sequence</field> | ||
<field name="code">hr.expense</field> | ||
</record> | ||
<record model="ir.sequence" id="seq_expense"> | ||
<field name="name">Expense report sequence</field> | ||
<field name="code">hr.expense.sheet</field> | ||
<field name="padding" eval="4"/> | ||
<field name="prefix">EX</field> | ||
</record> | ||
|
||
<record model="ir.sequence" id="seq_expense"> | ||
<field name="name">Expense sequence</field> | ||
<field name="code">hr.expense</field> | ||
<field name="padding" eval="4"/> | ||
<field name="prefix">EX</field> | ||
</record> | ||
|
||
</data> | ||
</openerp> | ||
</odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,3 @@ | ||
# -*- encoding: utf-8 -*- | ||
############################################################################## | ||
# For copyright and license notices, see __openerp__.py file in root directory | ||
############################################################################## | ||
# -*- coding: utf-8 -*- | ||
|
||
from . import hr_expense_expense | ||
from . import hr_expense_sheet |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) | ||
# Pedro M. Baeza <pedro.baeza@serviciosbaeza.com> | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
||
from odoo import models, fields, api | ||
|
||
|
||
class HrExpenseSheet(models.Model): | ||
_inherit = 'hr.expense.sheet' | ||
|
||
number = fields.Char(required=True, default="/", readonly=True, copy=False) | ||
|
||
@api.model | ||
def create(self, vals): | ||
if vals.get('number', '/') == '/': | ||
number = self.env['ir.sequence'].next_by_code('hr.expense.sheet') | ||
vals['number'] = number | ||
return super(HrExpenseSheet, self).create(vals) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<odoo> | ||
|
||
<template id="report_expense_sheet" inherit_id="hr_expense.report_expense_sheet"> | ||
<xpath expr="//h2" position="replace"> | ||
<h2>Expenses Report <span t-field="o.number"/></h2> | ||
</xpath> | ||
</template> | ||
|
||
</odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,37 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<openerp> | ||
<data> | ||
<odoo> | ||
|
||
<record id="view_expenses_tree_sequence" model="ir.ui.view"> | ||
<field name="name">hr.expense.expense.tree.sequence</field> | ||
<field name="model">hr.expense.expense</field> | ||
<field name="inherit_id" ref="hr_expense.view_expenses_tree"/> | ||
<field name="arch" type="xml"> | ||
<field name="employee_id" position="before"> | ||
<field name="number"/> | ||
</field> | ||
<record id="view_hr_expense_sheet_tree" model="ir.ui.view"> | ||
<field name="name">hr.expense.sheet.tree.sequence</field> | ||
<field name="model">hr.expense.sheet</field> | ||
<field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_tree"/> | ||
<field name="arch" type="xml"> | ||
<field name="name" position="before"> | ||
<field name="number"/> | ||
</field> | ||
</record> | ||
</field> | ||
</record> | ||
|
||
<record id="view_editable_expenses_tree_sequence" model="ir.ui.view"> | ||
<field name="name">hr.expense.expense.tree.sequence</field> | ||
<field name="model">hr.expense.expense</field> | ||
<field name="inherit_id" ref="hr_expense.view_editable_expenses_tree"/> | ||
<field name="arch" type="xml"> | ||
<field name="employee_id" position="before"> | ||
<field name="number"/> | ||
</field> | ||
<record id="view_hr_expense_sheet_form" model="ir.ui.view"> | ||
<field name="name">hr.expense.sheet.form.sequence</field> | ||
<field name="model">hr.expense.sheet</field> | ||
<field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_form"/> | ||
<field name="arch" type="xml"> | ||
<field name="employee_id" position="before"> | ||
<field name="number"/> | ||
</field> | ||
</record> | ||
</field> | ||
</record> | ||
|
||
<record id="view_expenses_form_sequence" model="ir.ui.view"> | ||
<field name="name">hr.expense.form.sequence</field> | ||
<field name="model">hr.expense.expense</field> | ||
<field name="inherit_id" ref="hr_expense.view_expenses_form"/> | ||
<field name="arch" type="xml"> | ||
<xpath expr="//sheet/group" position="before"> | ||
<h1> | ||
<label string="Expense "/> | ||
<field name="number" class="oe_inline"/> | ||
</h1> | ||
</xpath> | ||
<record id="view_hr_expense_sheet_filter" model="ir.ui.view"> | ||
<field name="name">hr.expense.sheet.filter.sequence</field> | ||
<field name="model">hr.expense.sheet</field> | ||
<field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_filter"/> | ||
<field name="arch" type="xml"> | ||
<field name="name" position="attributes"> | ||
<attribute name="filter_domain">['|', ('name', 'ilike', self), ('number', 'ilike', self)]</attribute> | ||
</field> | ||
</record> | ||
</field> | ||
</record> | ||
|
||
<record id="view_hr_expense_filter_sequence" model="ir.ui.view"> | ||
<field name="name">hr.expense.expense.filter.sequence</field> | ||
<field name="model">hr.expense.expense</field> | ||
<field name="inherit_id" ref="hr_expense.view_hr_expense_filter"/> | ||
<field name="arch" type="xml"> | ||
<field name="name" position="attributes"> | ||
<attribute name="filter_domain">['|', ('name', 'ilike', self), ('number', 'ilike', self)]</attribute> | ||
</field> | ||
</field> | ||
</record> | ||
|
||
</data> | ||
</openerp> | ||
</odoo> |