+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index fb1186ae401..d4907c90f11 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -6,7 +6,7 @@
hr.evaluation.report.tree
hr.evaluation.report
-
-
+
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index bf456cfc4d6..3e07516c01b 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -231,7 +231,7 @@
[[ formatLang(line.unit_quantity) ]]
- [[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(line.total_amount, currency_obj=o.currency_id) ]]
@@ -277,7 +277,7 @@
Total:
- [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(o.amount, currency_obj=o.currency_id) ]]
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1cd1e10c5ed..9f94c264c5e 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -6,7 +6,7 @@
hr.expense.report.tree
hr.expense.report
-
+
+ Allocation Requests to Approve
+ hr.holidays
+ form
+ {'default_type': 'add', 'search_default_approve':1}
+ [('type','=','add')]
+
+
+
+ tree
+
+
+
+ form
+
+
+
+
Leaves Summary
hr.holidays
diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml
index b3a5de9753d..8a5897c6091 100644
--- a/addons/hr_payroll/report/report_contribution_register.rml
+++ b/addons/hr_payroll/report/report_contribution_register.rml
@@ -206,7 +206,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]
@@ -222,7 +222,7 @@
Total:
- [[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]
diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml
index 4d96e4b5ef7..990419ee5f1 100644
--- a/addons/hr_payroll/report/report_payslip.rml
+++ b/addons/hr_payroll/report/report_payslip.rml
@@ -197,7 +197,8 @@
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+ [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -293,7 +294,7 @@
[[ formatLang(p.amount) ]]
- [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]
diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml
index fe6a10dd1f5..4ace0ad2f82 100644
--- a/addons/hr_payroll/report/report_payslip_details.rml
+++ b/addons/hr_payroll/report/report_payslip_details.rml
@@ -234,7 +234,8 @@
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+ [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -334,7 +335,7 @@
[[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
@@ -391,7 +392,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d48086f5663..11143201895 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -342,8 +342,8 @@
attrs="{'invisible':[('survey_id','=',False)]}"/>
+
+
hr.recruitment.report.tree
hr.recruitment.report
-
+
hr.timesheet.report.tree
hr.timesheet.report
-
+
[[ l['code'] (l['intra_code']) ]]
- [[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(l['amount'], currency_obj=company.currency_id) ]]
@@ -129,7 +129,7 @@
Total:
- [[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
index 5221b00c462..76c6eb9dedf 100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -290,9 +290,7 @@
[[o.employee_id.name or '_']]
- [[o.employee_id.address_home_id.street or '_' ]]
- [[o.employee_id.address_home_id.street2 or '' ]]
- [[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]
+ [[display_address(o.employee_id.address_home_id) or '_' ]]
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index 4d7dbe91ee1..38f1272718b 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -6,7 +6,7 @@
payment.advice.report.tree
payment.advice.report
-
+
payslip.report.tree
payslip.report
-
+
- [[ formatLang(e[13]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[13],currency_obj= company.currency_id)]]
@@ -248,43 +248,43 @@
Total
- [[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]]
- [[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]
- [[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(get_total()) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_total(), currency_obj = company.currency_id)]]
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index 7fa127b0bd3..502eaa7b0ff 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -478,7 +478,7 @@
- [[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[13],currency_obj= company.currency_id) ]]
@@ -571,7 +571,7 @@
- [[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[13],currency_obj= company.currency_id) ]]
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 8ca1bae5ba5..879314a24d9 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -247,7 +247,7 @@
[[ line['acc_no'] ]]
- [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[formatLang(line['bysal'], currency_obj = company.currency_id) ]]
[[ line['debit_credit'] ]]
@@ -296,7 +296,7 @@
[[ line['ifsc_code'] ]]
- [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[formatLang(line['bysal'], currency_obj = company.currency_id) ]]
[[ line['debit_credit'] ]]
@@ -321,7 +321,7 @@
- [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]
@@ -347,7 +347,7 @@
- [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
index a7ab3db3185..c4ce55bfa41 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
@@ -234,7 +234,7 @@
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -334,7 +334,7 @@
[[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index b09b59bb96b..0a13beb622c 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -137,7 +137,7 @@
- [[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]
+ [[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]]
@@ -155,7 +155,7 @@
[[ lines.descript]]
- [[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]
+ [[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]]
@@ -172,7 +172,7 @@
Total :
- [[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]
+ [[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]]
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7e77b2f2e8c..9631918050a 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -134,6 +134,7 @@ class mail_message(osv.Model):
'subtype_id': fields.many2one('mail.message.subtype', 'Subtype'),
'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', string='Votes',
help='Users that voted for this message'),
+ 'is_private': fields.boolean('Private message'),
}
def _needaction_domain_get(self, cr, uid, context=None):
@@ -150,6 +151,7 @@ class mail_message(osv.Model):
'date': lambda *a: fields.datetime.now(),
'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
'body': '',
+ 'is_private': True,
}
#------------------------------------------------------
@@ -220,127 +222,12 @@ class mail_message(osv.Model):
'unread': msg.unread and msg.unread['unread'] or False
}
- def message_read_tree_get_expandable(self, cr, uid, parent_message, last_message, domain=[], current_level=0, level=0, context=None):
- """ . """
- base_domain = [('id', '<', last_message['id'])]
- if parent_message and current_level < level:
- base_domain += [('parent_id', '=', parent_message['id'])]
- elif parent_message:
- base_domain += [('id', 'child_of', parent_message['id']), ('id', '!=', parent_message['id'])]
- if domain:
- base_domain += domain
- extension = { 'type': 'expandable',
- 'domain': base_domain,
- 'thread_level': current_level,
- 'context': context,
- 'id': -1,
- }
- return extension
-
- def message_read_tree_flatten(self, cr, uid, parent_message, messages, domain=[], level=0, current_level=0, context=None, limit=None, add_expandable=True):
- """ Given a tree with several roots of following structure :
- [ {'id': 1, 'child_ids': [
- {'id': 11, 'child_ids': [...] },],
- {...} ]
- Flatten it to have a maximum number of levels, 0 being flat and
- sort messages in a level according to a key of the messages.
- Perform the flattening at leafs if above the maximum depth, then get
- back in the tree.
- :param context: ``sort_key``: key for sorting (id by default)
- :param context: ``sort_reverse``: reverser order for sorting (True by default)
+ def _message_read_expandable(self, cr, uid, tree, result, message_loaded, domain, context, parent_id, limit):
"""
- def _flatten(msg_dict):
- """ from {'id': x, 'child_ids': [{child1}, {child2}]}
- get [{'id': x, 'child_ids': []}, {child1}, {child2}]
- """
- child_ids = msg_dict.pop('child_ids', [])
- msg_dict['child_ids'] = []
- return [msg_dict] + child_ids
-
- context = context or {}
- limit = limit or self._message_read_limit
-
- # Depth-first flattening
- for message in messages:
- if message.get('type') == 'expandable':
- continue
- message['child_ids'] = self.message_read_tree_flatten(cr, uid, message, message['child_ids'], domain, level, current_level + 1, context=context, limit=limit)
- for child in message['child_ids']:
- if child.get('type') == 'expandable':
- continue
- message['child_nbr'] += child['child_nbr']
- # Flatten if above maximum depth
- if current_level < level:
- return_list = messages
- else:
- return_list = [flat_message for message in messages for flat_message in _flatten(message)]
-
- # Add expandable
- return_list = sorted(return_list, key=itemgetter(context.get('sort_key', 'id')), reverse=context.get('sort_reverse', True))
- if return_list and current_level == 0 and add_expandable:
- expandable = self.message_read_tree_get_expandable(cr, uid, parent_message, return_list and return_list[-1] or parent_message, domain, current_level, level, context=context)
- return_list.append(expandable)
- elif return_list and current_level <= level and add_expandable:
- expandable = self.message_read_tree_get_expandable(cr, uid, parent_message, return_list and return_list[-1] or parent_message, domain, current_level, level, context=context)
- return_list.append(expandable)
- return return_list
-
- def message_read(self, cr, uid, ids=False, domain=[], level=0, context=None, parent_id=False, limit=None):
- """ Read messages from mail.message, and get back a structured tree
- of messages to be displayed as discussion threads. If IDs is set,
- fetch these records. Otherwise use the domain to fetch messages.
- After having fetch messages, their parents will be added to obtain
- well formed threads.
-
- :param domain: optional domain for searching ids
- :param level: level of threads to display, 0 being flat
- :param limit: number of messages to fetch
- :param parent_id: if parent_id reached, stop searching for
- further parents
- :return list: list of trees of messages
+ create the expandable message for all parent message read
+ this function is used by message_read
"""
- message_loaded = context and context.get('message_loaded') or [0]
-
- # don't read the message display by .js, in context message_loaded list
- if context and context.get('message_loaded'):
- domain += [ ['id','not in',message_loaded] ];
-
- limit = limit or self._message_read_limit
- context = context or {}
-
- tree = []
- result = []
- record = None
-
- # select ids
- if ids:
- for msg in self.browse(cr, uid, ids, context=context):
- result.append(self._message_dict_get(cr, uid, msg, context=context))
- return result
-
- # key: ID, value: record
- ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit)
- for msg in self.browse(cr, uid, ids, context=context):
- # if not in record and not in message_loded list
- if msg.id not in tree and msg.id not in message_loaded :
- record = self._message_dict_get(cr, uid, msg, context=context)
- tree.append(msg.id)
- result.append(record)
-
- while msg.parent_id and msg.parent_id.id != parent_id:
- parent_id = msg.parent_id.id
- if msg.parent_id.id not in tree:
- msg = msg.parent_id
- tree.append(msg.id)
- # if not in record and not in message_loded list
- if msg.id not in message_loaded :
- record = self._message_dict_get(cr, uid, msg, context=context)
- result.append(record)
-
- result = sorted(result, key=lambda k: k['id'])
-
-
tree_not = []
# expandable for not show message
for id_msg in tree:
@@ -367,10 +254,12 @@ class mail_message(osv.Model):
'parent_id': id_msg,
'id': id_min
})
+ id_min=None
+ id_max=None
nb=0
if nb>0:
result.append({
- 'domain': [['id','>=',id_min],['parent_id','=',id_msg]],
+ 'domain': [['id','>=',id_min],['id','<=',id_max],['parent_id','=',id_msg]],
'nb_messages': nb,
'type': 'expandable',
'parent_id': id_msg,
@@ -395,6 +284,73 @@ class mail_message(osv.Model):
return result
+ def message_read(self, cr, uid, ids=False, domain=[], level=0, context=None, parent_id=False, limit=None):
+ """ Read messages from mail.message, and get back a structured tree
+ of messages to be displayed as discussion threads. If IDs is set,
+ fetch these records. Otherwise use the domain to fetch messages.
+ After having fetch messages, their parents will be added to obtain
+ well formed threads.
+
+ :param domain: optional domain for searching ids
+ :param limit: number of messages to fetch
+ :param parent_id: if parent_id reached, stop searching for
+ further parents
+ :return list: list of trees of messages
+ """
+ message_loaded = context and context.get('message_loaded') or [0]
+
+ # don't read the message display by .js, in context message_loaded list
+ if context and context.get('message_loaded'):
+ domain += [ ['id','not in',message_loaded] ];
+
+ limit = limit or self._message_read_limit
+ context = context or {}
+
+ tree = []
+ result = []
+ record = None
+
+ # select ids
+ if ids and ids!=[None]:
+ for msg in self.browse(cr, uid, ids, context=context):
+ result.append(self._message_dict_get(cr, uid, msg, context=context))
+ return result
+
+ # key: ID, value: record
+ ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit)
+ for msg in self.browse(cr, uid, ids, context=context):
+ # if not in record and not in message_loded list
+ if msg.id not in tree and msg.id not in message_loaded :
+ record = self._message_dict_get(cr, uid, msg, context=context)
+ tree.append(msg.id)
+ result.append(record)
+
+ while msg.parent_id and msg.parent_id.id != parent_id:
+ parent_id = msg.parent_id.id
+ if msg.parent_id.id not in tree:
+ msg = msg.parent_id
+ tree.append(msg.id)
+ # if not in record and not in message_loded list
+ if msg.id not in message_loaded :
+ record = self._message_dict_get(cr, uid, msg, context=context)
+ result.append(record)
+
+ result = sorted(result, key=lambda k: k['id'])
+
+ result = self._message_read_expandable(cr, uid, tree, result, message_loaded, domain, context, parent_id, limit)
+
+ return result
+
+ def user_free_attachment(self, cr, uid, context=None):
+ attachment_list = []
+
+ attachment = self.pool.get('ir.attachment')
+ attachment_ids = attachment.search(cr, uid, [('res_model','=',''),('create_uid','=',uid)])
+ if len(attachment_ids):
+ attachment_list = [{'id': attach.id, 'name': attach.name, 'date': attach.create_date} for attach in attachment.browse(cr, uid, attachment_ids, context=context)]
+
+ return attachment_list
+
#------------------------------------------------------
# Email api
#------------------------------------------------------
@@ -525,11 +481,9 @@ class mail_message(osv.Model):
self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
return super(mail_message, self).unlink(cr, uid, ids, context=context)
- def _notify(self, cr, uid, newid, context=None):
+ def _notify_followers(self, cr, uid, newid, message, context=None):
""" Add the related record followers to the destination partner_ids.
- Call mail_notification.notify to manage the email sending
"""
- message = self.browse(cr, uid, newid, context=context)
partners_to_notify = set([])
# message has no subtype_id: pure log message -> no partners, no one notified
if not message.subtype_id:
@@ -550,6 +504,14 @@ class mail_message(osv.Model):
self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context)
partners_to_notify |= extra_notified
+ def _notify(self, cr, uid, newid, context=None):
+ """ Add the related record followers to the destination partner_ids if is not a private message.
+ Call mail_notification.notify to manage the email sending
+ """
+ message = self.browse(cr, uid, newid, context=context)
+ if message and (message.is_private!=False and message.is_private!=None):
+ self._notify_followers(cr, uid, newid, message, context=context)
+
# add myself if I wrote on my wall,
# unless remove myself author
if ((message.model=="res.partner" and message.res_id==message.author_id.id)):
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index cc0419352af..0c572384bb4 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -88,21 +88,21 @@
Inbox
mail.wall
Archives
mail.wall
Sent
mail.wall
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index e6150640eb3..e5b93ac4000 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -623,11 +623,10 @@ class mail_thread(osv.AbstractModel):
:param str subject: optional subject
:param str type: mail_message.type
:param int parent_id: optional ID of parent message in this thread
- :param tuple(str,str) attachments: list of attachment tuples in the form
+ :param tuple(str,str) attachments or list id: list of attachment tuples in the form
``(name,content)``, where content is NOT base64 encoded
:return: ID of newly created mail.message
"""
-
context = context or {}
attachments = attachments or []
assert (not thread_id) or isinstance(thread_id, (int, long)) or \
@@ -635,7 +634,7 @@ class mail_thread(osv.AbstractModel):
if isinstance(thread_id, (list, tuple)):
thread_id = thread_id and thread_id[0]
- attachment_ids = []
+ attachment_ids=[]
for name, content in attachments:
if isinstance(content, unicode):
content = content.encode('utf-8')
@@ -679,6 +678,13 @@ class mail_thread(osv.AbstractModel):
'attachment_ids': attachment_ids,
'subtype_id': subtype_id,
})
+
+ # if the parent is private, the message must be private
+ if parent_id:
+ msg = messages.browse(cr, uid, parent_id, context=context)
+ if msg.is_private:
+ values["is_private"] = msg.is_private
+
# Avoid warnings about non-existing fields
for x in ('from', 'to', 'cc'):
values.pop(x, None)
@@ -691,10 +697,23 @@ class mail_thread(osv.AbstractModel):
def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
- added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
- subtype=subtype, parent_id=parent_id, attachments=attachments, context=context)
- added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
+ # if the user write on his wall
+ if self._name=='res.partner' and not thread_id:
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ thread_id = user.partner_id.id
+ added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
+ subtype=subtype, parent_id=parent_id, context=context)
+
+ attachment_ids=[]
+ if attachments:
+ ir_attachment = self.pool.get('ir.attachment')
+ attachment_ids = ir_attachment.search(cr, 1, [('res_model', '=', ""), ('res_id', '=', ""), ('user_id', '=', uid), ('id', 'in', attachments)], context=context)
+ if attachment_ids:
+ self.pool.get('ir.attachment').write(cr, 1, attachment_ids, { 'res_model': self._name, 'res_id': thread_id }, context=context)
+ self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]} )
+
+ added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
return added_message
def get_message_subtypes(self, cr, uid, ids, context=None):
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 3507e7c449f..696edde0e15 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -20,13 +20,13 @@
Archives
-
Sent
-
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 364ac7e3165..1592d79e18d 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -82,9 +82,13 @@
overflow: auto;
}
+.openerp .oe_mail_record_wall {
+ margin: auto;
+ width: 560px;
+}
+
.openerp .oe_mail_record_wall > .oe_mail_wall_threads {
float: left;
- width: 560px;
}
.openerp div.oe_mail_recthread_aside {
@@ -145,6 +149,10 @@
z-index: 5;
}
.openerp .oe_mouse_subtypes .oe_recthread_subtypes {
+ background: #fff;
+ padding: 2px;
+ border: 1px solid #aaaaaa;
+ border-top: 0px;
position: absolute;
z-index: 2;
}
@@ -160,7 +168,6 @@
/* ------------------------------------------------------------ */
.openerp div.oe_mail_thread_action {
- display: none;
white-space: normal;
padding: 8px;
z-index:5;
@@ -173,16 +180,6 @@
clear: both;
}
-/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
-.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea {
- width: 474px;
- height: 60px;
- padding: 4px;
- font-size: 12px;
- border: 1px solid #cccccc;
-}
-
/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
@@ -206,6 +203,10 @@
margin-left: 66px;
}
+.openerp li.oe_mail_thread_msg {
+ width: 560px;
+}
+
.openerp div.oe_thread_placeholder li.oe_mail_thread_msg:last-child {
margin-bottom: 8px;
}
@@ -223,13 +224,18 @@
.openerp li.oe_mail_thread_msg.oe_mail_read,
.openerp li.oe_mail_thread_msg.oe_mail_read div {
- background-color: #F0F0F0;
+ border-left: #F0F0F0;
}
.openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread,
.openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread div {
background-color: #F6F6F6;
}
+.openerp li.oe_mail_thread_msg.oe_mail_unread>div>ul>li.oe_unread,
+.openerp li.oe_mail_thread_msg.oe_mail_read>div>ul>li.oe_read {
+ display: none;
+}
+
.openerp li.oe_mail_thread_msg > div:after {
content: "";
display: block;
@@ -247,7 +253,7 @@
.openerp .oe_mail_msg_email {
padding: 8px;
background: white;
- border-top: 1px solid #ebebeb;
+ position: relative;
}
.openerp .oe_mail_msg_notification:after,
@@ -259,7 +265,7 @@
}
.openerp div.oe_mail_msg_content {
- float: right;
+ float: left;
position: relative;
width: 486px;
}
@@ -309,76 +315,6 @@
display: none;
}
-/* ------------------------------------------------------------ */
-/* mail.compose.message form view & OpenERP hacks
-/* ------------------------------------------------------------ */
-
-/* form_view: delete white background */
-.openerp .oe_mail_msg_content div.oe_formview {
- background-color: transparent;
-}
-
-.openerp .oe_mail_msg_content div.oe_form_nosheet {
- margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_group {
- margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_field,
-.openerp .oe_mail_msg_content div.oe_form_field {
- padding: 0px;
-}
-
-.openerp .oe_mail_msg_content td.oe_form_group_cell {
- vertical-align: bottom;
-}
-
-/* subject: change width */
-.openerp .oe_mail_msg_content .oe_form .oe_form_field input {
- width: 472px;
-}
-
-/* body_html: cleditor */
-.openerp .oe_mail_msg_content div.cleditorMain {
- border: 1px solid #cccccc;
-}
-
-/* destination_partner_ids */
-.openerp .oe_mail_msg_content div.text-core {
- height: 22px !important;
- width: 472px;
-}
-
-/* buttons */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
- padding: 1px;
-}
-
-/* attachment button: override of openerp values */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file {
- display: inline-block;
- width: 24px;
- height: 24px;
- margin: 2px;
-}
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file button {
- margin: 0px;
-}
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons input.oe_form_binary_file {
- bottom: 0px;
- top: auto;
- left: auto;
- right: 28px;
- height: 26px;
- width: 26px;
- min-width: 22px;
- font-size: 0px;
- margin: 0px;
- padding: 0px;
-}
-
/* ------------------------------------------------------------ */
/* Messages layout
/* ------------------------------------------------------------ */
@@ -413,39 +349,27 @@
}
/* Dropdown menu */
-/*.openerp .oe_mail_msg_content .oe_dropdown_toggle {
- position: absolute;
- top: 0px;
- right: 3px;
-}*/
-.openerp .oe_mail .oe_semantic_html_override {
+.openerp .oe_mail ul.oe_mail_thread_display ul.oe_mail_thread_display {
position: relative;
+ border-left: 1px #DDD dashed;
}
.openerp .oe_mail ul.oe_header {
position: absolute;
right: 3px;
top: -6px;
- display: none;
z-index: 10;
- height: 18px;
}
.openerp .oe_mail ul.oe_header a {
text-decoration: none;
}
-.openerp .oe_mail .oe_semantic_html_override:hover > ul.oe_header {
- display: block;
-}
-
.openerp .oe_mail ul.oe_header>li {
display: inline-block;
-}
-
-.openerp .oe_mail_msg_content .oe_dropdown_arrow:after {
- border-top: 4px solid #404040;
+ height: 20px;
+ text-align: right;
}
/* Message footer */
@@ -465,16 +389,36 @@
/* Attachments list */
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
- display: none;
width: 100%;
- border-top: 1px solid #CCC;
margin: .5em 0 0 0;
padding: .5em 0;
list-style-position: inside;
}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments.oe_hidden {
+ display: none;
+}
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
float: none;
+ height: 20px;
+ line-height: 20px;
margin: 0;
padding: 0;
list-style-type: square;
}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process {
+ float: right;
+ width: 200px;
+ height: 16px;
+}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process div {
+ float: left;
+ width: 38px;
+ height: 16px;
+ margin-right: 2px;
+ background: #66FF66;
+}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process span {
+ color: #aaaaaa;
+ position: absolute;
+}
+
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index ba7ed36a695..e2f136eb755 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -1,12 +1,166 @@
/* ------------------------------ */
-/* Compose Message Wizard Form */
+/* Compose Message */
/* ------------------------------ */
-.openerp .oe_mail_compose_message_icons {
- text-align: right;
+.openerp .oe_mail_msg_content .oe_mail_compose_message_footer {
+ height: 24px;
}
-.openerp .oe_mail_compose_message_icons img {
- width: 20px;
- height: 20px;
+.openerp .oe_mail_msg_content .oe_mail_compose_message_footer button.oe_mail_compose_message_button_send {
+ float: left;
}
+
+.openerp .oe_mail .oe_mail_compose_textarea
+{
+ display: none;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header,
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_footer,
+{
+ position: relative;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel {
+ position: absolute;
+ right: -8px;
+ top: -8px;
+}
+.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel:first-of-type {
+ display:none;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea button.oe_full {
+ float: right;
+ position: relative;
+ right: -10px;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message : list_recipients
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail .oe_mail_list_recipients {
+ display: inline;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_all_follower {
+ color: blue;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_partner_follower a {
+ color: red;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_hidden,
+.openerp .oe_mail .oe_mail_list_recipients .oe_more_hidden {
+ display: none;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message : attachment
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail .oe_attachment_file {
+ display: inline-block;
+}
+
+.openerp .oe_mail .oe_attachment_file .oe_add {
+ float: left;
+ width: 24px;
+ height: 24px;
+ position: relative;
+ z-index: 10;
+ left: +2px;
+ top: +7px;
+ overflow: hidden;
+}
+
+/* attachment button: override of openerp values */
+.openerp .oe_mail .oe_attachment_file .oe_add button,
+.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
+ position: absolute;
+ bottom: +0px;
+ left: +0px;
+ height: 24px;
+ width: 24px;
+ margin: 0px;
+ padding: 0px;
+}
+.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
+ z-index:2;
+ width: 300px;
+ left: -100px;
+ background: transparent;
+ border: 0;
+ color: transparent;
+}
+.openerp .oe_mail .oe_attachment_file .oe_add button span {
+ position: relative;
+ bottom: +4px;
+ font-size: 30px;
+}
+
+.openerp .oe_mail .oe_mail_msg_attachments input {
+ visibility: hidden;
+}
+
+.openerp .oe_mail .oe_mail_compose_attachment_list {
+ clear: both;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message
+/* ------------------------------------------------------------ */
+
+
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
+.openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text,
+.openerp .oe_mail div.oe_mail_compose_message_body textarea.field_text {
+ width: 100%;
+ min-height: 120px;
+ height: auto;
+ padding: 4px;
+ font-size: 12px;
+ border: 1px solid #cccccc;
+}
+
+/* not top textarea */
+.openerp .oe_mail.oe_semantic_html_override .oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text {
+ height: 60px;
+}
+
+/* form_view: delete white background */
+.openerp .oe_mail_msg_content div.oe_formview {
+ background-color: transparent;
+}
+
+.openerp .oe_mail_msg_content div.oe_form_nosheet {
+ margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_group {
+ margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_field,
+.openerp .oe_mail_msg_content div.oe_form_field {
+ padding: 0px;
+}
+
+.openerp .oe_mail_msg_content td.oe_form_group_cell {
+ vertical-align: bottom;
+}
+
+/* subject: change width */
+.openerp .oe_mail_msg_content .oe_form .oe_form_field input[type='text'] {
+ width: 472px;
+}
+
+/* body_html: cleditor */
+.openerp .oe_mail_msg_content div.cleditorMain {
+ border: 1px solid #cccccc;
+}
+
+/* destination_partner_ids */
+.openerp .oe_mail_msg_content div.text-core {
+ height: 22px !important;
+ width: 472px;
+}
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e0c9ac9b7fc..15a81be4c54 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -18,17 +18,33 @@ openerp.mail = function(session) {
session.web.FormView = session.web.FormView.extend({
do_action: function(action, on_close) {
- if (action.res_model == 'mail.compose.message' &&
- action.context && action.context.redirect == true &&
- this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
- var thread = this.fields.message_ids.thread;
+ if (action.res_model == 'mail.compose.message') {
+
+ /* hack for stop context propagation of wrong value
+ * delete this hack when a global method to clean context is create
+ */
+ for(var key in action.context){
+ if( key!='default_template_id' &&
+ key!='default_use_template' &&
+ key!='default_is_private' &&
+ key!='default_model' &&
+ key!='default_res_id' &&
+ key!='default_subtype' &&
+ key!='active_id' &&
+ key!='lang' &&
+ key!='bin_raw' &&
+ key!='tz' &&
+ key!='active_model' &&
+ key!='edi_web_url_view' &&
+ key!='active_ids')
+ action.context[key]=null;
+ };
+ /* end hack */
+
+ $('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_fetch').click();
- thread.refresh(action.context);
- return false;
- }
- else {
- return this._super(action, on_close);
}
+ return this._super(action, on_close);
},
});
@@ -73,6 +89,15 @@ openerp.mail = function(session) {
}
return string;
},
+
+ /* replace textarea text into html text
+ * (add message.id){
+ if(!parent_newer || parent_newer.id>=thread_messages[i].id)
+ parent_newer = thread_messages[i];
+ } else if(thread_messages[i].id>0 && thread_messages[i].id < message.id) {
+ if(!parent_older || parent_older.idthis.options._expandable_max){
- this.list_ul.find('>li:gt('+(this.options._expandable_max-1)+')').hide();
- this.more_msg.show();
- } else {
- this.list_ul.find('>li').show();
- this.more_msg.hide();
+ if(parent_older){
+ if(sort){
+ message.insertBefore(parent_older.$el);
+ } else {
+ message.insertAfter(parent_older.$el);
+ }
}
+ else if(parent_newer){
+ if(sort){
+ message.insertAfter(parent_newer.$el);
+ } else {
+ message.insertBefore(parent_newer.$el);
+ }
+ }
+ else {
+ if(sort){
+ message.prependTo(thread.list_ul);
+ } else {
+ message.appendTo(thread.list_ul);
+ }
+ }
+ return message
},
display_user_avatar: function () {
@@ -1003,7 +1143,6 @@ openerp.mail = function(session) {
this._super.apply(this, arguments);
this.options.domain = this.options.domain || [];
this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
- this.options.thread_level = this.options.thread_level || 0;
},
start: function() {
@@ -1017,6 +1156,10 @@ openerp.mail = function(session) {
this.$el.toggle(this.view.get("actual_mode") !== "create");
},
+ /**
+ * Reinitialize the widget field and Display the threads
+ * @param {Object} new_context: context of the refresh
+ */
set_value: function() {
var self = this;
this._super.apply(this, arguments);
@@ -1034,30 +1177,26 @@ openerp.mail = function(session) {
var show_header_compose = this.view.is_action_enabled('edit') ||
(this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
+ if(this.thread){
+ this.thread.destroy();
+ }
this.thread = new mail.Thread(self, {
'domain': domain,
'context': this.options.context,
'options':{
'thread':{
- 'thread_level': this.options.thread_level,
'show_header_compose': show_header_compose,
'use_composer': show_header_compose,
'display_on_flat':true
},
'message':{
- 'show_dd_delete': true,
- 'show_reply_by_email': show_header_compose,
+ 'show_dd_delete': true
}
},
'parameters': {},
}
);
-
- this.$('ul.oe_mail_wall_threads').empty();
- var render_res = session.web.qweb.render('mail.wall_thread_container', {});
- $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
-
- return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
+ return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
},
});
@@ -1089,7 +1228,6 @@ openerp.mail = function(session) {
this.options = options || {};
this.options.domain = options.domain || [];
this.options.context = options.context || {};
- this.options.thread_level = options.thread_level || 1;
this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
},
@@ -1098,6 +1236,8 @@ openerp.mail = function(session) {
this._super.apply(this, arguments);
var searchview_ready = this.load_searchview({}, false);
var thread_displayed = this.message_render();
+ this.options.domain = this.options.domain.concat(this.search_results['domain']);
+ this.bind_events();
return (searchview_ready && thread_displayed);
},
@@ -1135,36 +1275,36 @@ openerp.mail = function(session) {
});
},
- /** Clean and display the threads */
+
+ /**
+ * Display the threads
+ */
message_render: function (search) {
- var domain = this.options.domain.concat(this.search_results['domain']);
-
- var domain = _.extend(this.options.domain, search&&search.domain? search.domain : {});
- var context = _.extend(this.options.context, search&&search.context ? search.context : {});
-
this.thread = new mail.Thread(this, {
- 'domain' : domain,
- 'context' : context,
+ 'domain' : this.options.domain.concat(this.search_results['domain']),
+ 'context' : _.extend(this.options.context, search&&search.search_results['context'] ? search.search_results['context'] : {}),
'options': {
'thread' :{
- 'thread_level': this.options.thread_level,
'use_composer': true,
- 'show_header_compose': 1,
+ 'show_header_compose': false,
},
'message': {
- 'show_reply': this.options.thread_level > 0,
+ 'show_reply': true,
'show_dd_hide': true,
+ 'show_dd_delete': true,
},
},
'parameters': {},
}
);
+ return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
- this.$('ul.oe_mail_wall_threads').empty();
- var render_res = session.web.qweb.render('mail.wall_thread_container', {});
- $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
-
- return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
},
+
+ bind_events: function(){
+ var self=this;
+ this.$("button.oe_write_full:first").click(function(){ self.thread.ComposeMessage.on_compose_fullmail(); });
+ this.$("button.oe_write_onwall:first").click(function(){ self.thread.ComposeMessage.$el.toggle(); });
+ }
});
};
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 6c016c6c679..236e3081136 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -40,6 +40,7 @@ openerp_mail_followers = function(session, mail) {
this._check_visibility();
this.reinit();
this.bind_events();
+ this.display_subtypes();
},
_check_visibility: function() {
@@ -53,31 +54,15 @@ openerp_mail_followers = function(session, mail) {
bind_events: function() {
var self = this;
- this.$('div.oe_mouse_subtypes')
- .on('mouseover', function () {
- $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
- self.display_subtypes();
- })
- .on('mouseleave', function () {
- $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
- self.display_subtypes();
- });
-
this.$('button.oe_follower')
.on('click', function () {
if($(this).hasClass('oe_notfollow'))
self.do_follow();
else
self.do_unfollow();
- })
- .on('mouseover', function () {
- $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
- })
- .on('mouseleave', function () {
- $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
});
- this.$el.on('click', 'ul.oe_subtypes input', function () { self.do_update_subscription(); })
+ this.$el.on('click', 'ul.oe_subtypes input', self.do_update_subscription );
this.$el.on('click', 'button.oe_invite', function(event) {
action = {
@@ -173,7 +158,8 @@ openerp_mail_followers = function(session, mail) {
set_subtypes:function(data){
var self = this;
- var records = data[this.view.datarecord.id].message_subtype_data;
+ var records = (data[this.view.datarecord.id] || data[null]).message_subtype_data;
+
_(records).each(function (record, record_name) {
record.name = record_name;
record.followed = record.followed || undefined;
@@ -194,16 +180,10 @@ openerp_mail_followers = function(session, mail) {
},
do_follow: function () {
- var self =this;
_(this.$('.oe_msg_subtype_check')).each(function(record){
$(record).attr('checked','checked');
});
- var context = new session.web.CompoundContext(this.build_context(), {});
- return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, undefined, context]).pipe(function(value_){
- self.read_value(value_);
- if(!self.$('.oe_recthread_subtypes').is(":visible"))
- self.display_subtypes(true);
- });
+ this.do_update_subscription();
},
do_unfollow: function () {
@@ -211,23 +191,28 @@ openerp_mail_followers = function(session, mail) {
$(record).attr('checked',false);
});
var context = new session.web.CompoundContext(this.build_context(), {});
- return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('read_value'));
+ return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context]).pipe(this.proxy('read_value'));
},
- do_update_subscription: function () {
- var context = new session.web.CompoundContext(this.build_context(), {});
+ do_update_subscription: function (event) {
var self = this;
var checklist = new Array();
- _(this.$('.oe_msg_subtype_check')).each(function(record){
+ _(this.$('.oe_mail_recthread_actions input[type="checkbox"]')).each(function(record){
if($(record).is(':checked')) {
checklist.push(parseInt($(record).data('id')))}
});
if(!checklist.length)
return this.do_unfollow();
- else
- return this.ds_model.call('message_subscribe_users',[[self.view.datarecord.id], undefined, checklist, context]).pipe(this.proxy('read_value'));
+ else{
+ var context = new session.web.CompoundContext(this.build_context(), {});
+ return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context]).pipe(function(value_){
+ self.read_value(value_);
+ self.display_subtypes(true);
+ });
+ }
+
},
});
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 07c9b406cdc..7941925415d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,11 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
, )
+ */
+ get_text2html: function(text){
+ return text
+ .replace(/[\n\r]/g,'
')
+ .replace(/((?:https?|ftp):\/\/[\S]+)/g,'$1 ')
+ }
};
@@ -84,160 +109,301 @@ openerp.mail = function(session) {
* This widget handles the display of a form to compose a new message.
* This form is a mail.compose.message form_view.
*/
-
- mail.ComposeMessage = session.web.Widget.extend({
+
+ mail.ThreadComposeMessage = session.web.Widget.extend({
template: 'mail.compose_message',
-
+
/**
* @param {Object} parent parent
* @param {Object} [options]
- * @param {Object} [options.context] context passed to the
- * mail.compose.message DataSetSearch. Please refer to this model
- * for more details about fields and default values.
+ * @param {Object} [context] context passed to the
+ * mail.compose.message DataSetSearch. Please refer to this model
+ * for more details about fields and default values.
+ * @param {Boolean} [show_attachment_delete]
*/
init: function (parent, options) {
var self = this;
this._super(parent);
this.attachment_ids = [];
- // options
- this.options = options || {};
- this.options.context = options.context || {};
- this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
- this.options.form_view_id = options.form_view_id || false;
- this.show_attachment_delete = true;
+
+ this.context = options.context || {};
+
+ this.id = options.parameters.id;
+ this.model = options.parameters.model;
+ this.res_id = options.parameters.res_id;
+ this.is_private = options.parameters.is_private;
+ this.partner_ids = options.parameters.partner_ids;
+ this.options={thread:{}};
+ this.options.thread.show_header_compose = options.parameters.options.thread.show_header_compose;
+ this.options.thread.display_on_flat = options.parameters.options.thread.display_on_flat;
+
+ this.attachment_ids = [];
+ this.options.thread.show_attachment_delete = true;
+ this.options.thread.show_attachment_link = true;
+
+ this.parent_thread= parent.messages!= undefined ? parent : false;
+
+
+ this.ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
+ this.fileupload_id = _.uniqueId('oe_fileupload_temp');
+ $(window).on(self.fileupload_id, self.on_attachment_loaded);
},
- start: function () {
- this._super.apply(this, arguments);
- // customize display: add avatar, clean previous content
+ start: function(){
+ this.display_attachments();
+ this.bind_events();
+
+ //load avatar img
var user_avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
this.$('img.oe_mail_icon').attr('src', user_avatar);
- this.$('div.oe_mail_msg_content').empty();
- // create a context for the dataset and default_get of the wizard
- var context = _.extend({}, this.options.context);
- this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
- // find the id of the view to display in the chatter form
- if (this.options.form_view_id) {
- return this.create_form_view();
- }
- else {
- var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
- return data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).pipe(this.proxy('create_form_view'));
- }
},
- /** Create a FormView, then append it to the to widget DOM. */
- create_form_view: function (new_form_view_id) {
+ /* upload the file on the server, add in the attachments list and reload display
+ */
+ display_attachments: function(){
var self = this;
- this.options.form_view_id = (new_form_view_id && new_form_view_id[1]) || this.options.form_view_id;
- // destroy previous form_view if any
- if (this.form_view) { this.form_view.destroy(); }
- // create the FormView
- this.form_view = new session.web.FormView(this, this.ds_compose, this.options.form_view_id, {
- action_buttons: false,
- pager: false,
- initial_mode: 'edit',
- disable_autofocus: true,
- });
- // add the form, bind events, activate the form
- var msg_node = this.$('div.oe_mail_msg_content');
- return $.when(this.form_view.appendTo(msg_node)).pipe(this.proxy('postprocess_create_form_view'));
- },
+ var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
+ if(!this.list_attachment){
+ this.$('.oe_mail_compose_attachment_list').replaceWith( render );
+ } else {
+ this.list_attachment.replaceWith( render );
+ }
+ this.list_attachment = this.$("ul.oe_mail_msg_attachments");
- postprocess_create_form_view: function () {
- // handle attachment button
- this.fileupload_id = _.uniqueId('oe_fileupload');
- var button_attach = this.$('button.oe_mail_compose_message_attachment');
- var rendered = session.web.qweb.render('mail.compose_message.add_attachment', {'widget': this});
- $(rendered).insertBefore(button_attach);
- // move the button inside div.oe_hidden_input_file
- var input_node = this.$('input[name=ufile]');
- button_attach.detach().insertAfter(input_node);
- // set the function called when attachments are added
- this.$('input.oe_form_binary_file').change(this.on_attachment_change);
- this.bind_events();
- this.form_view.do_show();
+ // event: delete an attachment
+ this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
},
-
on_attachment_change: function (event) {
+ event.stopPropagation();
+ var self = this;
var $target = $(event.target);
if ($target.val() !== '') {
- this.$('form.oe_form_binary_form').submit();
- session.web.blockUI();
+
+ var filename = $target.val().replace(/.*[\\\/]/,'');
+
+ // if the files exits for this answer, delete the file before upload
+ var attachments=[];
+ for(var i in this.attachment_ids){
+ if((this.attachment_ids[i].filename || this.attachment_ids[i].name) == filename){
+ if(this.attachment_ids[i].upload){
+ return false;
+ }
+ this.ds_attachment.unlink([this.attachment_ids[i].id]);
+ } else {
+ attachments.push(this.attachment_ids[i]);
+ }
+ }
+ this.attachment_ids = attachments;
+
+ // submit file
+ //session.web.blockUI();
+ self.$('form.oe_form_binary_form').submit();
+ //self.submit_ajax_attachment();
+
+ this.$(".oe_attachment_file").hide();
+
+ this.attachment_ids.push({
+ 'id': 0,
+ 'name': filename,
+ 'filename': filename,
+ 'url': '',
+ 'upload': true
+ });
+ this.display_attachments();
}
},
+
+ submit_ajax_attachment: function(){
+ var self=this;
+ var $form = self.$('form.oe_form_binary_form');
+ var filename = this.$('input.oe_form_binary_file').val().replace(/.*[\\\/]/,'');
+ // create form data
+ var fomdata = new FormData();
+ $.each($form.find('input'), function(i, field) {
+ var $field=$(field);
+ if($field.attr('type')!='file'){
+ fomdata.append($field.attr('name'), $field.val());
+ } else {
+ fomdata.append($field.attr('name'), field.files[0]);
+ }
+ });
+
+ var progress=function(event) {
+ self.$("span[name='"+filename+"'] div:lt("+Math.floor(event.loaded / event.total*5)+")").show();
+ };
+
+ $.ajax({
+ url: $form.attr("action"),
+ data: fomdata,
+ cache: false,
+ contentType: false,
+ processData: false,
+ type: 'POST',
+ enctype: 'multipart/form-data',
+ xhr: function() {
+ // custom xhr
+ myXhr = $.ajaxSettings.xhr();
+ if(myXhr.upload){
+ // for handling the progress of the upload
+ myXhr.upload.addEventListener('progress', progress, false);
+ }
+ myXhr.addEventListener('progress', progress, false);
+ return myXhr;
+ },
+ success: function(data){
+ $iframe=$('').html(data);
+ $iframe.appendTo(self.$el);
+ $iframe.remove();
+ }
+ });
+ },
+
+ on_attachment_loaded: function (event, result) {
+ //session.web.unblockUI();
+ for(var i in this.attachment_ids){
+ if(this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload){
+ this.attachment_ids[i]={
+ 'id': result.id,
+ 'name': result.name,
+ 'filename': result.filename,
+ 'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+ };
+ }
+ }
+ this.display_attachments();
+
+ var $input = this.$('input.oe_form_binary_file');
+ $input.after($input.clone(true)).remove();
+ this.$(".oe_attachment_file").show();
+ },
+ /* unlink the file on the server and reload display
+ */
on_attachment_delete: function (event) {
- if (event.target.dataset && event.target.dataset.id) {
- var attachment_id = parseInt(event.target.dataset.id);
- var idx = _.pluck(this.attachment_ids, 'id').indexOf(attachment_id);
- if (idx == -1) return false;
- new session.web.DataSetSearch(this, 'ir.attachment').unlink(attachment_id);
- this.attachment_ids.splice(idx, 1);
+ event.stopPropagation();
+ var attachment_id=$(event.target).data("id");
+ if (attachment_id) {
+ var attachments=[];
+ for(var i in this.attachment_ids){
+ if(attachment_id!=this.attachment_ids[i].id){
+ attachments.push(this.attachment_ids[i]);
+ }
+ else {
+ this.ds_attachment.unlink([attachment_id]);
+ }
+ }
+ this.attachment_ids = attachments;
this.display_attachments();
}
},
- display_attachments: function () {
- var attach_node = this.$('div.oe_mail_compose_message_attachments');
- var rendered = session.web.qweb.render('mail.thread.message.attachments', {'record': this});
- attach_node.empty();
- $(rendered).appendTo(attach_node);
- this.$('.oe_mail_msg_attachments').show();
- var composer_attachment_ids = _.pluck(this.attachment_ids, 'id');
- var onchange_like = {'value': {'attachment_ids': composer_attachment_ids}}
- this.form_view.on_processed_onchange(onchange_like, []);
- },
-
- /**
- * Reinitialize the widget field values to the default values obtained
- * using default_get on mail.compose.message. This allows to reinitialize
- * the widget without having to rebuild a complete form view.
- * @param {Object} new_context: context of the refresh */
- refresh: function (new_context) {
- if (! this.form_view) return;
- var self = this;
- this.attachments = [];
- this.options.context = _.extend(this.options.context, new_context || {});
- this.ds_compose.context = _.extend(this.ds_compose.context, this.options.context);
- return this.ds_compose.call('default_get', [
- ['subject', 'body_text', 'body', 'partner_ids', 'composition_mode',
- 'use_template', 'template_id', 'model', 'res_id', 'parent_id', 'content_subtype'],
- this.ds_compose.get_context(),
- ]).then( function (result) {
- self.form_view.on_processed_onchange({'value': result}, []);
- self.attachment_ids = [];
+ /* to avoid having unsorted file on the server.
+ we will show the users files of the first message post
+ */
+ set_free_attachments: function(){
+ var self=this;
+ this.parent_thread.ds_message.call('user_free_attachment').then(function(attachments){
+ this.attachment_ids=[];
+ for(var i in attachments){
+ self.attachment_ids[i]={
+ 'id': attachments[i].id,
+ 'name': attachments[i].name,
+ 'filename': attachments[i].filename,
+ 'url': mail.ChatterUtils.get_attachment_url(self.session, attachments[i])
+ };
+ }
self.display_attachments();
});
},
- /**
- * Bind events in the widget. Each event is slightly described
- * in the function. */
bind_events: function() {
var self = this;
- // event: add a new attachment
- $(window).on(this.fileupload_id, function() {
- var args = [].slice.call(arguments).slice(1);
- var attachment = args[0];
- attachment['url'] = mail.ChatterUtils.get_attachment_url(self.session, attachment);
- self.attachment_ids.push(attachment);
- self.display_attachments();
- session.web.unblockUI();
- });
- // event: delete an attachment
- this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
+
+ // set the function called when attachments are added
+ this.$el.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
+ this.$el.on('click', 'a.oe_cancel', self.on_cancel );
+ this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
+ this.$el.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
},
- }),
-
+
+ on_compose_fullmail: function(){
+ var attachments=[];
+ for(var i in this.attachment_ids){
+ attachments.push(this.attachment_ids[i].id);
+ }
+ var action = {
+ type: 'ir.actions.act_window',
+ res_model: 'mail.compose.message',
+ view_mode: 'form',
+ view_type: 'form',
+ action_from: 'mail.ThreadComposeMessage',
+ views: [[false, 'form']],
+ target: 'new',
+ context: {
+ 'default_res_model': this.context.default_res_model,
+ 'default_res_id': this.context.default_res_id,
+ 'default_content_subtype': 'html',
+ 'default_is_private': true,
+ 'default_parent_id': this.id,
+ 'default_body': mail.ChatterUtils.get_text2html(this.$('textarea').val() || ''),
+ 'default_attachment_ids': attachments
+ },
+ };
+ this.do_action(action);
+ },
+
+ on_cancel: function(){
+ event.stopPropagation();
+ this.$('textarea').val("");
+ this.$('input[data-id]').remove();
+ //this.attachment_ids=[];
+ this.display_attachments();
+ if(!this.options.thread.show_header_compose || !this.options.thread.display_on_flat){
+ this.$el.hide();
+ }
+ },
+
+ /*post a message and fetch the message*/
+ on_message_post: function (body) {
+
+ if (! body) {
+ var comment_node = this.$('textarea');
+ var body = comment_node.val();
+ comment_node.val('');
+ }
+
+ var attachments=[];
+ for(var i in this.attachment_ids){
+ if(this.attachment_ids[i].upload){
+ session.web.dialog($('
' + session.web.qweb.render('CrashManager.warning', {message: 'Please, wait while the file is uploading.'}) + '
'));
+ return false;
+ }
+ attachments.push(this.attachment_ids[i].id);
+ }
+
+ if(body.match(/\S+/)) {
+ this.parent_thread.ds_thread.call('message_post_api', [
+ this.context.default_res_id,
+ mail.ChatterUtils.get_text2html(body),
+ false,
+ 'comment',
+ false,
+ this.context.default_parent_id,
+ attachments]
+ ).then(this.parent_thread.proxy('switch_new_message'));
+ this.attachment_ids=[];
+ this.on_cancel();
+ return true;
+ }
+ },
+ });
/**
* ------------------------------------------------------------
* Thread Message Expandable Widget
* ------------------------------------------------------------
*
- * This widget handles the display the expandable message in a thread. The
- * [thread_level] parameter sets the thread level number:
+ * This widget handles the display the expandable message in a thread.
* - thread
* - - visible message
* - - expandable
@@ -256,14 +422,13 @@ openerp.mail = function(session) {
default_res_id: 0,
default_parent_id: false }, options.context || {});
- this.id = -1;
+ this.id = options.parameters.id || -1;
this.parent_id= options.parameters.parent_id || false;
this.nb_messages = options.parameters.nb_messages || 0;
- this.type = options.parameters.type || false;
+ this.type = 'expandable';
// record options and data
this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0] ;
-
},
@@ -285,8 +450,8 @@ openerp.mail = function(session) {
* @param {object} mouse envent
*/
on_expandable: function (event) {
- event.stopPropagation();
- this.parent_thread.message_fletch(false, this.domain, this.context);
+ if(event)event.stopPropagation();
+ this.parent_thread.message_fetch(false, this.domain, this.context);
this.destroy();
return false;
},
@@ -302,7 +467,7 @@ openerp.mail = function(session) {
* - record.timerelative: relative time givein by timeago lib
* - record.avatar: image url
* - record.attachment_ids[].url: url of each attachmentThe
- * [thread_level] parameter sets the thread level number:
+ * thread view :
* - root thread
* - - sub message (parent_id = root message)
* - - - sub thread
@@ -322,45 +487,24 @@ openerp.mail = function(session) {
* @param {Object} [options]
* @param {Object} [thread] read obout mail.Thread object
* @param {Object} [message]
- * @param {Number} [message_ids=null] ids for message_fletch
+ * @param {Number} [message_ids=null] ids for message_fetch
* @param {Number} [message_data=null] already formatted message data,
* for subthreads getting data from their parent
* @param {Number} [truncate_limit=250] number of character to
* display before having a "show more" link; note that the text
* will not be truncated if it does not have 110% of the parameter
* @param {Boolean} [show_record_name]
- * @param {Boolean} [show_reply]
- * @param {Boolean} [show_reply_by_email]
* @param {Boolean} [show_dd_delete]
* @param {Boolean} [show_dd_hide]
*/
init: function(parent, options) {
this._super(parent);
- this.domain = options.domain || [];
- this.context = _.extend({
- default_model: 'mail.thread',
- default_res_id: 0,
- default_parent_id: false }, options.context || {});
- // options
- this.options={
- 'thread' : options.options.thread,
- 'message' : {
- 'message_ids': options.options.message.message_ids || null,
- 'message_data': options.options.message.message_data || null,
- 'show_record_name': options.options.message.show_record_name != undefined ? options.options.message.show_record_name: true,
- 'show_reply': options.options.message.show_reply || false,
- 'show_reply_by_email': options.options.message.show_reply_by_email || false,
- 'show_dd_delete': options.options.message.show_dd_delete || false,
- 'show_dd_hide': options.options.message.show_dd_hide || false,
- 'truncate_limit': options.options.message.truncate_limit || 250,
- }
- };
- // record options and data
- this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0] ;
-
- var param = options.parameters;
// record parameters
+ var param = options.parameters;
+ for(var i in param){
+ this[i] = param[i];
+ }
this.id = param.id || -1;
this.model = param.model || false;
this.parent_id= param.parent_id || false;
@@ -372,7 +516,7 @@ openerp.mail = function(session) {
this.record_name = param.record_name || false;
this.body = param.body || false;
this.vote_user_ids =param.vote_user_ids || [];
- this.has_voted = param.has_voted || false;
+ this.has_voted = param.has_voted || false;
this.vote_user_ids = param.vote_user_ids || [];
@@ -381,6 +525,28 @@ openerp.mail = function(session) {
this.author_id = param.author_id || [];
this.attachment_ids = param.attachment_ids || [];
+ // record domain and context
+ this.domain = options.domain || [];
+ this.context = _.extend({
+ default_model: 'mail.thread',
+ default_res_id: 0,
+ default_parent_id: false }, options.context || {});
+
+ // record options
+ this.options={
+ 'thread' : options.options.thread,
+ 'message' : {
+ 'message_ids': options.options.message.message_ids || null,
+ 'message_data': options.options.message.message_data || null,
+ 'show_record_name': options.options.message.show_record_name != undefined ? options.options.message.show_record_name: true,
+ 'show_dd_delete': options.options.message.show_dd_delete || false,
+ 'show_dd_hide': options.options.message.show_dd_hide || false,
+ 'truncate_limit': options.options.message.truncate_limit || 250,
+ }
+ };
+
+ // record options and data
+ this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0];
this.thread = false;
if( param.id > 0 ) {
@@ -420,10 +586,10 @@ openerp.mail = function(session) {
* in the function. */
bind_events: function() {
var self = this;
+
// event: click on 'Attachment(s)' in msg
- this.$el.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
- var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
- act_dom.toggle();
+ this.$('a.oe_mail_msg_view_attachments:first').on('click', function (event) {
+ self.$('.oe_mail_msg_attachments:first').toggle();
});
// event: click on icone 'Read' in header
this.$el.on('click', 'a.oe_read', this.on_message_read_unread);
@@ -434,21 +600,13 @@ openerp.mail = function(session) {
// event: click on 'Reply' in msg
this.$el.on('click', 'a.oe_reply', this.on_message_reply);
- // event: click on 'Reply by email' in msg side menu
- this.$el.on('click', 'a.oe_reply_by_email', this.on_message_reply_by_mail);
// event: click on 'Vote' button
this.$el.on('click', 'button.oe_mail_msg_vote', this.on_vote);
},
on_message_reply:function(event){
event.stopPropagation();
- this.thread.on_compose_message($(event.srcElement).hasClass("oe_full_reply"), false);
- return false;
- },
-
- on_message_reply_by_mail:function(event){
- event.stopPropagation();
- this.thread.on_compose_message(true, true);
+ this.thread.on_compose_message();
return false;
},
@@ -468,6 +626,7 @@ openerp.mail = function(session) {
if(this.thread){
return false;
}
+ var param = _.extend(self, {'parent_id': self.id});
/*create thread*/
self.thread = new mail.Thread(self, {
'domain': self.domain,
@@ -480,11 +639,7 @@ openerp.mail = function(session) {
'thread' : self.options.thread,
'message' : self.options.message
},
- 'parameters':{
- 'model': self.model,
- 'id': self.id,
- 'parent_id': self.id
- }
+ 'parameters': param
}
);
/*insert thread in parent message*/
@@ -501,9 +656,6 @@ openerp.mail = function(session) {
} else {
self.destroy();
}
- for(var i in this.thread.messages){
- this.thread.messages[i].animated_destroy({fadeTime:0});
- }
},
on_message_delete: function (event) {
@@ -523,10 +675,17 @@ openerp.mail = function(session) {
*/
on_message_read_unread: function (event) {
event.stopPropagation();
- this.animated_destroy({fadeTime:250});
+ if($(event.srcElement).hasClass("oe_read")) this.animated_destroy({fadeTime:250});
// if this message is read, all childs message display is read
var ids = [this.id].concat( this.get_child_ids() );
- this.ds_notification.call('set_message_read', [ids,$(event.srcElement).hasClass("oe_read")]);
+
+ if($(event.srcElement).hasClass("oe_read")) {
+ this.ds_notification.call('set_message_read', [ids,true]);
+ this.$el.removeClass("oe_mail_unread").addClass("oe_mail_read");
+ } else {
+ this.ds_notification.call('set_message_read', [ids,false]);
+ this.$el.removeClass("oe_mail_read").addClass("oe_mail_unread");
+ }
return false;
},
@@ -598,8 +757,8 @@ openerp.mail = function(session) {
display_vote: function () {
var self = this;
var vote_element = session.web.qweb.render('mail.thread.message.vote', {'widget': self});
- self.$(".placeholder-mail-vote").empty();
- self.$(".placeholder-mail-vote").html(vote_element);
+ self.$(".placeholder-mail-vote:first").empty();
+ self.$(".placeholder-mail-vote:first").html(vote_element);
},
});
@@ -609,11 +768,13 @@ openerp.mail = function(session) {
* ------------------------------------------------------------
*
* This widget handles the display of a thread of messages. The
- * [thread_level] parameter sets the thread level number:
- * - root message
+ * thread view:
+ * - root thread
* - - sub message (parent_id = root message)
- * - - - sub sub message (parent id = sub message)
+ * - - - sub thread
+ * - - - - sub sub message (parent id = sub thread)
* - - sub message (parent_id = root message)
+ * - - - sub thread
*/
mail.Thread = session.web.Widget.extend({
template: 'mail.thread',
@@ -627,7 +788,6 @@ openerp.mail = function(session) {
* @param {Object} [options]
* @param {Object} [message] read about mail.ThreadMessage object
* @param {Object} [thread]
- * @param {Number} [thread_level=0] number of thread levels
* @param {Boolean} [use_composer] use the advanced composer, or
* the default basic textarea if not set
* @param {Number} [expandable_number=5] number message show
@@ -637,7 +797,7 @@ openerp.mail = function(session) {
* @param {Boolean} [display_on_flat] display all thread
* on the wall thread level (no hierarchy)
* @param {Array} [parents] liked with the parents thread
- * use with browse, fletch... [O]= top parent
+ * use with browse, fetch... [O]= top parent
*/
init: function(parent, options) {
this._super(parent);
@@ -650,7 +810,7 @@ openerp.mail = function(session) {
// options
this.options={
'thread' : {
- 'thread_level': options.options.thread.thread_level || 0,
+ 'thread_level': (options.options.thread.thread_level+1) || 0,
'show_header_compose': (options.options.thread.show_header_compose != undefined ? options.options.thread.show_header_compose: false),
'use_composer': options.options.thread.use_composer || false,
'expandable_number': options.options.thread.expandable_number || 5,
@@ -670,6 +830,14 @@ openerp.mail = function(session) {
this.id= param.id || false;
this.model= param.model || false;
this.parent_id= param.parent_id || false;
+ this.is_private = param.is_private || false;
+ this.author_id = param.author_id || false;
+ this.partner_ids = [];
+ for(var i in param.partner_ids){
+ if(param.partner_ids[i][0]!=(param.author_id ? param.author_id[0] : -1)){
+ this.partner_ids.push(param.partner_ids[i]);
+ }
+ }
this.messages = [];
@@ -687,8 +855,7 @@ openerp.mail = function(session) {
this.display_user_avatar();
var display_done = compose_done = false;
- // add message composition form view
- compose_done = this.instantiate_composition_form();
+ this.instantiate_ComposeMessage();
this.bind_events();
@@ -699,23 +866,57 @@ openerp.mail = function(session) {
return display_done && compose_done;
},
- /**
- * Override-hack of do_action: automatically load message on the chatter.
- * Normally it should be called only when clicking on 'Post/Send'
- * in the composition form. */
- do_action: function(action, on_close) {
- this.instantiate_composition_form();
- this.message_fletch(false, false, false, [action.id]);
- return this._super(action, on_close);
+ instantiate_ComposeMessage: function(){
+ // add message composition form view
+ this.ComposeMessage = new mail.ThreadComposeMessage(this,{
+ 'context': this.context,
+ 'parameters': this,
+ 'show_attachment_delete': true,
+ });
+ this.ComposeMessage.appendTo(this.$(".oe_mail_thread_action:first"));
},
/* this method is runing for first parent thread
*/
on_first_thread: function(){
+ var self=this;
// fetch and display message, using message_ids if set
- display_done = this.message_fletch(true);
- //show the first write message
- this.$(">.oe_mail_thread_action").show();
+ this.message_fetch();
+
+ $(document).scroll( self.on_scroll );
+ window.setTimeout( self.on_scroll, 500 );
+
+ $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$('ul.oe_mail_thread_display'));
+
+ if(this.options.thread.show_header_compose){
+ this.ComposeMessage.$el.show();
+ //this.ComposeMessage.set_free_attachments();
+ }
+
+ var button_fetch = $('').click(function(event){
+ if(event)event.stopPropagation();
+ self.message_fetch();
+ });
+ this.$el.prepend(button_fetch);
+ this.$el.addClass("oe_mail_wall_first_thread");
+ },
+
+ /* When the expandable object is visible on screen (with scrolling)
+ * then the on_expandable function is launch
+ */
+ on_scroll: function(event){
+ if(event)event.stopPropagation();
+ var last=this.messages[0];
+ if(last && last.type=="expandable"){
+ var pos = last.$el.position();
+ if(pos.top){
+ /* bottom of the screen */
+ var bottom = $(window).scrollTop()+$(window).height()+100;
+ if(bottom - pos.top > 0){
+ last.on_expandable();
+ }
+ }
+ }
},
/**
@@ -723,17 +924,8 @@ openerp.mail = function(session) {
* in the function. */
bind_events: function() {
var self = this;
- // event: writing in basic textarea of composition form (quick reply)
- // event: onblur for hide 'Reply'
- this.$('.oe_mail_compose_textarea:first textarea')
- .keyup(function (event) {
- var charCode = (event.which) ? event.which : window.event.keyCode;
- if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
- else if (charCode == 13) { return self.message_post(); }
- })
- .blur(function (event) {
- $(this).parents('.oe_mail_thread_action:first').hide();
- });
+ self.$('.oe_mail_compose_textarea .oe_more').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').show(); p.find('.oe_more').hide(); });
+ self.$('.oe_mail_compose_textarea .oe_more_hidden').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').hide(); p.find('.oe_more').show(); });
},
/* get all child message/thread id linked
@@ -796,71 +988,13 @@ openerp.mail = function(session) {
return this.options.thread._parents[0].messages[0].browse_message(options);
},
- /** Instantiate the composition form, with every parameters in context
- * or in the widget context.
- * @param {object}
- * @param {boolean} show_header_compose, force to instantiate form
- */
- instantiate_composition_form: function(context) {
- // add message composition form view
- if ((!context || !context.show_header_compose) &&
- (!this.options.thread.show_header_compose || !this.options.thread.use_composer ||
- (this.options.thread.show_header_compose <= this.options.thread._parents.length && this.options.thread._parents[0]!=this))) {
- this.$("textarea:first").val("");
- return false;
- }
- if (this.compose_message_widget) {
- this.compose_message_widget.refresh();
- } else {
- var context = _.extend(context || {}, this.context);
- this.compose_message_widget = new mail.ComposeMessage(this, {'context': context});
- var composition_node = this.$('div.oe_mail_thread_action');
- composition_node.empty();
- return this.compose_message_widget.appendTo(composition_node);
- }
- },
-
/* this function is launch when a user click on "Reply" button
*/
- on_compose_message: function(full_reply, by_mail){
- if(full_reply){
- this.instantiate_composition_form({'show_header_compose':true});
- }
- if(by_mail){
- if (!this.compose_message_widget) return true;
- this.compose_message_widget.refresh({
- 'default_composition_mode': 'reply',
- 'default_parent_id': this.id,
- 'default_content_subtype': 'html'} );
- }
- this.$('div.oe_mail_thread_action:first').toggle();
+ on_compose_message: function(){
+ this.ComposeMessage.$el.toggle();
return false;
},
- refresh: function (action_context) {
- var self=this;
- _(this.messages).each(function(){ self.destroy(); });
- self.message_fletch();
- },
-
- /*post a message and fletch the message*/
- message_post: function (body) {
- var self = this;
- if (! body) {
- var comment_node = this.$('textarea');
- var body = comment_node.val();
- comment_node.val('');
- }
- if(body.match(/\S+/)) {
- this.ds_thread.call('message_post_api', [
- [this.context.default_res_id], body, false, 'comment', false, this.context.default_parent_id, undefined])
- .then(this.proxy('switch_new_message'));
- }
- else {
- return false;
- }
- },
-
/** Fetch messages
* @param {Bool} initial_mode: initial mode: try to use message_data or
* message_ids, if nothing available perform a message_read; otherwise
@@ -868,7 +1002,7 @@ openerp.mail = function(session) {
* @param {Array} replace_domain: added to this.domain
* @param {Object} replace_context: added to this.context
*/
- message_fletch: function (initial_mode, replace_domain, replace_context, ids) {
+ message_fetch: function (initial_mode, replace_domain, replace_context, ids) {
var self = this;
// initial mode: try to use message_data or message_ids
@@ -879,8 +1013,8 @@ openerp.mail = function(session) {
fetch_domain = replace_domain ? replace_domain : this.domain;
fetch_context = replace_context ? replace_context : this.context;
fetch_context.message_loaded= [this.id||0].concat( self.options.thread._parents[0].get_child_ids() );
-
- return this.ds_message.call('message_read', [ids, fetch_domain, (this.options.thread.thread_level+1), fetch_context, this.context.default_parent_id || undefined]
+
+ return this.ds_message.call('message_read', [ids, fetch_domain, fetch_context, 0, this.context.default_parent_id || undefined]
).then(this.proxy('switch_new_message'));
},
@@ -906,6 +1040,8 @@ openerp.mail = function(session) {
insert_message: function (message) {
var self=this;
+ this.$("li.oe_wall_no_message").remove();
+
if(message.type=='expandable'){
var message = new mail.ThreadExpandable(self, {
'domain': message.domain,
@@ -930,42 +1066,46 @@ openerp.mail = function(session) {
});
}
- var thread = self.options.thread.display_on_flat ? self.options.thread._parents[0] : this;
+ var thread_messages = (self.options.thread.display_on_flat && self.options.thread.thread_level ? self.options.thread._parents[0].messages : []).concat(self.messages);
+ var thread = (self.options.thread.display_on_flat && self.options.thread.thread_level ? self.options.thread._parents[0] : self);
// check older and newer message for insert
var parent_newer = false;
var parent_older = false;
- for(var i in thread.messages){
- if(thread.messages[i].id > message.id){
- if(!parent_newer || parent_newer.id>thread.messages[i].id)
- parent_newer = thread.messages[i];
- } else if(thread.messages[i].id>0 && thread.messages[i].id < message.id) {
- if(!parent_older || parent_older.id
+ ![User img]()
+
+
+
+
+
+
+
+
+
+
+
+
+ This email is private.
+ I wrote for contacts and all my followers.
+
+
+
-
-
+
-
-
-
-
-
-
- /web/binary/upload_attachment
-
-
-
-
-
-
-
| + | |
| + + + | +
-
-
-
- ![User img]()
-
-
-
-
-
-
-
- -
@@ -104,16 +186,15 @@
- W -
- h -
- ) -
- ) -
- W +
- h +
- ) +
-
Ã
@@ -123,8 +204,6 @@
- Hide '
--> -' for this document - Full reply
-- Full reply
- Details
- Hide '
-
+
+
-
-
-
-
-
@@ -215,7 +276,7 @@
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index a6df1f0fe8c..f78c91c6305 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -13,9 +13,9 @@
Unfollow
Following
-
+
-
+
+
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1fc44ed81af..a94c4fc2c8a 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -529,109 +529,6 @@ class test_mail(TestMailMockups):
self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
- # FP Note: to be reviewed to be more generic, not depending on the algorythm of
- # message_read
- #def test_30_message_read(self):
- # """ Tests designed for message_read. """
- # # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
- # # It will be updated as soon as we have fixed specs !
- # cr, uid = self.cr, self.uid
- # group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
- # def _compare_structures(struct1, struct2, n=0):
- # # print '%scompare structure' % ('\t' * n)
- # # self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
-
- # for x in range(len(struct1)):
- # if struct1[x].get('type') == 'expandable':
- # continue
- # # print '%s' % ('\t' * n), struct1[x]['id'], struct1[x]['child_nbr'], struct2[x]['id'], struct2[x].get('child_nbr', 'XX'), struct1[x].get('subject') or ''
- # self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
- # _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
- # # print '%send compare' % ('\t' * n)
-
- # # ----------------------------------------
- # # CASE1: Flattening test
- # # ----------------------------------------
-
- # # Create dummy message structure
- # import copy
- # tree = [{'id': 2, 'child_nbr': 1, 'child_ids': [
- # {'id': 6, 'child_nbr': 1, 'child_ids': [
- # {'id': 8, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # ]},
- # {'id': 1, 'child_nbr': 3, 'child_ids':[
- # {'id': 7, 'child_nbr': 1, 'child_ids': [
- # {'id': 9, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # {'id': 4, 'child_nbr': 2, 'child_ids': [
- # {'id': 10, 'child_nbr': 0, 'child_ids': []},
- # {'id': 5, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # {'id': 3, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # ]
- # # Test: completely flat
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 0, limit=15, add_expandable=False)
- # _compare_structures(new_tree, new_tree)
- # self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat')
- # # Test: 1 thread level
- # tree_test = [{'id': 2, 'child_ids': [
- # {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []},
- # ]},
- # {'id': 1, 'child_ids': [
- # {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []},
- # {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []},
- # {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []},
- # ]},
- # ]
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 1, limit=15, add_expandable=False)
- # _compare_structures(new_tree, tree_test)
- # # Test: 2 thread levels
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 2, limit=15, add_expandable=False)
- # _compare_structures(new_tree, tree)
-
- # # ----------------------------------------
- # # CASE2: message_read test
- # # ----------------------------------------
-
- # # 1. Add a few messages to pigs group
- # msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
- # msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
- # msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
- # msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
- # msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
- # msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
-
- # # Test: read all messages flat
- # tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
- # {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=0, limit=15)
- # _compare_structures(tree, tree_test)
- # # Test: read with 1 level of thread
- # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
- # {'id': msgid1, 'child_ids': [
- # {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': []},
- # ]},
- # ]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=1, limit=15)
- # _compare_structures(tree, tree_test)
- # # Test: read with 2 levels of thread
- # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
- # {'id': msgid1, 'child_ids': [
- # {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
- # ]},
- # ]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=2, limit=15)
- # _compare_structures(tree, tree_test)
-
- # # 2. Test expandables
- # # TDE FIXME: add those tests when expandables are specified and implemented
-
def test_40_needaction(self):
""" Tests for mail.message needaction. """
cr, uid = self.cr, self.uid
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index d4dcafeb038..7d75c67b942 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -223,7 +223,6 @@ class mail_compose_message(osv.TransientModel):
email(s), rendering any template patterns on the fly if needed. """
if context is None:
context = {}
- print '**', context
active_ids = context.get('active_ids')
for wizard in self.browse(cr, uid, ids, context=context):
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 0f384dc5a0d..7329992f8ed 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -16,13 +16,11 @@
-
+
@@ -68,6 +66,7 @@
context="{'force_email':True}"
on_change="onchange_partner_ids(partner_ids)"
class="oe_mail_compose_message_partner_ids"/>
+
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index db79ce44132..d3693497408 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -5,7 +5,7 @@
campaign.analysis.tree
campaign.analysis
-
+
report.membership.tree
report.membership
-
+
@@ -961,10 +962,10 @@
-
+
product.normal.form.mrp.inherit
product.product
-
False
@@ -975,7 +976,7 @@
order using the bill of materials assigned to this product.
The delivery order will be ready once the production is done.
-
+
@@ -1050,7 +1051,5 @@
-
-
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 795ac5453fb..19f8a48b6fe 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -31,6 +31,7 @@ class procurement_order(osv.osv):
_columns = {
'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+ 'production_id': fields.many2one('mrp.production', 'Manufacturing Order'),
}
def check_produce_product(self, cr, uid, procurement, context=None):
@@ -95,16 +96,22 @@ class procurement_order(osv.osv):
'move_prod_id': res_id,
'company_id': procurement.company_id.id,
})
+
res[procurement.id] = produce_id
- self.write(cr, uid, [procurement.id], {'state': 'running'})
- self.running_send_note(cr, uid, ids, context=context)
+ self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})
bom_result = production_obj.action_compute(cr, uid,
[produce_id], properties=[x.id for x in procurement.property_ids])
wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
if res_id:
move_obj.write(cr, uid, [res_id],
{'location_id': procurement.location_id.id})
+ self.production_order_create_note(cr, uid, ids, context=context)
return res
+
+ def production_order_create_note(self, cr, uid, ids, context=None):
+ for procurement in self.browse(cr, uid, ids, context=context):
+ body = _("Manufacturing Order created.")
+ self.message_post(cr, uid, [procurement.id], body=body, context=context)
procurement_order()
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index cca9a7e3b24..de486face78 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -9,7 +9,7 @@
mrp.workorder.tree
mrp.workorder
-
+
[[ formatLang(line.price_unit) ]]
- [[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(line.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]
@@ -337,7 +337,7 @@
[[ formatLang(fees.price_unit) ]]
- [[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(fees.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]
@@ -353,7 +353,7 @@
Net Total :
- [[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]
@@ -367,7 +367,7 @@
Taxes:
- [[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]
@@ -380,7 +380,7 @@
Total :
- [[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index dfd0d73ad55..788c301a04f 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1300,7 +1300,7 @@ class product_product(osv.osv):
'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
help="If you want to sell this product through the point of sale, select the category it belongs to."),
- 'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
+ 'to_weight' : fields.boolean('To Weigh', help="This category contains products that should to be weighed, mainly used for the self-checkout interface"),
}
def _default_pos_categ_id(self, cr, uid, context=None):
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index dc6e6c5e64c..0b633f3f7c4 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -214,10 +214,10 @@
[[ formatLang(statement.closing_date,date_time=True)]]
- [[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]]
- [[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]]
@@ -250,7 +250,7 @@
[[ line_ids.partner_id.name ]]
- [[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]]
@@ -267,7 +267,7 @@
Total :
- [[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]]
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 0e75e7f7ae1..dc3b432728f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -73,7 +73,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
if res:
return res[0]['bal']
else:
- return False
+ return 0
def _get_sub_total(self, user, data, date):
res={}
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index bb58c5e823d..4f16031c8b3 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -183,10 +183,10 @@
- [[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_net_total_starting(user)[1], currency_obj = company.currency_id)]]
- [[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_net_total(user), currency_obj = company.currency_id)]]
@@ -207,10 +207,10 @@
[[ statement['closing_date'] ]]
- [[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_bal(statement), currency_obj = company.currency_id)]]
- [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]]
@@ -236,7 +236,7 @@
- [[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]
+ [[ formatLang(line_ids['amount'], currency_obj = company.currency_id)]]
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index b0019133009..e7c4c756e64 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -252,7 +252,7 @@
[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]
- [[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj = company.currency_id) ]]
[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]
@@ -289,7 +289,7 @@
[[ p['name'] or removeParentNode('para') ]]
- [[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(p['amount'], currency_obj = company.currency_id) or removeParentNode('tr') ]]
@@ -320,7 +320,7 @@
[[ p['name'] or removeParentNode('para') ]]
- [[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]]
@@ -349,7 +349,7 @@
Sales total(Revenue)
- [[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -365,7 +365,7 @@
Total invoiced
- [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -373,7 +373,7 @@
Total discount
- [[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -381,7 +381,7 @@
Total paid
- [[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -389,7 +389,7 @@
Total of the day
- [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index d12cdec2598..b1c71db7d40 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -204,7 +204,7 @@
[[ p[0] ]]
- [[ p[1] ]] [[company.currency_id.symbol]]
+ [[ formatLang(p[1], currency_obj=company.currency_id) ]]
@@ -235,7 +235,7 @@
[[ t[0] ]]
- [[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[1], currency_obj=company.currency_id) ]]
@@ -280,7 +280,7 @@
Total invoiced
- [[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice(objects), currency_obj=company.currency_id) ]]
@@ -288,7 +288,7 @@
Total discount
- [[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(objects), currency_obj=company.currency_id) ]]
@@ -296,7 +296,7 @@
Total paid
- [[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal(objects), currency_obj=company.currency_id) ]]
@@ -304,7 +304,7 @@
Total of the day
- [[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(objects), currency_obj=company.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index be394ed4f16..1ed8e33eede 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,7 +186,7 @@
[[ formatLang(l.discount) ]]
- [[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]
@@ -202,7 +202,7 @@
Net Total :
- [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
+ [[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]]
@@ -215,7 +215,7 @@
Taxes :
- [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]
@@ -228,7 +228,7 @@
Total:
- [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index fee47312610..8d7bf84171a 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -5,7 +5,7 @@
report.pos.order.tree
report.pos.order
-
+
[[ formatLang(line_ids['price_unit']) ]]
- [[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['total'], currency_obj = company.currency_id) ]]
@@ -201,7 +201,7 @@
Net Total:
- [[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]
+ [[ formatLang(pos_payment_total(o), currency_obj = company.currency_id) or removeParentNode('blockTable')]]
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 3105441aa0c..1d89d28c5f9 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -168,7 +168,7 @@
[[ formatLang(line_ids['price_unit']) ]]
- [[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]
+ [[ formatLang(line_ids['total'], currency_obj = company.currency_id)]]
@@ -194,7 +194,7 @@
Total:
- [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]
+ [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]]
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 55873887210..d7b8b08ad29 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -72,8 +72,7 @@
[[ repeatIn(objects,'o') ]]
[[o.user_id.company_id.name]]
- [[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]
- [[ address and address.country_id.name ]]
+ [[ address and display_address(address)]]
Tel : [[ address and address.phone ]]
User : [[ o.user_id.name ]]
Shop : [[ o.shop_id.name ]]
@@ -109,7 +108,7 @@
[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]
- [[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]])
@@ -119,7 +118,7 @@
Taxes :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]]
@@ -129,7 +128,7 @@
Total :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]]
@@ -158,7 +157,7 @@
- [[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]]
+ [[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index f3a8cfd77e8..9758e924ada 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -191,7 +191,7 @@
[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]
- [[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['amt'], currency_obj = company.currency_id) ]]
@@ -208,7 +208,7 @@
Total :
- [[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement), currency_obj = company.currency_id) ]]
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index a1aed1dfba8..48569fa76c4 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -57,7 +57,7 @@ depending on the product's configuration.
'company_view.xml',
'board_mrp_procurement_view.xml',
],
- 'demo': ['stock_orderpoint.xml'],
+ 'demo': ['stock_orderpoint.xml','procurement_demo.xml'],
'test': ['test/procurement.yml'],
'installable': True,
'auto_install': True,
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 5d81bcbb9ba..b21cef30773 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -102,7 +102,6 @@ class procurement_order(osv.osv):
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
" a make to order method."),
-
'note': fields.text('Note'),
'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."),
'state': fields.selection([
@@ -362,11 +361,10 @@ class procurement_order(osv.osv):
""" Changes procurement state to Running and writes message.
@return: True
"""
- message = _('From stock: products assigned.')
+ message = _('Products reserved from stock.')
self.write(cr, uid, ids, {'state': 'running',
'message': message}, context=context)
self.message_post(cr, uid, ids, body=message, context=context)
- self.running_send_note(cr, uid, ids, context=context)
return True
def _check_make_to_stock_service(self, cr, uid, procurement, context=None):
@@ -390,8 +388,6 @@ class procurement_order(osv.osv):
order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
if not order_point_id and not ok:
message = _("Not enough stock and no minimum orderpoint rule defined.")
- elif not order_point_id:
- message = _("No minimum orderpoint rule defined.")
elif not ok:
message = _("Not enough stock.")
@@ -407,7 +403,6 @@ class procurement_order(osv.osv):
"""
for procurement in self.browse(cr, uid, ids, context=context):
self.write(cr, uid, [procurement.id], {'state': 'running'})
- self.running_send_note(cr, uid, ids, context=None)
return True
def action_produce_assign_product(self, cr, uid, ids, context=None):
@@ -469,7 +464,6 @@ class procurement_order(osv.osv):
@return: True
"""
res = self.write(cr, uid, ids, {'state': 'ready'})
- self.ready_send_note(cr, uid, ids, context=None)
return res
def action_done(self, cr, uid, ids):
@@ -503,12 +497,6 @@ class procurement_order(osv.osv):
def confirm_send_note(self, cr, uid, ids, context=None):
self.message_post(cr, uid, ids, body=_("Procurement confirmed."), context=context)
- def running_send_note(self, cr, uid, ids, context=None):
- self.message_post(cr, uid, ids, body=_("Procurement set to running."), context=context)
-
- def ready_send_note(self, cr, uid, ids, context=None):
- self.message_post(cr, uid, ids, body=_("Procurement set to ready."), context=context)
-
def cancel_send_note(self, cr, uid, ids, context=None):
self.message_post(cr, uid, ids, body=_("Procurement cancelled."), context=context)
@@ -641,7 +629,18 @@ class stock_warehouse_orderpoint(osv.osv):
})
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
-stock_warehouse_orderpoint()
+class product_template(osv.osv):
+ _inherit="product.template"
+
+ _columns = {
+ 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
+ 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+ 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+ }
+ _defaults = {
+ 'procure_method': 'make_to_stock',
+ 'supply_method': 'buy',
+ }
class product_product(osv.osv):
_inherit="product.product"
@@ -649,6 +648,6 @@ class product_product(osv.osv):
'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
}
-product_product()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
new file mode 100644
index 00000000000..608eb56f3ba
--- /dev/null
+++ b/addons/procurement/procurement_demo.xml
@@ -0,0 +1,204 @@
+
+
+
+
+
+ make_to_order
+ produce
+
+
+
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index bf73b383216..dcaa5e8d543 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -294,6 +294,29 @@
stock.warehouse.orderpoint
+
+ product.template.procurement
+ product.template
+
+
+
+
+
+
+
+ product.search.procurment.form
+ product.product
+
+
+
+
+
+
product.product.procurement
product.product
@@ -303,6 +326,33 @@
+
+
+
+
+
+
diff --git a/addons/product/product.py b/addons/product/product.py
index d5acee0333b..5ee1701532c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -280,11 +280,8 @@ class product_template(osv.osv):
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
- 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
- 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
- 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
+ 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
- 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
@@ -296,7 +293,6 @@ class product_template(osv.osv):
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
'warranty': fields.float('Warranty'),
'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
- 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),
('draft', 'In Development'),
('sellable','Normal'),
@@ -309,11 +305,8 @@ class product_template(osv.osv):
'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
help='Coefficient to convert Unit of Measure to UOS\n'
' uos = uom * coeff'),
- 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+ 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
- 'loc_rack': fields.char('Rack', size=16),
- 'loc_row': fields.char('Row', size=16),
- 'loc_case': fields.char('Case', size=16),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
@@ -351,21 +344,17 @@ class product_template(osv.osv):
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
- 'list_price': lambda *a: 1,
- 'cost_method': lambda *a: 'standard',
- 'supply_method': lambda *a: 'buy',
- 'standard_price': lambda *a: 0.0,
- 'sale_ok': lambda *a: 1,
- 'sale_delay': lambda *a: 7,
- 'produce_delay': lambda *a: 1,
- 'purchase_ok': lambda *a: 1,
- 'procure_method': lambda *a: 'make_to_stock',
+ 'list_price': 1,
+ 'cost_method': 'standard',
+ 'standard_price': 0.0,
+ 'sale_ok': 1,
+ 'produce_delay': 1,
'uom_id': _get_uom_id,
'uom_po_id': _get_uom_id,
- 'uos_coeff' : lambda *a: 1.0,
- 'mes_type' : lambda *a: 'fixed',
+ 'uos_coeff' : 1.0,
+ 'mes_type' : 'fixed',
'categ_id' : _default_category,
- 'type' : lambda *a: 'consu',
+ 'type' : 'consu',
}
def _check_uom(self, cursor, user, ids, context=None):
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 1974acc6df2..8e5280d036a 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -197,7 +197,6 @@ parameter) will see those record just disappear.
Service
service
- 20.5
30.75
service
- make_to_order
- produce
This type of service include basic monitoring of products.
@@ -84,8 +82,6 @@
25.5
38.25
service
- make_to_order
- produce
This type of service include assistance for security questions, system configuration requirements, implementation or special needs.
@@ -97,9 +93,7 @@
450.0
300.0
- product
- make_to_order
- produce
+ consu
4.0
@@ -115,9 +109,8 @@ HDD SH-1
500.0
750.0
- product
- make_to_order
- produce
+ consu
+
4.0
@@ -133,9 +126,7 @@ HDD SH-1
600.0
900.0
- product
- make_to_order
- produce
+ consu
7.0
@@ -148,7 +139,7 @@ HDD SH-1
800.0
1200.0
- product
+ consu
880.0
1350.0
- product
+ consu
10.0
13.0
- product
+ consu
10.0
13.0
- product
- make_to_order
+ consu
12.50
14
- product
+ consu
14
16.50
- product
+ consu
18
12.50
- product
- make_to_order
+ consu
78.0
85.0
- product
+ consu
87.0
95.0
- product
+ consu
80.0
85.0
- product
+ consu
20.0
25.0
- product
- make_to_order
- produce
+ consu
860.0
975.0
- product
+ consu
1020.0
1150.0
- product
- make_to_order
- produce
+ consu
1100.0
1250.0
- product
- make_to_order
- produce
+ consu
On demand hard-disk having capacity based on requirement.
@@ -297,7 +280,7 @@ HDD SH-1
1700.0
1950.0
- product
+ consu
1790.0
2000.0
- product
+ consu
2010.0
2100.0
- product
+ consu
1910.0
1980.0
- product
+ consu
876.0
885.0
- product
+ consu
2870.0
2950.0
- product
+ consu
17" Monitor
@@ -361,7 +344,7 @@ QWERTY keyboard
3000.0
3245.0
- product
+ consu
17" Monitor
@@ -375,9 +358,7 @@ QWERTY keyboard
3300.0
3645.0
- product
- make_to_order
- produce
+ consu
Custom Laptop based on customer's requirement.
@@ -388,7 +369,7 @@ QWERTY keyboard
390.0
405.0
- product
+ consu
90.0
100.0
- product
+ consu
126.0
145.0
- product
+ consu
134.0
150.0
- product
+ consu
.
@@ -431,7 +412,7 @@ QWERTY keyboard
57.0
62.0
- product
+ consu
Hands free headset for laptop PC with in-line microphone and headphone plug.
@@ -442,8 +423,7 @@ QWERTY keyboard
60.0
65.0
- product
- make_to_order
+ consu
Headset for laptop PC with USB connector.
@@ -455,7 +435,7 @@ QWERTY keyboard
38.0
45.0
- product
+ consu
18.40
20.0
- product
+ consu
21.60
24.0
- product
+ consu
4258.0
4410.0
- product
- make_to_order
+ consu
All in one hi-speed printer with fax and scanner.
@@ -501,7 +480,7 @@ QWERTY keyboard
60.0
65.0
- product
+ consu
66.0
70.0
- product
+ consu
155.0
173.0
consu
- make_to_order
- produce
Full featured image editing software.
@@ -582,7 +559,7 @@ QWERTY keyboard
55.0
60.0
- product
+ consu
35.0
40.0
- product
+ consu
55.0
70.0
- product
+ consu
13.0
18.0
- product
+ consu
+ When you sell this service, nothing special will be trigered + to deliver the customer, as you set the procurement method as + 'Make to Stock'. +
+
+ When you sell this product, OpenERP will use the available
+ inventory for the delivery order.
+
+ If there are not enough quantities available, the delivery order
+ will wait for new products. To fulfill the inventory, you should
+ create others rules like orderpoints.
+
+ When you sell this product, a delivery order will be created. + OpenERP will consider that the required quantities are always + available as it's a consumable (as a result of this, the quantity + on hand may become negative). +
+