diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 5de205e1690..6d6f7b29991 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -362,7 +362,7 @@ Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it. - + diff --git a/addons/account_payment/i18n/es_CL.po b/addons/account_payment/i18n/es_CL.po new file mode 100644 index 00000000000..1015be4ec38 --- /dev/null +++ b/addons/account_payment/i18n/es_CL.po @@ -0,0 +1,714 @@ +# Spanish (Chile) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-08-26 23:15+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Chile) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-08-27 05:41+0000\n" +"X-Generator: Launchpad (build 13794)\n" + +#. module: account_payment +#: field:payment.order,date_scheduled:0 +msgid "Scheduled date if fixed" +msgstr "" + +#. module: account_payment +#: field:payment.line,currency:0 +msgid "Partner Currency" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Set to draft" +msgstr "" + +#. module: account_payment +#: help:payment.order,mode:0 +msgid "Select the Payment Mode to be applied." +msgstr "" + +#. module: account_payment +#: view:payment.mode:0 +#: view:payment.order:0 +msgid "Group By..." +msgstr "" + +#. module: account_payment +#: model:ir.module.module,description:account_payment.module_meta_information +msgid "" +"\n" +"This module provides :\n" +"* a more efficient way to manage invoice payment.\n" +"* a basic mechanism to easily plug various automated payment.\n" +" " +msgstr "" + +#. module: account_payment +#: field:payment.order,line_ids:0 +msgid "Payment lines" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +#: field:payment.line,info_owner:0 +#: view:payment.order:0 +msgid "Owner Account" +msgstr "" + +#. module: account_payment +#: help:payment.order,state:0 +msgid "" +"When an order is placed the state is 'Draft'.\n" +" Once the bank is confirmed the state is set to 'Confirmed'.\n" +" Then the order is paid the state is 'Done'." +msgstr "" + +#. module: account_payment +#: help:account.invoice,amount_to_pay:0 +msgid "" +"The amount which should be paid at the current date\n" +"minus the amount which is already in payment order" +msgstr "" + +#. module: account_payment +#: field:payment.mode,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_payment +#: field:payment.order,date_prefered:0 +msgid "Preferred date" +msgstr "" + +#. module: account_payment +#: selection:payment.line,state:0 +msgid "Free" +msgstr "" + +#. module: account_payment +#: field:payment.order.create,entries:0 +msgid "Entries" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Used Account" +msgstr "" + +#. module: account_payment +#: field:payment.line,ml_maturity_date:0 +#: field:payment.order.create,duedate:0 +msgid "Due Date" +msgstr "" + +#. module: account_payment +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "" + +#. module: account_payment +#: view:account.move.line:0 +msgid "Account Entry Line" +msgstr "" + +#. module: account_payment +#: view:payment.order.create:0 +msgid "_Add to payment order" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement +#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm +msgid "Payment Populate statement" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +#: view:payment.order:0 +msgid "Amount" +msgstr "" + +#. module: account_payment +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Total in Company Currency" +msgstr "" + +#. module: account_payment +#: selection:payment.order,state:0 +msgid "Cancelled" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new +msgid "New Payment Order" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +#: field:payment.order,reference:0 +msgid "Reference" +msgstr "" + +#. module: account_payment +#: sql_constraint:payment.line:0 +msgid "The payment line name must be unique!" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree +#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form +msgid "Payment Orders" +msgstr "" + +#. module: account_payment +#: selection:payment.order,date_prefered:0 +msgid "Directly" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_line_form +#: model:ir.model,name:account_payment.model_payment_line +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Payment Line" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +msgid "Amount Total" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +#: selection:payment.order,state:0 +msgid "Confirmed" +msgstr "" + +#. module: account_payment +#: help:payment.line,ml_date_created:0 +msgid "Invoice Effective Date" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Execution Type" +msgstr "" + +#. module: account_payment +#: selection:payment.line,state:0 +msgid "Structured" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +#: field:payment.order,state:0 +msgid "State" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Transaction Information" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form +#: model:ir.model,name:account_payment.model_payment_mode +#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form +#: view:payment.mode:0 +#: view:payment.order:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment +#: field:payment.line,ml_date_created:0 +msgid "Effective Date" +msgstr "" + +#. module: account_payment +#: field:payment.line,ml_inv_ref:0 +msgid "Invoice Ref." +msgstr "" + +#. module: account_payment +#: help:payment.order,date_prefered:0 +msgid "" +"Choose an option for the Payment Order:'Fixed' stands for a date specified " +"by you.'Directly' stands for the direct execution.'Due date' stands for the " +"scheduled date of execution." +msgstr "" + +#. module: account_payment +#: code:addons/account_payment/account_move_line.py:110 +#, python-format +msgid "Error !" +msgstr "" + +#. module: account_payment +#: view:account.move.line:0 +msgid "Total debit" +msgstr "" + +#. module: account_payment +#: field:payment.order,date_done:0 +msgid "Execution date" +msgstr "" + +#. module: account_payment +#: help:payment.mode,journal:0 +msgid "Bank or Cash Journal for the Payment Mode" +msgstr "" + +#. module: account_payment +#: selection:payment.order,date_prefered:0 +msgid "Fixed date" +msgstr "" + +#. module: account_payment +#: field:payment.line,info_partner:0 +#: view:payment.order:0 +msgid "Destination Account" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +msgid "Desitination Account" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Search Payment Orders" +msgstr "" + +#. module: account_payment +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" + +#. module: account_payment +#: field:payment.line,create_date:0 +msgid "Created" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Select Invoices to Pay" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +msgid "Currency Amount Total" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Make Payments" +msgstr "" + +#. module: account_payment +#: field:payment.line,state:0 +msgid "Communication Type" +msgstr "" + +#. module: account_payment +#: model:ir.module.module,shortdesc:account_payment.module_meta_information +msgid "Payment Management" +msgstr "" + +#. module: account_payment +#: field:payment.line,bank_statement_line_id:0 +msgid "Bank statement line" +msgstr "" + +#. module: account_payment +#: selection:payment.order,date_prefered:0 +msgid "Due date" +msgstr "" + +#. module: account_payment +#: field:account.invoice,amount_to_pay:0 +msgid "Amount to be paid" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Currency" +msgstr "" + +#. module: account_payment +#: view:account.payment.make.payment:0 +msgid "Yes" +msgstr "" + +#. module: account_payment +#: help:payment.line,info_owner:0 +msgid "Address of the Main Partner" +msgstr "" + +#. module: account_payment +#: help:payment.line,date:0 +msgid "" +"If no payment date is specified, the bank will treat this payment line " +"directly" +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_account_payment_populate_statement +msgid "Account Payment Populate Statement" +msgstr "" + +#. module: account_payment +#: help:payment.mode,name:0 +msgid "Mode of Payment" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Value Date" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Payment Type" +msgstr "" + +#. module: account_payment +#: help:payment.line,amount_currency:0 +msgid "Payment amount in the partner currency" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +#: selection:payment.order,state:0 +msgid "Draft" +msgstr "" + +#. module: account_payment +#: help:payment.line,communication2:0 +msgid "The successor message of Communication." +msgstr "" + +#. module: account_payment +#: code:addons/account_payment/account_move_line.py:110 +#, python-format +msgid "No partner defined on entry line" +msgstr "" + +#. module: account_payment +#: help:payment.line,info_partner:0 +msgid "Address of the Ordering Customer." +msgstr "" + +#. module: account_payment +#: view:account.payment.populate.statement:0 +msgid "Populate Statement:" +msgstr "" + +#. module: account_payment +#: view:account.move.line:0 +msgid "Total credit" +msgstr "" + +#. module: account_payment +#: help:payment.order,date_scheduled:0 +msgid "Select a date if you have chosen Preferred Date to be fixed." +msgstr "" + +#. module: account_payment +#: field:payment.order,user_id:0 +msgid "User" +msgstr "" + +#. module: account_payment +#: field:account.payment.populate.statement,lines:0 +#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line +msgid "Payment Lines" +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_payment +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "" + +#. module: account_payment +#: help:payment.line,move_line_id:0 +msgid "" +"This Entry Line will be referred for the information of the ordering " +"customer." +msgstr "" + +#. module: account_payment +#: view:payment.order.create:0 +msgid "Search" +msgstr "" + +#. module: account_payment +#: model:ir.actions.report.xml,name:account_payment.payment_order1 +#: model:ir.model,name:account_payment.model_payment_order +msgid "Payment Order" +msgstr "" + +#. module: account_payment +#: field:payment.line,date:0 +msgid "Payment Date" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Total:" +msgstr "" + +#. module: account_payment +#: field:payment.order,date_created:0 +msgid "Creation date" +msgstr "" + +#. module: account_payment +#: view:account.payment.populate.statement:0 +msgid "ADD" +msgstr "" + +#. module: account_payment +#: view:account.bank.statement:0 +msgid "Import payment lines" +msgstr "" + +#. module: account_payment +#: field:account.move.line,amount_to_pay:0 +msgid "Amount to pay" +msgstr "" + +#. module: account_payment +#: field:payment.line,amount:0 +msgid "Amount in Company Currency" +msgstr "" + +#. module: account_payment +#: help:payment.line,partner_id:0 +msgid "The Ordering Customer" +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_account_payment_make_payment +msgid "Account make payment" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Invoice Ref" +msgstr "" + +#. module: account_payment +#: field:payment.line,name:0 +msgid "Your Reference" +msgstr "" + +#. module: account_payment +#: field:payment.order,mode:0 +msgid "Payment mode" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Payment order" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "General Information" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +#: selection:payment.order,state:0 +msgid "Done" +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_payment +#: field:payment.line,communication:0 +msgid "Communication" +msgstr "" + +#. module: account_payment +#: view:account.payment.make.payment:0 +#: view:account.payment.populate.statement:0 +#: view:payment.order:0 +#: view:payment.order.create:0 +msgid "Cancel" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Information" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree +msgid "" +"A payment order is a payment request from your company to pay a supplier " +"invoice or a customer credit note. Here you can register all payment orders " +"that should be done, keep track of all payment orders and mention the " +"invoice reference and the partner the payment should be done for." +msgstr "" + +#. module: account_payment +#: help:payment.line,amount:0 +msgid "Payment amount in the company currency" +msgstr "" + +#. module: account_payment +#: view:payment.order.create:0 +msgid "Search Payment lines" +msgstr "" + +#. module: account_payment +#: field:payment.line,amount_currency:0 +msgid "Amount in Partner Currency" +msgstr "" + +#. module: account_payment +#: field:payment.line,communication2:0 +msgid "Communication 2" +msgstr "" + +#. module: account_payment +#: field:payment.line,bank_id:0 +msgid "Destination Bank account" +msgstr "" + +#. module: account_payment +#: view:account.payment.make.payment:0 +msgid "Are you sure you want to make payment?" +msgstr "" + +#. module: account_payment +#: view:payment.mode:0 +#: field:payment.mode,journal:0 +msgid "Journal" +msgstr "" + +#. module: account_payment +#: field:payment.mode,bank_id:0 +msgid "Bank account" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Confirm Payments" +msgstr "" + +#. module: account_payment +#: field:payment.line,company_currency:0 +#: report:payment.order:0 +msgid "Company Currency" +msgstr "" + +#. module: account_payment +#: model:ir.ui.menu,name:account_payment.menu_main_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Payment" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Payment Order / Payment" +msgstr "" + +#. module: account_payment +#: field:payment.line,move_line_id:0 +msgid "Entry line" +msgstr "" + +#. module: account_payment +#: help:payment.line,communication:0 +msgid "" +"Used as the message between ordering customer and current company. Depicts " +"'What do you want to say to the recipient about this order ?'" +msgstr "" + +#. module: account_payment +#: field:payment.mode,name:0 +msgid "Name" +msgstr "" + +#. module: account_payment +#: report:payment.order:0 +msgid "Bank Account" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Entry Information" +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_payment_order_create +msgid "payment.order.create" +msgstr "" + +#. module: account_payment +#: field:payment.line,order_id:0 +msgid "Order" +msgstr "" + +#. module: account_payment +#: field:payment.order,total:0 +msgid "Total" +msgstr "" + +#. module: account_payment +#: view:account.payment.make.payment:0 +#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment +msgid "Make Payment" +msgstr "" + +#. module: account_payment +#: field:payment.line,partner_id:0 +#: report:payment.order:0 +msgid "Partner" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_create_payment_order +msgid "Populate Payment" +msgstr "" + +#. module: account_payment +#: help:payment.mode,bank_id:0 +msgid "Bank Account for the Payment Mode" +msgstr "" + +#. module: account_payment +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "" diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index 4cbef04a204..370ca6c93f2 100644 --- a/addons/base_iban/__openerp__.py +++ b/addons/base_iban/__openerp__.py @@ -31,7 +31,7 @@ The ability to extract the correctly represented local accounts from IBAN accoun """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['account'], + 'depends': ['base'], 'init_xml': ['base_iban_data.xml'], 'update_xml': ['base_iban_view.xml'], 'installable': True, diff --git a/addons/crm/crm.py b/addons/crm/crm.py index d0abc98e518..d19a8b61e00 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -44,6 +44,18 @@ AVAILABLE_PRIORITIES = [ ('5', 'Lowest'), ] +class crm_case_channel(osv.osv): + _name = "crm.case.channel" + _description = "Channels" + _order = 'name' + _columns = { + 'name': fields.char('Channel Name', size=64, required=True), + 'active': fields.boolean('Active'), + } + _defaults = { + 'active': lambda *a: 1, + } + class crm_case_stage(osv.osv): """ Stage of case """ diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index e494db325e5..bab3e4bca5f 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -1,6 +1,18 @@ + + website + + + phone + + + direct + + + e-mail + Sales Department Sales diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index b08006578db..fae37ed54a4 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -142,7 +142,7 @@ class crm_lead(crm_case, osv.osv): domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"), 'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \ domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"), - 'channel_id': fields.many2one('res.partner.canal', 'Channel', help="From which channel (mail, direct, phone, ...) did this contact reach you?"), + 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"), 'contact_name': fields.char('Contact Name', size=64), 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity', select=1), 'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."), diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index ecae065beac..06c90417725 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -71,11 +71,6 @@ class crm_phonecall(crm_base, osv.osv): type="char", string="Contact", size=128), 'partner_mobile': fields.char('Mobile', size=32), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', \ - help="The channels represent the different communication\ - modes available with the customer." \ - " With each commercial opportunity, you can indicate\ - the canall which is this opportunity source."), 'date_closed': fields.datetime('Closed', readonly=True), 'date': fields.datetime('Date'), 'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 31105ffcbc8..d5c199087bf 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -7,7 +7,7 @@ - + @@ -21,6 +21,39 @@ parent="base.menu_base_partner" sequence="11" /> + + + crm.case.channel.tree + crm.case.channel + tree + + + + + + + + + crm.case.channel.form + crm.case.channel + form + +
+ + + + +
+ + Channels + crm.case.channel + form + tree,form + Track from where is coming your leads and opportunities by creating specific channels that will be maintained at the creation of a document in the system. Some examples of channels can be: Website, Phone Call, Reseller, etc. + + + + diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 51f1eb5d96e..bd61e1ee80d 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -57,7 +57,7 @@ class crm_lead_report(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'country_id':fields.many2one('res.country', 'Country', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True), - 'channel_id':fields.many2one('res.partner.canal', 'Channel', readonly=True), + 'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True), 'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'creation_month':fields.selection(MONTHS, 'Creation Date', readonly=True), diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 4aa68a6625c..6f7b3066d7a 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -3,6 +3,8 @@ "access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0 "access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1 +"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0 +"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1 "access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0 "access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1 @@ -41,7 +43,6 @@ "access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0 -"access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1 "access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,1,1,1 "access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1 "access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1 diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index e2b0bb566fd..01234dbf436 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -67,9 +67,6 @@ class crm_fundraising(crm.crm_case, osv.osv): 'duration': fields.float('Duration'), 'ref': fields.reference('Reference', selection=crm._links_get, size=128), 'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', \ - help="The channels represent the different communication \ - modes available with the customer."), 'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 9dddc31bd6c..c98a06eda46 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -190,7 +190,6 @@ - diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 5d02ec12369..b27fa04a2af 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -63,9 +63,7 @@ class crm_helpdesk(crm.crm_case, osv.osv): 'date': fields.datetime('Date'), 'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', \ - help="The channels represent the different communication \ - modes available with the customer."), + 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), 'planned_revenue': fields.float('Planned Revenue'), 'planned_cost': fields.float('Planned Costs'), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml index f48af6b5de3..a7f36c931c9 100644 --- a/addons/crm_helpdesk/crm_helpdesk_demo.xml +++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml @@ -2,7 +2,6 @@ - @@ -15,7 +14,6 @@ - @@ -28,7 +26,6 @@ - @@ -41,7 +38,6 @@ - @@ -54,4 +50,4 @@ - \ No newline at end of file + diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index e0ca162286f..af893a3f40f 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -62,7 +62,7 @@ - + diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index 0d1d97c6905..7b70b77d5d1 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -56,7 +56,7 @@ class crm_helpdesk_report(osv.osv): 'date_deadline': fields.date('Deadline', select=True), 'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \ ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'), - 'canal_id': fields.many2one('res.partner.canal', 'Channel'), + 'channel_id': fields.many2one('crm.case.channel', 'Channel'), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.helpdesk')]"), @@ -93,7 +93,7 @@ class crm_helpdesk_report(osv.osv): c.priority, c.date_deadline, c.categ_id, - c.canal_id, + c.channel_id, c.planned_cost, count(*) as nbr, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, @@ -104,7 +104,7 @@ class crm_helpdesk_report(osv.osv): group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ c.state, c.user_id,c.section_id,c.priority,\ c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\ - c.categ_id,c.canal_id,c.planned_cost,c.id + c.categ_id,c.channel_id,c.planned_cost,c.id )""") crm_helpdesk_report() diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index d54b719fe2b..e954c790582 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -25,7 +25,7 @@ - + @@ -106,9 +106,7 @@ domain="[]" context="{'group_by':'partner_id'}" /> - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 64580a7dbe1..fb10baedc9e 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -284,7 +284,7 @@ + id="menu_view_employee_category_tree" parent="menu_view_employee_category_configuration_form" sequence="2"/> hr.job.form @@ -377,7 +377,7 @@ - + diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index 20a4fa0e17a..b2d029f74d4 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -25,7 +25,6 @@ - @@ -45,7 +44,6 @@ - @@ -115,7 +113,6 @@ - @@ -136,7 +133,6 @@ - diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index 2e941877b65..9883e311fba 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -46,6 +46,9 @@ name="Applicants" parent="base.menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/> + + + diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po index 9c0ecd0cf5b..4db55064b64 100644 --- a/addons/marketing/i18n/ru.po +++ b/addons/marketing/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-10-10 07:29+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-08-28 14:15+0000\n" +"Last-Translator: Stanislav Hanzhin \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:47+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-08-29 04:34+0000\n" +"X-Generator: Launchpad (build 13794)\n" #. module: marketing #: model:ir.module.module,description:marketing.module_meta_information @@ -28,8 +28,8 @@ msgid "" "Helps you to manage marketing campaigns and automate actions and " "communication steps." msgstr "" -"Помогает Вам настроить маркетинговые кампании и автоматизировать действия и " -"этапы взамодействия" +"Помогает настроить маркетинговые кампании и автоматизировать действия и " +"общение." #. module: marketing #: field:marketing.installer,progress:0 @@ -39,12 +39,12 @@ msgstr "Выполнение настройки" #. module: marketing #: view:marketing.installer:0 msgid "title" -msgstr "заголовок" +msgstr "title" #. module: marketing #: field:marketing.installer,email_template:0 msgid "Automated E-Mails" -msgstr "Автоматизированные рассылки" +msgstr "Автоматизированные сообщения" #. module: marketing #: field:marketing.installer,config_logo:0 @@ -63,7 +63,7 @@ msgid "" "processes." msgstr "" "Помогает разработать шаблоны сообщений электронной почты и интегрировать их " -"в ваши процессы." +"в существующие процессы." #. module: marketing #: model:ir.model,name:marketing.model_marketing_installer @@ -86,8 +86,8 @@ msgid "" "OpenERP provides Addons to better manage your sales and marketing processes. " "Select the ones you would be interested in." msgstr "" -"OpenERP предоставляет дополнения для более лучшего управления вашими " -"процессами продаж и маркетинга. Выберите те, которые вам интересны." +"OpenERP предоставляет дополнения, улучшающие управление вашими процессами " +"продаж и маркетинга. Выберите те, которые вам интересны." #. module: marketing #: view:marketing.installer:0 @@ -100,7 +100,7 @@ msgid "Marketing Modules Installation" msgstr "Установка модулей маркетинга" #. module: marketing -#: model:ir.module.module,shortdesc:marketing.module_meta_information +#: field:marketing.installer,marketing_campaign:0 msgid "Marketing Campaigns" msgstr "Маркетинговые кампании" @@ -110,7 +110,7 @@ msgid "" "Helps you to perform segmentation of partners and design segmentation " "questionnaires" msgstr "" -"Помогает Вам выполнять сегментацию партнеров и проектировать сегментационные " +"Помогает выполнить сегментацию партнеров и спроектировать сегментационные " "опросы." #. module: marketing @@ -121,16 +121,6 @@ msgstr "Настроить" #~ msgid "Invalid model name in the action definition." #~ msgstr "Недопустимое имя модели в определении действия." -#~ msgid "Mailchimp Integration" -#~ msgstr "Интеграция с сервисом MailChimp" - -#~ msgid "" -#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass " -#~ "mailings." -#~ msgstr "" -#~ "Этот модуль интегрирует в OpenERP сервисы mailchimp.com для автоматизации " -#~ "почтовых рассылок" - #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Некорректный формат XML для просмотра архитектуры!" @@ -139,3 +129,6 @@ msgstr "Настроить" #~ msgstr "" #~ "Название объекта должно начинаться с x_ и не должно содержать специальных " #~ "символов !" + +#~ msgid "Marketing Applications Configuration" +#~ msgstr "Настройка приложения Маркетинг" diff --git a/addons/marketing_campaign_crm_demo/i18n/ru.po b/addons/marketing_campaign_crm_demo/i18n/ru.po index 1202b0ab258..613dc13eecf 100644 --- a/addons/marketing_campaign_crm_demo/i18n/ru.po +++ b/addons/marketing_campaign_crm_demo/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-09-30 06:47+0000\n" -"Last-Translator: Chertykov Denis \n" +"PO-Revision-Date: 2011-08-28 14:22+0000\n" +"Last-Translator: Stanislav Hanzhin \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:48+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-08-29 04:34+0000\n" +"X-Generator: Launchpad (build 13794)\n" #. module: marketing_campaign_crm_demo #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report @@ -28,6 +28,8 @@ msgid "" "Hello,Thanks for generous interest you have shown in the " "openERP.Regards,OpenERP Team," msgstr "" +"Здавствуйте. Благодарим за интерес, проявленный к OpenERP. С наилучшими " +"пожеланиями, команда OpenERP." #. module: marketing_campaign_crm_demo #: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information @@ -44,31 +46,35 @@ msgid "" " I really appreciate your co-operation on this.\n" " Regards,OpenERP Team," msgstr "" +"Здравствуйте! Благодарим за проявленный интерес и покупку книги об OpenERP.\n" +" Если Вам потребуется дополнительная информация - обращайтесь.\n" +" Надеемся на дальнейшее сотрудничество с Вами.\n" +" С наилучшими пожеланиями, команда OpenERP." #. module: marketing_campaign_crm_demo #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010" -msgstr "" +msgstr "Предложение подписки на OpenERP Discovery Day в мае 2010." #. module: marketing_campaign_crm_demo #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6 msgid "Propose paid training to Silver partners" -msgstr "" +msgstr "Предложить платный тренинг \"серебряным\" партнёрам." #. module: marketing_campaign_crm_demo #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1 msgid "Thanks for showing interest in OpenERP" -msgstr "" +msgstr "Спасибо за проявленный интерес к OpenERP" #. module: marketing_campaign_crm_demo #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4 msgid "Thanks for buying the OpenERP book" -msgstr "" +msgstr "Спасибо за покупку книги об OpenERP" #. module: marketing_campaign_crm_demo #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5 msgid "Propose a free technical training to Gold partners" -msgstr "" +msgstr "Предложить бесплатный технический тренинг \"золотым\" партнёрам." #. module: marketing_campaign_crm_demo #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7 @@ -79,11 +85,17 @@ msgid "" " I really appreciate your co-operation on this.\n" " Regards,OpenERP Team," msgstr "" +"Здравствуйте! Возможно, у нас есть для Вас подходящее предложение.\n" +" Мы предлагаем \"золотое\" партнёрство своим серебряным " +"партнёрам.\n" +" Если Вам потребуется дополнительная информация - обращайтесь.\n" +" Надеемся на дальнейшее сотрудничество с Вами.\n" +" С наилучшими пожеланиями, команда OpenERP." #. module: marketing_campaign_crm_demo #: report:crm.lead.demo:0 msgid "Partner :" -msgstr "Партнер:" +msgstr "Контрагент:" #. module: marketing_campaign_crm_demo #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8 @@ -166,6 +178,3 @@ msgstr "" #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7 msgid "Propose gold partnership to silver partners" msgstr "" - -#~ msgid "Error! You can not create recursive Directories." -#~ msgstr "Ошибка! Вы не можете созадавать вложенные директории." diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 5d23608769b..cf76031e9c0 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -304,7 +304,7 @@ Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. - +