tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git:~/gitrepos/cam-template

develop
Andreas Brückl 2015-04-23 16:48:26 +02:00
parent 4f3ec7e0e0 754bda171a
commit 17a99b0769
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/lib/cli.py
View File

@ -52,6 +52,7 @@ def main():
'set_warehouse', 'set_warehouse',
'base_config', 'base_config',
'sale_config', 'sale_config',
'hr_config',
'stock_config', 'stock_config',
'stock_set_cost_method', 'stock_set_cost_method',
'set_incoterms', 'set_incoterms',

10
setup/lib/config_at.py
View File

@ -92,6 +92,14 @@ class Config():
'group_costing_method': True, # Benutzen Sie 'Einkaufs-' oder 'Durchschnittspreis' zur Bestandsbewertung 'group_costing_method': True, # Benutzen Sie 'Einkaufs-' oder 'Durchschnittspreis' zur Bestandsbewertung
} }
#Einstellungen Personal
self.hr_config = {
'module_hr_expense': True, # Spesen der Mitarbeiter verwalten
'module_hr_timesheet': False, # Verwalten Sie Ihre Studenzettel
'group_hr_attendance': True, # Zuweisung der Berechtigung zur Arbeitszeiteingabe für alle Benutzer
}
#Einstellungen Lager #Einstellungen Lager
self.stock_config = { self.stock_config = {
'group_stock_multiple_locations': True, # Verwalten Sie mehrere Lager und Lagerorte 'group_stock_multiple_locations': True, # Verwalten Sie mehrere Lager und Lagerorte
@ -187,4 +195,4 @@ class Config():
self.default_values = [ # ir.values self.default_values = [ # ir.values
#('product.template', 'type', 'service'), #('product.template', 'type', 'service'),
] ]

12
setup/lib/functions.py
View File

@ -149,6 +149,16 @@ class CamadeusFunctions():
wizard_id = self._execute('stock.config.settings', 'create', vals) wizard_id = self._execute('stock.config.settings', 'create', vals)
return self._execute('stock.config.settings', 'execute', [wizard_id]) return self._execute('stock.config.settings', 'execute', [wizard_id])
return True return True
def hr_config(self):
"""Basiskonfiguration für Personal Laden"""
if hasattr(self.config, 'hr_config'):
vals = self._execute('hr.config.settings', 'default_get', [])
vals.update(self.config.hr_config)
wizard_id = self._execute('hr.config.settings', 'create', vals)
return self._execute('hr.config.settings', 'execute', [wizard_id])
return True
def set_incoterms(self): def set_incoterms(self):
"""Lieferbedingungen setzen""" """Lieferbedingungen setzen"""
@ -628,4 +638,4 @@ class CamadeusFunctions():
self._execute('ir.values', 'write', val_ids, vals) self._execute('ir.values', 'write', val_ids, vals)
else: else:
self._execute('ir.values', 'create', vals) self._execute('ir.values', 'create', vals)
return True return True