\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
@@ -77,7 +77,7 @@ msgstr "Własność"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_income
msgid "Income"
-msgstr ""
+msgstr "Przychody"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -113,12 +113,12 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_payable
msgid "Payable"
-msgstr ""
+msgstr "Należności"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "( IV )"
-msgstr ""
+msgstr "( IV )"
#. module: l10n_fr
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
@@ -138,7 +138,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
msgid "+ IV+ V+ VI"
-msgstr ""
+msgstr "+ IV+ V+ VI"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -153,12 +153,12 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "D"
-msgstr ""
+msgstr "D"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "PROVISIONS"
-msgstr ""
+msgstr "PROWIZJA"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -183,7 +183,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "P"
-msgstr ""
+msgstr "P"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_stocks
@@ -193,7 +193,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "T"
-msgstr ""
+msgstr "T"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -213,12 +213,12 @@ msgstr ""
#. module: l10n_fr
#: wizard_view:l10n.fr.cdr.report,init:0
msgid "Select period"
-msgstr ""
+msgstr "Wybierz okres"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "RÉSERVES"
-msgstr ""
+msgstr "ZAREZERWOWANY"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -228,7 +228,7 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_tax
msgid "Tax"
-msgstr ""
+msgstr "Podatek"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -290,7 +290,7 @@ msgstr ""
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
msgid "France"
-msgstr ""
+msgstr "Francja"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -306,7 +306,7 @@ msgstr ""
#: wizard_button:l10n.fr.bilan.report,init,report:0
#: wizard_button:l10n.fr.cdr.report,init,report:0
msgid "Print"
-msgstr ""
+msgstr "Drukuj"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -316,7 +316,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "Net"
-msgstr ""
+msgstr "Sieć"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -331,7 +331,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
msgid "( VI )"
-msgstr ""
+msgstr "( VI )"
#. module: l10n_fr
#: constraint:account.account.template:0
@@ -341,7 +341,7 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_provision
msgid "Provisions"
-msgstr ""
+msgstr "Prowizja"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -378,7 +378,7 @@ msgstr ""
#. module: l10n_fr
#: field:l10n.fr.line,report_id:0
msgid "Report"
-msgstr ""
+msgstr "Raport"
#. module: l10n_fr
#: constraint:account.tax.code.template:0
@@ -408,12 +408,12 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "C"
-msgstr ""
+msgstr "C"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "M"
-msgstr ""
+msgstr "M"
#. module: l10n_fr
#: model:ir.module.module,description:l10n_fr.module_meta_information
@@ -441,7 +441,7 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_expense
msgid "Expense"
-msgstr ""
+msgstr "Koszty"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
index 6503c99a6ea..c5e933847cd 100644
--- a/addons/lunch/lunch_report.xml
+++ b/addons/lunch/lunch_report.xml
@@ -3,7 +3,7 @@
+
-
).
+# Copyright (C) 2004-2009 Tiny SPRL ().
+# Copyright (C) 2010-TODAY OpenERP S.A. (http://www.openerp.com)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -22,14 +23,18 @@
import re
import smtplib
-import email, mimetypes
+import email
+import mimetypes
from email.Header import decode_header
from email.MIMEText import MIMEText
import xmlrpclib
import os
import binascii
-import time, socket
-
+import time
+import socket
+import logging
+import sys
+import optparse
email_re = re.compile(r"([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6})")
case_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
@@ -89,7 +94,6 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
html = html.replace('', '**').replace('
', '**')
html = html.replace('', '**').replace('
', '**')
html = html.replace('', '/').replace('', '/')
-
# the only line breaks we respect is those of ending tags and
# breaks
@@ -101,14 +105,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
html = re.sub('', '\n', html)
html = html.replace(' ' * 2, ' ')
-
- # for all other tags we failed to clean up, just remove then and
- # complain about them on the stderr
- def desperate_fixer(g):
- #print >>sys.stderr, "failed to clean up %s" % str(g.group())
- return ' '
-
- html = re.sub('<.*?>', desperate_fixer, html)
+ html = re.sub('<.*?>', ' ', html)
# lstrip all lines
html = '\n'.join([x.lstrip() for x in html.splitlines()])
@@ -166,10 +163,10 @@ class email_parser(object):
pass
return s.decode('latin1')
- def _decode_header(self, s):
- from email.Header import decode_header
- s = decode_header(s.replace('\r', ''))
- return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
+ def _decode_header(self, text):
+ if text:
+ text = decode_header(text.replace('\r', ''))
+ return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), text or []))
def msg_new(self, msg):
message = self.msg_body_get(msg)
@@ -188,14 +185,25 @@ class email_parser(object):
}
data.update(self.partner_get(msg_from))
- try:
- id = self.rpc(self.model, 'create', data)
- self.rpc(self.model, 'history', [id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
- #self.rpc(self.model, 'case_open', [id])
- except Exception, e:
- if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
- e = '\n\nThe Specified user does not have an access to the CRM case.'
- print e
+ values = {
+ 'message_ids' : [
+ (0, 0, {
+ 'model_id' : self.rpc('ir.model', 'search', [('name', '=', self.model)])[0],
+ 'date' : time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'description' : message['body'],
+ 'email_from' : msg_from,
+ 'email_to' : msg_to,
+ 'name' : 'Receive',
+ 'history' : True,
+ 'user_id' : self.rpc.user_id,
+ }
+ )
+ ]
+ }
+ thread_id = self.rpc('mailgate.thread', 'create', values)
+ data['thread_id'] = thread_id
+ oid = self.rpc(self.model, 'create', data)
+
attachments = message['attachment']
for attach in attachments or []:
data_attach = {
@@ -204,30 +212,19 @@ class email_parser(object):
'datas_fname': str(attach),
'description': 'Mail attachment',
'res_model': self.model,
- 'res_id': id
+ 'res_id': oid
}
self.rpc('ir.attachment', 'create', data_attach)
- return id
-
-# #change the return type format to dictionary
-# {
-# 'body':'body part',
-# 'attachment':{
-# 'file_name':'file data',
-# 'file_name':'file data',
-# 'file_name':'file data',
-# }
-# }
+ return (oid, thread_id,)
def msg_body_get(self, msg):
- message = {};
- message['body'] = '';
- message['attachment'] = {};
+ message = {
+ 'body' : '',
+ 'attachment' : {},
+ }
attachment = message['attachment'];
counter = 1;
- def replace(match):
- return ''
for part in msg.walk():
if part.get_content_maintype() == 'multipart':
@@ -237,27 +234,23 @@ class email_parser(object):
buf = part.get_payload(decode=True)
if buf:
txt = self._to_decode(buf, part.get_charsets())
- txt = re.sub("<(\w)>", replace, txt)
- txt = re.sub("<\/(\w)>", replace, txt)
+ txt = re.sub("<\/?(\w)>", '', txt)
if txt and part.get_content_subtype() == 'plain':
message['body'] += txt
- elif txt and part.get_content_subtype() == 'html':
+ elif txt and part.get_content_subtype() == 'html':
message['body'] += html2plaintext(txt)
-
+
filename = part.get_filename();
if filename :
attachment[filename] = part.get_payload(decode=True);
-
- elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
+
+ elif part.get_content_maintype() in ('application', 'image', 'text'):
filename = part.get_filename();
- if filename :
- attachment[filename] = part.get_payload(decode=True);
- else:
+ if not filename :
filename = 'attach_file'+str(counter);
counter += 1;
- attachment[filename] = part.get_payload(decode=True);
- #end if
- #end if
+
+ attachment[filename] = part.get_payload(decode=True);
message['attachment'] = attachment
#end for
return message
@@ -316,22 +309,42 @@ class email_parser(object):
}
self.rpc('ir.attachment', 'create', data_attach)
- self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), body['body'], self._decode_header(msg['From']), False, {'model' : self.model})
+ self.create_message(id, msg['From'], msg['To'], 'Send', message['body'])
+
return id
+ def create_message(self, oid, email_from, email_to, name, body):
+ """
+ This functions creates a message in the thread
+
+ > create_message(id, msg['From'], msg['To'], 'Send', message['body'])
+ """
+ values = {
+ 'thread_id' : self.rpc(self.model, 'read', [oid], ['thread_id'])[0]['thread_id'][0],
+ 'model_id' : self.rpc('ir.model', 'search', [('name', '=', self.model)])[0],
+ 'res_id' : oid,
+ 'date' : time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'description' : body,
+ 'email_from' : self._decode_header(email_from),
+ 'email_to' : self._decode_header(email_to),
+ 'name' : name,
+ 'history' : True,
+ 'user_id' : self.rpc.user_id,
+ }
+ return self.rpc('mailgate.message', 'create', values)
+
def msg_send(self, msg, emails, priority=None):
- if not len(emails):
+ if not emails:
return False
- del msg['To']
+
msg['To'] = emails[0]
- if len(emails)>1:
- if 'Cc' in msg:
- del msg['Cc']
+ if len(emails) > 1:
msg['Cc'] = ','.join(emails[1:])
- del msg['Reply-To']
msg['Reply-To'] = self.email
+
if priority:
msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
+
s = smtplib.SMTP()
s.connect()
s.sendmail(self.email, emails, msg.as_string())
@@ -343,11 +356,6 @@ class email_parser(object):
body = message['body']
act = 'case_open'
self.rpc(self.model, act, [id])
- #body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
- #data = {
- # 'description':body,
- #}
- #self.rpc(self.model, 'write', [id], data)
attachments = message['attachment']
for attach in attachments or []:
data_attach = {
@@ -360,14 +368,16 @@ class email_parser(object):
}
self.rpc('ir.attachment', 'create', data_attach)
- self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), message['body'], self._decode_header(msg['From']), False, {'model' : self.model})
+ self.create_message(id, msg['From'], msg['To'], 'Send', message['body'])
return id
def msg_test(self, msg, case_str):
if not case_str:
return (False, False)
- emails = self.rpc(self.model, 'emails_get', int(case_str))
- return (int(case_str), emails)
+
+ case_id = int(case_str)
+ emails = self.rpc(self.model, 'emails_get', [case_id])
+ return (case_id, emails)
def parse(self, msg):
case_str = reference_re.search(msg.get('References', ''))
@@ -377,23 +387,37 @@ class email_parser(object):
case_str = case_re.search(msg.get('Subject', ''))
if case_str:
case_str = case_str.group(1)
+
+ logging.info("email: %s -> %s -- %s", msg['From'], self.email, msg['Subject'])
(case_id, emails) = self.msg_test(msg, case_str)
+ thread_id = None
if case_id:
- if emails[0] and self.email_get(emails[0])==self.email_get(self._decode_header(msg['From'])):
+ values = self.rpc(self.model, 'read', [case_id], ['thread_id'])
+ if values:
+ thread_id = values[0]['thread_id'][0]
+ emails = emails[str(thread_id)]
+
+ user_email = filter(None, emails['user_email'])[0]
+
+ if user_email and self.email_get(user_email) == self.email_get(self._decode_header(msg['From'])):
self.msg_user(msg, case_id)
else:
self.msg_partner(msg, case_id)
else:
- case_id = self.msg_new(msg)
- subject = self._decode_header(msg['subject'])
- if msg.get('Subject', ''):
- del msg['Subject']
- msg['Subject'] = '['+str(case_id)+'] '+subject
- msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(case_id)+'@'+socket.gethostname()+'>'
+ case_id, thread_id = self.msg_new(msg)
+ subject = self._decode_header(msg['Subject'])
+ msg['Subject'] = "[%s] %s" % (case_id, subject,)
+ msg['Message-Id'] = "<%s-openerpcrm-%s@%s>" % (time.time(), case_id, socket.gethostname(),)
- emails = self.rpc(self.model, 'emails_get', case_id)
- priority = emails[3]
- em = [emails[0], emails[1]] + (emails[2] or '').split(',')
+ logging.info(" case: %r", case_id)
+ logging.info(" thread: %r", thread_id)
+
+ values = self.rpc(self.model, 'emails_get', [case_id])
+
+ emails = values[str(thread_id)]
+
+ priority = emails.get('piority', [3])[0]
+ em = emails['user_email'] + emails['email_from'] + emails['email_cc']
emails = map(self.email_get, filter(None, em))
mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc', '')).split(',')
@@ -405,13 +429,11 @@ class email_parser(object):
except:
if self.email_default:
a = self._decode_header(msg['Subject'])
- del msg['Subject']
msg['Subject'] = '[OpenERP-CaseError] ' + a
self.msg_send(msg, self.email_default.split(','))
- return case_id, emails
+ return case_id, thread_id, emails
if __name__ == '__main__':
- import sys, optparse
parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
group = optparse.OptionGroup(parser, "Note",
"This program parse a mail from standard input and communicate "
@@ -426,8 +448,10 @@ if __name__ == '__main__':
parser.add_option("--host", dest="host", help="Hostname of the Open ERP Server", default="localhost")
parser.add_option("--port", dest="port", help="Port of the Open ERP Server", default="8069")
-
(options, args) = parser.parse_args()
+
+ logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(levelname)s %(message)s")
+
parser = email_parser(options.userid, options.password, options.model, options.email, options.default, dbname=options.dbname, host=options.host, port=options.port)
msg_txt = email.message_from_file(sys.stdin)
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index ee6abca5355..6db46333985 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -29,7 +29,10 @@
"description": "Menu for Marketing",
'website': 'http://www.openerp.com',
'init_xml': [],
- 'update_xml': ['marketing_view.xml'],
+ 'update_xml': [
+ 'marketing_view.xml',
+ 'security/ir.model.access.csv'
+ ],
'demo_xml': [],
'installable': True,
'active': False,
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index cc6200537cf..800b85f7c49 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -1,7 +1,7 @@
-
+
@@ -21,9 +21,18 @@
position="attributes">
OpenERP provides tools to automate your leads process, design marketing campaigns and profile efficiently your customers.
+
+ 13
+
+
+
+ Configure
+
-
+
+
+
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index aee302283b2..78b4e78ff6c 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -25,9 +25,12 @@ class marketing_installer(osv.osv_memory):
_name = 'marketing.installer'
_inherit = 'res.config.installer'
_columns = {
- # Generic modules
+ 'email_template':fields.boolean('Automated E-Mails',
+ help="Helps you to design templates of emails and integrate them in your different processes."),
'marketing_campaign':fields.boolean('Marketing Campaigns',
help="Helps you to manage marketing campaigns and automate actions and communication steps."),
+ 'marketing_campaign_mailchimp':fields.boolean('Mailchimp Integration',
+ help="This modules integrate mailchimp.com's service with OpenERP to automate mass mailings."),
'crm_profiling':fields.boolean('Profiling Tools',
help="Helps you to perform segmentation within partners and design questionaires.")
}
diff --git a/addons/marketing/security/ir.model.access.csv b/addons/marketing/security/ir.model.access.csv
new file mode 100644
index 00000000000..2a712aab4fd
--- /dev/null
+++ b/addons/marketing/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_marketing_installer","marketing.installer","model_marketing_installer","base.group_system",1,1,1,1
+"access_res_config_installer","access_marketing_installer","base.model_res_config_installer","base.group_system",1,1,1,1
diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
old mode 100755
new mode 100644
index 992731c1332..8abbf9eb706
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -39,6 +39,8 @@
'marketing_campaign_data.xml',
'marketing_campaign_workflow.xml',
'report/campaign_analysis_view.xml',
+ "security/marketing_campaign_security.xml",
+ "security/ir.model.access.csv"
],
'demo_xml': [
'marketing_campaign_demo.xml',
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
old mode 100755
new mode 100644
index 3f29e03c968..36754bea803
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2004-2010 OpenERP SA ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -18,6 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
+
import time
import base64
from datetime import datetime
@@ -25,7 +26,7 @@ from dateutil.relativedelta import relativedelta
from osv import fields, osv
import netsvc
-import tools
+import tools
_intervalTypes = {
'hours': lambda interval: relativedelta(hours=interval),
@@ -34,184 +35,186 @@ _intervalTypes = {
'years': lambda interval: relativedelta(years=interval),
}
-class marketing_campaign(osv.osv): #{{{
+class marketing_campaign(osv.osv):
_name = "marketing.campaign"
_description = "Marketing Campaign"
-
+
_columns = {
'name': fields.char('Name', size=64, required=True),
- 'object_id': fields.many2one('ir.model', 'Objects', required=True,
+ 'object_id': fields.many2one('ir.model', 'Object', required=True,
help="Choose the Object on which you want \
- this campaign to be run"),
- 'mode':fields.selection([('test', 'Test'),
- ('test_realtime', 'Realtime'),
- ('manual', 'Manual'),
- ('active', 'Active')],
- 'Mode', required=True),
+this campaign to be run"),
+ 'mode':fields.selection([('test', 'Test Directly'),
+ ('test_realtime', 'Test in Realtime'),
+ ('manual', 'With Manual Confirmation'),
+ ('active', 'Normal')],
+ 'Mode', required=True, help= \
+"""Test - It creates and process all the workitems directly (without waiting for the delay on transitions) but do not send emails or produce reports.
+Test in Realtime - It creates and process all the workitems directly but do not send emails or produce reports.
+With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
+Normal - the campaign runs normally and automatically sends all emails and reports"""),
'state': fields.selection([('draft', 'Draft'),
('running', 'Running'),
('done', 'Done'),
('cancelled', 'Cancelled'),],
- 'State',),
- 'activity_ids': fields.one2many('marketing.campaign.activity',
+ 'State',),
+ 'activity_ids': fields.one2many('marketing.campaign.activity',
'campaign_id', 'Activities'),
'fixed_cost': fields.float('Fixed Cost', help="The fixed cost is cost\
- you required for the campaign"),
-
+you required for the campaign"),
}
-
_defaults = {
'state': lambda *a: 'draft',
- 'mode': lambda *a: 'test',
+ 'mode': lambda *a: 'test',
}
def state_running_set(self, cr, uid, ids, *args):
campaign = self.browse(cr, uid, ids[0])
if not campaign.activity_ids :
- raise osv.except_osv("Error", "There is no associate activitity for the campaign")
+ raise osv.except_osv("Error", "There is no activitity in the campaign")
act_ids = [ act_id.id for act_id in campaign.activity_ids]
act_ids = self.pool.get('marketing.campaign.activity').search(cr, uid,
[('id', 'in', act_ids), ('start', '=', True)])
if not act_ids :
- raise osv.except_osv("Error", "There is no associate activitity for the campaign")
- segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
- [('campaign_id', '=', campaign.id),
- ('state', '=', 'draft')])
+ raise osv.except_osv("Error", "There is no starting activitity in the campaign")
self.write(cr, uid, ids, {'state': 'running'})
return True
-
+
def state_done_set(self, cr, uid, ids, *args):
segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
[('campaign_id', 'in', ids),
('state', '=', 'running')])
if segment_ids :
- raise osv.except_osv("Error", "Camapign cannot be done before all segments are done")
+ raise osv.except_osv("Error", "Campaign cannot be marked as done before all segments are done")
self.write(cr, uid, ids, {'state': 'done'})
return True
-
+
def state_cancel_set(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'cancelled'})
return True
-marketing_campaign()#}}}
+marketing_campaign()
-class marketing_campaign_segment(osv.osv): #{{{
+class marketing_campaign_segment(osv.osv):
_name = "marketing.campaign.segment"
_description = "Campaign Segment"
_columns = {
'name': fields.char('Name', size=64,required=True),
- 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
- required=True),
+ 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
+ required=True, select=1),
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object'),
'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
- 'sync_last_date': fields.datetime('Date'),
- 'sync_mode': fields.selection([('create_date', 'Create'),
- ('write_date', 'Write')],
- 'Mode'),
+ 'sync_last_date': fields.datetime('Latest Synchronization'),
+ 'sync_mode': fields.selection([('create_date', 'Sync only on creation'),
+ ('write_date', 'Sync at each modification')],
+ 'Synchronization Mode'),
'state': fields.selection([('draft', 'Draft'),
('running', 'Running'),
('done', 'Done'),
('cancelled', 'Cancelled')],
- 'State',),
- 'date_run': fields.datetime('Running'),
- 'date_done': fields.datetime('Done'),
+ 'State',),
+ 'date_run': fields.datetime('Launching Date'),
+ 'date_done': fields.datetime('End Date'),
}
-
+
_defaults = {
'state': lambda *a: 'draft',
'sync_mode': lambda *a: 'create_date',
}
-
+
def state_running_set(self, cr, uid, ids, *args):
segment = self.browse(cr, uid, ids[0])
curr_date = time.strftime('%Y-%m-%d %H:%M:%S')
vals = {'state': 'running'}
if not segment.date_run:
- vals['date_run'] = time.strftime('%Y-%m-%d %H:%M:%S')
- if not segment.sync_last_date:
- vals['sync_last_date']=curr_date
- if not segment.date_done:
- vals['date_done']= (datetime.now() + _intervalTypes['years'](1) \
- ).strftime('%Y-%m-%d %H:%M:%S')
+ vals['date_run'] = time.strftime('%Y-%m-%d %H:%M:%S')
self.write(cr, uid, ids, vals)
return True
-
+
def state_done_set(self, cr, uid, ids, *args):
- date_done = self.browse(cr, uid, ids[0]).date_done
- if (date_done > time.strftime('%Y-%m-%d %H:%M:%S')):
- raise osv.except_osv("Error", "Segment cannot be closed before end date")
-
wi_ids = self.pool.get("marketing.campaign.workitem").search(cr, uid,
- [('state', 'in', ['inprogress', 'todo']),
- ('segment_id', '=', ids[0])])
- if wi_ids :
- raise osv.except_osv("Error", "Segment cannot be done before all workitems are processed")
- self.write(cr, uid, ids, {'state': 'done'})
+ [('state', '=', 'todo'), ('segment_id', 'in', ids)])
+ self.pool.get("marketing.campaign.workitem").write(cr, uid, wi_ids, {'state':'cancelled'})
+ self.write(cr, uid, ids, {'state': 'done','date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
return True
-
+
def state_cancel_set(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state': 'cancelled'})
+ wi_ids = self.pool.get("marketing.campaign.workitem").search(cr, uid,
+ [('state', '=', 'todo'), ('segment_id', 'in', ids)])
+ self.pool.get("marketing.campaign.workitem").write(cr, uid, wi_ids, {'state':'cancelled'})
+ self.write(cr, uid, ids, {'state': 'cancelled','date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
return True
-
- def process_segment(self, cr, uid, context={}):
- segment_ids = self.search(cr, uid, [('state', '=', 'running')])
+
+ def synchroniz(self, cr, uid, ids, *args):
+ self.process_segment(cr, uid, ids)
+ return True
+
+ def process_segment(self, cr, uid, segment_ids=None, context={}):
+ if not segment_ids:
+ segment_ids = self.search(cr, uid, [('state', '=', 'running')], context=context)
+
action_date = time.strftime('%Y-%m-%d %H:%M:%S')
- last_action_date = (datetime.now() + _intervalTypes['days'](-1) \
- ).strftime('%Y-%m-%d %H:%M:%S')
- for segment in self.browse(cr, uid, segment_ids):
- act_ids = self.pool.get('marketing.campaign.activity').search(cr,
- uid, [('start', '=', True),
- ('campaign_id', '=', segment.campaign_id.id)])
- if (segment.sync_last_date and \
- segment.sync_last_date <= action_date )\
- or not segment.sync_last_date :
- model_obj = self.pool.get(segment.object_id.model)
- object_ids = model_obj.search(cr, uid, [
- (segment.sync_mode, '<=', action_date),
- (segment.sync_mode, '>=', last_action_date)])
- for o_ids in model_obj.read(cr, uid, object_ids) :
- partner_id = 'partner_id' in o_ids and o_ids['partner_id'] \
- or False
- if partner_id:
- for act_id in act_ids:
- wi_vals = {'segment_id': segment.id,
- 'activity_id': act_id,
- 'date': action_date,
- 'partner_id': partner_id[0],
- 'state': 'todo',
- }
- self.pool.get('marketing.campaign.workitem').create(
- cr, uid, wi_vals)
- self.write(cr, uid, segment.id, {'sync_last_date':action_date})
+ campaigns = {}
+ for segment in self.browse(cr, uid, segment_ids, context=context):
+ campaigns[segment.campaign_id.id] = True
+ act_ids = self.pool.get('marketing.campaign.activity').search(cr,
+ uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)])
+
+ model_obj = self.pool.get(segment.object_id.model)
+ criteria = []
+ if segment.sync_last_date:
+ criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
+ if segment.ir_filter_id:
+ criteria += eval(segment.ir_filter_id.domain)
+ object_ids = model_obj.search(cr, uid, criteria, context=context)
+
+ for o_ids in model_obj.browse(cr, uid, object_ids, context=context) :
+ # avoid duplicated workitem for the same resource
+ if segment.sync_mode == 'write_date':
+ segids = self.pool.get('marketing.campaign.workitem').search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)])
+ if segids:
+ continue
+ for act_id in act_ids:
+ wi_vals = {
+ 'segment_id': segment.id,
+ 'activity_id': act_id,
+ 'date': action_date,
+ 'partner_id': o_ids.partner_id and o_ids.partner_id.id or False,
+ 'state': 'todo',
+ 'res_id': o_ids.id
+ }
+ self.pool.get('marketing.campaign.workitem').create(cr, uid, wi_vals)
+ self.write(cr, uid, segment.id, {'sync_last_date':action_date})
+ self.pool.get('marketing.campaign.workitem').process_all(cr, uid, campaigns.keys(), context=context)
return True
-marketing_campaign_segment()#}}}
+marketing_campaign_segment()
-class marketing_campaign_activity(osv.osv): #{{{
+class marketing_campaign_activity(osv.osv):
_name = "marketing.campaign.activity"
_description = "Campaign Activity"
-
+ _actions_type = [('email', 'E-mail'), ('paper', 'Paper'), ('action', 'Action'),
+ ('subcampaign', 'Sub-Campaign')]
_columns = {
'name': fields.char('Name', size=128, required=True),
- 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
- required = True, ondelete='cascade'),
+ 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
+ required = True, ondelete='cascade', select=1),
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object'),
- 'start': fields.boolean('Start',help= "Its necessary to start activity \
- before running campaign"),
- 'condition': fields.char('Condition', size=256, required=True,
- help="Condition that is to be tested before \
- action is executed"),
+ 'start': fields.boolean('Start',help= "This activity is launched when the campaign starts."),
+ 'condition': fields.char('Condition', size=256, required=True,
+ help="Python condition to know if the activity can be launched"),
'type': fields.selection([('email', 'E-mail'),
('paper', 'Paper'),
('action', 'Action'),
('subcampaign', 'Sub-Campaign')],
- 'Type', required=True),
+ 'Type', required=True,
+ help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
'email_template_id': fields.many2one('email.template','Email Template'),
- 'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
+ 'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
'report_directory_id': fields.many2one('document.directory','Directory',
help="Folder is used to store the generated reports"),
'server_action_id': fields.many2one('ir.actions.server', string='Action',
@@ -222,21 +225,27 @@ class marketing_campaign_activity(osv.osv): #{{{
'Next Activities'),
'from_ids': fields.one2many('marketing.campaign.transition',
'activity_to_id',
- 'Previous Activities'),
+ 'Previous Activities'),
'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign'),
'subcampaign_segment_id': fields.many2one('marketing.campaign.segment',
'Sub Campaign Segment'),
'variable_cost': fields.float('Variable Cost'),
'revenue': fields.float('Revenue')
- }
+ }
_defaults = {
'type': lambda *a: 'email',
'condition': lambda *a: 'True',
'object_id' : lambda obj, cr, uid, context : context.get('object_id',False),
}
+ def __init__(self, *args):
+ self._actions = {'paper' : self.process_wi_report,
+ 'email' : self.process_wi_email,
+ 'server_action' : self.process_wi_action,
+ }
+ return super(marketing_campaign_activity, self).__init__(*args)
- def search(self, cr, uid, args, offset=0, limit=None, order=None,
+ def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
if context == None:
context = {}
@@ -247,75 +256,94 @@ class marketing_campaign_activity(osv.osv): #{{{
for activity in segment_obj.campaign_id.activity_ids:
act_ids.append(activity.id)
return act_ids
- return super(marketing_campaign_activity, self).search(cr, uid, args,
+ return super(marketing_campaign_activity, self).search(cr, uid, args,
offset, limit, order, context, count)
+ def process_wi_report(self, cr, uid, activity, workitem, context={}):
+ service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
+ (report_data, format) = service.create(cr, uid, [], {}, {})
+ attach_vals = {
+ 'name': '%s_%s_%s'%(activity.report_id.report_name,
+ activity.name,workitem.partner_id.name),
+ 'datas_fname': '%s.%s'%(activity.report_id.report_name,
+ activity.report_id.report_type),
+ 'parent_id': activity.report_directory_id.id,
+ 'datas': base64.encodestring(report_data),
+ 'file_type': format
+ }
+ self.pool.get('ir.attachment').create(cr, uid, attach_vals)
+ return True
+
+ def process_wi_email(self, cr, uid, activity, workitem, context=None):
+ print 'Sending Email Init', activity.name
+ return self.pool.get('email.template').generate_mail(cr, uid, activity.email_template_id.id, [workitem.res_id], context=context)
+
+ #if not template.enforce_from_account:
+ # self.pool.get('marketing.campaign.workitem').write(cr, uid, [workitem.id], {
+ # 'error_msg': 'There is no account defined for the email',
+ # 'state': 'exception'
+ # })
+ # return False
+ #if not workitem.partner_id.email:
+ # self.pool.get('marketing.campaign.workitem').write(cr, uid, [workitem.id], {
+ # 'error_msg': "There is no email defined for the partner",
+ # 'state': 'exception'
+ # })
+ # return False
+ #vals = {
+ # 'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
+ # 'email_to': template.email_to,
+ # 'email_cc': template.email_cc,
+ # 'email_bcc': template.email_bcc,
+ # 'subject': template.def_subject,
+ # 'body_text': template.def_body_text,
+ # 'body_html': template.def_body_html,
+ # 'account_id': accounts.id,
+ # 'state':'na',
+ # 'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
+ #}
+# # if accounts.use_sign:
+# # signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
+# # if signature:
+# # vals['pem_body_text'] = tools.ustr(vals['pem_body_text'] or '') + signature
+# # vals['pem_body_html'] = tools.ustr(vals['pem_body_html'] or '') + signature
+
+ ##Create partly the mail and later update attachments
+ #print 'Sending Email', vals
+ #mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
+ return True
+
+ def process_wi_action(self, cr, uid, activity, workitem, context={}):
+ context = {}
+ server_obj = self.pool.get('ir.actions.server')
+ server_obj.run(cr, uid, [activity.server_action_id.id], context)
+ return True
+
def process(self, cr, uid, act_id, wi_id, context={}):
activity = self.browse(cr, uid, act_id)
+ print 'Process', activity.name
workitem_obj = self.pool.get('marketing.campaign.workitem')
- workitem = workitem_obj.browse(cr, uid, wi_id)
-
- if activity.type == 'paper' :
- service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
- (report_data, format) = service.create(cr, uid, [], {}, {})
- attach_vals = {
- 'name': '%s_%s_%s'%(activity.report_id.report_name,
- activity.name,workitem.partner_id.name),
- 'datas_fname': '%s.%s'%(activity.report_id.report_name,
- activity.report_id.report_type),
- 'parent_id': activity.report_directory_id.id,
- 'datas': base64.encodestring(report_data),
- 'file_type': format
- }
- self.pool.get('ir.attachment').create(cr, uid, attach_vals)
- elif activity.type == 'email' :
- context = {}
- template = activity.email_template_id
- accounts = template.enforce_from_account
- if not template.enforce_from_account:
- return {'error_msg' : "There is no account defined for the email"}
- if not workitem.partner_id.email:
- return {'error_msg' : "There is no email defined for the partner"}
- vals = {
- 'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
- 'email_to': workitem.partner_id.email,
- 'subject': template.def_subject,
- 'body_text': template.def_body_text,
- 'body_html': template.def_body_html,
- 'account_id':accounts.id,
- 'state':'na',
- 'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
- }
-# if accounts.use_sign:
-# signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
-# if signature:
-# vals['pem_body_text'] = tools.ustr(vals['pem_body_text'] or '') + signature
-# vals['pem_body_html'] = tools.ustr(vals['pem_body_html'] or '') + signature
+ workitem = workitem_obj.browse(cr, uid, wi_id, context=context)
+ print 'WI', workitem, activity.type
+ return self._actions[activity.type](cr, uid, activity, workitem, context)
- #Create partly the mail and later update attachments
- mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
- elif activity.type == 'action' :
- server_obj = self.pool.get('ir.actions.server')
- server_obj.run(cr, uid, [activity.server_action_id.id], context)
- #???
- return True
-marketing_campaign_activity()#}}}
+marketing_campaign_activity()
-class marketing_campaign_transition(osv.osv): #{{{
+class marketing_campaign_transition(osv.osv):
_name = "marketing.campaign.transition"
_description = "Campaign Transition"
_rec_name = "interval_type"
_columns = {
'activity_from_id': fields.many2one('marketing.campaign.activity',
- 'Source Activity'),
- 'activity_to_id': fields.many2one('marketing.campaign.activity',
+ 'Source Activity', select=1),
+ 'activity_to_id': fields.many2one('marketing.campaign.activity',
'Destination Activity'),
'interval_nbr': fields.integer('Interval No.'),
- 'interval_type': fields.selection([('hours', 'Hours'), ('days', 'Days'),
+ 'interval_type': fields.selection([('hours', 'Hours'), ('days', 'Days'),
('months', 'Months'),
('years','Years')],'Interval Type')
- }
+ }
def default_get(self, cr, uid, fields, context={}):
value = super(marketing_campaign_transition, self).default_get(cr, uid,
@@ -323,57 +351,82 @@ class marketing_campaign_transition(osv.osv): #{{{
if context.has_key('type_id'):
value[context['type_id']] = context['activity_id']
return value
-
-marketing_campaign_transition() #}}}
-class marketing_campaign_workitem(osv.osv): #{{{
+marketing_campaign_transition()
+
+class marketing_campaign_workitem(osv.osv):
_name = "marketing.campaign.workitem"
_description = "Campaign Workitem"
+ def _res_name_get(self, cr, uid, ids, field_name, arg, context=None):
+ res = {}
+ for obj in self.browse(cr, uid, ids, context=context):
+ if obj.res_id:
+ try:
+ res[obj.id] = self.pool.get(obj.object_id.model).name_get(cr, uid, [obj.res_id], context=context)[0][1]
+ except:
+ res[obj.id] = '/'
+ else:
+ res[obj.id] = '/'
+ return res
+
_columns = {
'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
- required=True),
+ required=True),
'activity_id': fields.many2one('marketing.campaign.activity','Activity',
- required=True),
- 'object_id': fields.related('segment_id', 'campaign_id', 'object_id',
- type='many2one', relation='ir.model',
- string='Object'),
- 'res_id': fields.integer('Results'),
+ required=True),
+ 'campaign_id': fields.related('segment_id', 'campaign_id',
+ type='many2one', relation='marketing.campaign', string='Campaign', readonly=True),
+ 'object_id': fields.related('segment_id', 'campaign_id', 'object_id',
+ type='many2one', relation='ir.model', string='Object', select=1),
+ 'res_id': fields.integer('Resource ID', select=1),
+ 'res_name': fields.function(_res_name_get, method=True, string='Resource Name', type="char", size=64),
'date': fields.datetime('Execution Date'),
- 'partner_id': fields.many2one('res.partner', 'Partner',required=True),
- 'state': fields.selection([('todo', 'ToDo'), ('inprogress', 'In Progress'),
+ 'partner_id': fields.many2one('res.partner', 'Partner', select=1),
+ 'state': fields.selection([('todo', 'To Do'), ('inprogress', 'In Progress'),
('exception', 'Exception'), ('done', 'Done'),
('cancelled', 'Cancelled')], 'State'),
'error_msg' : fields.text('Error Message')
- }
+ }
_defaults = {
- 'state': lambda *a: 'draft',
+ 'state': lambda *a: 'todo',
}
def process_chain(self, cr, uid, workitem_id, context={}):
workitem = self.browse(cr, uid, workitem_id)
- mct_obj = self.pool.get('marketing.campaign.transition')
- process_to_id = mct_obj.search(cr,uid, [
- ('activity_from_id','=', workitem.activity_id.id)])
- for mct_id in mct_obj.browse(cr, uid, process_to_id):
+ for mct_id in workitem.activity_id.to_ids:
+ launch_date = time.strftime('%Y-%m-%d %H:%M:%S')
if mct_id.interval_type and mct_id.interval_nbr :
launch_date = (datetime.now() + _intervalTypes[ \
mct_id.interval_type](mct_id.interval_nbr) \
).strftime('%Y-%m-%d %H:%M:%S')
- launch_date = time.strftime('%Y-%m-%d %H:%M:%S')
- workitem_vals = {'segment_id': workitem.segment_id.id,
- 'activity_id': mct_id.activity_to_id.id,
- 'date': launch_date,
- 'partner_id': workitem.partner_id.id,
- 'state': 'todo',
- }
+ workitem_vals = {
+ 'segment_id': workitem.segment_id.id,
+ 'activity_id': mct_id.activity_to_id.id,
+ 'date': launch_date,
+ 'partner_id': workitem.partner_id.id,
+ 'res_id': workitem.res_id,
+ 'state': 'todo',
+ }
self.create(cr, uid, workitem_vals)
-
+ return True
+
+ def button_draft(self, cr, uid, workitem_ids, context={}):
+ for wi in self.browse(cr, uid, workitem_ids, context=context):
+ if wi.state=='exception':
+ self.write(cr, uid, [wi.id], {'state':'todo'}, context=context)
+ return True
+
+ def button_cancel(self, cr, uid, workitem_ids, context={}):
+ for wi in self.browse(cr, uid, workitem_ids, context=context):
+ if wi.state in ('todo','exception'):
+ self.write(cr, uid, [wi.id], {'state':'cancelled'}, context=context)
+ return True
+
def process(self, cr, uid, workitem_ids, context={}):
for wi in self.browse(cr, uid, workitem_ids):
- if wi.state == 'todo':# we searched the wi which are in todo state
- #then y v keep this filter again
+ if wi.state == 'todo':
eval_context = {
'pool': self.pool,
'cr': cr,
@@ -384,51 +437,58 @@ class marketing_campaign_workitem(osv.osv): #{{{
}
expr = eval(str(wi.activity_id.condition), eval_context)
if expr:
- try :
- res = self.pool.get('marketing.campaign.activity').process(
- cr, uid, wi.activity_id.id, wi.id, context)
- if res :
+ try:
+ result = True
+ if wi.campaign_id.mode in ('manual','active'):
+ result = self.pool.get('marketing.campaign.activity').process(
+ cr, uid, wi.activity_id.id, wi.id, context)
+ if result:
self.write(cr, uid, wi.id, {'state': 'done'})
self.process_chain(cr, uid, wi.id, context)
- else :
- self.write(cr, uid, wi.id, {'state': 'exception',
- 'error_msg': res['error_msg']})
+ else:
+ self.write(cr, uid, wi.id, {'state': 'exception'})
except Exception,e:
- self.write(cr, uid, wi.id, {'state': 'exception'})
+ self.write(cr, uid, wi.id, {'state': 'exception', 'error_msg': str(e)})
else :
self.write(cr, uid, wi.id, {'state': 'cancelled'})
-
+
return True
-
- def process_all(self, cr, uid, context={}):
- workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
+
+ def process_all(self, cr, uid, camp_ids=None, context={}):
+ camp_obj = self.pool.get('marketing.campaign')
+ if not camp_ids:
+ camp_ids = camp_obj.search(cr, uid, [('state','=','running')], context=context)
+ for camp in camp_obj.browse(cr, uid, camp_ids, context=context):
+ if camp.mode in ('test_realtime','active'):
+ workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))])
- if workitem_ids:
- self.process(cr, uid, workitem_ids, context)
-
-marketing_campaign_workitem() #}}}
+ elif camp.mode == 'test':
+ workitem_ids = self.search(cr, uid, [('state', '=', 'todo')])
+ else:
+ # manual states are not processed automatically
+ workitem_ids = []
+ if workitem_ids:
+ self.process(cr, uid, workitem_ids, context)
+
+marketing_campaign_workitem()
class email_template(osv.osv):
_inherit = "email.template"
-
_defaults = {
'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
}
-email_template()
+email_template()
class report_xml(osv.osv):
-
_inherit = 'ir.actions.report.xml'
-
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if not context:
context = {}
if context and 'object_id' in context and context['object_id']:
- model = self.pool.get('ir.model').browse(cr, uid,
+ model = self.pool.get('ir.model').browse(cr, uid,
context['object_id']).model
args.append(('model', '=', model))
return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
-
-report_xml()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+report_xml()
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 7296ebf9c50..8bc5f879321 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -20,33 +20,27 @@
-
-
-
-
- Thanks for showing interest in OpenERP
- info@tinyerp.com
-
-
-
-
-
-
-
- Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,
- mako
-
- For OpenERP OnDemand Free Trial 2010
- crm.lead
-
-
-
+
+
+
+
+ Thanks for showing interest in OpenERP
+ info@tinyerp.com
+
+
+
+
+
+ Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,
+ mako
+ For OpenERP OnDemand Free Trial 2010
+ crm.lead
+
+
Propose to subscribe to the Open ERP Discovery Day on May 2010
info@tinyerp.com
-
-
@@ -56,19 +50,15 @@
We really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For Open ERP Discovery Day on May 2010
crm.lead
-
-
-
+
+
Thanks for subscribing to the Open ERP Discovery Day
info@tinyerp.com
-
-
@@ -77,19 +67,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For Open ERP Discovery Day
crm.lead
-
-
-
+
+
Thanks for buying the Open ERP book
info@tinyerp.com
-
-
@@ -98,19 +84,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For Open ERP book
crm.lead
-
-
+
Propose a free technical training to Gold partners
info@tinyerp.com
-
-
@@ -120,19 +102,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For technical training to Gold partners
crm.lead
-
-
+
Propose paid training to Silver partners
info@tinyerp.com
-
-
@@ -142,19 +120,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For training to Silver partners
crm.lead
-
-
+
Propose gold partnership to silver partners
info@tinyerp.com
-
-
@@ -164,73 +138,67 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For gold partnership to silver partners
crm.lead
-
-
+
Thanks for subscribing to technical training
info@tinyerp.com
-
-
Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
-
For subscribing to technical training
crm.lead
-
-
-
-
- Marketing campaign demo report
- ir.actions.report.xml
- crm.lead
- crm.lead.demo
- marketing_campaign/report/crm_lead_mc_demo_report.rml
- pdf
-
-
-
-
- OpenERP OnDemand Free Trial 2010
-
-
-
-
-
-
- Propose a 1 month free trial for an OnDemand offer
-
-
-
- paper
-
-
-
-
- Thanks for showing interest
-
-
-
-
-
-
+
+
+
+ Marketing campaign demo report
+ ir.actions.report.xml
+ crm.lead
+ crm.lead.demo
+ marketing_campaign/report/crm_lead_mc_demo_report.rml
+ pdf
+
+
+
+
+ OpenERP OnDemand Free Trial 2010
+
+
+
+
+
+
+ Propose a 1 month free trial for an OnDemand offer
+
+
+
+ paper
+
+
+
+
+ Thanks for showing interest
+
+
+
+
+
+
Propose to subscribe to the Open ERP Discovery Day on May 2010
-
-
+
+
Thanks for subscribing to the Open ERP Discovery Day
@@ -244,7 +212,7 @@
paper
-
+
Thanks for buying the Open ERP book
@@ -263,28 +231,28 @@
-
+
Propose gold partnership to silver partners
-
+
Thanks for subscribing to technical training
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -324,15 +292,15 @@
-
-
-
-
- BossList US Associations List-0/90
- create_date
-
- draft
-
-
-
-
+
+
+
+
+ BossList US Associations List-0/90
+ create_date
+
+ draft
+
+
+
+
\ No newline at end of file
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
old mode 100755
new mode 100644
index fb88b6d283d..0ab2add38ba
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -14,77 +14,69 @@
form
@@ -105,7 +97,6 @@
-
@@ -121,14 +112,14 @@
-
-
-
+
+
+
-
-
+
+
@@ -139,19 +130,19 @@
search
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -163,14 +154,14 @@
form
tree,form,diagram
- {'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}
+ {'group_by': []}
-
+
-
+
-
+
-
+
+
+ res.partner.form2
+ res.partner
+ form
+
+
+
+
+
+
+
res.partner.tree.form.inherit
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index d23cee8d565..30367ec35f8 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,6 +26,6 @@ import installer
import wizard
import report
import company
-import mrp_procurement
+import procurement
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 97e23f3488d..58320ebfdf7 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -26,7 +26,7 @@
"author" : "Tiny",
"website" : "http://www.openerp.com",
"category" : "Generic Modules/Production",
- "depends" : ["mrp_procurement", "stock", "resource", "purchase", "product","process"],
+ "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
"description": """
This is the base module to manage the manufacturing process in Open ERP.
@@ -76,7 +76,7 @@
'report/mrp_report_view.xml',
'report/mrp_production_order_view.xml',
],
- 'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
+ 'demo_xml': ['mrp_demo.xml'],
'test': [
'test/mrp_phantom_bom.yml',
'test/mrp_production_order.yml',
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
new file mode 100644
index 00000000000..2e356c5ca2a
--- /dev/null
+++ b/addons/mrp/i18n/hi.po
@@ -0,0 +1,1943 @@
+# Hindi translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-11 10:07+0000\n"
+"Last-Translator: vir (Open ERP) \n"
+"Language-Team: Hindi \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+msgid "Moves Created"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement.compute.all,init,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:mrp.module_meta_information
+msgid "Manufacturing Resource Planning"
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
+#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
+msgid "Exceptions Procurements"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Workcenters"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+msgid "Packing list"
+msgstr "पैकिंग सूची"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+msgid "Stockable Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,origin:0
+#: field:mrp.production,origin:0
+msgid "Origin"
+msgstr "मूल श्रोत"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "कॉन्फ़िगरेशन"
+
+#. module: mrp
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "संदर्भ"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:mrp.procurement.compute.all,init,automatic:0
+#: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "संरचना देखने के लिए अमान्य XML!"
+
+#. module: mrp
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "मूल्य प्रति घंटा"
+
+#. module: mrp
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "सर्वश्रेष्ठ (कीमत अभी तक सक्रिय नहीं!)"
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Product & Location"
+msgstr "उत्पाद और स्थान"
+
+#. module: mrp
+#: view:res.company:0
+msgid "MRP & Logistic Scheduler"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operation this workcenter can do in parallel. If this workcenter "
+"represent a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
+#. module: mrp
+#: wizard_button:product.product.procurement,init,create:0
+msgid "Ask New Products"
+msgstr "नए उत्पादों के लिए पूछें"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:change_production_qty,confirm,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "उत्पाद मात्रा"
+
+#. module: mrp
+#: field:mrp.production,move_lines:0
+msgid "Products Consummed"
+msgstr "उत्पादों की खपत"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr "क्षमता सूचना"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Packing Exception"
+msgstr "पैकिंग अपवाद"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+msgid "A purchase order is created for a sub-contracting demand."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Do nothing"
+msgstr "कुछ ना करें"
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement.orderpoint.compute,init,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,measure_unit:0
+msgid "Amount in hours"
+msgstr "घंटों में राशि"
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr "अनुसूचित माल"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid "you can see the minimum stock rules from product"
+msgstr "आप उत्पाद से न्यूनतम स्टॉक नियमों को देख सकते हैं"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.procurement.compute,init:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Ref."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+#: field:mrp.procurement,state:0
+#: field:mrp.production,state:0
+msgid "Status"
+msgstr "स्थिति"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "Stockable Production Order"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "Stockable Request"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceonorder0
+msgid "Service on Order"
+msgstr ""
+
+#. module: mrp
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Stockable Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: view:mrp.production:0
+msgid "Production Orders"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: field:mrp.procurement,product_qty:0
+#: rml:mrp.production.order:0
+#: wizard_field:product.product.procurement,init,qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procure Service Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production scheduled products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Details"
+msgstr "विवरण"
+
+#. module: mrp
+#: model:process.process,name:mrp.process_process_procurementprocess0
+msgid "Procurement Process"
+msgstr "खरीद प्रक्रिया"
+
+#. module: mrp
+#: field:mrp.production,date_planned_date:0
+msgid "Scheduled Date"
+msgstr "अनुसूचित तिथि"
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Urgent"
+msgstr "तत्काल"
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid ""
+"Rounding applied on the product quantity. For integer only values, put 1.0"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,move_id:0
+msgid "Reservation"
+msgstr "आरक्षण"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product.product.procurement,init,product_id:0
+msgid "product"
+msgstr "उत्पाद"
+
+#. module: mrp
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "अधिकतम"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Product to stock rules"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:product_price,init,price:0
+msgid "Print product price"
+msgstr "प्रिंट उत्पाद मूल्य"
+
+#. module: mrp
+#: wizard_view:product.product.procurement,done:0
+msgid "Make Procurement"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid "If Procure method is Make to order and supply method is produce"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr "लेखक"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Stockable Product Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Production Procure Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.process,name:mrp.process_process_serviceproductprocess0
+msgid "Service Product Process"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "Procurement convert into the draft purchase order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,message:0
+msgid "Latest error"
+msgstr "नवीनतम त्रुटि"
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Routing workcenter usage"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consumed Products"
+msgstr "खपत उत्पाद"
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid "If Product type is Stockable and procure method is make to stock"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturity Lead Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
+msgid "Exceptions Procurements to Fix"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Ready"
+msgstr "तैयार"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Workcenter Operations"
+msgstr "Workcenter संचालन"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
+#: model:ir.ui.menu,name:mrp.menu_production_orders_start_gantt
+msgid "Production Orders Planning"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_efficiency:0
+msgid "Factor that multiplies all times expressed in the workcenter."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finnished:0
+msgid "End Date"
+msgstr "समाप्ति तिथि"
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the internal picking list take bring the raw materials to the "
+"production plan."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "In Production"
+msgstr "उत्पादन में"
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:mrp.workcenter.load,init,report:0
+msgid "Print"
+msgstr "प्रिंट"
+
+#. module: mrp
+#: field:mrp.workcenter,type:0
+msgid "Type"
+msgstr "प्रकार"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable and consumable"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,time_unit:0
+msgid "Per month"
+msgstr "प्रति माह"
+
+#. module: mrp
+#: field:mrp.procurement,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+msgid "Product Name"
+msgstr "वस्तु का नाम"
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Printing date"
+msgstr "मुद्रण तारीख"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr "कोटेशन के लिए अनुरोध"
+
+#. module: mrp
+#: field:mrp.bom,revision_type:0
+msgid "indice type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Production orders are created for the product manufacturing."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "न्यूनतम मात्रा"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+#: field:mrp.bom,child_ids:0
+msgid "BoM Hyerarchy"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid "If Product type is service and procure method is Make to stock"
+msgstr "अगर उत्पाद प्रकार सेवा है और खरीद विधि है स्टॉक बनाने के लिए"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "If Product type is service"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "सुरक्षा दिवस"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Ready to Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Exception"
+msgstr "अपवाद"
+
+#. module: mrp
+#: wizard_view:product.product.procurement,init:0
+msgid ""
+"This wizard will planify the procurement for this product. This procurement "
+"may generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+msgid "The system waits for requested products in stock."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicemto0
+msgid "Serivce Stockable Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid "From minimum stock rules, it goes for procure product."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production done"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: field:mrp.bom,code:0
+#: field:mrp.routing,code:0
+#: field:mrp.workcenter,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "References"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:change_production_qty,confirm,end:0
+#: view:mrp.procurement:0
+#: selection:mrp.procurement,state:0
+#: wizard_button:mrp.procurement.compute,init,end:0
+#: wizard_button:mrp.procurement.compute.all,init,end:0
+#: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
+#: view:mrp.production:0
+#: wizard_button:mrp.workcenter.load,init,end:0
+#: wizard_button:product.product.procurement,init,end:0
+#: wizard_button:product_price,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,type:0
+msgid "Machine"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,name:0
+msgid "Workcenter Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the workcenter. Explain here what's a cycle according to this "
+"workcenter."
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+msgid "-"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,type:0
+msgid "Human Resource"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: field:mrp.routing,workcenter_lines:0
+msgid "Workcenters"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,procure_method:0
+msgid "on order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
+#: model:ir.ui.menu,name:mrp.mrp_Sched_all
+msgid "Compute All Schedulers"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: field:mrp.procurement,name:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycle"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:mrp.workcenter.load,init,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Run procurement"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurement that are not between today and today+range are "
+"skipped for futur computation."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_efficiency:0
+msgid "Time Efficiency"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.procurement.compute.all,init:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "A cycle is defined in the workcenter definition."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product.product.procurement,init,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,time_unit:0
+msgid "Per week"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:mrp.procurement.compute,init,compute:0
+#: wizard_button:mrp.procurement.compute.all,init,compute:0
+#: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Wait for available products for reservation"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:change_production_qty,confirm,validate:0
+msgid "Validate"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Procurement Purchase"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.workcenter.load,init:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product_price,init,number:0
+msgid "Number of products to produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material routing"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum stock rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Product Efficiency"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
+msgid "Orderpoint minimum rule"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicemts0
+msgid "Service Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Ref"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,priority:0
+#: field:mrp.production,priority:0
+#: rml:mrp.production.order:0
+msgid "Priority"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,location_id:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_new
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
+msgid "New Procurement"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,type:0
+msgid "Tool"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid ""
+"Location where the system will look for products used in raw materials."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+#: wizard_field:product.product.procurement,init,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "Procurement orders"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid "If product type is service and procure method is Make to order"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range"
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_procurement
+#: view:mrp.procurement:0
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.product_procurement_wizard
+msgid "Procurement Request"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wizard_price
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "Minimum Stock Procure"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,revision_type:0
+msgid "alphabetical indices"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Procurement for raw materials."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+#: field:mrp.procurement,note:0
+#: rml:mrp.production.order:0
+msgid "Note"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procure Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product_price,init:0
+msgid "Paid ?"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Define a routing to describe the manufacturing steps."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0
+#: view:mrp.property:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,date_planned:0
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Define the product structure, with sub-products and/or components."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid ""
+"Procurement is created if the product quantity is lower than the minimum "
+"limit."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+#: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
+msgid "Production Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
+msgid "Change Product Qty."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "Central document to procure products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
+msgid "Production Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:mrp.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:mrp.action_orderpoint_form
+#: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_id:0
+#: field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.product.line,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement,origin:0
+msgid ""
+"Reference of the document that created this procurement.\n"
+"This is automatically completed by Open ERP."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid "Product type is Stockable and procure method is make to stock"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,product_uos:0
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+msgid "Workcenter"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,purchase_id:0
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Workcenters"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement,procure_method:0
+msgid ""
+"If you encode manually a procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+msgid "Stockable Order Request"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,revision_type:0
+msgid "numeric indices"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid "If Procure method is Make to order and supply method is buy"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid "if Product type is Stockable in procurement order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: view:mrp.production:0
+#: rml:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of material revisions"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Planification"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "BOM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"Use a phantom bill of material in raw materials lines that have to be "
+"automatically computed in on eproduction order and not one per level.If you "
+"put \"Phantom/Set\" at the root level of a bill of material it is considered "
+"as a set or pack: the products are replaced by the components between the "
+"sale order to the picking without going through the production order.The "
+"normal BoM will generate one production order per BoM level."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product.product.procurement,done:0
+msgid "Your procurement request has been sent !"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product.product.procurement,init:0
+msgid "Internal Procurement Request"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Categories"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
+#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
+msgid "Compute Procurements Only"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
+msgid "Temporary Procurement Exceptions"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.procurement.compute,init:0
+#: wizard_view:mrp.procurement.orderpoint.compute,init:0
+msgid "Parameters"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Workcenters Utilisation"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid ""
+"Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+"production."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceonorder0
+msgid "If procurement is make to order"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+msgid "Minimum Stock Rule"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
+msgid "New Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: wizard_field:mrp.workcenter.load,init,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:mrp.procurement,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan futur loads on workcenters based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product Process"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_new
+#: model:ir.ui.menu,name:mrp.menu_production_orders_new
+msgid "New Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "A Request for Quotation is created and sent to the supplier."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Retry"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid "When any procuere products, it comes into the prpcurement orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+#: model:ir.ui.menu,name:mrp.menu_production_orders_start
+msgid "Production Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid "An entry is being made from billing material to routing."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,timesheet_id:0
+msgid "The normal working time of the workcenter."
+msgstr ""
+
+#. module: mrp
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid "In procurement order, if product type is service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: view:mrp.routing:0
+#: view:mrp.routing.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:product.product.procurement,done,end:0
+msgid "Close"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Create minimum stock rules"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product.product.procurement,init,warehouse_id:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service Product"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:change_production_qty,confirm:0
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+#: view:mrp.routing:0
+#: field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Running"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
+msgid "Unscheduled procurements"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
+#: model:ir.ui.menu,name:mrp.menu_bom_tree
+msgid "Bill of Material Structure"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
+msgid "Workcenter load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Procurement Details"
+msgstr "खरीद के विवरण"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid "You can see its bill of material which are used to make product"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End"
+msgstr "अनुसूचित समाप्ति"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr "अनुक्रम"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Materials Components"
+msgstr ""
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 42e8ef25d4a..ec2a1d15810 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -247,7 +247,7 @@ class mrp_bom(osv.osv):
v['name'] = prod.name
return {'value': v}
return {}
-
+
def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
""" Finds BoM for particular product and product uom.
@param product_id: Selected product.
@@ -460,18 +460,6 @@ class mrp_production(osv.osv):
result[prod.id] = prod.date_planned[:10]
return result
- def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
- """ Finds reference sale order for production order.
- @param field_names: Names of fields.
- @param arg: User defined arguments
- @return: Dictionary of values.
- """
- res = {}
- for f in field_names:
- for order_id in ids:
- res[order_id] = {f:False}
- return res
-
_columns = {
'name': fields.char('Reference', size=64, required=True),
'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."),
@@ -512,8 +500,6 @@ class mrp_production(osv.osv):
'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
- 'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
- 'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
@@ -823,7 +809,7 @@ class mrp_production(osv.osv):
seq_obj = self.pool.get('ir.sequence')
pick_obj = self.pool.get('stock.picking')
move_obj = self.pool.get('stock.move')
- proc_obj = self.pool.get('mrp.procurement')
+ proc_obj = self.pool.get('procurement.order')
wf_service = netsvc.LocalService("workflow")
for production in self.browse(cr, uid, ids):
if not production.product_lines:
@@ -917,7 +903,7 @@ class mrp_production(osv.osv):
'move_id': move_id,
'company_id': production.company_id.id,
})
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
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'})
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index a7db7109e55..64dd9f2c9e5 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -16,20 +16,5 @@
1
-
-
- Stock orderpoint
- mrp.warehouse.orderpoint
-
-
-
- Stock orderpoint
- mrp.warehouse.orderpoint
- OP/
- 5
- 1
- 1
-
-
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index fe4fb6b8348..c3929df10af 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -21,6 +21,9 @@
+
+ Configure
+
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index bcda66e8679..936a207caa3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -41,7 +41,7 @@
id="menu_mrp_configuration"
name="Configuration"
parent="base.menu_mrp_root"
- groups="base.group_extended"
+ groups="group_mrp_manager"
sequence="50" />
@@ -248,19 +248,19 @@
-
+
-
+
-
+
-
+
@@ -283,7 +283,7 @@
-
+
mrp.bom.select
mrp.bom
search
@@ -291,9 +291,9 @@
-
-
-
+
+
+
@@ -402,26 +402,26 @@
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+ Order Point
+ -->
+
+
+
mrp.production.tree
@@ -515,9 +515,9 @@
-
-
-
+
+
+
-
-
@@ -809,19 +807,19 @@
- mrp.procurement.form.inherit
- mrp.procurement
-
- form
-
-
-
-
-
+ procurement.order.form.inherit
+ procurement.order
+
+ form
+
+
+
+
+
-
+
produce
subflow
@@ -125,20 +125,20 @@
-
+
check_product()
-
+
subflow.cancel
-
+
subflow.done
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 08d66570b1f..16369eef298 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -4,11 +4,11 @@
-
+
-
+
@@ -19,94 +19,94 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 60bf3b562b9..a96a7a7bd4d 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -8,7 +8,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index c053103f476..bb5c36a015a 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -8,7 +8,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/addons/mrp/mrp_procurement.py b/addons/mrp/procurement.py
similarity index 90%
rename from addons/mrp/mrp_procurement.py
rename to addons/mrp/procurement.py
index 84392b329ea..d704afa46d6 100644
--- a/addons/mrp/mrp_procurement.py
+++ b/addons/mrp/procurement.py
@@ -27,17 +27,20 @@ import ir
import netsvc
import time
-class mrp_procurement(osv.osv):
- _inherit = 'mrp.procurement'
+class procurement_order(osv.osv):
+ _inherit = 'procurement.order'
_columns = {
'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
}
def check_produce_product(self, cr, uid, procurement, context=[]):
+ """ Finds the bill of material for the product from procurement order.
+ @return: True or False
+ """
properties = [x.id for x in procurement.property_ids]
bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
if not bom_id:
- cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
+ cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
return False
return True
@@ -45,7 +48,7 @@ class mrp_procurement(osv.osv):
""" This is action which call from workflow to assign production order to procurements
@return: True
"""
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
res = procurement_obj.make_mo(cr, uid, ids, context=context)
res = res.values()
return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
@@ -59,7 +62,7 @@ class mrp_procurement(osv.osv):
production_obj = self.pool.get('mrp.production')
move_obj = self.pool.get('stock.move')
wf_service = netsvc.LocalService("workflow")
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
for procurement in procurement_obj.browse(cr, uid, ids):
res_id = procurement.move_id.id
loc_id = procurement.location_id.id
@@ -88,6 +91,6 @@ class mrp_procurement(osv.osv):
{'location_id': procurement.location_id.id})
return res
-mrp_procurement()
+procurement_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 6a73063e591..ea717bd546c 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,30 +26,6 @@ from tools.translate import _
class product_product(osv.osv):
_inherit = "product.product"
- def get_product_accounts(self, cr, uid, product_id, context={}):
- """ To get the stock input account, stock output account and stock journal related to product.
- @param product_id: product id
- @return: dictionary which contains information regarding stock input account, stock output account and stock journal
- """
- product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False)
-
- stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False
- if not stock_input_acc:
- stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
-
- stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
- if not stock_output_acc:
- stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-
- journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
-
- res = {}
- res.update({'stock_account_input': stock_input_acc})
- res.update({'stock_account_output': stock_output_acc})
- res.update({'stock_journal': journal_id})
-
- return res
-
def do_change_standard_price(self, cr, uid, ids, datas, context={}):
""" Changes the Standard Price of Product and parent products and creates an account move accordingly.
@param datas: dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index d754d6a50ad..4fffbdf1689 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -32,11 +32,12 @@ class mrp_production_order(osv.osv):
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'day': fields.char('Day',size=64,readonly=True),
'origin': fields.char('Source Document', size=64),
- 'nbr': fields.integer('# of Orders', readonly=True),
+ 'nbr': fields.integer('# of Lines', readonly=True),
'products_to_consume': fields.integer('Products to Consume', readonly=True),
'consumed_products': fields.integer('Consumed Products', readonly=True),
'date': fields.date('Date', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True),
+ 'product_id2': fields.many2one('product.product', 'Product Consumed', readonly=True),
'product_qty': fields.float('Product Qty', readonly=True),
'state': fields.selection([('draft','Draft'),
('picking_except', 'Picking Exception'),
@@ -74,11 +75,12 @@ class mrp_production_order(osv.osv):
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
to_char(s.create_date, 'YYYY-MM-DD') as day,
- l.product_id as product_id,
+ s.product_id as product_id,
+ l.product_id as product_id2,
l.product_uom,
sum(l.product_qty * u.factor) as product_qty,
s.company_id as company_id,
- count(*) as nbr,
+ (select 1) as nbr,
(select sum(sm.product_qty) from stock_move as sm
left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
@@ -111,6 +113,7 @@ class mrp_production_order(osv.osv):
to_char(s.create_date, 'YYYY-MM-DD'),
to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
l.product_id,
+ s.product_id,
l.product_uom,
s.id,
l.id,
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 55957619e31..61aff34bf91 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -11,19 +11,20 @@
tree
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -81,7 +82,7 @@
-
+
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index af55afce91b..200ca5bb76e 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -265,10 +265,10 @@
[[ formatLang(o.date_planned, date_time = True) ]]
- [[ o.sale_ref or ' ' ]]
+ [[ o.sale_ref or removeParentNode('para')]]
|
- [[ o.sale_name or '' ]]
+ [[ o.sale_name or removeParentNode('para') ]]
|
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index d5e00b9cbda..8089be4a431 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -7,7 +7,7 @@
"access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1
"access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
-"access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1
+"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
@@ -22,9 +22,9 @@
"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_stock_worker","mrp.procurement stock_worker","model_mrp_procurement","stock.group_stock_user",1,1,1,1
+"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
+"access_mrp_installer","mrp.installer","model_mrp_installer","base.group_system",1,1,1,1
"access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
"access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 9bcc92e5c81..67efd0d2753 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -28,82 +28,12 @@ import netsvc
import time
-class stock_warehouse_orderpoint(osv.osv):
- """
- Defines Minimum stock rules.
- """
- _name = "stock.warehouse.orderpoint"
- _description = "Minimum Inventory Rule"
-
- _columns = {
- 'name': fields.char('Name', size=32, required=True),
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
- 'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
- 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
- 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
- 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
- 'product_min_qty': fields.float('Min Quantity', required=True,
- help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
- 'product_max_qty': fields.float('Max Quantity', required=True,
- help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
- 'qty_multiple': fields.integer('Qty Multiple', required=True,
- help="The procurement quantity will by rounded up to this multiple."),
- 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement', ondelete="set null"),
- 'company_id': fields.many2one('res.company','Company',required=True),
- }
- _defaults = {
- 'active': lambda *a: 1,
- 'logic': lambda *a: 'max',
- 'qty_multiple': lambda *a: 1,
- 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
- 'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
- 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
- }
- _sql_constraints = [
- ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', _('Qty Multiple must be greater than zero.')),
- ]
-
- def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
- """ Finds location id for changed warehouse.
- @param warehouse_id: Changed id of warehouse.
- @return: Dictionary of values.
- """
- if warehouse_id:
- w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
- v = {'location_id': w.lot_stock_id.id}
- return {'value': v}
- return {}
-
- def onchange_product_id(self, cr, uid, ids, product_id, context={}):
- """ Finds UoM for changed product.
- @param product_id: Changed id of product.
- @return: Dictionary of values.
- """
- if product_id:
- prod = self.pool.get('product.product').browse(cr,uid,product_id)
- v = {'product_uom': prod.uom_id.id}
- return {'value': v}
- return {}
-
- def copy(self, cr, uid, id, default=None,context={}):
- if not default:
- default = {}
- default.update({
- 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
- })
- return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-
-stock_warehouse_orderpoint()
-
class StockMove(osv.osv):
_inherit = 'stock.move'
_columns = {
'production_id': fields.many2one('mrp.production', 'Production', select=True),
- 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
+ 'procurements': fields.one2many('procurement.order', 'move_id', 'Procurements'),
}
def copy(self, cr, uid, id, default=None, context=None):
@@ -118,7 +48,7 @@ class StockMove(osv.osv):
"""
bom_obj = self.pool.get('mrp.bom')
move_obj = self.pool.get('stock.move')
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
product_obj = self.pool.get('product.product')
wf_service = netsvc.LocalService("workflow")
if move.product_id.supply_method == 'produce' and move.product_id.procure_method == 'make_to_order':
@@ -166,7 +96,7 @@ class StockMove(osv.osv):
'move_id': mid,
'company_id': line['company_id'],
})
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
move_obj.write(cr, uid, [move.id], {
'location_id': move.location_dest_id.id,
'auto_validate': True,
@@ -175,7 +105,7 @@ class StockMove(osv.osv):
'state': 'waiting'
})
for m in procurement_obj.search(cr, uid, [('move_id','=',move.id)], context):
- wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
+ wf_service.trg_validate(uid, 'procurement.order', m, 'button_wait_done', cr)
return True
def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):
@@ -231,7 +161,7 @@ class StockPicking(osv.osv):
for move in picking.move_lines:
if move.state == 'done' and move.procurements:
for procurement in move.procurements:
- wf_service.trg_validate(user, 'mrp.procurement',
+ wf_service.trg_validate(user, 'procurement.order',
procurement.id, 'button_check', cursor)
return res
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 5475d54ffd4..4a3e2e3e1da 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -9,6 +9,8 @@
factor: 1.0
name: Litre
rounding: 0.01
+-
+ I create record for product Orange Juice.
-
!record {model: product.product, id: product_product_orangejuice0}:
categ_id: product.cat1
@@ -18,6 +20,8 @@
type: product
uom_id: product_uom_litre0
uom_po_id: product_uom_litre0
+-
+ I create record for product Orange.
-
!record {model: product.product, id: product_product_orange0}:
categ_id: product.cat1
@@ -31,6 +35,8 @@
type: product
uom_id: product.product_uom_kgm
uom_po_id: product.product_uom_kgm
+-
+ I create record for product Sugar.
-
!record {model: product.product, id: product_product_sugar0}:
categ_id: product.cat1
@@ -44,6 +50,8 @@
type: product
uom_id: product.product_uom_kgm
uom_po_id: product.product_uom_kgm
+-
+ I create record for product Water.
-
!record {model: product.product, id: product_product_water0}:
categ_id: product.cat1
@@ -54,7 +62,7 @@
uom_id: product_uom_litre0
uom_po_id: product_uom_litre0
-
- I define the BoM to produce an orange juice
+ I define the BoM to produce an orange juice.
-
!record {model: mrp.bom, id: mrp_bom_orangejuice0}:
company_id: base.main_company
@@ -64,6 +72,8 @@
product_qty: 1.0
product_uom: product_uom_litre0
type: phantom
+-
+ I create bom lines for BoM for Orange Juice.
-
!record {model: mrp.bom, id: mrp_bom_orangejuice0}:
bom_lines:
@@ -92,7 +102,7 @@
product_uom: product_uom_litre0
type: normal
-
- I define Minimum stock rules for my stockable products orange and sugar
+ I define Minimum stock rules for my stockable product "Orange".
-
!record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
company_id: base.main_company
@@ -105,6 +115,8 @@
product_uom: product.product_uom_kgm
qty_multiple: 1
warehouse_id: stock.warehouse0
+-
+ I define Minimum stock rules for my stockable product "Sugar".
-
!record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
company_id: base.main_company
@@ -168,23 +180,23 @@
-
I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
-
- !python {model: mrp.procurement}: |
+ !python {model: procurement.order}: |
from tools.translate import _
proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
assert proc_ids, _('No Procurements!')
-
The scheduler runs.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
- search: "[('origin','=',':MO/00002')]"
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
+ search: "[('state','!=','cofirmed')]"
-
I am checking Internal picking. I see one picking for Orange juice and its
stock moves for Oranges, Sugar and Water made correctly.
-
!python {model: stock.picking}: |
from tools.translate import _
- pick_ids = self.search(cr, uid, [('origin','=',':MO/00002'),('type','=','internal')])
+ pick_ids = self.search(cr, uid, [('type','=','internal')])
assert pick_ids, _('No Internal Pickings!')
-
According to minimum stock rules. I have 2 purchase orders for
@@ -220,11 +232,15 @@
assert pick_ids, _('No Incoming Shipments found!')
-
I receive both the products. My incoming pickings are done.
+-
+ I create record for the incoming picking wizard.
-
!record {model: stock.partial.picking, id: stock_partial_picking0}:
date: '2010-04-30 16:53:36'
partner_id: base.res_partner_asus
address_id: base.res_partner_address_tang
+-
+ I make my pickings done.
-
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 37d0de5c5a9..1fe0f74fa6a 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -4,7 +4,7 @@
-
I am creating products.
-
- Creating a product.product record
+ I create record for product Shirt.
-
!record {model: product.product, id: product_product_shirt0}:
categ_id: product.cat1
@@ -27,7 +27,7 @@
weight: 0.0
weight_net: 0.0
-
- Creating a product.product record
+ I create record for product Cloth.
-
!record {model: product.product, id: product_product_cloth0}:
categ_id: product.cat1
@@ -53,7 +53,7 @@
weight: 0.0
weight_net: 0.0
-
- Creating a product.product record
+ I create record for product Buttons.
-
!record {model: product.product, id: product_product_buttons0}:
categ_id: product.cat1
@@ -81,7 +81,7 @@
-
I am creating bills of material for 'Shirt'.
-
- Creating a mrp.bom record
+ I create bills of material for Shirt.
-
!record {model: mrp.bom, id: mrp_bom_shirt0}:
bom_lines:
@@ -129,7 +129,7 @@
-
I create a procurement order for product Shirt.
-
- !record {model: mrp.procurement, id: mrp_procurement_shirt0}:
+ !record {model: procurement.order, id: procurement_order_shirt0}:
name: 'PROC: Shirt'
product_id: product_product_shirt0
product_qty: 5.00
@@ -138,11 +138,11 @@
-
I confirm the procurement order.
-
- !workflow {model: mrp.procurement, action: button_confirm, ref: mrp_procurement_shirt0}
+ !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_shirt0}
-
I run the procurement.
-
- !workflow {model: mrp.procurement, action: button_check, ref: mrp_procurement_shirt0}
+ !workflow {model: procurement.order, action: button_check, ref: procurement_order_shirt0}
-
I see that there is a manufacturing order for Shirt.
-
@@ -153,15 +153,15 @@
-
I also check that there are two more procurement orders for sub products Cloth and Buttons.
-
- !python {model: mrp.procurement}: |
+ !python {model: procurement.order}: |
from tools.translate import _
proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_cloth0'),ref('product_product_buttons0')])])
assert proc_ids, 'No Procurements.'
-
The scheduler runs.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
search: "[]"
-
I check that there is one purchase order for Cloth.
@@ -216,11 +216,15 @@
from tools.translate import _
pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
assert pick_ids, _('No Incoming Shipments found!')
+-
+ I create record for partial picking.
-
!record {model: stock.partial.picking, id: stock_partial_picking0}:
date: '2010-04-30 16:53:36'
partner_id: base.res_partner_maxtor
address_id: base.res_partner_address_wong
+-
+ I make my picking done.
-
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
@@ -245,17 +249,21 @@
})
pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
-
- I Check incoming shipments for buttons. And receive products.
+ I Check incoming shipments for buttons and receive products.
-
!python {model: stock.picking}: |
from tools.translate import _
pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
assert pick_ids, _('No Incoming Shipments found!')
+-
+ I create record for partial picking.
-
!record {model: stock.partial.picking, id: stock_partial_picking0}:
date: '2010-04-30 16:53:36'
partner_id: base.res_partner_maxtor
address_id: base.res_partner_address_wong
+-
+ I make my picking done.
-
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
@@ -282,8 +290,8 @@
-
Run scheduler again.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
search: "[]"
-
Check state of manufacturing order for Shirt.
@@ -303,22 +311,30 @@
wf_service = netsvc.LocalService("workflow")
for p_id in prod_ids:
wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
+-
+ I create record for producing products with quantity 5.00.
-
!record {model: mrp.product.produce, id: mrp_product_produce0}:
product_qty: 5.00
mode: 'consume_produce'
+-
+ I produce 2 products with 5.00 quantities each.
-
!python {model: mrp.product.produce}: |
from tools.translate import _
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+ I create record for remaining products with quantity 35.00.
-
!record {model: stock.move.consume, id: stock_move_consume0}:
product_id: product_product_buttons0
product_qty: 35.00
product_uom: product.product_uom_unit
location_id: stock.stock_location_stock
+-
+ I produce remaining product Buttons with 35.00 quantity.
-
!python {model: stock.move.consume}: |
from tools.translate import _
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 5de26180723..0ceebfab107 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -18,7 +18,7 @@
product_uom: product.product_uom_unit
product_uos_qty: 0.0
-
- Creating a mrp.production.workcenter.line record
+ I create a record for Workcenter line.
-
!record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
cycle: 5.0
@@ -28,7 +28,7 @@
sequence: 0.0
workcenter_id: mrp.mrp_workcenter_0
-
- Creating a mrp.production.product.line record
+ I create second record for Workcenter line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
name: Regular processor config
@@ -38,7 +38,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create third record for Workcenter line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
name: HDD Seagate 7200.8 80GB
@@ -48,7 +48,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create fourth record for Workcenter line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
name: ATX Mid-size Tower
@@ -58,7 +58,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create a record for production line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
name: Mouse
@@ -68,7 +68,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create second record for production line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
name: Keyboard
@@ -84,15 +84,15 @@
-
I am checking Procurement orders.
-
- !python {model: mrp.procurement}: |
+ !python {model: procurement.order}: |
from tools.translate import _
proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
assert proc_ids, _('No Procurements!')
-
The scheduler runs.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
search: "[('state','=','confirmed')]"
-
I am checking Internal picking.
@@ -102,7 +102,7 @@
pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
assert pick_ids, _('No Internal Pickings!')
-
- I see that there is a manufacturing order for the subproduct of PC1 with ready state.
+ I see that there is a manufacturing order for the sub product of PC1 with ready state.
-
!python {model: mrp.production}: |
from tools.translate import _
@@ -110,17 +110,21 @@
assert order_ids, _('No manufacturing order!')
-
I start producing that product first. So I marked it as started.
+-
+ I create record for producing products with quantity 5.00.
-
!record {model: mrp.product.produce, id: mrp_product_produce0}:
product_qty: 5.00
mode: 'consume_produce'
+-
+ I produce the product.
-
!python {model: mrp.product.produce}: |
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
-
- Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
+ Now the manufacturing order for subproduct CPU_GEN is done and manufacturing
order for PC1 is in ready state.
-
!python {model: mrp.production}: |
@@ -131,6 +135,8 @@
I start producing the product PC1.
-
!workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+-
+ Finally my production order is done.
-
!python {model: mrp.product.produce}: |
from tools.translate import _
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index d9a862f5ddd..497a81352f3 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -40,7 +40,7 @@
""",
'author': 'Tiny',
- 'depends': ['mrp_procurement'],
+ 'depends': ['procurement'],
'update_xml': ['mrp_jit.xml'],
'demo_xml': [],
'installable': True,
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index bab0d62b495..99f74a19517 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 9c0a2bb4f33..0ce116535c1 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -61,6 +61,7 @@
'process/mrp_operation_process.xml'
],
'demo_xml': ['mrp_operation_data.xml'],
+ 'test': ['test/mrp_operations.yml'],
'installable': True,
'active': False,
'certificate': '0056233813133',
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index e8a97a47d9d..d1e66c92889 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -47,6 +47,9 @@ stock_move()
class mrp_production_workcenter_line(osv.osv):
def _get_date_date(self, cr, uid, ids, field_name, arg, context):
+ """ Finds starting date.
+ @return: Dictionary of values.
+ """
res={}
for op in self.browse(cr, uid, ids, context=context):
if op.date_start:
@@ -54,7 +57,11 @@ class mrp_production_workcenter_line(osv.osv):
else:
res[op.id]=False
return res
+
def _get_date_end(self, cr, uid, ids, field_name, arg, context):
+ """ Finds ending date.
+ @return: Dictionary of values.
+ """
res = {}
for op in self.browse(cr, uid, ids, context=context):
res[op.id]= False
@@ -66,8 +73,10 @@ class mrp_production_workcenter_line(osv.osv):
else:
res[op.id] = op.date_planned
return res
+
_inherit = 'mrp.production.workcenter.line'
_order = "sequence, date_planned"
+
_columns = {
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'State', readonly=True,
help="* When a work order is created it is set in 'Draft' state.\n" \
@@ -90,16 +99,21 @@ class mrp_production_workcenter_line(osv.osv):
'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True),
'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM',readonly=True),
}
+
_defaults = {
'state': lambda *a: 'draft',
'delay': lambda *a: 0.0
}
- def modify_production_order_state(self,cr,uid,ids,action):
+ def modify_production_order_state(self, cr, uid, ids, action):
+ """ Modifies production order state if work order state is changed.
+ @param action: Action to perform.
+ @return: Nothing
+ """
wf_service = netsvc.LocalService("workflow")
- oper_obj=self.browse(cr,uid,ids)[0]
- prod_obj=oper_obj.production_id
- if action=='start':
+ oper_obj = self.browse(cr, uid, ids)[0]
+ prod_obj = oper_obj.production_id
+ if action == 'start':
if prod_obj.state =='confirmed':
self.pool.get('mrp.production').force_production(cr, uid, [prod_obj.id])
wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
@@ -110,12 +124,12 @@ class mrp_production_workcenter_line(osv.osv):
else:
raise osv.except_osv(_('Error!'),_('Production Order Cannot start in [%s] state') % (prod_obj.state,))
else:
- oper_ids=self.search(cr,uid,[('production_id','=',prod_obj.id)])
- obj=self.browse(cr,uid,oper_ids)
- flag=True
+ oper_ids = self.search(cr,uid,[('production_id','=',prod_obj.id)])
+ obj = self.browse(cr,uid,oper_ids)
+ flag = True
for line in obj:
- if line.state!='done':
- flag=False
+ if line.state != 'done':
+ flag = False
if flag:
wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
return
@@ -132,15 +146,24 @@ class mrp_production_workcenter_line(osv.osv):
return result
def action_draft(self, cr, uid, ids):
+ """ Sets state to draft.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'draft'})
return True
def action_start_working(self, cr, uid, ids):
- self.modify_production_order_state(cr,uid,ids,'start')
+ """ Sets state to start working and writes starting date.
+ @return: True
+ """
+ self.modify_production_order_state(cr, uid, ids, 'start')
self.write(cr, uid, ids, {'state':'startworking', 'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
return True
def action_done(self, cr, uid, ids):
+ """ Sets state to done, writes finish date and calculates delay.
+ @return: True
+ """
delay = 0.0
date_now = time.strftime('%Y-%m-%d %H:%M:%S')
obj_line = self.browse(cr, uid, ids[0])
@@ -155,14 +178,23 @@ class mrp_production_workcenter_line(osv.osv):
return True
def action_cancel(self, cr, uid, ids):
+ """ Sets state to cancel.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'cancel'})
return True
def action_pause(self, cr, uid, ids):
+ """ Sets state to pause.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'pause'})
return True
def action_resume(self, cr, uid, ids):
+ """ Sets state to startworking.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'startworking'})
return True
@@ -175,6 +207,9 @@ class mrp_production(osv.osv):
}
def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
+ """ Calculates planned end date of production order.
+ @return: Dictionary of values
+ """
result = {}
for prod in self.browse(cr, uid, ids, context=context):
result[prod.id] = prod.date_planned
@@ -183,10 +218,13 @@ class mrp_production(osv.osv):
return result
def action_production_end(self, cr, uid, ids):
- obj=self.browse(cr,uid,ids)[0]
+ """ Finishes work order if production order is done.
+ @return: Super method
+ """
+ obj = self.browse(cr, uid, ids)[0]
for workcenter_line in obj.workcenter_lines:
- tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
- return super(mrp_production,self).action_production_end(cr,uid,ids)
+ tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr, uid, [workcenter_line.id])
+ return super(mrp_production,self).action_production_end(cr, uid, ids)
def action_in_production(self, cr, uid, ids):
""" Changes state to In Production and writes starting date.
@@ -199,12 +237,18 @@ class mrp_production(osv.osv):
return super(mrp_production,self).action_in_production(cr, uid, ids)
def action_cancel(self, cr, uid, ids):
- obj=self.browse(cr,uid,ids)[0]
+ """ Cancels work order if production order is canceled.
+ @return: Super method
+ """
+ obj = self.browse(cr, uid, ids)[0]
for workcenter_line in obj.workcenter_lines:
- tmp=self.pool.get('mrp.production.workcenter.line').action_cancel(cr,uid,[workcenter_line.id])
+ tmp = self.pool.get('mrp.production.workcenter.line').action_cancel(cr, uid, [workcenter_line.id])
return super(mrp_production,self).action_cancel(cr,uid,ids)
def _compute_planned_workcenter(self, cr, uid, ids, context={}, mini=False):
+ """ Computes planned and finished dates for work order.
+ @return: Calculated date
+ """
dt_end = DateTime.now()
for po in self.browse(cr, uid, ids, context=context):
dt_end = DateTime.strptime(po.date_start or po.date_planned, '%Y-%m-%d %H:%M:%S')
@@ -241,6 +285,9 @@ class mrp_production(osv.osv):
return dt_end
def _move_pass(self, cr, uid, ids, context={}):
+ """ Calculates start date for stock moves finding interval from resource calendar.
+ @return: True
+ """
for po in self.browse(cr, uid, ids, context):
if po.allow_reorder:
continue
@@ -251,7 +298,7 @@ class mrp_production(osv.osv):
if l.state in ('done','cancel','draft'):
continue
todo += l.move_dest_id_lines
- if l.production_id and (l.production_id.date_finnished>dt):
+ if l.production_id and (l.production_id.date_finnished > dt):
if l.production_id.state not in ('done','cancel'):
for wc in l.production_id.workcenter_lines:
i = self.pool.get('resource.calendar').interval_min_get(
@@ -261,11 +308,14 @@ class mrp_production(osv.osv):
dt, wc.hour or 0.0
)
dt = i[0][0]
- if l.production_id.date_start>dt.strftime('%Y-%m-%d %H:%M:%S'):
+ if l.production_id.date_start > dt.strftime('%Y-%m-%d %H:%M:%S'):
self.write(cr, uid, [l.production_id.id], {'date_start':dt.strftime('%Y-%m-%d %H:%M:%S')}, mini=True)
return True
def _move_futur(self, cr, uid, ids, context={}):
+ """ Calculates start date for stock moves.
+ @return: True
+ """
for po in self.browse(cr, uid, ids, context):
if po.allow_reorder:
continue
@@ -277,8 +327,8 @@ class mrp_production(osv.osv):
break
if l.production_id.state in ('done','cancel'):
break
- if l.production_id and (l.production_id.date_start\n"
"POT-Creation-Date: 2009-11-26 05:24+0000\n"
-"PO-Revision-Date: 2010-04-11 22:28+0000\n"
-"Last-Translator: Juan Eduardo Riva \n"
+"PO-Revision-Date: 2010-06-08 14:19+0000\n"
+"Last-Translator: victor tejada yau \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap
@@ -57,7 +57,7 @@ msgstr ""
#. module: olap
#: field:olap.cube.table,schema_id:0
msgid "Schema id"
-msgstr ""
+msgstr "Schema id"
#. module: olap
#: field:olap.schema,database_id:0
@@ -186,7 +186,7 @@ msgstr ""
#. module: olap
#: field:olap.measure,formatstring:0
msgid "Format string"
-msgstr ""
+msgstr "Formato de cadena"
#. module: olap
#: wizard_button:olap.query_builder,exec,exec:0
@@ -307,17 +307,17 @@ msgstr "Nombre de la aplicación"
#. module: olap
#: field:olap.cube.table,column_link_id:0
msgid "Relational Column"
-msgstr ""
+msgstr "columna relacional"
#. module: olap
#: field:olap.level,type:0
msgid "Level class"
-msgstr ""
+msgstr "Nivel de clase"
#. module: olap
#: field:olap.cube,name:0
msgid "Cube name"
-msgstr ""
+msgstr "nombre de cubo"
#. module: olap
#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
diff --git a/addons/partner_geo_assign/__init__.py b/addons/partner_geo_assign/__init__.py
new file mode 100644
index 00000000000..e1957dfb286
--- /dev/null
+++ b/addons/partner_geo_assign/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import partner_geo_assign
diff --git a/addons/partner_geo_assign/__openerp__.py b/addons/partner_geo_assign/__openerp__.py
new file mode 100644
index 00000000000..2d18649236e
--- /dev/null
+++ b/addons/partner_geo_assign/__openerp__.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+
+{
+ 'name': 'Partner Geo-Localisation',
+ 'version': '1.0',
+ 'category': 'Generic Modules/Production',
+ 'description': """
+This is the module used by OpenERP SA to redirect customers to his partners,
+based on geolocalisation.
+ """,
+ 'author': 'OpenERP SA',
+ 'depends': ['crm'],
+ 'update_xml': ['res_partner_view.xml'],
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
+ 'certificate': False,
+}
diff --git a/addons/partner_geo_assign/partner_geo_assign.py b/addons/partner_geo_assign/partner_geo_assign.py
new file mode 100644
index 00000000000..2ed96e3125d
--- /dev/null
+++ b/addons/partner_geo_assign/partner_geo_assign.py
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import urllib,re
+import random, time
+
+def geo_find(addr):
+ import urllib,re
+ regex = '([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)'
+ url = 'http://maps.google.com/maps/geo?q=' + urllib.quote(addr) + '&output=xml&oe=utf8&sensor=false'
+ xml = urllib.urlopen(url).read()
+ if '' in xml:
+ print 'Error'
+ return None
+ result = re.search(regex, xml, re.M|re.I)
+ if not result:
+ print 'No Regex', xml
+ return None
+ return float(result.group(1)),float(result.group(2))
+
+class res_partner(osv.osv):
+ _inherit = "res.partner"
+ _columns = {
+ 'partner_latitude': fields.float('Geo Latitude', digits=(16,2)),
+ 'partner_longitude': fields.float('Geo Longitude', digits=(16,2)),
+ 'partner_weight': fields.integer('Weight',
+ help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
+ }
+ _defaults = {
+ 'partner_weight': lambda *args: 0
+ }
+ def geo_localize(self, cr, uid, ids, context=None):
+ regex = '([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)'
+ for partner in self.browse(cr, uid, ids, context=context):
+ part = partner.address[0]
+ addr = ', '.join(filter(None, [part.street, part.street2, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
+ result = geo_find(addr)
+ if result:
+ print 'Write', {
+ 'partner_latitude': result[0],
+ 'partner_longitude': result[1]
+ }
+ self.write(cr, uid, [partner.id], {
+ 'partner_latitude': result[0],
+ 'partner_longitude': result[1]
+ }, context=context)
+ return True
+res_partner()
+
+class crm_lead(osv.osv):
+ _inherit = "crm.lead"
+ _columns = {
+ 'partner_latitude': fields.float('Geo Latitude', digits=(16,2)),
+ 'partner_longitude': fields.float('Geo Longitude', digits=(16,2)),
+ 'partner_assigned_id': fields.many2one('res.partner','Assigned Partner')
+ 'date_assign': fields.date('Assignation Date')
+ }
+ def assign_partner(self, cr, uid, ids, context=None):
+ for part in self.browse(cr, uid, ids, context=context):
+ if not part.country_id:
+ continue
+ addr = ', '.join(filter(None, [part.street, part.street2, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
+ result = geo_find(addr)
+ if result:
+ self.write(cr, uid, [part.id], {
+ 'partner_latitude': result[0],
+ 'partner_longitude': result[1]
+ }, context=context)
+
+ part_ids = self.pool.get('res.partner').search(cr, uid, [
+ ('partner_weight','>',0),
+ ('partner_latitude','>',result[0]-2), ('partner_latitude','<',result[0]+2),
+ ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5)
+ ], context=context)
+ if not part_ids:
+ part_ids = self.pool.get('res.partner').search(cr, uid, [
+ ('partner_weight','>',0),
+ ('partner_latitude','>',result[0]-4), ('partner_latitude','<',result[0]+4),
+ ('partner_longitude','>',result[1]-3), ('partner_longitude','<',result[1]+3)
+ ], context=context)
+ total = 0
+ toassign = []
+ for part2 in self.pool.get('res.partner').browse(cr, uid, part_ids, context=context):
+ total += part2.partner_weight
+ toassign.append( (part2.id, total) )
+ mypartner = random.randint(0,total)
+ for t in toassign:
+ if mypartner<=t[1]:
+ self.write(cr, uid, [part.id], {'partner_assigned_id': t[0], 'date_assign': time.strftime('%Y-%m-%d')}, context=context)
+ break
+ return True
+crm_lead()
+
diff --git a/addons/partner_geo_assign/res_partner_view.xml b/addons/partner_geo_assign/res_partner_view.xml
new file mode 100644
index 00000000000..d5f4f918d98
--- /dev/null
+++ b/addons/partner_geo_assign/res_partner_view.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+ crm.lead.geo_assign.inherit
+ crm.lead
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ res.partner.geo.inherit
+ res.partner
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 0baf4639019..2d195b3d4a5 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -23,7 +23,6 @@
import pos
import account_bank_statement
import pos_account_bank_statement
-import stock
import wizard
import report
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index e0e58ad75d7..9ae66800ff9 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -1,32 +1,7 @@
-
- OpenERP Editor
-
-
- OpenERP Editor
-
-
- Free Business Solutions
- Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07
- IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701
-
-
-
- OpenERP Integrator
-
-
-
- OpenERP Integrator
-
-
- Free Business Solutions
- Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07
- IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701
-
-
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
index a74ea0a56e9..cc8d30d080d 100644
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -1,41 +1,5 @@
-
-
-
- property_stock_account_output
-
-
-
-
-
- property_stock_account_input
-
-
-
-
-
- property_stock_account_output_categ
-
-
-
-
-
- property_stock_account_input_categ
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 517b2d8b4a0..9e73fe0361e 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -193,10 +193,10 @@ class pos_order(osv.osv):
res[order.id]['amount_tax'])
else:
res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
- tax_obj.compute(cr, uid, line.product_id.taxes_id,
+ tax_obj.compute_all(cr, uid, line.product_id.taxes_id,
line.price_unit * \
- (1-(line.discount or 0.0)/100.0), line.qty),
- res[order.id]['amount_tax'])
+ (1-(line.discount or 0.0)/100.0), line.qty)['taxes'],
+ res[order.id]['amount_tax'])
return res
@@ -463,12 +463,13 @@ class pos_order(osv.osv):
"""Create a picking for each order and validate it."""
picking_obj = self.pool.get('stock.picking')
-
+ pick_name=self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
orders = self.browse(cr, uid, ids, context)
for order in orders:
if not order.picking_id:
new = True
picking_id = picking_obj.create(cr, uid, {
+ 'name':pick_name,
'origin': order.name,
'type': 'out',
'state': 'draft',
@@ -504,7 +505,7 @@ class pos_order(osv.osv):
if line.qty < 0:
location_id, stock_dest_id = stock_dest_id, location_id
- self.pool.get('stock.move').create(cr, uid, {
+ self.pool.get('stock.move').create(cr, uid, {
'name': 'Stock move (POS %d)' % (order.id, ),
'product_uom': line.product_id.uom_id.id,
'product_uos': line.product_id.uom_id.id,
@@ -788,8 +789,8 @@ class pos_order(osv.osv):
tax_amount = 0
taxes = [t for t in line.product_id.taxes_id]
if order.price_type=='tax_excluded':
- computed_taxes = account_tax_obj.compute(
- cr, uid, taxes, line.price_unit, line.qty)
+ computed_taxes = account_tax_obj.compute_all(
+ cr, uid, taxes, line.price_unit, line.qty)['taxes']
else:
computed_taxes = account_tax_obj.compute_inv(
cr, uid, taxes, line.price_unit, line.qty)
@@ -1057,7 +1058,7 @@ class pos_order_line(osv.osv):
for line in self.browse(cr, uid, ids):
tax_amount = 0.0
taxes = [t for t in line.product_id.taxes_id]
- computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
+ computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
for tax in computed_taxes:
tax_amount += tax['amount']
price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
@@ -1086,17 +1087,18 @@ class pos_order_line(osv.osv):
raise osv.except_osv(_('No Pricelist !'),
_('You have to select a pricelist in the sale form !\n' \
'Please set one before choosing a product.'))
- p_obj = self.pool.get('product.product').browse(cr,uid,product_id).list_price
+ p_obj = self.pool.get('product.product').browse(cr,uid,[product_id])[0]
+ uom_id=p_obj.uom_po_id.id
price = self.pool.get('product.pricelist').price_get(cr, uid,
- [pricelist], product_id, qty or 1.0, partner_id)[pricelist]
- # Todo need to check
-# if price is False:
-# raise osv.except_osv(_('No valid pricelist line found !'),
-# _("Couldn't find a pricelist line matching this product" \
-# " and quantity.\nYou have to change either the product," \
-# " the quantity or the pricelist."))
- return price or p_obj
-
+ [pricelist], product_id, qty or 1.0, partner_id,{'uom': uom_id})[pricelist]
+ unit_price=price or p_obj.list_price
+ if unit_price is False:
+ raise osv.except_osv(_('No valid pricelist line found !'),
+ _("Couldn't find a pricelist line matching this product" \
+ " and quantity.\nYou have to change either the product," \
+ " the quantity or the pricelist."))
+ return unit_price
+
def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
self.write(cr,uid,ids,{'price_unit':price})
@@ -1329,4 +1331,13 @@ class product_product(osv.osv):
'disc_controle': lambda *a: True,
}
product_product()
+
+class stock_picking(osv.osv):
+
+ _inherit = 'stock.picking'
+ _columns = {
+ 'pos_order': fields.many2one('pos.order', 'Pos order'),
+ }
+stock_picking()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index b36bd0827c2..14710cf8f37 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -1,58 +1,6 @@
-
- Paiement
-
-
- Acompte
-
- service
- 0.0
- 0.0
-
-
-
-
- Reparation
-
- service
- 100.0
- 100.0
-
-
-
-
-
- Bon
-
-
-
- GIFT
- produce
- 1.0
- 1.0
-
-
- 0.0
- Cheque cadeau
-
-
-
-
- PORT01
- produce
- 1.0
- 1.0
-
-
- 0.0
- Shipping cost
-
- service
- 0
-
-
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index b548f12d8e7..14710cf8f37 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,190 +1,6 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Main Receivable
- x 40000
- receivable
-
-
-
-
-
-
-
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-
-
-
-
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index 9123502d288..b079f6b9177 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,112 +1,112 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/pos_sequence.xml
index 42bc4334b89..691b35a8f1a 100644
--- a/addons/point_of_sale/pos_sequence.xml
+++ b/addons/point_of_sale/pos_sequence.xml
@@ -2,42 +2,42 @@
- #
- # Sequences for pos.order
- #
+ #
+ # Sequences for pos.order
+ #
-
- POS Order
- pos.order
-
-
- POS Order
- pos.order
- POS/
- 3
-
+
+ POS Order
+ pos.order
+
+
+ POS Order
+ pos.order
+ POS/
+ 3
+
-
- POS Payment
- pos.payment
-
-
- POS Payment
- pos.payment
- Payment/
- 2
-
+
+ POS Payment
+ pos.payment
+
+
+ POS Payment
+ pos.payment
+ Payment/
+ 2
+
-
- POS order line
- pos.order.line
-
-
- POS order line
- pos.order.line
- Order Line/
- 2
-
+
+ POS order line
+ pos.order.line
+
+
+ POS order line
+ pos.order.line
+ Order Line/
+ 2
+
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 62b15db0234..22e46933365 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -1,6 +1,9 @@
+
pos.order
@@ -9,11 +12,11 @@