mirror of
https://github.com/NaN-tic/trytond-analytic_location.git
synced 2023-12-14 04:12:54 +01:00
Merge
This commit is contained in:
commit
e805208a43
|
@ -14,8 +14,7 @@ from trytond.modules.analytic_account import AnalyticMixin
|
||||||
__all__ = ['Location', 'LocationCompany', 'AnalyticAccountEntry']
|
__all__ = ['Location', 'LocationCompany', 'AnalyticAccountEntry']
|
||||||
|
|
||||||
|
|
||||||
class Location:
|
class Location(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'stock.location'
|
__name__ = 'stock.location'
|
||||||
companies = fields.One2Many('stock.location.company', 'location',
|
companies = fields.One2Many('stock.location.company', 'location',
|
||||||
'Configuration by company')
|
'Configuration by company')
|
||||||
|
@ -128,8 +127,7 @@ class LocationCompany(AnalyticMixin, ModelSQL, ModelView):
|
||||||
return Transaction().context.get('company')
|
return Transaction().context.get('company')
|
||||||
|
|
||||||
|
|
||||||
class AnalyticAccountEntry:
|
class AnalyticAccountEntry(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'analytic.account.entry'
|
__name__ = 'analytic.account.entry'
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -4,7 +4,7 @@
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
import ConfigParser
|
import configparser
|
||||||
|
|
||||||
MODULE = 'analytic_location'
|
MODULE = 'analytic_location'
|
||||||
PREFIX = 'nantic'
|
PREFIX = 'nantic'
|
||||||
|
@ -24,7 +24,7 @@ def get_require_version(name):
|
||||||
major_version, minor_version + 1)
|
major_version, minor_version + 1)
|
||||||
return require
|
return require
|
||||||
|
|
||||||
config = ConfigParser.ConfigParser()
|
config = configparser.ConfigParser()
|
||||||
config.readfp(open('tryton.cfg'))
|
config.readfp(open('tryton.cfg'))
|
||||||
info = dict(config.items('tryton'))
|
info = dict(config.items('tryton'))
|
||||||
for key in ('depends', 'extras_depend', 'xml'):
|
for key in ('depends', 'extras_depend', 'xml'):
|
||||||
|
|
Loading…
Reference in a new issue