odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] 

bzr revid: uco@tinyerp.co.in-20100210050658-an47b3hg26gtmv17
This commit is contained in:
uco (OpenERP) 2010-02-10 10:36:58 +05:30
parent c97844c536 277924363e
commit 4cd8792dea
10 changed files with 561 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/board_document/i18n/pl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-04 00:48+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-02-09 17:31+0000\n"
"Last-Translator: Antoni Górski <Unknown>\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: 2009-12-16 05:25+0000\n"
"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_document
@ -76,7 +76,7 @@ msgstr ""
#. module: board_document
#: model:ir.ui.menu,name:board_document.menu_board_document
msgid "Document"
msgstr ""
msgstr "Dokument"
#. module: board_document
#: view:board.board:0

25
addons/caldav/caldav.py
View File

@ -241,8 +241,7 @@ class invite_attendee_wizard(osv.osv_memory):
})
att_id = att_obj.create(cr, uid, vals)
if model_field:
obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)],
'state': 'delegated'})
obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
if datas.get('send_mail'):
att_obj._send_mail(cr, uid, [att_id], mail_to, \
@ -665,13 +664,13 @@ or contains the text to be used for display"""),
mail_to = [alarm.user_id.address_id.email]
for att in alarm.attendee_ids:
mail_to.append(att.user_id.address_id.email)
tools.email_send(
tools.config.get('email_from', False),
mail_to,
sub,
body
)
if mail_to:
tools.email_send(
tools.config.get('email_from', False),
mail_to,
sub,
body
)
self.write(cr, uid, [alarm.id], {'state':'done'})
return True
@ -756,12 +755,12 @@ rule or repeating pattern for anexception to a recurrence set"),
def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
if not user_id:
return {'value': {'vtimezone': ''}}
value = {}
return {'value': {'vtimezone': None}}
value = {'vtimezone': None}
cr.execute('select context_tz from res_users where id=%s' % (user_id))
timezone = cr.fetchone()
timezone = cr.fetchone()[0]
if timezone:
value.update({'vtimezone': timezone[0].lower()})
value.update({'vtimezone': timezone.lower()})
return {'value': value}
def export_cal(self, cr, uid, ids, context={}):

2
addons/crm/crm.py
View File

@ -817,6 +817,6 @@ class users(osv.osv):
_inherit = 'res.users'
_description = "Users"
_columns = {
'context_section_id': fields.selection(_section_get, 'Sales Section'),
'context_section_id': fields.many2one('crm.case.section', 'Sales Section'),
}
users()

4
addons/crm/crm_view.xml
View File

@ -576,7 +576,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<page string="Current Activity" position="inside">
<field name="context_section_id" completion="1"/>
<field name="context_section_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
</page>
</field>
</record>
@ -589,7 +589,7 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="password" position="after">
<field name="context_section_id" completion="1"/>
<field name="context_section_id" completion="1" widget="selection"/>
</field>
</field>
</record>

921
addons/crm/i18n/fr.po
View File

File diff suppressed because it is too large Load Diff

35
addons/project/project.py
View File

@ -36,7 +36,7 @@ class project_task_type(osv.osv):
'sequence': fields.integer('Sequence'),
}
_order = 'sequence'
_defaults = {
'sequence': lambda *args: 1
}
@ -46,6 +46,21 @@ class project(osv.osv):
_name = "project.project"
_description = "Project"
_inherits = {'account.analytic.account':"category_id"}
def search(self, cr, user, args, offset=0, limit=None, order=None,
context=None, count=False):
if user==1:
return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
context=context, count=count)
if context and context.has_key('user_prefence') and context['user_prefence']:
cr.execute("""SELECT project.id FROM project_project project
LEFT JOIN account_analytic_account account ON account.id = project.category_id
WHERE (account.user_id = %s)"""%(user))
res = cr.fetchall()
return [(r[0]) for r in res]
return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
context=context, count=count)
def _complete_name(self, cr, uid, ids, name, args, context):
res = {}
for m in self.browse(cr, uid, ids, context=context):
@ -191,7 +206,7 @@ class project(osv.osv):
self.pool.get('project.task').copy(cr, uid, tasks_id, default = {
'project_id': new_id,
'active':True}, context=context)
child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
if child_ids:
self.duplicate_template(cr, uid, child_ids, context={'parent_id':new_id})
return result
@ -204,7 +219,7 @@ class project(osv.osv):
tasks_id = [x[0] for x in cr.fetchall()]
if tasks_id:
self.pool.get('project.task').write(cr, uid, tasks_id, {'active': value}, context)
child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
if child_ids:
self.setActive(cr, uid, child_ids, value, context)
return True
@ -238,7 +253,7 @@ class task(osv.osv):
res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
return res
def onchange_planned(self, cr, uid, ids, planned, effective, date_start,occupation_rate=0.0):
def onchange_planned(self, cr, uid, ids, planned=0.0, effective=0.0, date_start=None,occupation_rate=0.0):
result = {}
for res in self.browse(cr, uid, ids):
if date_start and planned:
@ -249,7 +264,7 @@ class task(osv.osv):
hrs = (planned)/(occupation_rate)
work_times = self.pool.get('resource.calendar').interval_get(cr, uid, resource_obj.calendar_id.id or False, d, hrs or 0.0, resource_obj.id)
result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
result['remaining_hours'] = planned-effective
result['remaining_hours'] = planned-effective
return {'value':result}
def _default_project(self, cr, uid, context={}):
@ -272,7 +287,7 @@ class task(osv.osv):
if task['date_start'] > task['date_end']:
return False
return True
_columns = {
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it."),
'name': fields.char('Task Summary', size=128, required=True),
@ -534,8 +549,8 @@ class message(osv.osv):
return False
_defaults = {
'user_id' : lambda self,cr,uid,ctx : uid,
'project_id':_default_project}
'user_id' : lambda self,cr,uid,ctx : uid,
'project_id':_default_project}
message()
@ -557,8 +572,8 @@ class users(osv.osv):
_inherit = 'res.users'
_description = "Users"
_columns = {
'context_project_id': fields.selection(_project_get, 'Project'),
}
'context_project_id': fields.many2one('project.project', 'Project')
}
users()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/project/project_view.xml
View File

@ -570,7 +570,7 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="password" position="after">
<field name="context_project_id" completion="1"/>
<field name="context_project_id" completion="1" widget="selection"/>
</field>
</field>
</record>
@ -583,7 +583,7 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<page string="Current Activity" position="inside">
<field name="context_project_id" completion="1" />
<field name="context_project_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
</page>
</field>
</record>

2
addons/project_gtd/project_gtd_view.xml
View File

@ -105,7 +105,7 @@
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="planned_hours" widget="float_time" invisible="not context.get('set_visible',False)"/>
<field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours)" invisible="not context.get('set_visible',False)"/>
</field>
</field>
</record>

34
addons/purchase/i18n/bs.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-08 18:46+0000\n"
"Last-Translator: Selma <Unknown>\n"
"PO-Revision-Date: 2010-02-09 23:39+0000\n"
"Last-Translator: adnan <adnankraljic@yahoo.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-02-09 05:10+0000\n"
"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@ -465,6 +465,8 @@ msgid ""
"customer.In this case, it will remove the warehouse link and set the "
"customer location."
msgstr ""
"Postavi adresu ukoliko želite predati direktno od dobavljača kupac. U ovom "
"slučaju, to će se maknuti link skladišta i postaviti lokaciju kupca."
#. module: purchase
#: rml:purchase.quotation:0
@ -618,7 +620,7 @@ msgstr "Nije moguće imati dva cjenovnika koja se preklapaju!"
#. module: purchase
#: view:purchase.order:0
msgid "Cancel Purchase Order"
msgstr ""
msgstr "Otkaži nabavni nalog"
#. module: purchase
#: model:process.transition,name:purchase.process_transition_createpackinglist0
@ -638,7 +640,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order.line:0
msgid "History"
msgstr "Historija"
msgstr "Historijat"
#. module: purchase
#: field:purchase.order,state:0
@ -738,17 +740,17 @@ msgstr ""
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
msgid "Control invoices on receptions"
msgstr ""
msgstr "Kontrolisati račun prilikom primke"
#. module: purchase
#: rml:purchase.order:0
msgid "Date Req."
msgstr ""
msgstr "Datum upita"
#. module: purchase
#: field:purchase.order,date_approve:0
msgid "Date Approved"
msgstr ""
msgstr "Datum odobrenja"
#. module: purchase
#: model:ir.module.module,description:purchase.module_meta_information
@ -756,6 +758,8 @@ msgid ""
"Module for purchase management\n"
" Request for quotation, Create Supplier Invoice, Print Order..."
msgstr ""
"Modul za upravljanje nabavkom \n"
"Zahtjev za ponudu, kreiranje računa dobavljača, printanje naloga..."
#. module: purchase
#: field:purchase.order.line,product_id:0
@ -788,7 +792,7 @@ msgstr "Nabavni nalog - potrebno odobrenje"
#. module: purchase
#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
msgid "Confirming Purchase Order"
msgstr ""
msgstr "Potvrdite nabavni nalog"
#. module: purchase
#: field:purchase.order.line,product_uom:0
@ -803,7 +807,7 @@ msgstr "Rezervacija"
#. module: purchase
#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
msgid "Purchase order is confirmed by the user."
msgstr ""
msgstr "Nabavni nalog je potvrđen od strane korisnika."
#. module: purchase
#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
@ -813,7 +817,7 @@ msgstr ""
#. module: purchase
#: rml:purchase.order:0
msgid "Your Order Reference"
msgstr ""
msgstr "Referenca vašeg naloga"
#. module: purchase
#: rml:purchase.order:0
@ -844,7 +848,7 @@ msgstr "Zahtjevi za ponudu"
#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
msgstr ""
msgstr "Kontrola fakturisanja"
#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@ -869,17 +873,17 @@ msgstr "Ukupno"
#. module: purchase
#: wizard_view:purchase.order.merge,init:0
msgid "Are you sure you want to merge these orders ?"
msgstr ""
msgstr "Da li ste sigurni da želite sastaviti ove naruđbe?"
#. module: purchase
#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
msgid "Approving Purchase Order"
msgstr ""
msgstr "Odobriti nabavni nalog"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid "After approved purchase order , it comes into the supplier invoice"
msgstr ""
msgstr "Nakon što je nabavni nalog odobren prelazi u račun dobavljača."
#. module: purchase
#: view:purchase.order.line:0

8
addons/purchase/i18n/pl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 10:17+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-02-09 17:33+0000\n"
"Last-Translator: Antoni Górski <Unknown>\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: 2009-12-16 05:06+0000\n"
"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@ -575,7 +575,7 @@ msgstr "Tworzy fakturę z listy przesunięć (przyjęć)"
#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
msgstr "Data utworzenia dokumentu."
#. module: purchase
#: view:purchase.order:0