diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 58ad4f5346d..f10931214ac 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ 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-01-29 14:02+0000\n" -"Last-Translator: Carlo \n" +"PO-Revision-Date: 2010-02-03 19:01+0000\n" +"Last-Translator: Davide Corio \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-01-30 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -288,6 +288,11 @@ msgid "" "date empty, it means direct payment. The payment term may compute several " "due dates, for example 50% now, 50% in one month." msgstr "" +"Se vengono utilizzati i termini di pagamento, la data di scadenza verrà " +"calcolata automaticamente alla generazione dei movimenti contabili. Se i " +"termini di pagamento e la data di scadenza non vengono valorizzati, equivale " +"al pagamento diretto. Il termine di pagamento può essere calcolato a fronte " +"di diverse scadenze, per esempio 50% subito e 50% dopo un mese." #. module: account #: selection:account.tax,type:0 @@ -321,7 +326,7 @@ msgstr "Origine" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "" +msgstr "Nome Movimento" #. module: account #: xsl:account.transfer:0 @@ -353,7 +358,7 @@ msgstr "Tassa" #. module: account #: rml:account.general.journal:0 msgid "Debit Trans." -msgstr "" +msgstr "Debito Trans." #. module: account #: field:account.analytic.line,account_id:0 diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 232ba274769..2862f7b7657 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,6 +1,7 @@ - + + diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po index c3f12aef08c..e9332b8394f 100644 --- a/addons/account_analytic_analysis/i18n/nl.po +++ b/addons/account_analytic_analysis/i18n/nl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po index aab9ded1466..e945c85b380 100644 --- a/addons/account_anglo_saxon/i18n/pl.po +++ b/addons/account_anglo_saxon/i18n/pl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_anglo_saxon diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml index 86516f35bfa..bdb8bfd4c8f 100644 --- a/addons/account_budget/crossovered_budget_view.xml +++ b/addons/account_budget/crossovered_budget_view.xml @@ -294,6 +294,14 @@ auto="False" menu="False"/>--> + + + + + + diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po index d756121ab3b..c0a481b6cbc 100644 --- a/addons/account_followup/i18n/nl.po +++ b/addons/account_followup/i18n/nl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po index 0fac8e23859..091a5087244 100644 --- a/addons/account_reporting/i18n/ru.po +++ b/addons/account_reporting/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po index c6a12f8f1aa..8b92024b5fd 100644 --- a/addons/auction/i18n/pt_BR.po +++ b/addons/auction/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml index b15cd72874e..7ebab73aca5 100644 --- a/addons/base_calendar/base_calendar_data.xml +++ b/addons/base_calendar/base_calendar_data.xml @@ -1,6 +1,6 @@ - + @@ -54,7 +54,12 @@ valarm vevent - + + + vtimezone + vevent + + priority vevent @@ -172,7 +177,12 @@ seq vtodo - + + + vtimezone + vtodo + + url vtodo diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po index 21dacd2804b..7a20a160d31 100644 --- a/addons/base_contact/i18n/nl.po +++ b/addons/base_contact/i18n/nl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_module_merge/i18n/ru.po b/addons/base_module_merge/i18n/ru.po index 0cb1fec8c32..33266cc8bea 100644 --- a/addons/base_module_merge/i18n/ru.po +++ b/addons/base_module_merge/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 06:51+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-03 23:27+0000\n" +"Last-Translator: Artyom Packhomov \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: 2009-12-16 05:26+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_merge @@ -60,7 +60,7 @@ msgstr "Версия" #: wizard_view:base_module_merge.module_merge,info:0 #: wizard_view:base_module_merge.module_merge,save:0 msgid "Module Recording" -msgstr "" +msgstr "Запись модуля" #. module: base_module_merge #: wizard_view:base_module_merge.module_merge,save:0 diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po index bd6fee8b068..4c567fde222 100644 --- a/addons/base_module_quality/i18n/ru.po +++ b/addons/base_module_quality/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po index 6b64eeb3280..a702b009170 100644 --- a/addons/base_report_creator/i18n/zh_CN.po +++ b/addons/base_report_creator/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index 853d609b31b..7a50baf7b14 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po index fc16d1b23f8..affbcdb6e83 100644 --- a/addons/base_vat/i18n/ru.po +++ b/addons/base_vat/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm_configuration/i18n/it.po index dad58efb8b1..956b3c2a9f0 100644 --- a/addons/board_crm_configuration/i18n/it.po +++ b/addons/board_crm_configuration/i18n/it.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_crm_configuration diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml index 0ea7fb48297..cdc93d9a274 100644 --- a/addons/board_warehouse/board_warehouse_view.xml +++ b/addons/board_warehouse/board_warehouse_view.xml @@ -5,6 +5,15 @@ Warehouse + + Reception Picking Stock Move + stock.move + ir.actions.act_window + form + tree,form + [('picking_id','!=',False),('picking_id.type','=','in'),('date','<=',time.strftime('%Y-%m-%d 23:59:59'))] + + board.warehouse.form @@ -15,11 +24,11 @@ - + - + diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py index 38a2dcacd78..ff35a8492c8 100644 --- a/addons/caldav/caldav.py +++ b/addons/caldav/caldav.py @@ -188,13 +188,6 @@ class calendar_attendee(osv.osv): name = name[0] result = {} - def get_delegate_data(user): - if not user.address_id.email: - raise osv.except_osv(_('Error!'), \ - ("User does not have an email Address")) - email = (user.address_id and ('MAILTO:' + user.address_id.email)) or '' - return email - for attdata in self.browse(cr, uid, ids, context=context): id = attdata.id result[id] = {} @@ -213,13 +206,10 @@ class calendar_attendee(osv.osv): else: result[id][name] = self._get_address(None, attdata.email) if name == 'delegated_to': - user_obj = self.pool.get('res.users') - todata = map(get_delegate_data, attdata.del_to_user_ids) + todata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_to_user_ids) result[id][name] = ', '.join(todata) if name == 'delegated_from': - dstring = [] - user_obj = self.pool.get('res.users') - fromdata = map(get_delegate_data, attdata.del_from_user_ids) + fromdata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_from_user_ids) result[id][name] = ', '.join(fromdata) if name == 'event_date': if attdata.ref: @@ -288,11 +278,11 @@ class calendar_attendee(osv.osv): string='Delegated To', type="char", size=124, store=True, \ multi='delegated_to', help="The users that the original \ request was delegated to"), - 'del_to_user_ids': fields.many2many('res.users', 'att_del_to_user_rel', + 'del_to_user_ids': fields.many2many('calendar.attendee', 'att_del_to_user_rel', 'attendee_id', 'user_id', 'Users'), 'delegated_from': fields.function(_compute_data, method=True, string=\ 'Delegated From', type="char", store=True, size=124, multi='delegated_from'), - 'del_from_user_ids': fields.many2many('res.users', 'att_del_from_user_rel', \ + 'del_from_user_ids': fields.many2many('calendar.attendee', 'att_del_from_user_rel', \ 'attendee_id', 'user_id', 'Users'), 'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), @@ -1169,6 +1159,9 @@ class invite_attendee_wizard(osv.osv_memory): } def do_invite(self, cr, uid, ids, context={}): + model2field = { + 'calendar.attendee': 'del_to_user_ids', + 'crm.meeting': 'attendee_ids'} datas = self.read(cr, uid, ids)[0] if not context or not context.get('model'): return {} @@ -1178,7 +1171,9 @@ class invite_attendee_wizard(osv.osv_memory): res_obj = obj.browse(cr, uid, context['active_id']) type = datas.get('type') att_obj = self.pool.get('calendar.attendee') - vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))} + vals = {} + if not model == 'calendar.attendee': + vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))} if type == 'internal': user_obj = self.pool.get('res.users') for user_id in datas.get('user_ids', []): @@ -1189,7 +1184,7 @@ class invite_attendee_wizard(osv.osv_memory): vals.update({'user_id': user_id, 'email': user.address_id.email}) att_id = att_obj.create(cr, uid, vals) - obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]}) + obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]}) elif type == 'external' and datas.get('email'): vals.update({'email': datas['email']}) @@ -1200,7 +1195,7 @@ class invite_attendee_wizard(osv.osv_memory): (att.partner_id and att.partner_id.name) or \ att.email) + ' - Status: ' + att.state.title()) att_id = att_obj.create(cr, uid, vals) - obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]}) + obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]}) sign = res_obj.user_id and res_obj.user_id.signature or '' sign = '
'.join(sign and sign.split('\n') or []) sub = '[%s Invitation][%d] %s' % (company, att_id, res_obj.name) @@ -1217,22 +1212,25 @@ class invite_attendee_wizard(osv.osv_memory): body = html_invitation % body_vals mail_to = [datas['email']] tools.email_send( - tools.config.get('email_from',False), + tools.config.get('email_from', False), mail_to, sub, body, subtype='html', - reply_to=tools.config.get('email_from',False) + reply_to=tools.config.get('email_from', False) ) elif type == 'partner': add_obj = self.pool.get('res.partner.address') for contact in add_obj.browse(cr, uid, datas['contact_ids']): + if not contact.email: + raise osv.except_osv(_('Error!'), \ + ("Partner does not have an email Address")) vals.update({ 'partner_address_id': contact.id, 'email': contact.email}) att_id = att_obj.create(cr, uid, vals) - obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]}) + obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]}) return {} diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 2bb35500a76..16c63d8dde1 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -22,14 +22,14 @@ import time import re import os - -import mx.DateTime import base64 +import tools +import mx.DateTime from tools.translate import _ - -import tools -from osv import fields,osv,orm +from osv import fields +from osv import osv +from osv import orm from osv.orm import except_orm MAX_LEVEL = 15 @@ -584,7 +584,7 @@ class crm_case(osv.osv): "Reminder: [%s] %s" % (str(case.id), case.name, ), self.format_body(body), reply_to=case.section_id.reply_to, - tinycrm=str(case.id), + openobject_id=str(case.id), attach=attach_to_send ) if flag: @@ -644,7 +644,7 @@ class crm_case(osv.osv): '['+str(case.id)+'] '+case.name, self.format_body(body), reply_to=case.section_id.reply_to, - tinycrm=str(case.id) + openobject_id=str(case.id) ) return True @@ -840,7 +840,7 @@ class crm_email_add_cc_wizard(osv.osv_memory): subject or '['+str(case.id)+'] '+case.name, crm_case.format_body(body), email_cc = [email], - tinycrm=str(case.id) + openobject_id=str(case.id) ) if flag: crm_case.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email}) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 04a5a09da3d..cb97f8b4c6b 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -33,10 +33,11 @@ class crm_lead(osv.osv): _order = "id desc" _inherit = 'crm.case' _columns = { + 'name': fields.char('Lead Subject', size=64), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), - 'partner_name': fields.char("Employee's Name", size=64), - 'partner_name2': fields.char('Employee Email', size=64), + 'partner_name': fields.char("Lead Name", size=64), + 'partner_name2': fields.char('Email', size=64), 'partner_phone': fields.char('Phone', size=32), 'partner_mobile': fields.char('Mobile', size=32), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 2c5024ebd0f..778cf41d756 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -26,87 +26,89 @@ form
- - - - -