From 61ae8cb4f5c56c876130926eb535f39eab04c139 Mon Sep 17 00:00:00 2001 From: Oscar Alvarez Date: Tue, 3 Nov 2020 19:47:40 -0500 Subject: [PATCH] Remove wrong default --- .gitignore | 29 +++++++++++++++++++++++++++++ employee.py | 16 +++------------- 2 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..63d810d --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +# See https://help.github.com/ignore-files/ for more about ignoring files. + +# dependencies +/build +/dist +*egg-info + + +/node_modules + +# testing +/coverage + +# production +/build + +# misc + +.DS_Store + +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +package-lock* + +/__pycache__ +/app/__pycache__ +/app/commons/__pycache__ diff --git a/employee.py b/employee.py index a727de7..9971c58 100644 --- a/employee.py +++ b/employee.py @@ -3,7 +3,6 @@ from trytond.model import fields, Unique from trytond.pool import PoolMeta, Pool from trytond.transaction import Transaction -from sql import Table, Null __all__ = ['Employee'] @@ -14,16 +13,11 @@ class Employee: active = fields.Boolean('Active') code = fields.Char('Code', size=None, select=True) salary = fields.Function(fields.Numeric('Salary', digits=(16, 2), - help='Salary monthly of person', - depends=['contract'], readonly=True), 'get_salary') - # salary = fields.Numeric('Salary', digits=(16, 2), - # help='Salary monthly of person', - # depends=['contract']) + help='Salary monthly of person', + depends=['contract'], readonly=True), 'get_salary') contract = fields.Function(fields.Many2One('staff.contract', - 'Contract'), 'get_contract') + 'Contract'), 'get_contract') position = fields.Function(fields.Many2One('staff.position', 'Position'), 'get_position') - # position = fields.Many2One('staff.position', 'Position', - # select=True, readonly=True) curses = fields.Text('Curses') career = fields.Text('Career') contracting_state = fields.Selection([ @@ -61,10 +55,6 @@ class Employee: def default_active(): return True - @staticmethod - def default_contracting_state(): - return 'in_process' - @staticmethod def default_company(): return Transaction().context.get('company')