FIX type inherit form + PoolMeta

This commit is contained in:
Raimon Esteve 2017-03-14 19:23:36 +01:00
parent 15291d0af7
commit 5e2c813649
5 changed files with 16 additions and 15 deletions

View file

@ -2,15 +2,15 @@
# The COPYRIGHT file at the top level of this repository contains
# the full copyright notices and license terms.
from trytond.pool import Pool
from .configuration import *
from .shipment import *
from . import configuration
from . import shipment
def register():
Pool.register(
Configuration,
StockConfigurationCompany,
configuration.Configuration,
configuration.StockConfigurationCompany,
module='stock_delivery_note_jreport', type_='model'),
Pool.register(
DeliveryNote,
shipment.DeliveryNote,
module='stock_delivery_note_jreport', type_='report')

View file

@ -1,14 +1,15 @@
# The COPYRIGHT file at the top level of this repository contains the full
# copyright notices and license terms.
# This file is part stock_delivery_note_jreport module for Tryton.
# The COPYRIGHT file at the top level of this repository contains
# the full copyright notices and license terms.
from trytond.model import Model, ModelSQL, fields
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
__all_ = ['Configuration', 'StockConfigurationCompany']
__metaclass__ = PoolMeta
class Configuration:
__metaclass__ = PoolMeta
__name__ = 'stock.configuration'
shipment_qty_decimal = fields.Function(fields.Boolean(

View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!-- This file is part stock_delivery_note_jreport module for Tryton.
The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
<record model="ir.ui.view" id="stock_configuration_view_form">
<field name="model">stock.configuration</field>
<field name="type">form</field>
<field name="inherit" ref="stock.stock_configuration_view_form"/>
<field name="name">configuration_form</field>
</record>

View file

@ -1,11 +1,10 @@
# This file is part jasper_reports module for Tryton.
# This file is part stock_delivery_note_jreport module for Tryton.
# The COPYRIGHT file at the top level of this repository contains
# the full copyright notices and license terms.
from trytond.pool import Pool, PoolMeta
from trytond.pool import Pool
from trytond.modules.jasper_reports.jasper import JasperReport
__all__ = ['DeliveryNote']
__metaclass__ = PoolMeta
class DeliveryNote(JasperReport):

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<!-- This file is part stock_delivery_note_jreport module for Tryton.
The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
<data>
<xpath expr="/form" position="inside">
<newline />