parent
80cd518e1d
commit
6430fec108
|
@ -378,7 +378,7 @@ class account_bank_statement(osv.osv):
|
|||
self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
|
||||
|
||||
self.write(cr, uid, [st.id], {'name': st_number}, context=context)
|
||||
self.log(cr, uid, st.id, _('Statement %s is confirmed and entries are created.') % st_number)
|
||||
self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
|
||||
done.append(st.id)
|
||||
return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
|
||||
|
||||
|
|
|
@ -376,7 +376,7 @@ class account_invoice(osv.osv):
|
|||
def confirm_paid(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state':'paid'}, context=context)
|
||||
for inv_id, name in self.name_get(cr, uid, ids, context=context):
|
||||
message = _('Invoice ') + " '" + name + "' "+ _("is marked as paid.")
|
||||
message = _('Invoice ') + " '" + name + "' "+ _("is paid.")
|
||||
self.log(cr, uid, inv_id, message)
|
||||
return True
|
||||
|
||||
|
@ -1221,7 +1221,6 @@ class account_invoice(osv.osv):
|
|||
|
||||
inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
|
||||
if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
|
||||
self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
|
||||
self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
|
||||
else:
|
||||
code = invoice.currency_id.code
|
||||
|
|
|
@ -322,11 +322,7 @@ class crm_case(object):
|
|||
'active': True})
|
||||
self._action(cr, uid, cases, 'cancel')
|
||||
for case in cases:
|
||||
message = "The " + self._description + " '" + case.name + "' has been Cancelled."
|
||||
#TODO: Need to differentiate lead and opportunity
|
||||
# if hasattr(case, 'type'):
|
||||
# #TO CHECK: hasattr gives warning for other crm objects that don't have field 'type'
|
||||
# message = "The " + (case.type or 'Case').title() + " '" + case.name + "' has been Cancelled."
|
||||
message = _("The case '%s' has been cancelled.") % (case.name,)
|
||||
self.log(cr, uid, case.id, message)
|
||||
return True
|
||||
|
||||
|
|
|
@ -197,9 +197,12 @@ class crm_lead(crm_case, osv.osv):
|
|||
value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
|
||||
self.write(cr, uid, ids, value)
|
||||
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
type = self.browse(cr, uid, id).type or 'Lead'
|
||||
message = (_('The ') + type.title()) + " '" + name + "' "+ _("has been Opened.")
|
||||
for case in self.browse(cr, uid, ids):
|
||||
n = {
|
||||
'lead': _('The lead'),
|
||||
'opportunity': _('The opportunity')
|
||||
}.get(case.type, _('The case'))
|
||||
message = (n +" '" + case.name + "' "+ _("has been opened.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
@ -213,11 +216,13 @@ class crm_lead(crm_case, osv.osv):
|
|||
"""
|
||||
res = super(crm_lead, self).case_close(cr, uid, ids, args)
|
||||
self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
lead = self.browse(cr, uid, id)
|
||||
if lead.type == 'lead':
|
||||
message = _('The Lead') + " '" + name + "' "+ _("has been Closed.")
|
||||
self.log(cr, uid, id, message)
|
||||
for case in self.browse(cr, uid, ids):
|
||||
n = {
|
||||
'lead': _('The lead'),
|
||||
'opportunity': _('The opportunity')
|
||||
}.get(case.type, _('The case'))
|
||||
message = (n +" '" + case.name + "' "+ _("has been closed.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
def convert_opportunity(self, cr, uid, ids, context=None):
|
||||
|
@ -315,8 +320,6 @@ class crm_lead(crm_case, osv.osv):
|
|||
vals.update(res)
|
||||
|
||||
res = self.create(cr, uid, vals, context)
|
||||
message = _('A Lead created') + " '" + subject + "' " + _("from Mailgate.")
|
||||
self.log(cr, uid, res, message)
|
||||
attachents = msg.get('attachments', [])
|
||||
for attactment in attachents or []:
|
||||
data_attach = {
|
||||
|
|
|
@ -134,7 +134,7 @@ class crm_meeting(crm_case, osv.osv):
|
|||
"""
|
||||
res = super(crm_meeting, self).case_open(cr, uid, ids, args)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('The Meeting') + " '" + name + "' "+ _("has been Confirmed.")
|
||||
message = _('The meeting') + " '" + name + "' "+ _("has been confirmed.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ class crm_opportunity(osv.osv):
|
|||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
opp = self.browse(cr, uid, id)
|
||||
if opp.type == 'opportunity':
|
||||
message = _('The Opportunity') + " '" + name + "' "+ _("has been Won.")
|
||||
message = _('The opportunity') + " '" + name + "' "+ _("has been won.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
@ -94,7 +94,7 @@ class crm_opportunity(osv.osv):
|
|||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
opp = self.browse(cr, uid, id)
|
||||
if opp.type == 'opportunity':
|
||||
message = _('The Opportunity') + " '" + name + "' "+ _("has been Lost.")
|
||||
message = _('The opportunity') + " '" + name + "' "+ _("has been marked as lost.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
|
|
@ -332,9 +332,6 @@ class hr_applicant(crm.crm_case, osv.osv):
|
|||
vals.update(res)
|
||||
res = self.create(cr, uid, vals, context=context)
|
||||
|
||||
message = _('A Job Request created') + " '" + subject + "' " + _("from Mailgate.")
|
||||
self.log(cr, uid, res, message)
|
||||
|
||||
attachents = msg.get('attachments', [])
|
||||
for attactment in attachents or []:
|
||||
data_attach = {
|
||||
|
@ -410,7 +407,7 @@ class hr_applicant(crm.crm_case, osv.osv):
|
|||
if not date['date_open']:
|
||||
self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Job request for') + " '" + name + "' "+ _("is Open.")
|
||||
message = _('The job request ') + " '" + name + "' "+ _("has been set 'in progress'.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
@ -426,7 +423,7 @@ class hr_applicant(crm.crm_case, osv.osv):
|
|||
job_obj = self.pool.get('hr.job')
|
||||
res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Applicant ') + " '" + name + "' "+ _("is Hired.")
|
||||
message = _('Applicant ') + " '" + name + "' "+ _("is being hired.")
|
||||
self.log(cr, uid, id, message)
|
||||
|
||||
applicant = self.browse(cr, uid, ids)[0]
|
||||
|
|
|
@ -644,11 +644,7 @@ class mrp_production(osv.osv):
|
|||
move_obj.write(cr, uid, [production.move_prod_id.id],
|
||||
{'location_id': production.location_dest_id.id})
|
||||
|
||||
message = ("Manufacturing Order '%s' for %s %s is Ready to produce.") % (
|
||||
name,
|
||||
production.product_qty,
|
||||
production.product_id.name,
|
||||
)
|
||||
message = _("Manufacturing order '%s' is ready to produce.") % ( name,)
|
||||
self.log(cr, uid, production_id, message)
|
||||
return True
|
||||
|
||||
|
@ -759,9 +755,6 @@ class mrp_production(osv.osv):
|
|||
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr)
|
||||
for (id, name) in self.pool.get('product.product').name_get(cr, uid, [production.product_id.id]):
|
||||
message = str(production_qty) + ' ' + production.product_uom.name +" '" + name + _("' have been manufactured for ") + production.name
|
||||
self.log(cr, uid, production_id, message)
|
||||
return True
|
||||
|
||||
def _costs_generate(self, cr, uid, production):
|
||||
|
@ -929,16 +922,10 @@ class mrp_production(osv.osv):
|
|||
proc_ids.append(proc_id)
|
||||
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
|
||||
self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
|
||||
message = ("%s '%s' %s %s %s %s %s %s.") % (
|
||||
_('Manufacturing Order'),
|
||||
production.name,
|
||||
_('for'),
|
||||
production.product_qty,
|
||||
production.product_id.name,
|
||||
_('scheduled for date '),
|
||||
datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
|
||||
_('is waiting')
|
||||
)
|
||||
message = _("Manufacturing order '%s' is scheduled for the %s.") % (
|
||||
production.name,
|
||||
datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y'),
|
||||
)
|
||||
self.log(cr, uid, production.id, message)
|
||||
return picking_id
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ class procurement_order(osv.osv):
|
|||
if not bom_id:
|
||||
cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
|
||||
for (id, name) in self.name_get(cr, uid, procurement.id):
|
||||
message = _('Procurement ') + " '" + name + "' "+ _("has an exception.") + _('No BoM defined for this product !')
|
||||
message = _('Procurement ') + " '" + name + "' "+ _("has an exception: 'No BoM defined for this product !'")
|
||||
self.log(cr, uid, id, message)
|
||||
return False
|
||||
return True
|
||||
|
|
|
@ -335,8 +335,6 @@ class procurement_order(osv.osv):
|
|||
})
|
||||
move_obj.action_confirm(cr, uid, [id], context=context)
|
||||
self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
|
||||
message = _("Procurement '%s' is running.") % procurement.name
|
||||
self.log(cr, uid, procurement.id, message)
|
||||
self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
|
||||
return True
|
||||
|
||||
|
@ -370,9 +368,8 @@ class procurement_order(osv.osv):
|
|||
cr.execute('update procurement_order set message=%s where id=%s',
|
||||
(_('Not enough stock and no minimum orderpoint rule defined.'),
|
||||
procurement.id))
|
||||
message = _("Procurement '%s' has an exception." \
|
||||
"Not enough stock and no minimum orderpoint rule defined.") % \
|
||||
procurement.name
|
||||
message = _("Procurement '%s' is in exception: not enough stock.") % \
|
||||
(procurement.name,)
|
||||
self.log(cr, uid, procurement.id, message)
|
||||
return ok
|
||||
|
||||
|
@ -451,8 +448,6 @@ class procurement_order(osv.osv):
|
|||
if procurement.move_id:
|
||||
if procurement.close_move and (procurement.move_id.state <> 'done'):
|
||||
move_obj.action_done(cr, uid, [procurement.move_id.id])
|
||||
message = _("Procurement '%s' is done.") % procurement.name
|
||||
self.log(cr, uid, procurement.id, message)
|
||||
res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
for id in ids:
|
||||
|
|
|
@ -248,7 +248,7 @@ class project(osv.osv):
|
|||
task_obj.write(cr, uid, task_ids, {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
|
||||
self.write(cr, uid, ids, {'state':'close'}, context=context)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Project ') + " '" + name + "' "+ _("is Closed.")
|
||||
message = _('The project ') + " '" + name + "' "+ _("has been closed.")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
|
@ -270,7 +270,7 @@ class project(osv.osv):
|
|||
def reset_project(self, cr, uid, ids, context=None):
|
||||
res = self.setActive(cr, uid, ids, value=True, context=context)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Project ') + " '" + name + "' "+ _("is Open.")
|
||||
message = _('The project ') + " '" + name + "' "+ _("has been opened.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
@ -634,7 +634,7 @@ class task(osv.osv):
|
|||
if reopen:
|
||||
self.do_reopen(cr, uid, [parent_id.id])
|
||||
self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
|
||||
message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
|
||||
message = _("The task '%s' is done") % (task.name,)
|
||||
self.log(cr, uid, task.id, message)
|
||||
return True
|
||||
|
||||
|
@ -675,7 +675,7 @@ class task(osv.osv):
|
|||
'ref_doc1': 'project.task,%d' % task.id,
|
||||
'ref_doc2': 'project.project,%d' % project.id,
|
||||
})
|
||||
message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
|
||||
message = _("The task '%s' is cancelled.") % (task.name,)
|
||||
self.log(cr, uid, task.id, message)
|
||||
self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
|
||||
return True
|
||||
|
@ -687,7 +687,7 @@ class task(osv.osv):
|
|||
if not t.date_start:
|
||||
data['date_start'] = time.strftime('%Y-%m-%d %H:%M:%S')
|
||||
self.write(cr, uid, [t.id], data)
|
||||
message = _('Task ') + " '" + t.name + "' "+ _("is Open.")
|
||||
message = _("The task '%s' is opened.") % (t.name,)
|
||||
self.log(cr, uid, t.id, message)
|
||||
return True
|
||||
|
||||
|
@ -724,15 +724,15 @@ class task(osv.osv):
|
|||
else:
|
||||
self.do_close(cr, uid, [task.id], context)
|
||||
user_pool = self.pool.get('res.users')
|
||||
delegrate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
|
||||
message = _('Task ') + " '" + delegate_data['name'] + "' "+ _("is Delegated to User:") +" '"+ delegrate_user.name +"' "
|
||||
delegate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
|
||||
message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_user.name)
|
||||
self.log(cr, uid, task.id, message)
|
||||
return True
|
||||
|
||||
def do_pending(self, cr, uid, ids, *args):
|
||||
self.write(cr, uid, ids, {'state': 'pending'})
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Task ') + " '" + name + "' "+ _("is Pending.")
|
||||
message = _('The task ') + " '" + name + "' "+ _("is pending.")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ class project_issue(crm.crm_case, osv.osv):
|
|||
res = super(project_issue, self).case_open(cr, uid, ids, *args)
|
||||
self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Issue ') + " '" + name + "' "+ _("is Open.")
|
||||
message = _('Issue ') + " '" + name + "' "+ _("has been opened.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
@ -73,7 +73,7 @@ class project_issue(crm.crm_case, osv.osv):
|
|||
|
||||
res = super(project_issue, self).case_close(cr, uid, ids, *args)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Issue ') + " '" + name + "' "+ _("is Closed.")
|
||||
message = _('Issue ') + " '" + name + "' "+ _("has been closed.")
|
||||
self.log(cr, uid, id, message)
|
||||
return res
|
||||
|
||||
|
@ -401,8 +401,6 @@ class project_issue(crm.crm_case, osv.osv):
|
|||
vals.update(res)
|
||||
context.update({'state_to' : 'draft'})
|
||||
res = self.create(cr, uid, vals, context)
|
||||
message = _('An Issue created') + " '" + subject + "' " + _("from Mailgate.")
|
||||
self.log(cr, uid, res, message)
|
||||
self.convert_to_bug(cr, uid, [res], context=context)
|
||||
|
||||
attachents = msg.get('attachments', [])
|
||||
|
|
|
@ -54,9 +54,6 @@ class project_tasks(osv.osv):
|
|||
data.update(res)
|
||||
res = self.create(cr, uid, data)
|
||||
|
||||
message = _('A task created') + " '" + subject + "' " + _("from Mailgate.")
|
||||
self.log(cr, uid, res, message)
|
||||
|
||||
attachments = msg.get('attachments', [])
|
||||
for attachment in attachments or []:
|
||||
data_attach = {
|
||||
|
|
|
@ -86,7 +86,7 @@ class project_scrum_sprint(osv.osv):
|
|||
context = {}
|
||||
self.write(cr, uid, ids, {'state':'open'}, context=context)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sprint ') + " '" + name + "' "+ _("is Open.")
|
||||
message = _("The sprint '%s' has been opened.") % (name,)
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
|
@ -95,7 +95,7 @@ class project_scrum_sprint(osv.osv):
|
|||
context = {}
|
||||
self.write(cr, uid, ids, {'state':'done'}, context=context)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sprint ') + " '" + name + "' "+ _("is Closed.")
|
||||
message = _("The sprint '%s' has been closed.") % (name,)
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
|
@ -214,9 +214,6 @@ class project_scrum_product_backlog(osv.osv):
|
|||
if context is None:
|
||||
context = {}
|
||||
self.write(cr, uid, ids, {'state':'open'}, context=context)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
message = _('Product Backlog ') + " '" + name + "' "+ _("is Open.")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def button_close(self, cr, uid, ids, context=None):
|
||||
|
@ -226,8 +223,6 @@ class project_scrum_product_backlog(osv.osv):
|
|||
self.write(cr, uid, ids, {'state':'done'}, context=context)
|
||||
for backlog in self.browse(cr, uid, ids, context=context):
|
||||
obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
|
||||
message = _('Product Backlog ') + " '" + backlog.name + "' "+ _("is Closed.")
|
||||
self.log(cr, uid, backlog.id, message)
|
||||
return True
|
||||
|
||||
def button_pending(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -270,9 +270,6 @@ class purchase_order(osv.osv):
|
|||
|
||||
def wkf_approve_order(self, cr, uid, ids, context={}):
|
||||
self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Purchase order ') + " '" + name + "' "+_("is approved by the supplier")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
#TODO: implement messages system
|
||||
|
@ -285,15 +282,12 @@ class purchase_order(osv.osv):
|
|||
for line in po.order_line:
|
||||
if line.state=='draft':
|
||||
todo.append(line.id)
|
||||
message = _("Purchase order '%s' is confirmed.") % (po.name,)
|
||||
self.log(cr, uid, po.id, message)
|
||||
current_name = self.name_get(cr, uid, ids)[0][1]
|
||||
self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
|
||||
for id in ids:
|
||||
self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
|
||||
for line in po.order_line:
|
||||
product.append(line.product_id.default_code or '')
|
||||
params = ', '.join(map(lambda x : str(x), product))
|
||||
message = _('Purchase order ') + " '" + po.name + "' "+_('placed on')+ " '" + po.date_order + "' "+_('for')+" '" + params + "' "+ _("is confirmed")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def wkf_warn_buyer(self, cr, uid, ids):
|
||||
|
@ -336,8 +330,8 @@ class purchase_order(osv.osv):
|
|||
wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
|
||||
wf_service.trg_create(uid, 'purchase.order', p_id, cr)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Purchase order') + " '" + name + "' "+ _("is in the draft state")
|
||||
self.log(cr, uid, id, message)
|
||||
message = _('Purchase order') + " '" + name + "' "+ _("has been set in draft state.")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def action_invoice_create(self, cr, uid, ids, *args):
|
||||
|
@ -417,8 +411,8 @@ class purchase_order(osv.osv):
|
|||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
|
||||
self.write(cr,uid,ids,{'state':'cancel'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled")
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled.")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
|
@ -723,9 +717,6 @@ class purchase_order_line(osv.osv):
|
|||
|
||||
def action_confirm(self, cr, uid, ids, context={}):
|
||||
self.write(cr, uid, ids, {'state': 'confirmed'}, context)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Purchase order line') + " '" + name + "' "+ _("is confirmed")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
purchase_order_line()
|
||||
|
|
|
@ -68,30 +68,18 @@ class purchase_requisition(osv.osv):
|
|||
if str(purchase_id.state) in('draft','wait'):
|
||||
purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
|
||||
self.write(cr, uid, ids, {'state': 'cancel'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Tender') + " '" + name + "' "+ _("is cancelled")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def tender_in_progress(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Tender') + " '" + name + "' "+ _(" is In Progress")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def tender_reset(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state': 'draft'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Tender') + " '" + name + "' "+ _("is in draft state")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def tender_done(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Tender') + " '" + name + "' "+ _("is done")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
purchase_requisition()
|
||||
|
|
|
@ -331,7 +331,7 @@ class sale_order(osv.osv):
|
|||
wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
|
||||
wf_service.trg_create(uid, 'sale.order', inv_id, cr)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale order ') + " '" + name + "' "+ _("is in draft state")
|
||||
message = _("The sale order '%s' has been set in draft state.") %(name,)
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
|
@ -618,7 +618,7 @@ class sale_order(osv.osv):
|
|||
wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
|
||||
sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
|
||||
{'state': 'cancel'})
|
||||
message = _('Sale order') + " '" + sale.name + _(" is cancelled")
|
||||
message = _("The sale order '%s' has been cancelled.") % (sale.name,)
|
||||
self.log(cr, uid, sale.id, message)
|
||||
self.write(cr, uid, ids, {'state': 'cancel'})
|
||||
return True
|
||||
|
@ -630,7 +630,7 @@ class sale_order(osv.osv):
|
|||
else:
|
||||
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
|
||||
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
|
||||
message = _('Quotation') + " '" + o.name + "' "+ _("is converted to Sale order")
|
||||
message = _("The quotation '%s' has been converted to a sale order.") % (o.name,)
|
||||
self.log(cr, uid, o.id, message)
|
||||
return True
|
||||
|
||||
|
@ -989,8 +989,6 @@ class sale_order_line(osv.osv):
|
|||
raise osv.except_osv(
|
||||
_('Could not cancel sale order line!'),
|
||||
_('You must first cancel stock moves attached to this sale order line.'))
|
||||
message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled")
|
||||
self.log(cr, uid, id, message)
|
||||
return self.write(cr, uid, ids, {'state': 'cancel'})
|
||||
|
||||
def button_confirm(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -73,9 +73,6 @@ class sale_journal(osv.osv):
|
|||
for saleid in sale_ids:
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale order of Journal') + " '" + name + "' "+ _("is cancelled")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def button_sale_confirm(self, cr, uid, ids, context={}):
|
||||
|
@ -85,36 +82,21 @@ class sale_journal(osv.osv):
|
|||
for saleid in sale_ids:
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr)
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale orders of Journal') + " '" + name + "' "+ _("is confirmed")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def button_open(self, cr, uid, ids, context={}):
|
||||
self.write(cr, uid, ids, {'state':'open'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale orders of Journal') + " '" + name + "' "+ _("is opened")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def button_draft(self, cr, uid, ids, context={}):
|
||||
self.write(cr, uid, ids, {'state':'draft'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def button_close(self, cr, uid, ids, context={}):
|
||||
self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale orders of Journal') + " '" + name + "' "+ _("is closed")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
def button_reset(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state': 'draft'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
"""Overrides orm copy method
|
||||
|
@ -182,9 +164,6 @@ class picking_journal(osv.osv):
|
|||
|
||||
def button_reset(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state': 'draft'})
|
||||
for (id,name) in self.name_get(cr, uid, ids):
|
||||
message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
|
||||
self.log(cr, uid, id, message)
|
||||
return True
|
||||
|
||||
def button_picking_confirm(self, cr, uid, ids, context={}):
|
||||
|
@ -267,4 +246,4 @@ class sale(osv.osv):
|
|||
|
||||
sale()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -1247,23 +1247,25 @@ class stock_picking(osv.osv):
|
|||
@param ids: List of Picking Ids
|
||||
@param context: A standard dictionary for contextual values
|
||||
"""
|
||||
msg=''
|
||||
for pick in self.browse(cr, uid, ids, context=context):
|
||||
msg=''
|
||||
#if pick.auto_picking:
|
||||
# continue
|
||||
type_list = {
|
||||
'out':'Picking List',
|
||||
'in':'Reception',
|
||||
'internal': 'Internal picking',
|
||||
'out':_("Delivery Order"),
|
||||
'in':_('Reception'),
|
||||
'internal': _('Internal picking'),
|
||||
}
|
||||
message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
|
||||
message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
|
||||
if pick.min_date:
|
||||
msg=datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d') + "'."
|
||||
msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
|
||||
state_list = {
|
||||
'confirmed': "is scheduled for the '" + msg ,
|
||||
'assigned': 'is ready to process.',
|
||||
'cancel': 'is Cancelled.',
|
||||
'done': 'is processed.',
|
||||
'draft':'is draft.',
|
||||
}
|
||||
'confirmed': _("is scheduled") + msg +'.',
|
||||
'assigned': _('is ready to process.'),
|
||||
'cancel': _('is cancelled.'),
|
||||
'done': _('is done.'),
|
||||
'draft':_('is in draft state.'),
|
||||
}
|
||||
message += state_list[pick.state]
|
||||
self.log(cr, uid, pick.id, message)
|
||||
return True
|
||||
|
@ -1997,7 +1999,6 @@ class stock_move(osv.osv):
|
|||
for pick_id in picking_ids:
|
||||
wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
|
||||
|
||||
picking_obj.log_picking(cr, uid, picking_ids, context=context)
|
||||
return True
|
||||
|
||||
def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
|
||||
|
|
Loading…
Reference in New Issue