diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index de046de6211..47b6ebf3110 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -58,6 +58,9 @@
+
@@ -71,17 +74,19 @@
+ string="Customer Invoices"
+ domain="[('type','=','out_invoice')]"
+ default="1"/>
+ string="Customer Refunds"
+ domain="[('type','=','out_refund')]"/>
+
+ string="Supplier Invoices"
+ domain="[('type','=','in_invoice')]"/>
+ string="Supplier Refunds"
+ domain="[('type','=','in_refund')]"/>
@@ -90,6 +95,7 @@
+
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index e9558f7a101..0c3c46690ac 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -204,7 +204,7 @@ class account_analytic_account(osv.osv):
'date': fields.date('Date End'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
- 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True,readonly=True,
+ 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,readonly=True,
help='* When an account is created its in \'Draft\' state.\
\n* If any associated partner is there, it can be in \'Open\' state.\
\n* If any pending balance is there it can be in \'Pending\'. \
diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
deleted file mode 100644
index 96135460c72..00000000000
--- a/addons/auction/wizard/auction_lots_able_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- auction.lots.able.form
- auction.lots.able
- form
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
deleted file mode 100644
index dd116a8bc6c..00000000000
--- a/addons/auction/wizard/auction_lots_auction_move_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- auction.lots.auction.move.form
- auction.lots.auction.move
- form
-
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
deleted file mode 100644
index 8384524dad2..00000000000
--- a/addons/auction/wizard/auction_lots_enable_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- auction.lots.enable.form
- auction.lots.enable
- form
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
deleted file mode 100644
index ba4aac79ca6..00000000000
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- auction.lots.make.invoice.buyer.form
- auction.lots.make.invoice.buyer
- form
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
deleted file mode 100644
index 29ef3e09348..00000000000
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
- auction.lots.make.invoice.form
- auction.lots.make.invoice
- form
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
deleted file mode 100644
index 22aa9d681ac..00000000000
--- a/addons/auction/wizard/auction_lots_sms_send_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- auction.lots.sms.send.form
- auction.lots.sms.send
- form
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
deleted file mode 100644
index 0a9a3a6dcee..00000000000
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- auction.pay.buy.form
- auction.pay.buy
- form
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
deleted file mode 100644
index 2570b7a7a0a..00000000000
--- a/addons/auction/wizard/auction_pay_sel_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- auction.pay.sel.form
- auction.pay.sel
- form
-
-
-
-
-
-
- Pay objects of the seller
- auction.pay.sel
- form
- tree,form
-
- new
-
-
-
-
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
deleted file mode 100644
index 57c43df8fe4..00000000000
--- a/addons/auction/wizard/auction_payer_sel_view.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
- auction.payer.form
- auction.payer
- form
-
-
-
-
-
-
- auction.payer.sel.form
- auction.payer.sel
- form
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
deleted file mode 100644
index 626caa473ad..00000000000
--- a/addons/auction/wizard/auction_taken_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- auction.taken.form
- auction.taken
- form
-
-
-
-
-
-
- Gestion emporte
- auction.taken
- form
- tree,form
-
- new
-
-
-
-
-
-
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c60b75a9815..16dfa9d9936 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -31,9 +31,10 @@ import time
import tools
months = {
- 1: "January", 2: "February", 3: "March", 4: "April", \
- 5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
- 10: "October", 11: "November", 12: "December"}
+ 1: "January", 2: "February", 3: "March", 4: "April", \
+ 5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
+ 10: "October", 11: "November", 12: "December"
+}
def get_recurrent_dates(rrulestring, exdate, startdate=None):
"""
@@ -94,7 +95,6 @@ def real_id2base_calendar_id(real_id, recurrent_date):
return '%d-%s' % (real_id, recurrent_date)
return real_id
-
def _links_get(self, cr, uid, context={}):
"""
Get request link.
@@ -386,9 +386,11 @@ property or property parameter."),
response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
def msg_new(self, cr, uid, msg):
- """ @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks, """
+ """
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ """
return False
def msg_act_get(self, msg):
@@ -508,7 +510,6 @@ property or property parameter."),
for vals in self.browse(cr, uid, ids, context=context):
user = vals.user_id
if user:
-
mod_obj = self.pool.get(vals.ref._name)
if vals.ref:
if vals.ref.user_id.id != user.id:
@@ -567,9 +568,7 @@ class res_alarm(osv.osv):
are both optional, but if one occurs, so MUST the other"""),
'repeat': fields.integer('Repeat'),
'active': fields.boolean('Active', help="If the active field is set to \
- true, it will allow you to hide the event alarm information without removing it."),
-
-
+ true, it will allow you to hide the event alarm information without removing it.")
}
_defaults = {
'trigger_interval': lambda *x: 'minutes',
@@ -595,10 +594,10 @@ are both optional, but if one occurs, so MUST the other"""),
model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
model_obj = self.pool.get(model)
- for data in model_obj.browse(cr, uid, ids):
+ for data in model_obj.browse(cr, uid, ids, context):
basic_alarm = data.alarm_id
- if not context.get('alarm_id'):
+ if not context.get('alarm_id', False):
self.do_alarm_unlink(cr, uid, [data.id], model)
return True
self.do_alarm_unlink(cr, uid, [data.id], model)
@@ -641,7 +640,7 @@ are both optional, but if one occurs, so MUST the other"""),
ir_obj = self.pool.get('ir.model')
model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
model_obj = self.pool.get(model)
- for datas in model_obj.browse(cr, uid, ids):
+ for datas in model_obj.browse(cr, uid, ids, context):
alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
if alarm_ids:
alarm_obj.unlink(cr, uid, alarm_ids)
@@ -682,18 +681,17 @@ class calendar_alarm(osv.osv):
'event_date': fields.datetime('Event Date'),
'event_end_date': fields.datetime('Event End Date'),
'trigger_date': fields.datetime('Trigger Date', readonly="True"),
- 'state':fields.selection([
- ('draft', 'Draft'),
- ('run', 'Run'),
- ('stop', 'Stop'),
- ('done', 'Done'),
- ], 'State', select=True, readonly=True),
- }
+ 'state':fields.selection([('draft', 'Draft'),
+ ('run', 'Run'),
+ ('stop', 'Stop'),
+ ('done', 'Done'),
+ ], 'State', select=True, readonly=True),
+ }
_defaults = {
- 'action': lambda *x: 'email',
- 'state': lambda *x: 'run',
- }
+ 'action': lambda *x: 'email',
+ 'state': lambda *x: 'run',
+ }
def create(self, cr, uid, vals, context={}):
"""
@@ -722,15 +720,14 @@ class calendar_alarm(osv.osv):
def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
context=None):
"""
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of calendar alarm’s IDs.
- @param use_new_cursor: False or the dbname
- @param context: A standard dictionary for contextual values
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of calendar alarm’s IDs.
+ @param use_new_cursor: False or the dbname
+ @param context: A standard dictionary for contextual values
"""
-
if not context:
context = {}
current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
@@ -798,7 +795,6 @@ class calendar_event(osv.osv):
def _tz_get(self, cr, uid, context={}):
return [(x.lower(), x) for x in pytz.all_timezones]
-
def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, context={}):
"""
@param self: The object pointer
@@ -904,10 +900,10 @@ class calendar_event(osv.osv):
whr = " where id=%(id)s"
qry = qry + whr
val.update({
- 'table': self._table,
- 'rule_type': rrule_type,
- 'id': id,
- })
+ 'table': self._table,
+ 'rule_type': rrule_type,
+ 'id': id,
+ })
cr.execute(qry % val)
return True
@@ -921,9 +917,7 @@ class calendar_event(osv.osv):
@return: dictionary of rrule value.
"""
result = {}
- for event in ids:
-
- datas = self.read(cr, uid, event)
+ for datas in self.read(cr, uid, ids):
if datas.get('rrule_type'):
if datas.get('rrule_type') == 'none':
result[event] = False
@@ -947,14 +941,13 @@ class calendar_event(osv.osv):
'duration': fields.float('Duration'),
'description': fields.text('Your action'),
'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
- ('confidential', 'Confidential')], 'Mark as'),
- 'location': fields.char('Location', size=264, help="Location of Event"),
- 'show_as': fields.selection([('free', 'Free'), \
- ('busy', 'Busy')],
- 'Show as'),
+ ('confidential', 'Confidential')], 'Mark as'),
+ 'location': fields.char('Location', size=264, help="Location of Event"),
+ 'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
+ 'Show as'),
'base_calendar_url': fields.char('Caldav URL', size=264),
'exdate': fields.text('Exception Date/Times', help="This property \
- defines the list of date/time exceptions for arecurring calendar component."),
+defines the list of date/time exceptions for arecurring calendar component."),
'exrule': fields.char('Exception Rule', size=352, help="defines a \
rule or repeating pattern for anexception to a recurrence set"),
'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
@@ -974,13 +967,13 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
string='Timezone', store=True),
'user_id': fields.many2one('res.users', 'Responsible'),
'freq': fields.selection([('None', 'No Repeat'), \
- ('secondly', 'Secondly'), \
- ('minutely', 'Minutely'), \
- ('hourly', 'Hourly'), \
- ('daily', 'Daily'), \
- ('weekly', 'Weekly'), \
- ('monthly', 'Monthly'), \
- ('yearly', 'Yearly')], 'Frequency'),
+ ('secondly', 'Secondly'), \
+ ('minutely', 'Minutely'), \
+ ('hourly', 'Hourly'), \
+ ('daily', 'Daily'), \
+ ('weekly', 'Weekly'), \
+ ('monthly', 'Monthly'), \
+ ('yearly', 'Yearly')], 'Frequency'),
'interval': fields.integer('Interval'),
'count': fields.integer('Count'),
'mo': fields.boolean('Mon'),
@@ -991,7 +984,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
'sa': fields.boolean('Sat'),
'su': fields.boolean('Sun'),
'select1': fields.selection([('date', 'Date of month'), \
- ('day', 'Day of month')], 'Option'),
+ ('day', 'Day of month')], 'Option'),
'day': fields.integer('Date of month'),
'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
('WE', 'Wednesday'), ('TH', 'Thursday'), \
@@ -1003,7 +996,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
'month_list': fields.selection(months.items(), 'Month'),
'end_date': fields.date('Repeat Until')
}
-
_defaults = {
'class': lambda *a: 'public',
'show_as': lambda *a: 'busy',
@@ -1047,7 +1039,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
@param event_ids: List of crm meeting’s IDs.
@return: True
"""
- #start Loop
+
for event_id in event_ids:
event_id = base_calendar_id2real_id(event_id)
@@ -1062,7 +1054,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
qry += ", location = '%(location)s'"
qry += "WHERE id = %s" % (event_id)
cr.execute(qry %(defaults))
- #End Loop
+
return True
def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
@@ -1159,7 +1151,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
weekstring = ''
monthstring = ''
yearstring = ''
-# logic for computing rrule string
+
freq = datas.get('freq')
if freq == 'None':
return ''
@@ -1198,7 +1190,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
rrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \
+ enddate + monthstring + yearstring
-# End logic
return rrule_string
@@ -1390,13 +1381,14 @@ class calendar_todo(osv.osv):
_description = "Calendar Task"
def _get_date(self, cr, uid, ids, name, arg, context):
- """ Get Date
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of calendar todo's IDs.
- @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
- @param context: A standard dictionary for contextual values
+ """
+ Get Date
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of calendar todo's IDs.
+ @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+ @param context: A standard dictionary for contextual values
"""
res = {}
@@ -1405,14 +1397,15 @@ class calendar_todo(osv.osv):
return res
def _set_date(self, cr, uid, id, name, value, arg, context):
- """ Set Date
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param id: calendar's ID.
- @param value: Get Value
- @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
- @param context: A standard dictionary for contextual values
+ """
+ Set Date
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: calendar's ID.
+ @param value: Get Value
+ @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+ @param context: A standard dictionary for contextual values
"""
event = self.browse(cr, uid, id, context=context)
@@ -1436,11 +1429,12 @@ class ir_attachment(osv.osv):
_inherit = 'ir.attachment'
def search_count(self, cr, user, args, context=None):
- """ @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param user: the current user’s ID for security checks,
- @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
- @param context: A standard dictionary for contextual values
+ """
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param user: the current user’s ID for security checks,
+ @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+ @param context: A standard dictionary for contextual values
"""
args1 = []
@@ -1450,14 +1444,14 @@ class ir_attachment(osv.osv):
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
-
- """ @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
- @param offset: The Number of Results to pass,
- @param limit: The Number of Results to Return,
- @param context: A standard dictionary for contextual values
+ """
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+ @param offset: The Number of Results to pass,
+ @param limit: The Number of Results to Return,
+ @param context: A standard dictionary for contextual values
"""
new_args = args
@@ -1474,12 +1468,13 @@ class ir_values(osv.osv):
def set(self, cr, uid, key, key2, name, models, value, replace=True, \
isobject=False, meta=False, preserve_user=False, company=False):
-
- """ set IR Values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param model: Get The Model """
+ """
+ Set IR Values
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param model: Get The Model
+ """
new_model = []
for data in models:
@@ -1492,12 +1487,13 @@ class ir_values(osv.osv):
def get(self, cr, uid, key, key2, models, meta=False, context={}, \
res_id_req=False, without_user=True, key2_req=True):
-
- """ Get IR Values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param model: Get The Model """
+ """
+ Get IR Values
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param model: Get The Model
+ """
new_model = []
for data in models:
@@ -1516,14 +1512,14 @@ class ir_model(osv.osv):
def read(self, cr, uid, ids, fields=None, context={},
load='_classic_read'):
-
- """ Read IR Model
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of IR Model’s IDs.
- @param context: A standard dictionary for contextual values """
-
+ """
+ Read IR Model
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of IR Model’s IDs.
+ @param context: A standard dictionary for contextual values
+ """
data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
context=context, load=load)
@@ -1537,13 +1533,13 @@ ir_model()
class virtual_report_spool(web_services.report_spool):
def exp_report(self, db, uid, object, ids, datas=None, context=None):
-
- """ Export Report
- @param self: The object pointer
- @param db: get the current database,
- @param uid: the current user’s ID for security checks,
- @param context: A standard dictionary for contextual values """
-
+ """
+ Export Report
+ @param self: The object pointer
+ @param db: get the current database,
+ @param uid: the current user’s ID for security checks,
+ @param context: A standard dictionary for contextual values
+ """
if object == 'printscreen.list':
return super(virtual_report_spool, self).exp_report(db, uid, \
@@ -1561,13 +1557,14 @@ class res_users(osv.osv):
_inherit = 'res.users'
def _get_user_avail(self, cr, uid, ids, context=None):
-
- """ Get USer Availability
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of res user’s IDs.
- @param context: A standard dictionary for contextual values """
+ """
+ Get USer Availability
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of res user’s IDs.
+ @param context: A standard dictionary for contextual values
+ """
current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
res = {}
@@ -1591,13 +1588,14 @@ class res_users(osv.osv):
return res
def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
-
- """ Get USer Availability Function
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of res user’s IDs.
- @param context: A standard dictionary for contextual values """
+ """
+ Get USer Availability Function
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of res user’s IDs.
+ @param context: A standard dictionary for contextual values
+ """
return self._get_user_avail(cr, uid, ids, context=context)
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index ef55adcec9e..698c28484c7 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 23e04e19609..4c1baf99c97 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -134,7 +134,6 @@ class crm_case_categ(osv.osv):
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'object_id': fields.many2one('ir.model', 'Object Name'),
}
-
def _find_object_id(self, cr, uid, context=None):
"""Finds id for case object
@@ -167,7 +166,6 @@ class crm_case_resource_type(osv.osv):
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'object_id': fields.many2one('ir.model', 'Object Name'),
}
-
def _find_object_id(self, cr, uid, context=None):
"""Finds id for case object
@param self: The object pointer
@@ -205,7 +203,6 @@ class crm_case_stage(osv.osv):
help="Change Probability on next and previous stages."),
'requirements': fields.text('Requirements')
}
-
def _find_object_id(self, cr, uid, context=None):
"""Finds id for case object
@param self: The object pointer
@@ -350,7 +347,6 @@ class crm_case(osv.osv):
\nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
'company_id': fields.many2one('res.company', 'Company'),
}
-
def _get_default_partner_address(self, cr, uid, context):
"""Gives id of default address for current user
@param self: The object pointer
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 6677bf7184b..f791a1b86cc 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -14,7 +14,7 @@
+ id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
@@ -28,7 +28,7 @@
+ id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
@@ -42,8 +42,8 @@
+ id="menu_crm_claim_stage_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -57,26 +57,26 @@
-
+
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="done,cancel" type="object" icon="gtk-convert" />
@@ -132,20 +132,20 @@
+ states="open,draft,pending" type="object"
+ icon="gtk-jump-to" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ string="Reset to Draft" states="done,cancel"
+ type="object" icon="gtk-convert" />
@@ -183,10 +183,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.claim'}"
+ icon="gtk-undo" type="action" />
@@ -195,9 +195,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.claim'}"
+ icon="gtk-go-forward" type="action" />
@@ -206,7 +206,7 @@
-
+
CRM - Claims Calendar
@@ -222,7 +222,7 @@
-
+
CRM -Graph
@@ -237,7 +237,7 @@
-
+
CRM - Claims Search
@@ -263,28 +263,28 @@
-
-
+
+
-
+ widget="selection"
+ default="context.get('section_id', False)">
+
-
-
+
+
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 170e7f9b4a0..ec4f0d49236 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -8,29 +8,29 @@
Fundraising Categories
crm.case.categ
form
-
- [('object_id.model', '=', 'crm.fundraising')]
- {'object_id':'crm.fundraising'}
+
+ [('object_id.model', '=', 'crm.fundraising')]
+ {'object_id':'crm.fundraising'}
+ id="menu_crm_case_fundraising-act"
+ parent="crm.menu_crm_case_categ" />
-
- Fundraising Stages
- crm.case.stage
- form
-
- [('object_id.model', '=', 'crm.fundraising')]
- {'object_id':'crm.fundraising'}
-
+
+ Fundraising Stages
+ crm.case.stage
+ form
+
+ [('object_id.model', '=', 'crm.fundraising')]
+ {'object_id':'crm.fundraising'}
+
-
+
@@ -39,13 +39,13 @@
crm.case.resource.type
form
- [('object_id.model', '=', 'crm.fundraising')]
- {'object_id':'crm.fundraising'}
+ [('object_id.model', '=', 'crm.fundraising')]
+ {'object_id':'crm.fundraising'}
+ id="menu_crm_fundraising_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -56,31 +56,31 @@
tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -96,20 +96,20 @@
+ domain="[('object_id.model', '=', 'crm.fundraising')]" />
-
-
-
-
-
+
+
+
+
+
@@ -117,13 +117,13 @@
-
+
-
-
-
+
+
+
@@ -131,23 +131,23 @@
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ string="Reset to Draft" states="done,cancel"
+ type="object" icon="gtk-convert" />
@@ -191,10 +191,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.fundraising'}"
+ icon="gtk-undo" type="action" />
@@ -203,9 +203,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.fundraising'}"
+ icon="gtk-go-forward" type="action" />
@@ -256,32 +256,33 @@
separator="1"
help="Funds Related to Current User"
/>
+
+ domain="[('state','in',('draft', 'open'))]"
+ help="Current Funds" />
+ domain="[('state','=','open')]"
+ help="Open Funds" />
+ string="Pending Funds"
+ domain="[('state','=','pending')]"
+ help="Pending Funds" />
+ string="Fund Description" />
-
+ widget="selection">
+
-
+ widget="selection"
+ default="context.get('section_id', False)">
+
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 542b37d69ab..6bb356bacfb 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -8,13 +8,13 @@
Helpdesk Categories
crm.case.categ
form
-
+
[('object_id.model', '=', 'crm.helpdesk')]
- {'object_id':'crm.helpdesk'}
+ {'object_id':'crm.helpdesk'}
+ id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
@@ -31,20 +31,20 @@
-
+
+ on_change="onchange_partner_id(partner_id, email_from)"
+ select="1" />
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ select="2" />
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
@@ -53,37 +53,37 @@
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
+ nolabel="1" widget="text_tag" readonly="1" />
+ states="open,draft,pending" string="Close"
+ type="object" icon="gtk-close" />
+ states="draft,pending" string="Open"
+ type="object" icon="gtk-go-forward" />
+ states="draft,open,pending" string="Cancel"
+ type="object" icon="gtk-cancel" />
+ states="draft,open" string="Pending"
+ type="object" icon="gtk-media-pause" />
+ states="open,draft,pending"
+ string="Escalate" type="object"
+ icon="gtk-go-up" />
+ states="done,cancel"
+ string="Reset to Draft" type="object"
+ icon="gtk-convert" />
@@ -126,10 +126,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+ icon="gtk-undo" type="action" />
@@ -138,9 +138,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.helpdesk'}"
+ icon="gtk-go-forward" type="action" />
@@ -162,25 +162,25 @@
-
+
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ states="done,cancel" type="object" icon="gtk-convert" />
@@ -224,24 +224,24 @@
+ domain="[('user_id','=',uid)]"
+ help="My Helpdesk Requests" default="1" />
-
+ default="context.get('section_id', False)" select="1"
+ widget="selection" string="Section">
+
+ domain="[]" context="{'group_by':'partner_id'}" />
+ context="{'group_by':'state'}" />
+ domain="[]" context="{'group_by':'priority'}" />
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6805f8cac16..dd8373538ba 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,7 @@
{'object_id':'crm.lead'}
+ parent="crm.menu_crm_case_stage" />
@@ -22,12 +22,12 @@
crm.case.resource.type
form
- [('object_id.model', '=', 'crm.lead')]
- {'object_id':'crm.lead'}
+ [('object_id.model', '=', 'crm.lead')]
+ {'object_id':'crm.lead'}
+ id="menu_crm_lead_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -45,23 +45,23 @@
name="convert_opportunity"
string="Convert"
help="Convert into Opportunity"
- icon="gtk-index"
- type="object"
+ icon="gtk-index"
+ type="object"
attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+ widget="selection" />
+ readonly="1"
+ domain="[('object_id.model', '=', 'crm.lead')]" />
-
-
+
+
@@ -104,23 +104,47 @@
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ string="Reset to Draft" states="done,cancel"
+ type="object" icon="gtk-convert" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -135,53 +159,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ name="%(crm.action_view_crm_email_add_cc_wizard)d"
+ icon="gtk-add" type="action"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -207,30 +207,30 @@
+ states="open,pending" type="object" icon="gtk-go-back" />
+ states="open,pending" type="object"
+ icon="gtk-go-forward" />
+ invisible="context.get('invisible_section', True)" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ name="%(action_crm_lead2opportunity)d"
+ states="draft,open,pending" icon="gtk-index"
+ type="action" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
@@ -244,11 +244,11 @@
-
-
-
+ date_start="create_date" color="user_id"
+ date_delay="duration">
+
+
+
@@ -274,9 +274,9 @@
+ domain="[('create_date','<', time.strftime('%%Y-%%m-%%d 23:59:59')), \
+ ('create_date','>=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+ help="Todays' Opportunities" />
@@ -300,7 +303,7 @@
+ help="Show Sales Team"/>
@@ -314,7 +317,7 @@
+ domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index c208a91832b..e6694215bee 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,8 @@
+ id="menu_crm_case_opportunity-act"
+ parent="crm.menu_crm_case_categ" />
@@ -29,8 +29,8 @@
+ id="menu_crm_opportunity_stage_act"
+ parent="crm.menu_crm_case_stage" />
@@ -44,9 +44,8 @@
-
+ id="menu_crm_opportunity_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -61,19 +60,19 @@
+ on_change="onchange_stage_id(stage_id)"
+ widget="selection"
+ domain="[('object_id.model', '=', 'crm.opportunity')]" />
+ states="open,pending" type="object"
+ icon="gtk-go-back" string="" />
+ type="object" icon="gtk-go-forward" string="" />
+ string="Schedule Meeting" icon="gtk-redo" />
@@ -84,14 +83,14 @@
-
+
+ on_change="onchange_partner_id(partner_id, email_from)"
+ colspan="2" />
+ string="Contact"
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ colspan="1" />
@@ -101,8 +100,8 @@
+ string="Category" widget="selection"
+ domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -112,23 +111,23 @@
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="done,cancel" type="object"
+ icon="gtk-convert" />
@@ -145,7 +144,6 @@
-
@@ -177,10 +175,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.opportunity'}"
+ icon="gtk-undo" type="action" />
@@ -189,9 +187,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.opportunity'}"
+ icon="gtk-go-forward" type="action" />
@@ -213,10 +211,10 @@
+ states="open,pending" type="object" icon="gtk-go-back" />
+ states="open,pending" type="object"
+ icon="gtk-go-forward" />
@@ -224,17 +222,17 @@
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="open,draft" type="object"
+ icon="gtk-media-pause" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
@@ -262,14 +260,24 @@
search
+
+
+
+
-
@@ -279,44 +287,37 @@
domain="[('user_id','=',uid)]"
help="My Opportunities" default="1"
/>
+
-
-
-
-
+ default="context.get('section_id', False)" select="1"
+ widget="selection">
+
-
+
+ context="{'group_by':'stage_id'}" />
+ domain="[]" context="{'group_by':'categ_id'}" />
-
+ domain="[]" context="{'group_by':'type_id'}" />
-
+ context="{'group_by':'partner_id'}" />
-
+ domain="[]" context="{'group_by':'user_id'}" />
-
+ domain="[]" context="{'group_by':'create_date'}" />
+ domain="[]" context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 42692eee9ce..ec773cf78ef 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -14,7 +14,7 @@
+ id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
@@ -23,13 +23,13 @@
crm.case.resource.type
form
- [('object_id.model', '=', 'crm.phonecall')]
- {'object_id':'crm.phonecall'}
+ [('object_id.model', '=', 'crm.phonecall')]
+ {'object_id':'crm.phonecall'}
+ id="menu_crm_phonecall_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -87,9 +87,9 @@
name="%(phonecall2opportunity_act)d"
icon="gtk-index" type="action"
attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-
-
+
@@ -97,7 +97,7 @@
+ on_change="onchange_partner_id(partner_id, email_from)" />
+ on_change="onchange_partner_address_id(partner_address_id, email_from)" />
@@ -120,19 +120,19 @@
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open" type="object" icon="gtk-undo" />
+ states="open,draft,pending" type="object"
+ icon="gtk-jump-to" />
+ states="done,cancel" type="object"
+ icon="gtk-convert" />
@@ -177,35 +177,30 @@
+ domain="[('user_id','=',uid)]" help="My Phonecalls"
+ default="1" />
-
-
-
+ domain="[('user_id','=',False)]"
+ help="Unassigned Phonecalls" />
-
+ default="context.get('section_id', False)" select="1"
+ widget="selection" string="Section">
+
+ context="{'group_by':'partner_id'}" />
+ domain="[]" context="{'group_by':'user_id'}" />
+ domain="[]" context="{'group_by':'create_date'}" />
+ context="{'group_by':'date'}" />
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 2d987839302..f0a44c56c8c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -20,7 +20,6 @@
-
@@ -142,8 +141,8 @@
+ id="menu_crm_case_section_act"
+ parent="crm.menu_crm_configuration" />
@@ -185,7 +184,7 @@
+ parent="crm.menu_crm_configuration" />
Cases by section
@@ -242,11 +241,11 @@
calendar
-
-
-
+ date_stop="date_deadline" day_length="12"
+ string="Cases">
+
+
+
@@ -268,22 +267,22 @@
+ states="open,draft,pending" string="Close"
+ type="object" icon="gtk-close" />
+ string="Open" type="object" icon="gtk-go-forward" />
+ states="draft,open,pending" string="Cancel"
+ type="object" icon="gtk-cancel" />
+ string="Pending" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" string="Escalate"
+ type="object" icon="gtk-go-up" />
+ string="Reset to Draft" type="object"
+ icon="gtk-convert" />
@@ -306,24 +305,24 @@
+ on_change="onchange_partner_id(partner_id, email_from)"
+ select="1" />
+ name="partner_address_id"
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ select="2" />
+ select="2" />
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
@@ -331,27 +330,27 @@
+ states="open,draft,pending"
+ string="Close" type="object"
+ icon="gtk-close" />
+ states="draft,pending" string="Open"
+ type="object" icon="gtk-go-forward" />
+ states="draft,open,pending"
+ string="Cancel" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" string="Pending"
+ type="object" icon="gtk-media-pause" />
+ states="open,draft,pending"
+ string="Escalate" type="object"
+ icon="gtk-go-up" />
+ states="done,cancel"
+ string="Reset to Draft" type="object"
+ icon="gtk-convert" />
@@ -364,7 +363,7 @@
-
+
@@ -377,7 +376,7 @@
-
+
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.case'}"
+ icon="gtk-undo" type="action" />
@@ -398,9 +397,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.case'}"
+ icon="gtk-go-forward" type="action" />
@@ -415,28 +414,28 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -454,7 +453,7 @@
crm.case
form
- [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
+ [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
@@ -504,15 +503,15 @@
+ domain="[('user_id','=',uid)]"
+ help="My Histories" />
+ default="context.get('section_id', False)"
+ select="1" widget="selection"/>
@@ -574,11 +573,11 @@
form
@@ -640,8 +639,8 @@
tree,form
+ id="menu_crm_segmentation-act"
+ parent="crm.menu_crm_configuration" />
view.users.form.crm.modif.inherited1
@@ -651,8 +650,8 @@
+ widget="selection"
+ context="{'user_prefence':True}" />
@@ -672,7 +671,7 @@
-
+
view.res.partner.form.crm.inherited1
res.partner
form
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index c2643ad5e8a..f06b2d047d3 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 46e4b7490a5..1e917d83710 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -24,12 +24,10 @@ import tools
class crm_opportunity_report(osv.osv):
""" CRM Opportunity Report """
-
_name = "crm.opportunity.report"
_auto = False
_inherit = "crm.case.report"
_description = "CRM Opportunity Report"
-
_columns = {
'probability': fields.float('Avg. Probability', readonly=True),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
@@ -47,7 +45,6 @@ class crm_opportunity_report(osv.osv):
}
def init(self, cr):
-
""" Display Est.Revenue , Average Probability ,Est.Revenue Probability
@param cr: the current row, from the database cursor
"""
@@ -88,5 +85,3 @@ class crm_opportunity_report(osv.osv):
)""")
crm_opportunity_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index e4729b78cad..53d4f1b5476 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -1,53 +1,53 @@
-
+
-
+
-
- crm.lead2partner.view.create
- crm.lead2partner
- form
-
-
-
-
+
+ crm.lead2partner.view.create
+ crm.lead2partner
+ form
+
+
+
+
-
+
-
- crm.lead2partner.view
- crm.lead2partner
- form
-
-
-
-
+
+ crm.lead2partner.view
+ crm.lead2partner
+ form
+
+
+
+
-
+
-
+
-
+
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f8b7c58985c..057d049af9c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -38,20 +38,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -62,6 +48,13 @@
+
+
+
+
+
+
+
@@ -70,6 +63,14 @@
+
+
+
+
+
+
+
+
@@ -87,10 +88,10 @@
-
+
@@ -101,14 +102,12 @@
search
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -154,6 +153,7 @@
form
tree,form
[]
+
hr.timesheet.employee.extd_form
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 6fd9ba3a577..acb4bc52b66 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-22 19:08+0000\n"
+"PO-Revision-Date: 2010-04-06 23:02+0000\n"
"Last-Translator: Ferdinand @ ChriCar \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-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
@@ -351,7 +351,7 @@ msgstr "März"
#: xsl:hr.analytical.timesheet:0
#: xsl:hr.analytical.timesheet_users:0
msgid "Total"
-msgstr "Betrag gesammt"
+msgstr "Betrag gesamt"
#. module: hr_timesheet
#: selection:hr.analytical.timesheet,init,month:0
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 79086640262..c895250284e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -68,16 +68,16 @@
search
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -124,8 +124,8 @@
search
-
-
+
+
@@ -207,17 +207,17 @@
search
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -281,17 +281,17 @@
search
@@ -323,15 +323,15 @@
tree
-
-
-
-
+
+
+
+
-
+
-
+
Random Timesheet
report.random.timesheet
form
@@ -347,21 +347,21 @@
tree
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
ir.actions.act_window
Timesheet Lines
random.timesheet.lines
@@ -376,7 +376,7 @@
name="Time Tracking"
parent="base.menu_main_pm" sequence="3"/>
-
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3702bcb0f1d..580fc64638f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,18 +1,18 @@
-
hr.timesheet.sheet.tree
hr_timesheet_sheet.sheet
tree
-
+
-
+
@@ -156,9 +156,11 @@
-
-
-
+
+
+
+
+
@@ -179,17 +181,13 @@
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
@@ -308,17 +306,6 @@
-
- hr.attendance.tree
- hr.attendance
- tree
-
-
-
-
-
-
-
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 4395f13380e..1a29940ada6 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -25,7 +25,7 @@ class res_company(osv.osv):
_description = 'res.company'
def _get_default_ad(self, addresses):
- city = post_code = address = ""
+ city = post_code = address = country_code = ""
for ads in addresses:
if ads.type == 'default':
city = ads.city or ""
@@ -34,7 +34,9 @@ class res_company(osv.osv):
address = ads.street or ""
if ads.street2:
address += " " + ads.street2
- return city, post_code, address
+ if ads.country_id:
+ country_code = ads.country_id and ads.country_id.code or ""
+ return city, post_code, address, country_code
res_company()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 9dd5ea5b269..b1674293291 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -32,6 +32,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
'period_id': fields.many2one('account.period','Period', required=True),
'msg': fields.text('File created', size=64, readonly=True),
'file_save': fields.binary('Save File'),
+ 'ask_resitution': {'type': 'boolean', 'string': 'Ask Restitution',},
+ 'ask_payment': {'type': 'boolean', 'string': 'Ask Payment',},
+ 'client_nihil': {'type': 'boolean', 'string': 'Last Declaration of Entreprise', 'help': 'Thick this case only if it concerns only the last statement on the civil or cessation of activity'},
}
_defaults = {
@@ -46,7 +49,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
obj_comp = self.pool.get('res.company')
obj_data = self.pool.get('ir.model.data')
- list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
+ list_of_tags=['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','88','91']
obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
user_cmpny = obj_company.name
vat_no=obj_company.partner_id.vat
@@ -59,26 +62,19 @@ class l10n_be_vat_declaration(osv.osv_memory):
ctx['period_id'] = data['period_id'] #added context here
tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
- address = post_code = city = ''
- if not obj_company.partner_id.address:
- address = post_code = city = ''
-
- city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
+ address = post_code = city = country_code = ''
+ city, post_code, address, country_code = obj_comp._get_default_ad(obj_company.partner_id.address)
year_id = obj_fyear.find(cr, uid)
account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
- current_year = account_period.fiscalyear_id.name
period_code = account_period.code
- send_ref = user_cmpny
- if period_code:
- send_ref = send_ref + period_code
-
+ send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
data_of_file='\n'
data_of_file +='\n\t\n\t\t'+str(vat_no)+'\n\t\t'+str(obj_company.name)+'\n\t\t'+address+''
- data_of_file +='\n\t\t'+post_code+'\n\t\t'+city+'\n\t\t'+send_ref+'\n\t'
- data_of_file +='\n\t\n\t\t1\n\t\t'+str(vat_no)+'\n\t\t\n\t\t\t'
-
+ data_of_file +='\n\t\t'+post_code+'\n\t\t'+city+'\n\t\t'+country_code+'\n\t\t'+send_ref+'\n\t'
+ data_of_file +='\n\t\n\t\t1\n\t\t'+str(vat_no[2:])+'\n\t\t\n\t\t\t'
+
starting_month = account_period.date_start[5:7]
ending_month = account_period.date_stop[5:7]
if starting_month != ending_month:
@@ -89,14 +85,16 @@ class l10n_be_vat_declaration(osv.osv_memory):
else:
data_of_file += '' + starting_month + '\n\t\t\t'
data_of_file += '' + str(account_period.date_stop[:4]) + '\n\t\t\n\t\t'
+ data_of_file += '\n\t\t'+ (data['form']['client_nihil'] and 'YES' or 'NO') +''
data_of_file +='\n\t\t\n\t\t\t'
for item in tax_info:
if item['code']:
+
if item['code'] == '71-72':
item['code'] = '71'
if item['code'] in list_of_tags:
- data_of_file +='\n\t\t\t\t' + str(int(item['sum_period']*100)) + ''
+ data_of_file +='\n\t\t\t\t' + str(abs(int(item['sum_period']*100))) + ''
data_of_file +='\n\t\t\t\n\t\t\n\t\n'
data['file_save'] = base64.encodestring(data_of_file)
@@ -105,4 +103,4 @@ class l10n_be_vat_declaration(osv.osv_memory):
l10n_be_vat_declaration()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 56f8b6477f9..3f33448f8d3 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -15,6 +15,9 @@
@@ -223,51 +228,51 @@
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Project
# ------------------------------------------------------
- phase.project.form1
- project.project
- form
-
-
-
-
-
+ phase.project.form1
+ project.project
+ form
+
+
+
+
+
-
-
+
+
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Project Task
# ------------------------------------------------------
-
- project.phase.task.form1
- project.task
- form
-
-
-
-
-
+
+ project.phase.task.form1
+ project.task
+ form
+
+
+
+
+
-
-
+
+
-
- project.phase.task.form2
- project.task
- form
-
-
-
-
-
-
-
+
+ project.phase.task.form2
+ project.task
+ form
+
+
+
+
+
+
+
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Menu Items
# ------------------------------------------------------
-
+
-
-
-
+
+
+
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 20f71776b41..956f97ff5a9 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_purchase
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f08b03600f8..4fbcdd1c284 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -2,27 +2,26 @@
-
+
-
+
resource.resource.search
resource.resource
search
-
-
+
-
-
-
-
-
+
+
+
+
-
+
+
@@ -37,10 +36,9 @@
-
-
-
-
+
+
+
@@ -71,7 +69,7 @@
resource.calendar
form
-