|
- Invoiced to
+ [[ o.sale_id and o.sale_id.partner_invoice_id and 'Invoiced to' or '' ]]
[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.partner_id.name or '']]
[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]
[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 27091dda8bd..6193a6299a1 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -55,6 +55,8 @@ class stock_picking(osv.osv):
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
}),
+ 'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
+ 'number_of_packages': fields.integer('Number of Packages'),
}
def action_invoice_create(self, cursor, user, ids, journal_id=False,
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 07dce405c07..5aedea7ed72 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -133,11 +133,13 @@ class email_template(osv.osv):
string="Enforce From Account",
help="Emails will be sent only from this account(which are approved)."),
'from_email' : fields.related('enforce_from_account', 'email_id',
- type='char', string='From',),
+ type='char', string='From',
+ help='From Email (select mail account)',
+ readonly=True),
'def_to':fields.char(
- 'Recepient (To)',
+ 'Recipient (To)',
size=250,
- help="The default recepient of email."
+ help="The default recipient of email."
"Placeholders can be used here."),
'def_cc':fields.char(
'Default CC',
@@ -172,7 +174,7 @@ class email_template(osv.osv):
'use_sign':fields.boolean(
'Signature',
help="the signature from the User details"
- "will be appened to the mail"),
+ " will be appended to the mail"),
'file_name':fields.char(
'File Name Pattern',
size=200,
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index e5bbe0f5e56..8c71ce05ddf 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -59,21 +59,23 @@ class email_template_account(osv.osv):
'user':fields.many2one('res.users',
'Related User', required=True,
readonly=True, states={'draft':[('readonly', False)]}),
- 'email_id': fields.char('Email ID',
+ 'email_id': fields.char('From Email',
size=120, required=True,
readonly=True, states={'draft':[('readonly', False)]} ,
- help=" eg:yourname@yourdomain.com "),
+ help="eg: yourname@yourdomain.com "),
'smtpserver': fields.char('Server',
size=120, required=True,
readonly=True, states={'draft':[('readonly', False)]},
- help="Enter name of outgoing server,eg:smtp.gmail.com "),
+ help="Enter name of outgoing server, eg:smtp.gmail.com "),
'smtpport': fields.integer('SMTP Port ',
size=64, required=True,
readonly=True, states={'draft':[('readonly', False)]},
help="Enter port number,eg:SMTP-587 "),
'smtpuname': fields.char('User Name',
size=120, required=False,
- readonly=True, states={'draft':[('readonly', False)]}),
+ readonly=True, states={'draft':[('readonly', False)]},
+ help="Specify the username if your SMTP server requires authentication, "
+ "otherwise leave it empty."),
'smtppass': fields.char('Password',
size=120, invisible=True,
required=False, readonly=True,
@@ -91,11 +93,11 @@ class email_template_account(osv.osv):
'company':fields.selection([
('yes', 'Yes'),
('no', 'No')
- ], 'Company Mail A/c',
+ ], 'Corporate',
readonly=True,
- help="Select if this mail account does not belong" \
- "to specific user but the organisation as a whole." \
- "eg:info@somedomain.com",
+ help="Select if this mail account does not belong " \
+ "to specific user but to the organization as a whole. " \
+ "eg: info@companydomain.com",
required=True, states={
'draft':[('readonly', False)]
}),
@@ -316,8 +318,6 @@ class email_template_account(osv.osv):
msg['To'] = u','.join(addresses_l['To'])
if addresses_l['CC']:
msg['CC'] = u','.join(addresses_l['CC'])
-# if addresses_l['BCC']:
-# msg['BCC'] = u','.join(addresses_l['BCC'])
if body.get('text', False):
temp_body_text = body.get('text', '')
l = len(temp_body_text.replace(' ', '').replace('\r', '').replace('\n', ''))
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 4a35134bb41..d86b4187858 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -24,7 +24,7 @@
-
+
diff --git a/addons/event/event.py b/addons/event/event.py
index f3402b047b7..cf2b3f7b4c6 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -100,6 +100,9 @@ class event_event(osv.osv):
@param context: A standard dictionary for contextual values
@return: True
"""
+ if not context:
+ context = {}
+ res = False
if type(ids) in (int, long,):
ids = [ids]
data_pool = self.pool.get('ir.model.data')
@@ -107,7 +110,7 @@ class event_event(osv.osv):
for event in self.browse(cr, uid, ids, context=context):
total_confirmed = event.register_current
if total_confirmed >= event.register_min or event.register_max == 0:
- self.do_confirm(cr, uid, [event.id], context=context)
+ res = self.do_confirm(cr, uid, [event.id], context=context)
else:
unconfirmed_ids.append(event.id)
if unconfirmed_ids:
@@ -126,8 +129,8 @@ class event_event(osv.osv):
'target': 'new',
'context': context,
'nodestroy': True
- }
- return True
+ }
+ return res
def _get_register(self, cr, uid, ids, fields, args, context=None):
@@ -192,7 +195,7 @@ class event_event(osv.osv):
return res
_columns = {
- 'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
+ 'name': fields.char('Summary', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
'parent_id': fields.many2one('event.event', 'Parent Event', readonly=False, states={'done': [('readonly', True)]}),
'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}),
@@ -219,10 +222,10 @@ class event_event(osv.osv):
'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'),
'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
- 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Product which is provided cost of event. Invoice of event will be created with this Product."),
+ 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."),
'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
- 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}),
+ 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to"),
'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}),
'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
@@ -311,15 +314,16 @@ class event_registration(osv.osv):
'date_closed': fields.datetime('Closed', readonly=True),
'ref': fields.reference('Reference', selection=crm._links_get, size=128),
'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
- 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
+ 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+ 'date_deadline': fields.related('event_id','date_end', type='datetime', string="End Date", readonly=True, store=True),
+ 'date': fields.related('event_id', 'date_begin', type='datetime', string="Start Date", readonly=True, store=True),
'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True, states={'draft':[('readonly',False)]}),
'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
}
_defaults = {
'nb_register': 1,
'tobe_invoiced': True,
- 'date': time.strftime('%Y-%m-%d %H:%M:%S')
}
def _make_invoice(self, cr, uid, reg, lines, context=None):
@@ -441,6 +445,8 @@ class event_registration(osv.osv):
@param context: A standard dictionary for contextual values
@return: True
"""
+ if not context:
+ context = {}
data_pool = self.pool.get('ir.model.data')
unconfirmed_ids = []
for registration in self.browse(cr, uid, ids, context=context):
@@ -505,29 +511,7 @@ class event_registration(osv.osv):
registrations = self.browse(cr, uid, ids)
self._history(cr, uid, registrations, _('Cancel'))
self.write(cr, uid, ids, {'state': 'cancel'})
- return True
-
- def create(self, cr, uid, values, context=None):
- """ Overrides orm create method.
- """
- event_obj = self.pool.get('event.event')
- event = event_obj.browse(cr, uid, values['event_id'], context=context)
- values['date_deadline']= event.date_begin
- values['description']= event.mail_confirm
- res = super(event_registration, self).create(cr, uid, values, context=context)
- registrations = self.browse(cr, uid, [res], context=context)
- self._history(cr, uid, registrations, _('Created'))
- return res
-
- def write(self, cr, uid, ids, values, context=None):
- """ Overrides orm write method.
- """
- event_obj = self.pool.get('event.event')
- if 'event_id' in values:
- event = event_obj.browse(cr, uid, values['event_id'], context=context)
- values['date_deadline']= event.date_begin
- values['description']= event.mail_confirm
- return super(event_registration, self).write(cr, uid, ids, values, context=context)
+ return True
def mail_user(self, cr, uid, ids, confirm=False, context=None):
"""
@@ -618,10 +602,11 @@ class event_registration(osv.osv):
event_obj = self.pool.get('event.event')
prod_obj = self.pool.get('product.product')
- res_obj = self.pool.get('res.partner')
+ res_obj = self.pool.get('res.partner')
data_event = event_obj.browse(cr, uid, event_id)
- res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False}}
+ res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False,
+ 'date': data_event.date_begin, 'date_deadline': data_event.date_end, 'description': data_event.note, 'name': data_event.name}}
if data_event.user_id.id:
res['value'].update({'user_id':data_event.user_id.id})
if data_event.product_id:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b199544345f..c625a44fc06 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,7 +45,7 @@
-
-
+
+
@@ -145,11 +147,7 @@
-
-
-
-
-
+
@@ -308,7 +306,7 @@
-
-
-
+
+
-
+
@@ -369,15 +369,23 @@
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 1abda444116..d7da882ed03 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -41,8 +41,7 @@ class mailgate_thread(osv.osv):
_description = 'Mailgateway Thread'
_columns = {
- 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True)], readonly=True),
- 'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False)], readonly=True),
+ 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', readonly=True),
}
def message_new(self, cr, uid, msg, context):
@@ -145,9 +144,25 @@ class mailgate_message(osv.osv):
'''
Mailgateway Message
'''
+ def _get_display_text(self, cr, uid, ids, name, arg, context=None):
+ result = {}
+ for message in self.browse(cr, uid, ids, context=context):
+ msg_txt = ''
+ if message.history:
+ msg_txt += (message.email_from or '/') + ' wrote on ' + message.date + ':\n\t'
+ msg_txt += '\n\t'.join(message.description.split('\n')[:3]) + '...'
+ else:
+ msg_txt = (message.user_id.name or '/') + ' on ' + message.date + ':\n\t'
+ if message.name == 'Opportunity':
+ msg_txt += "Converted to Opportunity"
+ else:
+ msg_txt += "Changed Status to: " + message.name
+ result[message.id] = msg_txt
+ return result
+
_name = 'mailgate.message'
_description = 'Mailgateway Message'
- _order = 'id desc'
+ _order = 'date desc'
_columns = {
'name':fields.text('Subject', readonly=True),
'model': fields.char('Object Name', size=128, select=1, readonly=True),
@@ -166,6 +181,7 @@ class mailgate_message(osv.osv):
'description': fields.text('Description', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', required=False),
'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
+ 'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
}
def init(self, cr):
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 415dc192e50..a9a2d1f96fc 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -79,41 +79,10 @@
-
-
-
-
-
-
-
-
-
+
-
-
+
-
-
-
+
-
-
-
+
@@ -311,8 +306,8 @@
-
-
+
+
@@ -340,7 +335,7 @@
-
+
@@ -350,8 +345,8 @@
-
-
+
+
@@ -384,7 +379,7 @@
- Campaign Activities (Workitems)
+ Campaign Followup
ir.actions.act_window
marketing.campaign.workitem
form
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 5c744899ee2..bd1e6a04652 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -1,19 +1,19 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
-# * mrp
+# * mrp
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-21 08:19+0000\n"
+"PO-Revision-Date: 2010-07-18 15:01+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-06-22 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-19 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -45,7 +45,7 @@ msgstr "Planowanie zasobów produkcyjnych (MRP)"
#. module: mrp
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: mrp
#: field:mrp.bom.revision,indice:0
@@ -91,12 +91,14 @@ msgid "Stockable Stock"
msgstr "Zapas rejestrowany"
#. module: mrp
-#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0
+#: field:mrp.production,origin:0
msgid "Origin"
msgstr "Pochodzenie"
#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
msgid "Configuration"
msgstr "Konfiguracja"
@@ -175,7 +177,8 @@ msgstr "Automatyczne nabycia"
#. 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.bom,product_qty:0
+#: field:mrp.production,product_qty:0
#: field:mrp.production.product.line,product_qty:0
msgid "Product Qty"
msgstr "Ilość produktu"
@@ -203,7 +206,7 @@ msgstr "Wyjątek przesunięcia"
#. module: mrp
#: model:process.node,note:mrp.process_node_orderrfq0
msgid "A purchase order is created for a sub-contracting demand."
-msgstr ""
+msgstr "Zamówienie zakupu zostało utworzone dla podwykonawcy."
#. module: mrp
#: rml:mrp.production.order:0
@@ -262,7 +265,8 @@ msgid "Internal Ref."
msgstr "Wewn. odnośnik"
#. module: mrp
-#: view:mrp.procurement:0 field:mrp.procurement,state:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,state:0
#: field:mrp.production,state:0
msgid "Status"
msgstr "Stan"
@@ -304,26 +308,29 @@ 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
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: view:mrp.production:0
msgid "Production Orders"
msgstr "Zamówienia produkcji"
#. module: mrp
-#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
+#: 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 "Ilość"
#. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
msgid "Not urgent"
msgstr "Nie pilne"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
msgid "Procure Service Product"
-msgstr ""
+msgstr "Nabycie usługi"
#. module: mrp
#: view:mrp.production:0
@@ -359,10 +366,11 @@ msgstr "Proces nabycia"
#. module: mrp
#: field:mrp.production,date_planned_date:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "Zaplanowana data"
#. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
msgid "Urgent"
msgstr "Pilne"
@@ -478,19 +486,20 @@ msgid "Stockable Product Stock"
msgstr ""
#. module: mrp
-#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
msgid "Product UOS"
msgstr "JS produktu"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
msgid "Production Procure Products"
-msgstr ""
+msgstr "Nabycie z produkcji"
#. module: mrp
#: model:process.process,name:mrp.process_process_serviceproductprocess0
msgid "Service Product Process"
-msgstr ""
+msgstr "Proces usługi"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -544,7 +553,7 @@ msgstr "Czas produkcji"
#: 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 ""
+msgstr "Wyjątki nabycia do poprawienia"
#. module: mrp
#: selection:mrp.procurement,state:0
@@ -602,8 +611,10 @@ msgid "Waiting"
msgstr "Oczekiwanie"
#. 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: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 "Marszruta"
@@ -676,7 +687,8 @@ msgid "Production orders"
msgstr "Zamówienia produkcji"
#. module: mrp
-#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0
+#: field:mrp.bom,child_ids:0
msgid "BoM Hyerarchy"
msgstr "Hierarchia Zest. Mat."
@@ -702,7 +714,8 @@ msgid "Security Days"
msgstr "Dni na wszelki wypadek"
#. module: mrp
-#: view:mrp.production:0 field:mrp.production,cycle_total:0
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
msgid "Total Cycles"
msgstr "Suma cykli"
@@ -762,7 +775,9 @@ msgid "Production done"
msgstr "Produkcja wykonana"
#. module: mrp
-#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
+#: rml:bom.structure:0
+#: field:mrp.bom,code:0
+#: field:mrp.routing,code:0
#: field:mrp.workcenter,code:0
msgid "Code"
msgstr "Kod"
@@ -774,7 +789,8 @@ msgstr "Liczba godzin"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
msgid "Property Group"
msgstr "Grupa właściwości"
@@ -789,12 +805,14 @@ msgid "References"
msgstr "Odnośniki"
#. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
+#: 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
+#: 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"
@@ -876,10 +894,14 @@ msgid "Nbr of cycle"
msgstr "Liczba cykli"
#. 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
+#: 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 "Nazwa"
@@ -992,7 +1014,8 @@ msgid "Notes"
msgstr "Uwagi"
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
#: field:mrp.production,bom_id:0
msgid "Bill of Material"
msgstr "Zestawienie materiałowe"
@@ -1053,7 +1076,8 @@ msgid "Sale Ref"
msgstr "Odnośnik sprzedaży"
#. module: mrp
-#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0
+#: field:mrp.production,priority:0
#: rml:mrp.production.order:0
msgid "Priority"
msgstr "Priorytet"
@@ -1082,7 +1106,8 @@ msgstr "Narzędzie"
#. module: mrp
#: help:mrp.production,location_src_id:0
-msgid "Location where the system will look for products used in raw materials."
+msgid ""
+"Location where the system will look for products used in raw materials."
msgstr ""
"Strefa, w której system oczekuje produktów jako materiałów do produkcji."
@@ -1118,7 +1143,8 @@ msgid "Max Quantity"
msgstr "Ilość maks."
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement
+#: view:mrp.procurement:0
msgid "Procurement"
msgstr "Nabycie"
@@ -1168,7 +1194,8 @@ msgid "Procurement for raw materials."
msgstr "Nabycie dla materiałów do produkcji."
#. module: mrp
-#: view:mrp.procurement:0 field:mrp.procurement,note:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,note:0
#: rml:mrp.production.order:0
msgid "Note"
msgstr "Uwaga"
@@ -1194,8 +1221,10 @@ msgid "Define a routing to describe the manufacturing steps."
msgstr "Zdefiniuj marszrutę, aby opisać kroki produkcyjne."
#. module: mrp
-#: field:mrp.bom,active:0 field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0
+#: field:stock.warehouse.orderpoint,active:0
msgid "Active"
msgstr "Aktywne"
@@ -1208,18 +1237,23 @@ msgstr "Nabądź produkty"
#: 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
+#: 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 "Właściwości"
#. module: mrp
-#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0
+#: field:mrp.production,date_planned:0
msgid "Scheduled date"
msgstr "Planowana data"
#. module: mrp
-#: view:mrp.procurement:0 view:mrp.production:0
+#: view:mrp.procurement:0
+#: view:mrp.production:0
msgid "Extra Information"
msgstr "Dodatkowe informacje"
@@ -1267,7 +1301,8 @@ msgid "Change Product Qty."
msgstr "Zmień ilość produktu"
#. module: mrp
-#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
msgid "Done"
msgstr "Wykonano"
@@ -1315,15 +1350,18 @@ msgid "Capacity per Cycle"
msgstr "Ilość na cykl"
#. 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.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 "Produkt"
#. module: mrp
-#: view:mrp.production:0 field:mrp.production,hour_total:0
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
msgid "Total Hours"
msgstr "Suma godzin"
@@ -1338,7 +1376,8 @@ msgid "Product BoM Structure"
msgstr "Struktura Zest. Mat. produktu"
#. module: mrp
-#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
+#: 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"
@@ -1364,14 +1403,16 @@ msgid "Product type is Stockable and procure method is make to stock"
msgstr "Typ produktu jest Rejestrowany i metoda nabycia jest Na zapas."
#. module: mrp
-#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
+#: 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 ""
"Ważność tego Zestawienia materiałowego lub komponentu. Pozostaw puste, jeśli "
"ma być zawsze ważny."
#. module: mrp
-#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0
+#: field:mrp.production,product_uos:0
msgid "Product UoS"
msgstr "JS produktu"
@@ -1383,12 +1424,14 @@ msgstr "JM produktu"
#. 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
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
msgid "Workcenter"
msgstr "Centrum robocze"
#. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
msgid "Very Urgent"
msgstr "Bardzo pilne"
@@ -1428,7 +1471,8 @@ msgid "Stockable Order Request"
msgstr ""
#. module: mrp
-#: view:mrp.production:0 view:mrp.production.product.line:0
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
msgid "Scheduled Products"
msgstr "Zaplanowane produkty"
@@ -1455,7 +1499,8 @@ msgstr "Jeśli w zamówieniu nabycia produkt jest typu Rejestrowany."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0 rml:mrp.production.order:0
+#: view:mrp.production:0
+#: rml:mrp.production.order:0
msgid "Work Orders"
msgstr "Centra robocze"
@@ -1603,7 +1648,8 @@ msgstr "Wykorzystanie centrów roboczych"
msgid ""
"Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
"production."
-msgstr "Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
+msgstr ""
+"Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
#. module: mrp
#: field:mrp.bom,product_rounding:0
@@ -1693,7 +1739,8 @@ msgid "plus"
msgstr "plus"
#. module: mrp
-#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0
+#: field:mrp.procurement,bom_id:0
msgid "BoM"
msgstr "Zest. Mat."
@@ -1737,7 +1784,8 @@ msgid "last indice"
msgstr ""
#. module: mrp
-#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
msgid "BoM Revisions"
msgstr "Wersje Zest. Mat."
@@ -1747,12 +1795,14 @@ msgid "Retry"
msgstr "Powtórz"
#. module: mrp
-#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
msgid "Draft"
msgstr "Projekt"
#. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
msgid "Normal"
msgstr "Normalne"
@@ -1806,8 +1856,11 @@ msgid "from stock"
msgstr "z zapasu"
#. module: mrp
-#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
-#: view:mrp.routing:0 view:mrp.routing.workcenter:0
+#: 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 "Informacje ogólne"
@@ -1860,10 +1913,14 @@ msgid "Change Product Qty"
msgstr "Zmień ilość produktu"
#. 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.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 "Opis"
@@ -1923,7 +1980,8 @@ msgid "On Stock"
msgstr "Na zapas"
#. module: mrp
-#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
+#: 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"
@@ -1981,4 +2039,9 @@ msgstr "Tygodniowe odchylenie wartości zapasów"
#: model:ir.model,name:mrp.model_report_mrp_inout
#: view:report.mrp.inout:0
msgid "Stock value variation"
-msgstr "Odchylenie wartości zapasów"
+msgstr "Zmiany wartości zapasów"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next production orders"
+msgstr "Następne zamówienie produkcji"
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e7a5f1c195a..840c5f74d67 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -319,7 +319,7 @@ class procurement_order(osv.osv):
move_obj = self.pool.get('stock.move')
for procurement in self.browse(cr, uid, ids):
if procurement.product_qty <= 0.00:
- raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
+ raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity in Procurement Order(s), it should not be less than 1!'))
if procurement.product_id.type in ('product', 'consu'):
if not procurement.move_id:
source = procurement.location_id.id
diff --git a/addons/product/product.py b/addons/product/product.py
index aa916fb5b5c..cbb2ffefd67 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -48,25 +48,24 @@ class product_uom(osv.osv):
_name = 'product.uom'
_description = 'Product Unit of Measure'
+ def _compute_factor_inv(self, factor):
+ return factor and round(1.0 / factor, 6) or 0.0
+
def _factor_inv(self, cursor, user, ids, name, arg, context):
res = {}
for uom in self.browse(cursor, user, ids, context=context):
- if uom.factor:
- res[uom.id] = round(1 / uom.factor, 6)
- else:
- res[uom.id] = 0.0
+ res[uom.id] = self._compute_factor_inv(uom.factor)
return res
def _factor_inv_write(self, cursor, user, id, name, value, arg, context):
- if value:
- self.write(cursor, user, id, {
- 'factor': round(1/value, 6),
- }, context=context)
- else:
- self.write(cursor, user, id, {
- 'factor': 0.0,
- }, context=context)
- return True
+ return self.write(cursor, user, id, {'factor': self._compute_factor_inv(value)}, context=context)
+
+ def create(self, cr, uid, data, context={}):
+ if 'factor_inv' in data:
+ if data['factor_inv'] <> 1:
+ data['factor'] = self._compute_factor_inv(data['factor_inv'])
+ del(data['factor_inv'])
+ return super(product_uom, self).create(cr, uid, data, context)
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
@@ -85,13 +84,11 @@ class product_uom(osv.osv):
"Use 1.0 for a UoM that cannot be further split, such as a piece."),
'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
'uom_type': fields.selection([('bigger','Bigger than the reference UoM'),
- ('reference','Reference UoM for this category (ratio=1)'),
+ ('reference','Reference UoM for this category'),
('smaller','Smaller than the reference UoM')],'UoM Type', required=1),
}
_defaults = {
- 'factor': 1.0,
- 'factor_inv': 1.0,
'active': 1,
'rounding': 0.01,
'uom_type': 'reference',
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e58987cf2c8..4e68abfbda5 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -297,6 +297,7 @@
+
diff --git a/addons/project/project.py b/addons/project/project.py
index af8332abb27..816e85c29b4 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -337,6 +337,7 @@ class task(osv.osv):
def copy_data(self, cr, uid, id, default={}, context=None):
default = default or {}
default['work_ids'] = []
+ default['active'] = True
return super(task, self).copy_data(cr, uid, id, default, context)
def _check_dates(self, cr, uid, ids, context=None):
@@ -353,8 +354,17 @@ class task(osv.osv):
return False
return True
+ def _is_template(self, cr, uid, ids, field_name, arg, context=None):
+ res = {}
+ for task in self.browse(cr, uid, ids, context=context):
+ res[task.id] = True
+ if task.project_id:
+ if task.project_id.active == False or task.project_id.state == 'template':
+ res[task.id] = False
+ return res
+
_columns = {
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it. This is basically used for the management of templates of projects and tasks."),
+ 'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
'name': fields.char('Task Summary', size=128, required=True),
'description': fields.text('Description'),
'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 473d67750e0..2e9320e420b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -188,8 +188,7 @@ class project_issue(osv.osv, crm.crm_case):
method=True, multi='working_days_open', type="float", store=True),
'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
method=True, multi='working_days_close', type="float", store=True),
- 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
- 'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+ 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
'date_action_last': fields.datetime('Last Action', readonly=1),
'date_action_next': fields.datetime('Next Action', readonly=1),
}
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index cbf24b18f76..d014181bcb5 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -73,14 +73,24 @@
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 5fc873c40aa..11e1b785405 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -168,7 +168,7 @@ class project_scrum_product_backlog(osv.osv):
if match:
ids = self.search(cr, uid, [('sprint_id','=', int(match.group(1)))], limit=limit, context=context)
return self.name_get(cr, uid, ids, context=context)
- return super(scrum_product_backlog, self).name_search(cr, uid, name, args, operator,context, limit=limit)
+ return super(project_scrum_product_backlog, self).name_search(cr, uid, name, args, operator,context, limit=limit)
def _calc_progress(self, cr, uid, ids, name, args, context):
res = {}
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index fd044427869..007399c40a8 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -90,7 +90,7 @@
-
+
|