pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge from trunk addons

Browse Source 
bzr revid: mra@mra-laptop-20101021094026-o9v4s89k9ywhw3bk
This commit is contained in:
Mustufa Rangwala
2010-10-21 15:10:26 +05:30
parent a20240b078 27be0ec7e4
commit 39beffe2e3
3 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/account_move_journal.py
+2 -1
View File
@@ -21,6 +21,7 @@
from osv import osv
from tools.translate import _
import tools
class account_move_journal(osv.osv_memory):
_name = "account.move.journal"
@@ -100,7 +101,7 @@ class account_move_journal(osv.osv_memory):
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
</group>
</form>""" % (str(journal), str(period))
</form>""" % (tools.ustr(journal), tools.ustr(period))
res.update({
'arch':view
addons/account_voucher/voucher_payment_receipt_view.xml
-3
View File
@@ -181,9 +181,6 @@
<field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
<field name="amount" sum="Payment"/>
</tree>
<form string="Payment Information">
<label string="Form view not available for Payment Lines"/>
</form>
</field>
<field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
<tree string="Credits" editable="bottom">
addons/base_calendar/base_calendar.py
+42 -22
View File
@@ -477,7 +477,7 @@ property or property parameter."),
@param context: A standard dictionary for contextual values
@return: True
"""
if not context:
if context is None:
context = {}
company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
@@ -555,7 +555,7 @@ property or property parameter."),
@param context: A standard dictionary for contextual values
@return: True
"""
if not context:
if context is None:
context = {}
for vals in self.browse(cr, uid, ids, context=context):
@@ -575,7 +575,7 @@ property or property parameter."),
@param ids: List of calendar attendee’s IDs
@param *args: Get Tupple value
@param context: A standard dictionary for contextual values """
if not context:
if context is None:
context = {}
return self.write(cr, uid, ids, {'state': 'declined'}, context)
@@ -587,7 +587,7 @@ property or property parameter."),
@param vals: Get Values
@param context: A standard dictionary for contextual values """
if not context:
if context is None:
context = {}
if not vals.get("email") and vals.get("cn"):
cnval = vals.get("cn").split(':')
@@ -641,7 +641,7 @@ true, it will allow you to hide the event alarm information without removing it.
@param context: A standard dictionary for contextual values
@return: True
"""
if not context:
if context is None:
context = {}
alarm_obj = self.pool.get('calendar.alarm')
res_alarm_obj = self.pool.get('res.alarm')
@@ -713,7 +713,7 @@ true, it will allow you to hide the event alarm information without removing it.
@param model: Model name for which alarm is to be cleared.
@return: True
"""
if not context:
if context is None:
context = {}
alarm_obj = self.pool.get('calendar.alarm')
ir_obj = self.pool.get('ir.model')
@@ -781,7 +781,7 @@ class calendar_alarm(osv.osv):
@param context: A standard dictionary for contextual values
@return: new record id for calendar_alarm.
"""
if not context:
if context is None:
context = {}
event_date = vals.get('event_date', False)
if event_date:
@@ -808,7 +808,7 @@ class calendar_alarm(osv.osv):
@param context: A standard dictionary for contextual values
"""
return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!!
if not context:
if context is None:
context = {}
current_datetime = datetime.now()
request_obj = self.pool.get('res.request')
@@ -943,8 +943,9 @@ class calendar_event(osv.osv):
@param end_date: Ending Datee
@param context: A standard dictionary for contextual values
"""
if not context:
if context is None:
context = {}
value = {}
if not start_date:
return value
@@ -967,6 +968,14 @@ class calendar_event(osv.osv):
elif not end_date:
end = start + timedelta(hours=duration)
value['date_deadline'] = end.strftime("%Y-%m-%d %H:%M:%S")
elif end_date and duration:
# we have both, keep them synchronized:
# set duration based on end_date (arbitrary decision: this avoid
# getting dates like 06:31:48 instead of 06:32:00)
end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
diff = end - start
duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
value['duration'] = round(duration, 2)
return {'value': value}
@@ -975,7 +984,7 @@ class calendar_event(osv.osv):
This function deletes event which are linked with the event with recurrent_uid
(Removes the events which refers to the same UID value)
"""
if not context:
if context is None:
context = {}
for event_id in ids:
cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,))
@@ -992,7 +1001,7 @@ class calendar_event(osv.osv):
@param context: A standard dictionary for contextual values
@return: dictionary of rrule value.
"""
if not context:
if context is None:
context = {}
cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
@@ -1203,7 +1212,7 @@ true, it will allow you to hide the event alarm information without removing it.
@param context: A standard dictionary for contextual values
@return: Dictionary value which open Crm Meeting form.
"""
if not context:
if context is None:
context = {}
data_obj = self.pool.get('ir.model.data')
@@ -1448,7 +1457,7 @@ true, it will allow you to hide the event alarm information without removing it.
@param context: A standard dictionary for contextual values
@return: True
"""
if not context:
if context is None:
context = {}
if isinstance(ids, (str, int, long)):
select = [ids]
@@ -1477,14 +1486,23 @@ true, it will allow you to hide the event alarm information without removing it.
if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
vals['vtimezone'] = vals['vtimezone'][40:]
updated_vals = self.onchange_dates(cr, uid, new_ids,
vals.get('date', False),
vals.get('duration', False),
vals.get('date_deadline', False),
vals.get('allday', False),
context=context)
vals.update(updated_vals.get('value', {}))
if new_ids:
res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
or (vals.has_key('date') or vals.has_key('duration') or vals.has_key('date_deadline')):
if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
# change alarm details
alarm_obj = self.pool.get('res.alarm')
alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', \
context=context)
alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
return res
def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
@@ -1520,7 +1538,7 @@ true, it will allow you to hide the event alarm information without removing it.
@return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
"""
# FIXME This whole id mangling has to go!
if not context:
if context is None:
context = {}
if isinstance(ids, (str, int, long)):
@@ -1558,7 +1576,7 @@ true, it will allow you to hide the event alarm information without removing it.
@param context: A standard dictionary for contextual values
@return: Duplicate record id.
"""
if not context:
if context is None:
context = {}
res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
alarm_obj = self.pool.get('res.alarm')
@@ -1607,10 +1625,12 @@ true, it will allow you to hide the event alarm information without removing it.
@param context: A standard dictionary for contextual values
@return: new created record id.
"""
if not context:
if context is None:
context = {}
if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
vals['vtimezone'] = vals['vtimezone'][40:]
res = super(calendar_event, self).create(cr, uid, vals, context)
alarm_obj = self.pool.get('res.alarm')
alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
@@ -1770,7 +1790,7 @@ class ir_values(osv.osv):
@param uid: the current user’s ID for security checks,
@param model: Get The Model
"""
if not context:
if context is None:
context = {}
new_model = []
for data in models:
@@ -1798,7 +1818,7 @@ class ir_model(osv.osv):
@param context: A standard dictionary for contextual values
"""
new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
if not context:
if context is None:
context = {}
data = super(ir_model, self).read(cr, uid, new_ids, fields=fields, \
context=context, load=load)