nch@tinyerp.com
@@ -78,7 +78,7 @@
|
||||
<form string="Users">
|
||||
<notebook colspan="4">
|
||||
<page string="Current Activity">
|
||||
<field name="company_id" widget="selection" readonly="0" domain="[('user_ids','=',uid)]"/>
|
||||
<field name="company_id" widget="selection" readonly="0"/>
|
||||
<newline/>
|
||||
<separator colspan="4" string="Preferences"/>
|
||||
</page>
|
||||
|
||||
+62
-53
@@ -7,24 +7,24 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
|
||||
"PO-Revision-Date: 2009-12-29 05:47+0000\n"
|
||||
"Last-Translator: Damir <damir.tusek@gmail.com>\n"
|
||||
"PO-Revision-Date: 2010-02-01 10:37+0000\n"
|
||||
"Last-Translator: goranc <goranc@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.sh
|
||||
msgid "Saint Helena"
|
||||
msgstr ""
|
||||
msgstr "Sveta Helena"
|
||||
|
||||
#. module: base
|
||||
#: wizard_view:res.partner.sms_send,init:0
|
||||
msgid "SMS - Gateway: clickatell"
|
||||
msgstr ""
|
||||
msgstr "SMS - Gateway: clickatell"
|
||||
|
||||
#. module: base
|
||||
#: view:res.lang:0
|
||||
@@ -40,18 +40,18 @@ msgstr "Meta podaci"
|
||||
#: field:ir.ui.view,arch:0
|
||||
#: field:ir.ui.view.custom,arch:0
|
||||
msgid "View Architecture"
|
||||
msgstr ""
|
||||
msgstr "Arhitektura pogleda"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/ir/ir_model.py:0
|
||||
#, python-format
|
||||
msgid "You can not create this kind of document! (%s)"
|
||||
msgstr ""
|
||||
msgstr "Ne možete izraditi ovu vrstu dokumenta (%s)"
|
||||
|
||||
#. module: base
|
||||
#: wizard_field:module.lang.import,init,code:0
|
||||
msgid "Code (eg:en__US)"
|
||||
msgstr ""
|
||||
msgstr "Šifra (npr: hr__HR)"
|
||||
|
||||
#. module: base
|
||||
#: view:workflow:0
|
||||
@@ -63,7 +63,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: view:wizard.module.lang.export:0
|
||||
msgid "To browse official translations, you can visit this link: "
|
||||
msgstr ""
|
||||
msgstr "Za pregledavanje službenih prijevoda, možete posjetiti ovaj link: "
|
||||
|
||||
#. module: base
|
||||
#: selection:module.lang.install,init,lang:0
|
||||
@@ -73,12 +73,12 @@ msgstr "Mađarski / Magyar"
|
||||
#. module: base
|
||||
#: field:ir.actions.server,wkf_model_id:0
|
||||
msgid "Workflow On"
|
||||
msgstr ""
|
||||
msgstr "Tijek procesa aktivan"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.module.module:0
|
||||
msgid "Created Views"
|
||||
msgstr ""
|
||||
msgstr "Stvoreni pogledi"
|
||||
|
||||
#. module: base
|
||||
#: view:workflow.activity:0
|
||||
@@ -88,12 +88,12 @@ msgstr ""
|
||||
#. module: base
|
||||
#: selection:ir.report.custom,frequency:0
|
||||
msgid "Yearly"
|
||||
msgstr ""
|
||||
msgstr "Godišnje"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.act_window,target:0
|
||||
msgid "Target Window"
|
||||
msgstr ""
|
||||
msgstr "Ciljni prozor"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.todo,note:base.config_wizard_simple_view
|
||||
@@ -106,65 +106,71 @@ msgid ""
|
||||
"understand. You will be able to switch to the extended view later.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"Odaberite između \"Pojednostavljenog sučelja\" ili proširenog.\n"
|
||||
"Ako testirate ili koristite OpenERP prvi put, preporučamo vam korištenje\n"
|
||||
"pojednostavljenog sučelja, koje ima manje opcija i polja, ali je "
|
||||
"jednostavnije za \n"
|
||||
"razumijevanje. Bit ćete u mogućnosti prebaciti u prošireni prikaz kasnije.\n"
|
||||
" "
|
||||
|
||||
#. module: base
|
||||
#: field:ir.rule,operand:0
|
||||
msgid "Operand"
|
||||
msgstr ""
|
||||
msgstr "Operator"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.kr
|
||||
msgid "South Korea"
|
||||
msgstr ""
|
||||
msgstr "Republika Korea"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.action_workflow_transition_form
|
||||
#: model:ir.ui.menu,name:base.menu_workflow_transition
|
||||
#: view:workflow.activity:0
|
||||
msgid "Transitions"
|
||||
msgstr ""
|
||||
msgstr "Prijelazi"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_ui_view_custom
|
||||
msgid "ir.ui.view.custom"
|
||||
msgstr ""
|
||||
msgstr "ir.ui.view.custom"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.sz
|
||||
msgid "Swaziland"
|
||||
msgstr ""
|
||||
msgstr "Swaziland"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_actions_report_custom
|
||||
#: selection:ir.ui.menu,action:0
|
||||
msgid "ir.actions.report.custom"
|
||||
msgstr ""
|
||||
msgstr "ir.actions.report.custom"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.ui.menu,icon:0
|
||||
msgid "STOCK_CANCEL"
|
||||
msgstr ""
|
||||
msgstr "STOCK_CANCEL"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.report.custom,sortby:0
|
||||
msgid "Sorted By"
|
||||
msgstr ""
|
||||
msgstr "Poredano prema"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.sequence,number_increment:0
|
||||
msgid "Increment Number"
|
||||
msgstr ""
|
||||
msgstr "Povećati za broj"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.action_res_company_tree
|
||||
#: model:ir.ui.menu,name:base.menu_action_res_company_tree
|
||||
msgid "Company's Structure"
|
||||
msgstr ""
|
||||
msgstr "Struktura tvrtke"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_report_custom_fields
|
||||
msgid "ir.report.custom.fields"
|
||||
msgstr ""
|
||||
msgstr "ir.report.custom.fields"
|
||||
|
||||
#. module: base
|
||||
#: view:res.partner:0
|
||||
@@ -175,33 +181,33 @@ msgstr ""
|
||||
#: code:addons/base/module/wizard/wizard_export_lang.py:0
|
||||
#, python-format
|
||||
msgid "new"
|
||||
msgstr ""
|
||||
msgstr "novi"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.ui.menu,icon:0
|
||||
msgid "STOCK_GOTO_TOP"
|
||||
msgstr ""
|
||||
msgstr "STOCK_GOTO_TOP"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.report.custom,multi:0
|
||||
#: field:ir.actions.report.xml,multi:0
|
||||
msgid "On multiple doc."
|
||||
msgstr ""
|
||||
msgstr "Na više dokum."
|
||||
|
||||
#. module: base
|
||||
#: field:ir.module.category,module_nr:0
|
||||
msgid "Number of Modules"
|
||||
msgstr ""
|
||||
msgstr "Broj modula"
|
||||
|
||||
#. module: base
|
||||
#: field:res.partner.bank.type.field,size:0
|
||||
msgid "Max. Size"
|
||||
msgstr ""
|
||||
msgstr "Max. veličina"
|
||||
|
||||
#. module: base
|
||||
#: field:res.partner.address,name:0
|
||||
msgid "Contact Name"
|
||||
msgstr ""
|
||||
msgstr "Naziv kontakta"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/wizard/wizard_export_lang.py:0
|
||||
@@ -210,126 +216,129 @@ msgid ""
|
||||
"Save this document to a %s file and edit it with a specific software or a "
|
||||
"text editor. The file encoding is UTF-8."
|
||||
msgstr ""
|
||||
"Spremite ovaj dokument u %s datoteku i uredite ga sa specifičnim softverom "
|
||||
"ili tekst editorom. Standard kodiranja znakova datoteke je UTF-8."
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.ui.menu,icon:0
|
||||
msgid "STOCK_DELETE"
|
||||
msgstr ""
|
||||
msgstr "STOCK_DELETE"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/ir/ir_model.py:0
|
||||
#, python-format
|
||||
msgid "Password mismatch !"
|
||||
msgstr ""
|
||||
msgstr "Nepodudarnost lozinke !"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/module.py:0
|
||||
#, python-format
|
||||
msgid "This url '%s' must provide an html file with links to zip modules"
|
||||
msgstr ""
|
||||
"Ovaj url '%s' mora sadržavati html datoteku sa linkovima na zip modula"
|
||||
|
||||
#. module: base
|
||||
#: selection:res.request,state:0
|
||||
msgid "active"
|
||||
msgstr ""
|
||||
msgstr "aktivno"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.wizard,wiz_name:0
|
||||
msgid "Wizard Name"
|
||||
msgstr ""
|
||||
msgstr "Naziv čarobnjaka"
|
||||
|
||||
#. module: base
|
||||
#: view:res.lang:0
|
||||
msgid "%y - Year without century as a decimal number [00,99]."
|
||||
msgstr ""
|
||||
msgstr "%y - Godina bez stoljeća kao decimalni broj [00,99]"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.ui.menu,icon:0
|
||||
msgid "STOCK_GOTO_FIRST"
|
||||
msgstr ""
|
||||
msgstr "STOCK_GOTO_FIRST"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.rule.group,rules:0
|
||||
msgid "The rule is satisfied if at least one test is True"
|
||||
msgstr ""
|
||||
msgstr "Pravilo je zadovoljeno ako je barem jedan test točan"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.report.custom.fields,operation:0
|
||||
msgid "Get Max"
|
||||
msgstr ""
|
||||
msgstr "Dobiti maksimum"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.actions.act_window,limit:0
|
||||
msgid "Default limit for the list view"
|
||||
msgstr ""
|
||||
msgstr "Zadano ograničenje broja stavki u prikazu popisa"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.model.data,date_update:0
|
||||
msgid "Update Date"
|
||||
msgstr ""
|
||||
msgstr "Datum ažuriranja"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.act_window,src_model:0
|
||||
msgid "Source Object"
|
||||
msgstr ""
|
||||
msgstr "Izvorni objekt"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
|
||||
#: view:ir.actions.todo:0
|
||||
#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
|
||||
msgid "Config Wizard Steps"
|
||||
msgstr ""
|
||||
msgstr "Koraci konfiguracijskog čarobnjaka"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_ui_view_sc
|
||||
msgid "ir.ui.view_sc"
|
||||
msgstr ""
|
||||
msgstr "ir.ui.view_sc"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.model.access,group_id:0
|
||||
#: field:ir.rule,rule_group:0
|
||||
msgid "Group"
|
||||
msgstr ""
|
||||
msgstr "Grupa"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.exports.line,name:0
|
||||
#: field:ir.translation,name:0
|
||||
#: field:res.partner.bank.type.field,name:0
|
||||
msgid "Field Name"
|
||||
msgstr ""
|
||||
msgstr "Naziv polja"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.open_module_tree_uninstall
|
||||
#: model:ir.ui.menu,name:base.menu_module_tree_uninstall
|
||||
msgid "Uninstalled modules"
|
||||
msgstr ""
|
||||
msgstr "Deinstalirani moduli"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.actions.report.xml,report_type:0
|
||||
msgid "txt"
|
||||
msgstr ""
|
||||
msgstr "txt"
|
||||
|
||||
#. module: base
|
||||
#: wizard_view:server.action.create,init:0
|
||||
#: wizard_field:server.action.create,init,type:0
|
||||
msgid "Select Action Type"
|
||||
msgstr ""
|
||||
msgstr "Odaberite tip akcije"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.actions.todo,type:0
|
||||
msgid "Configure"
|
||||
msgstr ""
|
||||
msgstr "Podesi"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.tv
|
||||
msgid "Tuvalu"
|
||||
msgstr ""
|
||||
msgstr "Tuvalu"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.model,state:0
|
||||
#: selection:ir.model.grid,state:0
|
||||
msgid "Custom Object"
|
||||
msgstr ""
|
||||
msgstr "Posebni objekt"
|
||||
|
||||
#. module: base
|
||||
#: field:res.lang,date_format:0
|
||||
@@ -340,12 +349,12 @@ msgstr ""
|
||||
#: field:res.bank,email:0
|
||||
#: field:res.partner.address,email:0
|
||||
msgid "E-Mail"
|
||||
msgstr ""
|
||||
msgstr "Email"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.an
|
||||
msgid "Netherlands Antilles"
|
||||
msgstr ""
|
||||
msgstr "Nizozemski Antili"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/res/res_user.py:0
|
||||
|
||||
@@ -8,13 +8,13 @@ msgstr ""
|
||||
"Project-Id-Version: openobject-server\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
|
||||
"PO-Revision-Date: 2010-01-31 06:40+0000\n"
|
||||
"Last-Translator: Teru <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-02-01 05:36+0000\n"
|
||||
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
|
||||
"Language-Team: Japanese <ja@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-02-01 04:45+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base
|
||||
|
||||
+193
-191
File diff suppressed because it is too large
Load Diff
@@ -20,8 +20,9 @@
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from mx import DateTime
|
||||
import time
|
||||
from datetime import datetime
|
||||
from dateutil.relativedelta import relativedelta
|
||||
import netsvc
|
||||
import tools
|
||||
import pooler
|
||||
@@ -31,12 +32,12 @@ def str2tuple(s):
|
||||
return eval('tuple(%s)' % (s or ''))
|
||||
|
||||
_intervalTypes = {
|
||||
'work_days': lambda interval: DateTime.RelativeDateTime(days=interval),
|
||||
'days': lambda interval: DateTime.RelativeDateTime(days=interval),
|
||||
'hours': lambda interval: DateTime.RelativeDateTime(hours=interval),
|
||||
'weeks': lambda interval: DateTime.RelativeDateTime(days=7*interval),
|
||||
'months': lambda interval: DateTime.RelativeDateTime(months=interval),
|
||||
'minutes': lambda interval: DateTime.RelativeDateTime(minutes=interval),
|
||||
'work_days': lambda interval: relativedelta(days=interval),
|
||||
'days': lambda interval: relativedelta(days=interval),
|
||||
'hours': lambda interval: relativedelta(hours=interval),
|
||||
'weeks': lambda interval: relativedelta(days=7*interval),
|
||||
'months': lambda interval: relativedelta(months=interval),
|
||||
'minutes': lambda interval: relativedelta(minutes=interval),
|
||||
}
|
||||
|
||||
class ir_cron(osv.osv, netsvc.Agent):
|
||||
@@ -100,10 +101,10 @@ class ir_cron(osv.osv, netsvc.Agent):
|
||||
cr = db.cursor()
|
||||
try:
|
||||
if not pool._init:
|
||||
now = DateTime.now()
|
||||
now = datetime.now()
|
||||
cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority')
|
||||
for job in cr.dictfetchall():
|
||||
nextcall = DateTime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
|
||||
nextcall = datetime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
|
||||
numbercall = job['numbercall']
|
||||
|
||||
ok = False
|
||||
|
||||
@@ -47,9 +47,11 @@ class ir_sequence(osv.osv):
|
||||
'number_next': fields.integer('Next Number', required=True),
|
||||
'number_increment': fields.integer('Increment Number', required=True),
|
||||
'padding' : fields.integer('Number padding', required=True),
|
||||
'company_id': fields.many2one('res.company', 'Company'),
|
||||
}
|
||||
_defaults = {
|
||||
'active': lambda *a: True,
|
||||
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', context=c),
|
||||
'number_increment': lambda *a: 1,
|
||||
'number_next': lambda *a: 1,
|
||||
'padding' : lambda *a : 0,
|
||||
|
||||
@@ -86,8 +86,7 @@ class res_company(osv.osv):
|
||||
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
|
||||
'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
|
||||
'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
def _company_default_get(self, cr, uid, object=False, field=False, context=None):
|
||||
"""
|
||||
|
||||
@@ -26,9 +26,6 @@ import ir
|
||||
from tools.misc import currency
|
||||
from tools.translate import _
|
||||
|
||||
import mx.DateTime
|
||||
from mx.DateTime import RelativeDateTime, now, DateTime, localtime
|
||||
|
||||
class res_currency(osv.osv):
|
||||
def _current_rate(self, cr, uid, ids, name, arg, context={}):
|
||||
res={}
|
||||
|
||||
@@ -113,12 +113,6 @@ def _lang_get(self, cr, uid, context={}):
|
||||
def _tz_get(self,cr,uid, context={}):
|
||||
return [(x, x) for x in pytz.all_timezones]
|
||||
|
||||
def _companies_get(self,cr, uid, context={}):
|
||||
res=[]
|
||||
ids = self.pool.get('res.users').browse(cr, uid, uid, context).company_ids
|
||||
res = [(i.id,i.name) for i in ids]
|
||||
return res
|
||||
|
||||
class users(osv.osv):
|
||||
__admin_ids = {}
|
||||
_uid_cache = {}
|
||||
@@ -147,8 +141,7 @@ class users(osv.osv):
|
||||
'company_id': fields.many2one('res.company', 'Company', help="The company this user is currently working on.", required=True),
|
||||
'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),
|
||||
'context_lang': fields.selection(_lang_get, 'Language', required=True),
|
||||
'context_tz': fields.selection(_tz_get, 'Timezone', size=64),
|
||||
'company': fields.selection(_companies_get, 'Company', size=64),
|
||||
'context_tz': fields.selection(_tz_get, 'Timezone', size=64),
|
||||
}
|
||||
def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
|
||||
def override_password(o):
|
||||
@@ -180,8 +173,11 @@ class users(osv.osv):
|
||||
ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
|
||||
return ids and ids[0] or False
|
||||
|
||||
def _get_company(self,cr, uid, context={}):
|
||||
return self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
|
||||
def _get_company(self,cr, uid, context={}, uid2=False):
|
||||
if not uid2:
|
||||
uid2 = uid
|
||||
user = self.pool.get('res.users').browse(cr, uid, uid2, context)
|
||||
return user.company_id.id
|
||||
|
||||
def _get_menu(self,cr, uid, context={}):
|
||||
ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
|
||||
@@ -201,9 +197,8 @@ class users(osv.osv):
|
||||
'groups_id': _get_group,
|
||||
'address_id': False,
|
||||
}
|
||||
def company_get(self, cr, uid, uid2):
|
||||
company_id = self.pool.get('res.users').browse(cr, uid, uid2).company_id.id
|
||||
return company_id
|
||||
def company_get(self, cr, uid, uid2, context={}):
|
||||
return self._get_company(cr, uid, context=context, uid2=uid2)
|
||||
company_get = tools.cache()(company_get)
|
||||
|
||||
def write(self, cr, uid, ids, values, *args, **argv):
|
||||
@@ -251,13 +246,7 @@ class users(osv.osv):
|
||||
result[k[8:]] = getattr(user,k)
|
||||
return result
|
||||
|
||||
|
||||
def _check_company(self, cursor, user, ids):
|
||||
for user in self.browse(cursor, user, ids):
|
||||
if user.company_ids and (user.company_id.id not in map(lambda x: x.id, user.company_ids)):
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def action_get(self, cr, uid, context={}):
|
||||
dataobj = self.pool.get('ir.model.data')
|
||||
data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
|
||||
@@ -312,10 +301,7 @@ class users(osv.osv):
|
||||
if not res:
|
||||
raise security.ExceptionNoTb('Bad username or password')
|
||||
return res[0]
|
||||
|
||||
_constraints = [
|
||||
(_check_company, 'This user can not connect using this company !', ['company_id']),
|
||||
]
|
||||
|
||||
users()
|
||||
|
||||
class config_users(osv.osv_memory):
|
||||
|
||||
@@ -79,10 +79,6 @@ for name, value in [('addons_path', tools.config['addons_path']),
|
||||
|
||||
import time
|
||||
|
||||
if sys.platform == 'win32':
|
||||
import mx.DateTime
|
||||
mx.DateTime.strptime = lambda x, y: mx.DateTime.mktime(time.strptime(x, y))
|
||||
|
||||
#----------------------------------------------------------
|
||||
# init net service
|
||||
#----------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -165,7 +165,7 @@ class browse_record(object):
|
||||
else:
|
||||
self.logger.notifyChannel("browse_record", netsvc.LOG_WARNING,
|
||||
"Field '%s' does not exist in object '%s': \n%s" % (
|
||||
name, self, ''.join(traceback.format_trace())))
|
||||
name, self, ''.join(traceback.format_exc())))
|
||||
raise KeyError("Field '%s' does not exist in object '%s'" % (
|
||||
name, self))
|
||||
|
||||
@@ -203,7 +203,7 @@ class browse_record(object):
|
||||
# Where did those ids come from? Perhaps old entries in ir_model_dat?
|
||||
self.logger.notifyChannel("browse_record", netsvc.LOG_WARNING,
|
||||
"No datas found for ids %s in %s \n%s" % (
|
||||
ids, self, ''.join(traceback.format_trace())))
|
||||
ids, self, ''.join(traceback.format_exc())))
|
||||
raise KeyError('Field %s not found in %s'%(name,self))
|
||||
# create browse records for 'remote' objects
|
||||
for data in datas:
|
||||
|
||||
@@ -27,7 +27,7 @@ from report import render
|
||||
import locale
|
||||
|
||||
import time, os
|
||||
import mx.DateTime
|
||||
from datetime import datetime
|
||||
|
||||
class report_printscreen_list(report_int):
|
||||
def __init__(self, name):
|
||||
@@ -165,19 +165,19 @@ class report_printscreen_list(report_int):
|
||||
|
||||
if fields[f]['type'] == 'date' and line[f]:
|
||||
format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))
|
||||
d1= mx.DateTime.strptime(line[f],'%Y-%m-%d')
|
||||
d1 = datetime.strptime(line[f],'%y-%m-%d')
|
||||
new_d1 = d1.strftime(format)
|
||||
line[f] = new_d1
|
||||
|
||||
if fields[f]['type'] == 'time' and line[f]:
|
||||
format = str(locale.nl_langinfo(locale.T_FMT))
|
||||
d1= mx.DateTime.strptime(line[f],'%H:%M:%S')
|
||||
d1 = datetime.strptime(line[f], '%H:%M:%S')
|
||||
new_d1 = d1.strftime(format)
|
||||
line[f] = new_d1
|
||||
|
||||
if fields[f]['type'] == 'datetime' and line[f]:
|
||||
format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))+' '+str(locale.nl_langinfo(locale.T_FMT))
|
||||
d1= mx.DateTime.strptime(line[f],'%Y-%m-%d %H:%M:%S')
|
||||
d1 = datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
|
||||
new_d1 = d1.strftime(format)
|
||||
line[f] = new_d1
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ import cStringIO
|
||||
import base64
|
||||
import copy
|
||||
import locale
|
||||
import mx.DateTime
|
||||
from datetime import datetime
|
||||
import os
|
||||
import re
|
||||
import time
|
||||
@@ -109,7 +109,7 @@ class _date_format(str, _format):
|
||||
def __str__(self):
|
||||
if self.val:
|
||||
if getattr(self,'name', None):
|
||||
date = mx.DateTime.strptime(self.name,DT_FORMAT)
|
||||
date = datetime.strptime(self.name, DT_FORMAT)
|
||||
return date.strftime(self.lang_obj.date_format)
|
||||
return self.val
|
||||
|
||||
@@ -121,7 +121,7 @@ class _dttime_format(str, _format):
|
||||
def __str__(self):
|
||||
if self.val:
|
||||
if getattr(self,'name', None):
|
||||
datetime = mx.DateTime.strptime(self.name,DHM_FORMAT)
|
||||
datetime = datetime.strptime(self.name, DHM_FORMAT)
|
||||
return datetime.strftime(self.lang_obj.date_format+ " " + self.lang_obj.time_format)
|
||||
return self.val
|
||||
|
||||
@@ -262,11 +262,11 @@ class rml_parse(object):
|
||||
|
||||
if not isinstance(value, time.struct_time):
|
||||
try:
|
||||
date = mx.DateTime.strptime(str(value),parse_format)
|
||||
date = datetime.datetime(str(value), parse_format)
|
||||
except:# sometimes it takes converted values into value, so we dont need conversion.
|
||||
return str(value)
|
||||
else:
|
||||
date = mx.DateTime.DateTime(*(value.timetuple()[:6]))
|
||||
date = datetime(*value.timetuple()[:6])
|
||||
return date.strftime(date_format)
|
||||
return self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
|
||||
|
||||
|
||||
@@ -205,6 +205,11 @@ class configmanager(object):
|
||||
die(opt.translate_out and (not opt.db_name),
|
||||
"the i18n-export option cannot be used without the database (-d) option")
|
||||
|
||||
# Check if the config file exists (-c used, but not -s)
|
||||
die(not opt.save and opt.config and not os.path.exists(opt.config),
|
||||
"The config file '%s' selected with -c/--config doesn't exist, "\
|
||||
"use -s/--save if you want to generate it"%(opt.config))
|
||||
|
||||
# place/search the config file on Win32 near the server installation
|
||||
# (../etc from the server)
|
||||
# if the server is run by an unprivileged user, he has to specify location of a config file where he has the rights to write,
|
||||
|
||||
+13
-16
@@ -18,25 +18,24 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
import re
|
||||
import cStringIO
|
||||
from lxml import etree
|
||||
import osv
|
||||
import ir
|
||||
import pooler
|
||||
|
||||
import csv
|
||||
import logging
|
||||
import os.path
|
||||
import pickle
|
||||
import re
|
||||
import sys
|
||||
import time
|
||||
|
||||
from datetime import datetime
|
||||
from lxml import etree
|
||||
|
||||
import ir
|
||||
import misc
|
||||
import netsvc
|
||||
|
||||
import osv
|
||||
import pooler
|
||||
from config import config
|
||||
import logging
|
||||
|
||||
import sys
|
||||
import pickle
|
||||
|
||||
|
||||
class ConvertError(Exception):
|
||||
def __init__(self, doc, orig_excpt):
|
||||
@@ -79,11 +78,9 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
|
||||
return f_val
|
||||
a_eval = node.get('eval','')
|
||||
if a_eval:
|
||||
import time
|
||||
from mx import DateTime
|
||||
idref2 = idref.copy()
|
||||
idref2['time'] = time
|
||||
idref2['DateTime'] = DateTime
|
||||
idref2['DateTime'] = datetime
|
||||
import release
|
||||
idref2['version'] = release.major_version
|
||||
idref2['ref'] = lambda x: self.id_get(cr, False, x)
|
||||
|
||||
+15
-10
@@ -19,21 +19,24 @@
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
import os
|
||||
from os.path import join
|
||||
import codecs
|
||||
import csv
|
||||
import fnmatch
|
||||
import csv, re
|
||||
import inspect
|
||||
import locale
|
||||
import os
|
||||
import re
|
||||
import tarfile
|
||||
import tempfile
|
||||
from os.path import join
|
||||
|
||||
from datetime import datetime
|
||||
from lxml import etree
|
||||
|
||||
import osv, tools, pooler
|
||||
import ir
|
||||
import netsvc
|
||||
from tools.misc import UpdateableStr
|
||||
import inspect
|
||||
import mx.DateTime as mxdt
|
||||
import tempfile
|
||||
import tarfile
|
||||
import codecs
|
||||
import locale
|
||||
|
||||
_LOCALE2WIN32 = {
|
||||
'af_ZA': 'Afrikaans_South Africa',
|
||||
@@ -283,7 +286,7 @@ class TinyPoFile(object):
|
||||
'version': release.version,
|
||||
'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
|
||||
'bugmail': release.support_email,
|
||||
'now': mxdt.ISO.strUTC(mxdt.ISO.DateTime.utc()),
|
||||
'now': datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')+"+0000",
|
||||
}
|
||||
)
|
||||
|
||||
@@ -764,6 +767,8 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
|
||||
# the same source
|
||||
obj = pool.get(model)
|
||||
if obj:
|
||||
if not field in obj._columns:
|
||||
continue
|
||||
ids = obj.search(cr, uid, [(field, '=', dic['src'])])
|
||||
|
||||
# if the resource id (res_id) is in that list, use it,
|
||||
|
||||
Vendored
+42
@@ -0,0 +1,42 @@
|
||||
# Croatian translation for openobject-server
|
||||
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
|
||||
# This file is distributed under the same license as the openobject-server package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-server\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-24 22:41+0300\n"
|
||||
"PO-Revision-Date: 2010-02-01 09:48+0000\n"
|
||||
"Last-Translator: goranc <goranc@gmail.com>\n"
|
||||
"Language-Team: Croatian <hr@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../openerp-server.templates:1001
|
||||
msgid "Dedicated system account for the Open ERP server:"
|
||||
msgstr ""
|
||||
"Namjenski račun sistemskog korisnika za sustav poslužitelja Open ERP:"
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../openerp-server.templates:1001
|
||||
msgid ""
|
||||
"The Open ERP server must use a dedicated account for its operation so that "
|
||||
"the system's security is not compromised by running it with superuser "
|
||||
"privileges."
|
||||
msgstr ""
|
||||
"Server Open ERP mora koristiti namjenski korisnički račun za svoj rad, tako "
|
||||
"da sigurnost sustava nije ugrožena korištenjem privilegija superkorisnika."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../openerp-server.templates:1001
|
||||
msgid "Please choose that account's username."
|
||||
msgstr "Molimo odaberite korisnički račun."
|
||||
@@ -53,7 +53,7 @@ py_short_version = '%s.%s' % sys.version_info[:2]
|
||||
required_modules = [
|
||||
('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'),
|
||||
('mako', 'Mako template engine'),
|
||||
('mx', "egenix's mx library for its extended DateTime module"),
|
||||
('dateutil', "Extensions to the standard datetime module"),
|
||||
('psycopg2', 'PostgreSQL module'),
|
||||
('pychart', 'pychart module'),
|
||||
('pydot', 'pydot module'),
|
||||
@@ -172,7 +172,7 @@ options = {
|
||||
"dist_dir": 'dist',
|
||||
"packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
|
||||
"lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
|
||||
"encodings","mx.DateTime","wizard","pychart","PIL",
|
||||
"encodings","dateutil","wizard","pychart","PIL",
|
||||
"pyparsing", "pydot","asyncore","asynchat", "reportlab",
|
||||
"vobject", "HTMLParser", "select"],
|
||||
"excludes" : ["Tkconstants","Tkinter","tcl"],
|
||||
|
||||
Reference in New Issue
Block a user