diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index c92d4eda602..58e824a6250 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -14,8 +14,12 @@ +

+ Select a configuration package to setup automatically your + taxes and chart of accounts. +

- + @@ -32,7 +36,7 @@ - Configure your Chart of Accounts + Configure Accounting Data ir.actions.act_window account.installer diff --git a/addons/account/installer.py b/addons/account/installer.py index 60a34628b1b..6173ea9213e 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -45,12 +45,12 @@ class account_installer(osv.osv_memory): sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context)), key=itemgetter(1))) - charts.insert(0, ('configurable', 'Generic Chart Of Accounts')) + charts.insert(0, ('configurable', _('Custom'))) return charts _columns = { # Accounting - 'charts': fields.selection(_get_charts, 'Chart of Accounts', + 'charts': fields.selection(_get_charts, 'Accounting Package', required=True, help="Installs localized accounting charts to match as closely as " "possible the accounting needs of your company based on your " diff --git a/addons/account_check_writing/i18n/es_EC.po b/addons/account_check_writing/i18n/es_EC.po index 7543458097f..4a0783d4648 100644 --- a/addons/account_check_writing/i18n/es_EC.po +++ b/addons/account_check_writing/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-12 04:36+0000\n" -"X-Generator: Launchpad (build 15930)\n" +"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. module: account_check_writing #: selection:res.company,check_layout:0 diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index d90e2006a71..66a67ad4219 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -96,22 +96,6 @@ class account_analytic_account(osv.osv): res[row['id']][field] = row[field] return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context) - def name_get(self, cr, uid, ids, context=None): - if isinstance(ids, (int, long)): - ids=[ids] - if not ids: - return [] - res = [] - for account in self.browse(cr, uid, ids, context=context): - data = [] - acc = account - while acc: - data.insert(0, acc.name) - acc = acc.parent_id - data = ' / '.join(data) - res.append((account.id, data)) - return res - def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict): res = self.name_get(cr, uid, ids) return dict(res) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index b45b8ea8712..aff2bcb610b 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -75,7 +75,9 @@ class crm_case_stage(osv.osv): 'requirements': fields.text('Requirements'), 'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections', help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."), - 'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."), + 'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True, + help="The status of your document will automatically change regarding the selected stage. " \ + "For example, if a stage is related to the state 'Close', when your document reaches this stage, it is automatically closed."), 'case_default': fields.boolean('Common to All Teams', help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."), 'fold': fields.boolean('Hide in Views when Empty', diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index b51f1288b95..4f4d73d5f43 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -183,7 +183,7 @@
- + diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index e90303dda66..44ce73c23fe 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -30,10 +30,10 @@ class crm_lead2opportunity_partner(osv.osv_memory): _inherit = 'crm.lead2partner' _columns = { - 'action': fields.selection([('exist', 'Link to an existing partner'), \ - ('create', 'Create a new partner'), \ - ('nothing', 'Do not link to a partner')], \ - 'Related Partner', required=True), + 'action': fields.selection([('exist', 'Link to an existing customer'), \ + ('create', 'Create a new customer'), \ + ('nothing', 'Do not link to a customer')], \ + 'Related Customer', required=True), 'name': fields.selection([('convert', 'Convert to Opportunities'), ('merge', 'Merge with existing Opportunities')], 'Conversion Action', required=True), 'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]), } diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml index 6a826f7bc0e..ef8acf95b58 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml @@ -7,22 +7,23 @@ crm.lead2opportunity.partner - - - + + + - - + + + + + + + + + + - - - - - - - - -