diff --git a/addons/account/account.py b/addons/account/account.py index fa2b10a7478..c9dd1950347 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1007,7 +1007,7 @@ class account_period(osv.osv): 'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}), 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), 'state': fields.selection([('draft','Open'), ('done','Closed')], 'Status', readonly=True, - help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), + help='When monthly periods are created. The status is \'Draft\'. At the end of monthly period it is in \'Done\' status.'), 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } _defaults = { @@ -1134,7 +1134,7 @@ class account_journal_period(osv.osv): 'icon': fields.function(_icon_get, string='Icon', type='char', size=32), 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."), 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True, - help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'), + help='When journal period is created. The status is \'Draft\'. If a report is printed it comes to \'Printed\' status. When all transactions are done, it comes in \'Done\' status.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } @@ -1282,7 +1282,7 @@ class account_move(osv.osv): 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}), 'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True, - help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), + help='All manually created new journal entries are usually in the status \'Unposted\', but you can set the option to skip that status on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' status.'), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), @@ -1431,6 +1431,9 @@ class account_move(osv.osv): if 'line_id' in vals: c = context.copy() c['novalidate'] = True + c['period_id'] = vals['period_id'] + c['journal_id'] = vals['journal_id'] + c['date'] = vals['date'] result = super(account_move, self).create(cr, uid, vals, c) self.validate(cr, uid, [result], context) else: diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 549363ce269..48082451f35 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -123,8 +123,8 @@ class account_bank_statement(osv.osv): ('open','Open'), # used by cash statements ('confirm', 'Closed')], 'Status', required=True, readonly="1", - help='When new statement is created the state will be \'Draft\'.\n' - 'And after getting confirmation from the bank it will be in \'Confirmed\' state.'), + help='When new statement is created the status will be \'Draft\'.\n' + 'And after getting confirmation from the bank it will be in \'Confirmed\' status.'), 'currency': fields.function(_currency, string='Currency', type='many2one', relation='res.currency'), 'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'), diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 57f16473b82..16393f0ea49 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -185,6 +185,7 @@ class account_invoice(osv.osv): _columns = { 'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}), 'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}), + 'supplier_invoice_number': fields.char('Supplier Invoice Number', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}), 'type': fields.selection([ ('out_invoice','Customer Invoice'), ('in_invoice','Supplier Invoice'), @@ -206,12 +207,12 @@ class account_invoice(osv.osv): ('open','Open'), ('paid','Paid'), ('cancel','Cancelled'), - ],'State', select=True, readonly=True, - help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \ - \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \ - \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \ - \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \ - \n* The \'Cancelled\' state is used when user cancel invoice.'), + ],'Status', select=True, readonly=True, + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Invoice. \ + \n* The \'Pro-forma\' when invoice is in Pro-forma status,invoice does not have an invoice number. \ + \n* The \'Open\' status is used when user create invoice,a invoice number is generated.Its in open status till user does not pay invoice. \ + \n* The \'Paid\' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \ + \n* The \'Cancelled\' status is used when user cancel invoice.'), 'sent': fields.boolean('Sent', readonly=True, help="It indicates that the invoice has been sent."), 'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"), 'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, @@ -1359,7 +1360,7 @@ class account_invoice_line(osv.osv): _description = "Invoice Line" _columns = { 'name': fields.text('Description', required=True), - 'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."), + 'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."), 'sequence': fields.integer('Sequence', help="Gives the sequence of this line when displaying the invoice."), 'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True), 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'), diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 8516fcd96ae..5ed373456f3 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -143,13 +143,11 @@
- -
@@ -170,12 +168,15 @@ context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" domain="[('supplier', '=', True)]"/> - -
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index f5fb3dbd051..cbdc43b23af 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1023,10 +1023,10 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'rrule': fields.function(_get_rulestring, type='char', size=124, \ fnct_inv=_rrule_write, store=True, string='Recurrent Rule'), 'rrule_type': fields.selection([ - ('daily', 'Daily'), - ('weekly', 'Weekly'), - ('monthly', 'Monthly'), - ('yearly', 'Yearly') + ('daily', 'Day(s)'), + ('weekly', 'Week(s)'), + ('monthly', 'Month(s)'), + ('yearly', 'Year(s)') ], 'Recurrency', states={'done': [('readonly', True)]}, help="Let the event automatically repeat at that interval"), 'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]}, diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index d5dc75df873..a922521d970 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -1,121 +1,11 @@ - - - calendar.attendee.form - calendar.attendee - -
-
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - calendar.attendee.tree - calendar.attendee - - - - - - - - - - - - - - - - calendar.attendee.search - calendar.attendee - - - - - - - - - - - - - - - - - - - - - - - Event Invitations - ir.actions.act_window - calendar.attendee - form - tree,form - - {'default_sent_by_uid': uid} - - - - res.alarm.form diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 9dd37afa3d6..760a47d3796 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -86,7 +86,7 @@ - + diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index 81a60a5dd5f..14e029eb988 100644 --- a/addons/base_crypt/crypt.py +++ b/addons/base_crypt/crypt.py @@ -140,18 +140,20 @@ class users(osv.osv): # Add handlers for 'input_pw' field. def set_pw(self, cr, uid, id, name, value, args, context): - if not value: - raise osv.except_osv(_('Error!'), _("You have to specify a password.")) + if value: + obj = pooler.get_pool(cr.dbname).get('res.users') + if not hasattr(obj, "_salt_cache"): + obj._salt_cache = {} - obj = pooler.get_pool(cr.dbname).get('res.users') - if not hasattr(obj, "_salt_cache"): - obj._salt_cache = {} + salt = obj._salt_cache[id] = gen_salt() + encrypted = encrypt_md5(value, salt) - salt = obj._salt_cache[id] = gen_salt() - encrypted = encrypt_md5(value, salt) + else: + #setting a password to '' is allowed. It can be used to inactivate the classic log-in of the user + #while the access can still be granted by another login method (openid...) + encrypted = '' cr.execute('update res_users set password=%s where id=%s', (encrypted.encode('utf-8'), int(id))) - cr.commit() del value def get_pw( self, cr, uid, ids, name, args, context ): diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css index 07b193c3dc4..47b5506a10f 100644 --- a/addons/base_import/static/src/css/import.css +++ b/addons/base_import/static/src/css/import.css @@ -156,5 +156,11 @@ border-right: 1px solid #D0D0D0; } +.oe_import .oe_import_error_report > p { + background: #efc9cb; +} +.oe_import .select2-results { + font-size: 12px; +} diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js index 043630afc48..407d38dacd7 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/import.js @@ -38,7 +38,7 @@ openerp.base_import = function (instance) { // if true, the 'Import', 'Export', etc... buttons will be shown instance.web.ListView.prototype.defaults.import_enabled = true; instance.web.ListView.include({ - on_loaded: function () { + load_list: function () { var self = this; var add_button = false; if (!this.$buttons) { diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py index 617af125215..867b2207a99 100644 --- a/addons/base_status/base_stage.py +++ b/addons/base_status/base_stage.py @@ -302,50 +302,13 @@ class base_stage(object): rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])], context=context) return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context) - def remind_partner(self, cr, uid, ids, context=None, attach=False): - return self.remind_user(cr, uid, ids, context, attach, - destination=False) - - def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True): - if hasattr(self, 'message_post'): - for case in self.browse(cr, uid, ids, context=context): - if destination: - recipient_id = case.user_id.partner_id.id - else: - if not case.email_from: - return False - recipient_id = self.pool.get('res.partner').find_or_create(cr, uid, case.email_from, context=context) - - body = case.description or "" - for message in case.message_ids: - if message.type == 'email' and message.body: - body = message.body - break - body = self.format_body(body) - attach_to_send = {} - if attach: - attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)]) - attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas']) - attach_to_send = dict(map(lambda x: (x['datas_fname'], x['datas'].decode('base64')), attach_to_send)) - - subject = "Reminder: [%s] %s" % (case.id, case.name) - self.message_post(cr, uid, case.id, body=body, - subject=subject, attachments=attach_to_send, - partner_ids=[recipient_id], context=context) - return True - + def _check(self, cr, uid, ids=False, context=None): """ Function called by the scheduler to process cases for date actions. Must be overriden by inheriting classes. """ return True - def format_body(self, body): - return self.pool.get('base.action.rule').format_body(body) - - def format_mail(self, obj, body): - return self.pool.get('base.action.rule').format_mail(obj, body) - # ****************************** # Notifications # ****************************** diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml index ec98b7922de..6d15099dc5a 100644 --- a/addons/base_vat/base_vat_view.xml +++ b/addons/base_vat/base_vat_view.xml @@ -11,7 +11,7 @@ diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index dd36aa19041..9a90a8022b6 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -85,7 +85,6 @@ Dashboard for CRM will include: 'crm_lead_view.xml', 'crm_lead_menu.xml', - 'crm_meeting_view.xml', 'crm_meeting_menu.xml', 'crm_meeting_shortcut_data.xml', @@ -107,6 +106,7 @@ Dashboard for CRM will include: 'crm_demo.xml', 'crm_lead_demo.xml', 'crm_phonecall_demo.xml', + 'crm_action_rule_demo.xml', ], 'test': [ 'test/process/communication_with_customer.yml', diff --git a/addons/crm/crm.py b/addons/crm/crm.py index d5f5b2511d1..eb602b98c09 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -77,7 +77,7 @@ class crm_case_stage(osv.osv): help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."), '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."), + "For example, if a stage is related to the status '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_action_rule.py b/addons/crm/crm_action_rule.py index 8b1ba655afc..910a1fca169 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -41,24 +41,15 @@ class base_action_rule(osv.osv): 'regex_history' : fields.char('Regular Expression on Case History', size=128), 'act_section_id': fields.many2one('crm.case.section', 'Set Team to'), 'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'), - 'act_mail_to_partner': fields.boolean('Mail to Partner', - help="Check this if you want the rule to send an email to the partner."), } - def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None): - mail_id = super(base_action_rule, self).email_send(cr, uid, obj, emails, body, emailfrom=emailfrom, context=context) - if mail_id and hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id: - reply_to = obj.section_id.alias_id.name_get()[0][1] - self.pool.get('mail.mail').write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context) - return mail_id - def do_check(self, cr, uid, action, obj, context=None): ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context) if hasattr(obj, 'section_id'): ok = ok and (not action.trg_section_id or action.trg_section_id.id == obj.section_id.id) - if hasattr(obj, 'categ_id'): - ok = ok and (not action.trg_categ_id or action.trg_categ_id.id == obj.categ_id.id) + if hasattr(obj, 'categ_ids'): + ok = ok and (not action.trg_categ_id or action.trg_categ_id.id in [x.id for x in obj.categ_ids]) #Cheking for history regex = action.regex_history @@ -80,36 +71,18 @@ class base_action_rule(osv.osv): ok = ok and res_count return ok - def do_action(self, cr, uid, action, model_obj, obj, context=None): + def do_action(self, cr, uid, action, obj, context=None): + res = super(base_action_rule, self).do_action(cr, uid, action, obj, context=context) + model_obj = self.pool.get(action.model_id.model) write = {} if hasattr(action, 'act_section_id') and action.act_section_id: - obj.section_id = action.act_section_id write['section_id'] = action.act_section_id.id - if hasattr(obj, 'email_cc') and action.act_email_cc: - if '@' in (obj.email_cc or ''): - emails = obj.email_cc.split(",") - if obj.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails: - write['email_cc'] = obj.email_cc + ',' + obj.act_email_cc - else: - write['email_cc'] = obj.act_email_cc - - # Put state change by rule in communication history - if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state: - model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context) + if hasattr(action, 'act_categ_id') and action.act_categ_id: + write['categ_ids'] = [4, action.act_categ_id.id] model_obj.write(cr, uid, [obj.id], write, context) - super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) - emails = [] - - if hasattr(obj, 'email_from') and action.act_mail_to_partner: - emails.append(obj.email_from) - emails = filter(None, emails) - if len(emails) and action.act_mail_body: - emails = list(set(emails)) - self.email_send(cr, uid, obj, emails, action.act_mail_body) - return True - + return res def state_get(self, cr, uid, context=None): """Gets available states for crm""" diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml new file mode 100644 index 00000000000..85cb8de1ac9 --- /dev/null +++ b/addons/crm/crm_action_rule_demo.xml @@ -0,0 +1,83 @@ + + + + + + Reminder to User + + True + ir.actions.server + email + object.user_id.email + Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']] + Hello [[object.user_id.name]], +can you check following lead, it's not open since 5 days ? + +Lead: [[object.id ]] +Description: + + [[object.description]] + +Thanks, + + + + + Reminder to Customer + + True + ir.actions.server + email + object.email_from + Reminder on Lead: [[object.id ]] + Hello [[object.partner_id and object.partner_id.name or '']], +your following lead is not open since 5 days. + +Lead: [[object.id ]] +Description: + + [[object.description]] + +Thanks, + + + + + Filter on leads which are draft. + crm.lead + [('state','=','draft')] + + + + + Set Auto Reminder on leads which are not open since 5 days. + + 1 + + create + 5 + day + + + + + Filter on leads which come from USA. + crm.lead + [('country_id','=','United States')] + + + + Set Auto Followers on leads which are urgent and come from USA. + + 2 + urgent.* + + + + + create + 0 + minutes + + + diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml index f2a5f57702d..e21b74de382 100644 --- a/addons/crm/crm_action_rule_view.xml +++ b/addons/crm/crm_action_rule_view.xml @@ -7,53 +7,21 @@ base.action.rule - - - + + + + + + - - - - - - base.action.rule.form2.inherit - base.action.rule - - - - - - - - - - - - - - base.action.rule.form3.inherit - base.action.rule - - - + + - + - - - base.action.rule.form4.inherit - base.action.rule - - - - - - - - diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fbe47c08dca..9ee5aeb2301 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -223,11 +223,11 @@ class crm_lead(base_stage, format_address, osv.osv): 'day_close': fields.function(_compute_day, string='Days to Close', \ multi='day_close', type="float", store=True), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=crm.AVAILABLE_STATES, string="State", readonly=True, - help='The state is set to \'Draft\', when a case is created.\ - If the case is in progress the state is set to \'Open\'.\ - When the case is over, the state is set to \'Done\'.\ - If the case needs to be reviewed then the state is \ + selection=crm.AVAILABLE_STATES, string="Status", readonly=True, + help='The Status is set to \'Draft\', when a case is created.\ + If the case is in progress the Status is set to \'Open\'.\ + When the case is over, the Status is set to \'Done\'.\ + If the case needs to be reviewed then the Status is \ set to \'Pending\'.'), # Only used for type opportunity diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml deleted file mode 100644 index 068f7cfbf64..00000000000 --- a/addons/crm/crm_meeting_view.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - calendar.attendee.form.inherit - calendar.attendee - - - - - - - - - - diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 44894fc881d..bac33815794 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -50,10 +50,10 @@ class crm_phonecall(base_state, osv.osv): ('cancel', 'Cancelled'), ('done', 'Held'),], string='Status', size=16, readonly=True, - help='The state is set to \'Todo\', when a case is created.\ - If the case is in progress the state is set to \'Open\'.\ - When the call is over, the state is set to \'Held\'.\ - If the call needs to be done then the state is set to \'Not Held\'.'), + help='The status is set to \'Todo\', when a case is created.\ + If the case is in progress the status is set to \'Open\'.\ + When the call is over, the status is set to \'Held\'.\ + If the call needs to be done then the status is set to \'Not Held\'.'), 'email_from': fields.char('Email', size=128, help="These people will receive email."), 'date_open': fields.datetime('Opened', readonly=True), # phonecall fields diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index c359aa461e7..30303d4205c 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -123,7 +123,7 @@ OpenERP allows you to easily define all the calls to be done by your sales team and follow up based on their summary.

- You can use the import feature to massicely import a new list of + You can use the import feature to massively import a new list of prospects to qualify.

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 7f18f8d16e4..b6e2f09de68 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -70,19 +70,19 @@ - - - - - + -
TOTAL
+
+
Total
@@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/addons/l10n_ar/l10n_ar_wizard.xml b/addons/l10n_ar/l10n_ar_wizard.xml index 9a2fa377155..3c94d3db7a8 100644 --- a/addons/l10n_ar/l10n_ar_wizard.xml +++ b/addons/l10n_ar/l10n_ar_wizard.xml @@ -2,13 +2,9 @@ - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic - + + open + diff --git a/addons/l10n_at/l10n_chart_at_wizard.xml b/addons/l10n_at/l10n_chart_at_wizard.xml index b23d9be6cb5..efc68ce13e9 100644 --- a/addons/l10n_at/l10n_chart_at_wizard.xml +++ b/addons/l10n_at/l10n_chart_at_wizard.xml @@ -1,12 +1,8 @@ - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_be/l10n_be_wizard.yml b/addons/l10n_be/l10n_be_wizard.yml index 178009be7ff..0b16827225f 100644 --- a/addons/l10n_be/l10n_be_wizard.yml +++ b/addons/l10n_be/l10n_be_wizard.yml @@ -1,10 +1,6 @@ -- - !record {model: ir.actions.todo, id: config_call_account_template}: - action_id: account.action_wizard_multi_chart - type: automatic - !python {model: ir.actions.todo}: | - install_todo = self.browse(cr, uid, ref('l10n_be.config_call_account_template')) + install_todo = self.browse(cr, uid, ref('account.action_wizard_multi_chart_todo')) if install_todo.state == 'open': wiz = self.pool.get('wizard.multi.charts.accounts') values = { diff --git a/addons/l10n_ca/l10n_ca_wizard.xml b/addons/l10n_ca/l10n_ca_wizard.xml index 3bdc380325d..efc68ce13e9 100644 --- a/addons/l10n_ca/l10n_ca_wizard.xml +++ b/addons/l10n_ca/l10n_ca_wizard.xml @@ -1,13 +1,9 @@ - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic - + + open + diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml index 084159aa36d..792bd21a2fc 100644 --- a/addons/l10n_ch/wizard.xml +++ b/addons/l10n_ch/wizard.xml @@ -1,13 +1,7 @@ - - Generate Chart of Accounts for l10n_ch - Generate Chart of Accounts from a Chart Template. Please let the nuber to 0 for Swiss charts. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial - Accounts/Generate Chart of Accounts from a Chart Template. - - 4 - automatic + + open diff --git a/addons/l10n_cl/l10n_cl_wizard.xml b/addons/l10n_cl/l10n_cl_wizard.xml index fd0d29f1edb..bcbd9a43f27 100644 --- a/addons/l10n_cl/l10n_cl_wizard.xml +++ b/addons/l10n_cl/l10n_cl_wizard.xml @@ -1,14 +1,9 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic - + + open + diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml index 0a098120682..6919eb199b6 100644 --- a/addons/l10n_cn/l10n_chart_cn_wizard.xml +++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml index ef37667b318..6919eb199b6 100644 --- a/addons/l10n_cr/l10n_wizard.xml +++ b/addons/l10n_cr/l10n_wizard.xml @@ -1,10 +1,8 @@ - - - - automatic - + + open + diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml index 3a0dcd34bd3..efc68ce13e9 100644 --- a/addons/l10n_de/l10n_de_wizard.xml +++ b/addons/l10n_de/l10n_de_wizard.xml @@ -1,12 +1,9 @@ - - Generiert Kontenplan aus Vorlage - Der Assistent generiert einen Kontenplan auf Basis eines Templates (Vorlage). Sie werden aufgefordert den Namen der Firma einzugeben, sowie die entsprechende Kontenvorlage zu wählen. Ausserdem können Sie für die Initialisierung der Journale die gewünschte Stellenanzahl der Konten, sowie die Hauptwährung Ihres Betriebes auswählen. Dieser Assistent ist identisch mit dem Open ERP Menü Finanzen/Konfiguration/Finanzkonten/Erzeuge Konten aus Vorlage. - - automatic - + + open + diff --git a/addons/l10n_ec/l10n_chart_ec_wizard.xml b/addons/l10n_ec/l10n_chart_ec_wizard.xml index 9906cf9828c..6919eb199b6 100644 --- a/addons/l10n_ec/l10n_chart_ec_wizard.xml +++ b/addons/l10n_ec/l10n_chart_ec_wizard.xml @@ -1,13 +1,8 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic - + + open + diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml index ec30f9e9e25..52aaa88fdab 100644 --- a/addons/l10n_es/l10n_es_wizard.xml +++ b/addons/l10n_es/l10n_es_wizard.xml @@ -1,9 +1,7 @@ - - - - automatic + + open diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml index 897da1d5414..bcbd9a43f27 100644 --- a/addons/l10n_fr/l10n_fr_wizard.xml +++ b/addons/l10n_fr/l10n_fr_wizard.xml @@ -1,12 +1,9 @@ - - - - automatic - + + open + diff --git a/addons/l10n_gr/l10n_gr_wizard.xml b/addons/l10n_gr/l10n_gr_wizard.xml index 4fa564e2155..6919eb199b6 100644 --- a/addons/l10n_gr/l10n_gr_wizard.xml +++ b/addons/l10n_gr/l10n_gr_wizard.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml index 4ba27d6a5c4..8caf6ebe48c 100644 --- a/addons/l10n_gt/l10n_gt_base.xml +++ b/addons/l10n_gt/l10n_gt_base.xml @@ -1,14 +1,8 @@ - - Generar la nomenclatura contable a partir de un modelo - Generar la nomenclatura contable a partir de un modelo. Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios. - - - automatic + + open diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml index a12d93db034..b8b85c3f2a7 100644 --- a/addons/l10n_hn/l10n_hn_base.xml +++ b/addons/l10n_hn/l10n_hn_base.xml @@ -2,13 +2,7 @@ - - Generar la nomenclatura contable a partir de un modelo - Generar la nomenclatura contable a partir de un modelo. Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios. - - + open diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml index 20d35aa09a2..bcbd9a43f27 100644 --- a/addons/l10n_in/l10n_in_wizard.xml +++ b/addons/l10n_in/l10n_in_wizard.xml @@ -1,13 +1,8 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py index 085a2679db2..b7c3926d727 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py @@ -65,7 +65,7 @@ class payroll_advice(osv.osv): ('draft', 'Draft'), ('confirm', 'Confirmed'), ('cancel', 'Cancelled'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), 'number':fields.char('Reference', size=16, readonly=True), 'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True), 'chaque_nos':fields.char('Cheque Numbers', size=256), diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py index 838334913a5..a264368be94 100644 --- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py +++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py @@ -38,7 +38,7 @@ class payment_advice_report(osv.osv): ('draft', 'Draft'), ('confirm', 'Confirmed'), ('cancel', 'Cancelled'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), 'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True), 'nbr': fields.integer('# Payment Lines', readonly=True), 'number':fields.char('Number', size=16, readonly=True), diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py index b688af4329b..a78d9850667 100644 --- a/addons/l10n_in_hr_payroll/report/payslip_report.py +++ b/addons/l10n_in_hr_payroll/report/payslip_report.py @@ -39,7 +39,7 @@ class payslip_report(osv.osv): ('draft', 'Draft'), ('done', 'Done'), ('cancel', 'Rejected'), - ], 'State', readonly=True), + ], 'Status', readonly=True), 'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True), 'nbr': fields.integer('# Payslip lines', readonly=True), 'number': fields.char('Number', size=16, readonly=True), diff --git a/addons/l10n_it/l10n_chart_it_generic.xml b/addons/l10n_it/l10n_chart_it_generic.xml index 52269c71962..792bd21a2fc 100644 --- a/addons/l10n_it/l10n_chart_it_generic.xml +++ b/addons/l10n_it/l10n_chart_it_generic.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml index 32351428bb6..6919eb199b6 100644 --- a/addons/l10n_lu/l10n_lu_wizard.xml +++ b/addons/l10n_lu/l10n_lu_wizard.xml @@ -1,10 +1,8 @@ - - - - automatic - + + open + diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml index 428a17e081a..6919eb199b6 100644 --- a/addons/l10n_ma/l10n_ma_wizard.xml +++ b/addons/l10n_ma/l10n_ma_wizard.xml @@ -1,10 +1,8 @@ - - - - automatic - + + open + diff --git a/addons/l10n_mx/i18n/es_MX.po b/addons/l10n_mx/i18n/es_MX.po index e9822e23498..305ec408af2 100644 --- a/addons/l10n_mx/i18n/es_MX.po +++ b/addons/l10n_mx/i18n/es_MX.po @@ -1,28 +1,41 @@ -# Spanish translation for openobject-addons -# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# Spanish (Mexico) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 # This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2011. +# FIRST AUTHOR , 2012. # msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-01-07 06:07+0000\n" -"PO-Revision-Date: 2011-02-15 15:37+0000\n" +"POT-Creation-Date: 2011-12-23 09:56+0000\n" +"PO-Revision-Date: 2012-10-22 22:58+0000\n" "Last-Translator: FULL NAME \n" -"Language-Team: Spanish \n" +"Language-Team: Spanish (Mexico) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2012-10-24 04:55+0000\n" +"X-Generator: Launchpad (build 16179)\n" #. module: l10n_mx -#: model:ir.module.module,description:l10n_mx.module_meta_information -msgid "" -"This is the module to manage the accounting chart for Mexico in Open ERP." -msgstr "" -"Este es el módulo para gestionar el plan contable para Méjico en Open ERP." +#: model:account.account.type,name:l10n_mx.account_type_receivable +msgid "Receivable" +msgstr "Por cobrar" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_equity +msgid "Equity" +msgstr "Capital" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_tax +msgid "Tax" +msgstr "Impuesto" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_cash +msgid "Cash" +msgstr "Efectivo" #. module: l10n_mx #: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_chart @@ -35,16 +48,28 @@ msgid "" "Management/Configuration/Financial Accounting/Financial Accounts/Generate " "Chart of Accounts from a Chart Template." msgstr "" -"Generar Plan Contable a partir de una plantilla de Plan. Se le preguntará " -"por el nombre de la compañía, la plantilla de plan contable a seguir, el no. " -"de dígitos para generar el código de sus cuentas y la cuenta bancaria, la " -"divisa para crear Diarios. Por lo tanto, la copia exacta de la plantilla de " -"plan contable será generada.\n" -"Este es el mismo asistente que se ejecuta desde Gestión " -"Financiera/Configuración/Contabilidad Financiera/Contabilidad " -"Financiera/Generar Plan Contable a partir de una Plantilla de Plan." #. module: l10n_mx -#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information -msgid "Mexico - Chart of Account" -msgstr "Méjico - Plan Contable" +#: model:account.account.type,name:l10n_mx.account_type_payable +msgid "Payable" +msgstr "A pagar" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_asset +msgid "Asset" +msgstr "Activo" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_income +msgid "Income" +msgstr "Ingreso" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_expense +msgid "Expense" +msgstr "Gasto" + +#. module: l10n_mx +#: model:account.account.type,name:l10n_mx.account_type_view +msgid "View" +msgstr "Vista" diff --git a/addons/l10n_mx/l10n_chart_mx_wizard.xml b/addons/l10n_mx/l10n_chart_mx_wizard.xml index aeea1f3cd69..6919eb199b6 100644 --- a/addons/l10n_mx/l10n_chart_mx_wizard.xml +++ b/addons/l10n_mx/l10n_chart_mx_wizard.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml index bcdd183b12c..6919eb199b6 100644 --- a/addons/l10n_nl/l10n_nl_wizard.xml +++ b/addons/l10n_nl/l10n_nl_wizard.xml @@ -1,19 +1,8 @@ - - - Genereer Grootboekrekingschema vanuit het Nederlandse Grootboek Template - Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen. -* U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind. -* Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren. - -Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen" - -* Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - - automatic - + + open + diff --git a/addons/l10n_pe/l10n_pe_wizard.xml b/addons/l10n_pe/l10n_pe_wizard.xml index e1189fbcc2d..3c94d3db7a8 100644 --- a/addons/l10n_pe/l10n_pe_wizard.xml +++ b/addons/l10n_pe/l10n_pe_wizard.xml @@ -2,12 +2,8 @@ - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_pl/l10n_chart_pl_wizard.xml b/addons/l10n_pl/l10n_chart_pl_wizard.xml index aded9e3b2a3..6919eb199b6 100644 --- a/addons/l10n_pl/l10n_chart_pl_wizard.xml +++ b/addons/l10n_pl/l10n_chart_pl_wizard.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_ro/l10n_chart_ro_wizard.xml b/addons/l10n_ro/l10n_chart_ro_wizard.xml index bafb7b26f82..6919eb199b6 100644 --- a/addons/l10n_ro/l10n_chart_ro_wizard.xml +++ b/addons/l10n_ro/l10n_chart_ro_wizard.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_syscohada/l10n_syscohada_wizard.xml b/addons/l10n_syscohada/l10n_syscohada_wizard.xml index 7174ef438b7..792bd21a2fc 100644 --- a/addons/l10n_syscohada/l10n_syscohada_wizard.xml +++ b/addons/l10n_syscohada/l10n_syscohada_wizard.xml @@ -1,11 +1,7 @@ - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a SYSCOHADA Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic - + + open + diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml index d5885d4b92b..d730caa8404 100644 --- a/addons/l10n_th/account_data.xml +++ b/addons/l10n_th/account_data.xml @@ -643,14 +643,9 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. -This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic - + + open + diff --git a/addons/l10n_tr/l10n_tr_wizard.xml b/addons/l10n_tr/l10n_tr_wizard.xml index e7ae8dc2d82..59668347bed 100644 --- a/addons/l10n_tr/l10n_tr_wizard.xml +++ b/addons/l10n_tr/l10n_tr_wizard.xml @@ -1,16 +1,8 @@ - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be -asked to pass the name of the company, the chart template to follow, the no. of digits to generate -the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of -chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial -Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml index cb947163ab3..1b8d528c0e8 100644 --- a/addons/l10n_uk/l10n_uk_wizard.xml +++ b/addons/l10n_uk/l10n_uk_wizard.xml @@ -1,41 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - wizard.multi.charts.accounts - - - - - - - - - - Generate UK Chart of Accounts from a Chart Template - ir.actions.act_window - wizard.multi.charts.accounts - - form - form - new - - - - - 10 - once + open diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml index 8c306f155fe..6919eb199b6 100644 --- a/addons/l10n_us/l10n_us_wizard.xml +++ b/addons/l10n_us/l10n_us_wizard.xml @@ -1,12 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. - This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - automatic + + open diff --git a/addons/l10n_uy/l10n_uy_wizard.xml b/addons/l10n_uy/l10n_uy_wizard.xml index 6543664b2b6..49cbeca89f9 100644 --- a/addons/l10n_uy/l10n_uy_wizard.xml +++ b/addons/l10n_uy/l10n_uy_wizard.xml @@ -1,9 +1,8 @@ - - - automatic + + open diff --git a/addons/l10n_ve/l10n_chart_ve_wizard.xml b/addons/l10n_ve/l10n_chart_ve_wizard.xml index 823fa833313..6919eb199b6 100644 --- a/addons/l10n_ve/l10n_chart_ve_wizard.xml +++ b/addons/l10n_ve/l10n_chart_ve_wizard.xml @@ -1,15 +1,7 @@ - - - Generate Chart of Accounts from a Chart Template - Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. -This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. -Genere el Plan de cuentas de una Plantilla de Carta. Le pedirán pasar el nombre de la compania, la plantilla de carta para seguir, el no. de digitos para generar el codigo para sus cuentas y cuenta Bancaria, dinero para crear Diarios. Asi, la copia pura de la carta la Plantilla es generada. -Esto es el mismo wizard que corre de la Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - - - automatic + + open diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py index 707ece6a180..a29ee2519d5 100644 --- a/addons/mail/mail_group_menu.py +++ b/addons/mail/mail_group_menu.py @@ -41,7 +41,7 @@ class ir_ui_menu(osv.osv): """ Override to take off menu entries (mail.group) the user is not following. Access are done using SUPERUSER_ID to avoid access rights issues for an internal back-end algorithm. """ - ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False) + ids = super(ir_ui_menu, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False) partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0] follower_obj = self.pool.get('mail.followers') for menu in self.browse(cr, uid, ids, context=context): @@ -52,4 +52,6 @@ class ir_ui_menu(osv.osv): ], context=context) if not sub_ids: ids.remove(menu.id) + if count: + return len(ids) return ids diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 5ef5e14b846..55cc1de1ec0 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -45,7 +45,7 @@ sequence="10"/> - + @@ -79,4 +79,4 @@ - \ No newline at end of file + diff --git a/addons/mail/update.py b/addons/mail/update.py index 9e35391bf52..f571a59440d 100644 --- a/addons/mail/update.py +++ b/addons/mail/update.py @@ -22,7 +22,7 @@ check the logs to see if a message we just received was already logged. """ _PREVIOUS_LOG_CHECK = datetime.timedelta(days=365) -def get_sys_logs(cr, uid): +def get_sys_logs(self, cr, uid): """ Utility method to send a publisher warranty get logs messages. """ @@ -42,7 +42,7 @@ def get_sys_logs(cr, uid): nbr_active_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True), ("date", ">=", limit_date_str)], count=True) user = pool.get("res.users").browse(cr, uid, uid) - web_base_url = safe_eval(self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', 'False')) + web_base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', 'False') msg = { "dbuuid": dbuuid, "nbr_users": nbr_users, @@ -62,6 +62,7 @@ def get_sys_logs(cr, uid): arguments_raw = urllib.urlencode(arguments) url = config.get("publisher_warranty_url") + uo = urllib2.urlopen(url, arguments_raw, **add_arg) result = {} try: @@ -84,8 +85,8 @@ class publisher_warranty_contract(osv.osv): """ try: try: - result = get_sys_logs(cr, uid) - except Exception: + result = get_sys_logs(self, cr, uid) + except Exception, ex: if cron_mode: # we don't want to see any stack trace in cron return False _logger.debug("Exception while sending a get logs messages", exc_info=1) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 87af723f2f9..5e3816419f8 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -150,11 +150,11 @@ class membership_line(osv.osv): 'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True), 'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True), 'state': fields.function(_state, - string='Membership State', type='selection', + string='Membership Status', type='selection', selection=STATE, store = { 'account.invoice': (_get_membership_lines, ['state'], 10), 'res.partner': (_get_partners, ['membership_state'], 12), - }, help="""It indicates the membership state. + }, help="""It indicates the membership status. -Non Member: A member who has not applied for any membership. -Cancelled Member: A member who has cancelled his membership. -Old Member: A member whose membership date has expired. @@ -323,7 +323,7 @@ class Partner(osv.osv): help = 'The price negotiated by the partner'), 'membership_state': fields.function( __get_membership_state, - string = 'Current Membership State', type = 'selection', + string = 'Current Membership Status', type = 'selection', selection = STATE, store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3ae27bf2c41..f8b53583a8c 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -499,12 +499,12 @@ class mrp_production(osv.osv): [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Waiting Goods'), ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')], string='Status', readonly=True, - help="When the production order is created the state is set to 'Draft'.\n\ - If the order is confirmed the state is set to 'Waiting Goods'.\n\ - If any exceptions are there, the state is set to 'Picking Exception'.\n\ - If the stock is available then the state is set to 'Ready to Produce'.\n\ - When the production gets started then the state is set to 'In Production'.\n\ - When the production is over, the state is set to 'Done'."), + help="When the production order is created the status is set to 'Draft'.\n\ + If the order is confirmed the status is set to 'Waiting Goods'.\n\ + If any exceptions are there, the status is set to 'Picking Exception'.\n\ + If the stock is available then the status is set to 'Ready to Produce'.\n\ + When the production gets started then the status is set to 'In Production'.\n\ + When the production is over, the status is set to 'Done'."), 'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True), 'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True), 'user_id':fields.many2one('res.users', 'Responsible'), diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9d1ae9eae8a..8ca4a168c9c 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -668,7 +668,7 @@ - + @@ -692,7 +692,7 @@ - + diff --git a/addons/mrp_subproduct/__init__.py b/addons/mrp_byproduct/__init__.py similarity index 97% rename from addons/mrp_subproduct/__init__.py rename to addons/mrp_byproduct/__init__.py index 5b48431ef16..7e507e0fe0a 100644 --- a/addons/mrp_subproduct/__init__.py +++ b/addons/mrp_byproduct/__init__.py @@ -18,5 +18,5 @@ # along with this program. If not, see . # ############################################################################## -import mrp_subproduct +import mrp_byproduct # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_byproduct/__openerp__.py similarity index 88% rename from addons/mrp_subproduct/__openerp__.py rename to addons/mrp_byproduct/__openerp__.py index 6475cbe4a91..58e7a194771 100644 --- a/addons/mrp_subproduct/__openerp__.py +++ b/addons/mrp_byproduct/__openerp__.py @@ -21,14 +21,14 @@ { - 'name': 'MRP Subproducts', + 'name': 'MRP Byproducts', 'version': '1.0', 'category': 'Manufacturing', 'description': """ This module allows you to produce several products from one production order. ============================================================================= -You can configure sub-products in the bill of material. +You can configure by-products in the bill of material. Without this module: -------------------- @@ -40,14 +40,14 @@ With this module: """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'images': ['images/bom_subproduct.jpeg'], + 'images': ['images/bom_byproduct.jpeg'], 'depends': ['base', 'mrp'], 'data': [ 'security/ir.model.access.csv', - 'mrp_subproduct_view.xml' + 'mrp_byproduct_view.xml' ], 'demo': [], - 'test': ['test/mrp_subproduct.yml'], + 'test': ['test/mrp_byproduct.yml'], 'installable': True, 'auto_install': False, } diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_byproduct/i18n/ab.po similarity index 100% rename from addons/mrp_subproduct/i18n/ab.po rename to addons/mrp_byproduct/i18n/ab.po diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_byproduct/i18n/ar.po similarity index 100% rename from addons/mrp_subproduct/i18n/ar.po rename to addons/mrp_byproduct/i18n/ar.po diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_byproduct/i18n/bg.po similarity index 100% rename from addons/mrp_subproduct/i18n/bg.po rename to addons/mrp_byproduct/i18n/bg.po diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_byproduct/i18n/bs.po similarity index 100% rename from addons/mrp_subproduct/i18n/bs.po rename to addons/mrp_byproduct/i18n/bs.po diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_byproduct/i18n/ca.po similarity index 100% rename from addons/mrp_subproduct/i18n/ca.po rename to addons/mrp_byproduct/i18n/ca.po diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_byproduct/i18n/cs.po similarity index 100% rename from addons/mrp_subproduct/i18n/cs.po rename to addons/mrp_byproduct/i18n/cs.po diff --git a/addons/mrp_subproduct/i18n/da.po b/addons/mrp_byproduct/i18n/da.po similarity index 100% rename from addons/mrp_subproduct/i18n/da.po rename to addons/mrp_byproduct/i18n/da.po diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po similarity index 100% rename from addons/mrp_subproduct/i18n/de.po rename to addons/mrp_byproduct/i18n/de.po diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_byproduct/i18n/es.po similarity index 100% rename from addons/mrp_subproduct/i18n/es.po rename to addons/mrp_byproduct/i18n/es.po diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_byproduct/i18n/es_AR.po similarity index 100% rename from addons/mrp_subproduct/i18n/es_AR.po rename to addons/mrp_byproduct/i18n/es_AR.po diff --git a/addons/mrp_subproduct/i18n/es_CR.po b/addons/mrp_byproduct/i18n/es_CR.po similarity index 100% rename from addons/mrp_subproduct/i18n/es_CR.po rename to addons/mrp_byproduct/i18n/es_CR.po diff --git a/addons/mrp_subproduct/i18n/es_EC.po b/addons/mrp_byproduct/i18n/es_EC.po similarity index 100% rename from addons/mrp_subproduct/i18n/es_EC.po rename to addons/mrp_byproduct/i18n/es_EC.po diff --git a/addons/mrp_subproduct/i18n/es_MX.po b/addons/mrp_byproduct/i18n/es_MX.po similarity index 100% rename from addons/mrp_subproduct/i18n/es_MX.po rename to addons/mrp_byproduct/i18n/es_MX.po diff --git a/addons/mrp_subproduct/i18n/es_VE.po b/addons/mrp_byproduct/i18n/es_VE.po similarity index 100% rename from addons/mrp_subproduct/i18n/es_VE.po rename to addons/mrp_byproduct/i18n/es_VE.po diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_byproduct/i18n/et.po similarity index 100% rename from addons/mrp_subproduct/i18n/et.po rename to addons/mrp_byproduct/i18n/et.po diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_byproduct/i18n/fi.po similarity index 100% rename from addons/mrp_subproduct/i18n/fi.po rename to addons/mrp_byproduct/i18n/fi.po diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po similarity index 100% rename from addons/mrp_subproduct/i18n/fr.po rename to addons/mrp_byproduct/i18n/fr.po diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_byproduct/i18n/gl.po similarity index 100% rename from addons/mrp_subproduct/i18n/gl.po rename to addons/mrp_byproduct/i18n/gl.po diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_byproduct/i18n/hr.po similarity index 100% rename from addons/mrp_subproduct/i18n/hr.po rename to addons/mrp_byproduct/i18n/hr.po diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_byproduct/i18n/hu.po similarity index 100% rename from addons/mrp_subproduct/i18n/hu.po rename to addons/mrp_byproduct/i18n/hu.po diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_byproduct/i18n/id.po similarity index 100% rename from addons/mrp_subproduct/i18n/id.po rename to addons/mrp_byproduct/i18n/id.po diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_byproduct/i18n/it.po similarity index 100% rename from addons/mrp_subproduct/i18n/it.po rename to addons/mrp_byproduct/i18n/it.po diff --git a/addons/mrp_subproduct/i18n/ja.po b/addons/mrp_byproduct/i18n/ja.po similarity index 100% rename from addons/mrp_subproduct/i18n/ja.po rename to addons/mrp_byproduct/i18n/ja.po diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_byproduct/i18n/ko.po similarity index 100% rename from addons/mrp_subproduct/i18n/ko.po rename to addons/mrp_byproduct/i18n/ko.po diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_byproduct/i18n/lt.po similarity index 100% rename from addons/mrp_subproduct/i18n/lt.po rename to addons/mrp_byproduct/i18n/lt.po diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_byproduct/i18n/mn.po similarity index 100% rename from addons/mrp_subproduct/i18n/mn.po rename to addons/mrp_byproduct/i18n/mn.po diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_byproduct/i18n/mrp_subproduct.pot similarity index 100% rename from addons/mrp_subproduct/i18n/mrp_subproduct.pot rename to addons/mrp_byproduct/i18n/mrp_subproduct.pot diff --git a/addons/mrp_subproduct/i18n/nb.po b/addons/mrp_byproduct/i18n/nb.po similarity index 100% rename from addons/mrp_subproduct/i18n/nb.po rename to addons/mrp_byproduct/i18n/nb.po diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_byproduct/i18n/nl.po similarity index 100% rename from addons/mrp_subproduct/i18n/nl.po rename to addons/mrp_byproduct/i18n/nl.po diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_byproduct/i18n/nl_BE.po similarity index 100% rename from addons/mrp_subproduct/i18n/nl_BE.po rename to addons/mrp_byproduct/i18n/nl_BE.po diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_byproduct/i18n/oc.po similarity index 100% rename from addons/mrp_subproduct/i18n/oc.po rename to addons/mrp_byproduct/i18n/oc.po diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_byproduct/i18n/pl.po similarity index 100% rename from addons/mrp_subproduct/i18n/pl.po rename to addons/mrp_byproduct/i18n/pl.po diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_byproduct/i18n/pt.po similarity index 100% rename from addons/mrp_subproduct/i18n/pt.po rename to addons/mrp_byproduct/i18n/pt.po diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_byproduct/i18n/pt_BR.po similarity index 100% rename from addons/mrp_subproduct/i18n/pt_BR.po rename to addons/mrp_byproduct/i18n/pt_BR.po diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_byproduct/i18n/ro.po similarity index 100% rename from addons/mrp_subproduct/i18n/ro.po rename to addons/mrp_byproduct/i18n/ro.po diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_byproduct/i18n/ru.po similarity index 100% rename from addons/mrp_subproduct/i18n/ru.po rename to addons/mrp_byproduct/i18n/ru.po diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_byproduct/i18n/sk.po similarity index 100% rename from addons/mrp_subproduct/i18n/sk.po rename to addons/mrp_byproduct/i18n/sk.po diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_byproduct/i18n/sl.po similarity index 100% rename from addons/mrp_subproduct/i18n/sl.po rename to addons/mrp_byproduct/i18n/sl.po diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_byproduct/i18n/sq.po similarity index 100% rename from addons/mrp_subproduct/i18n/sq.po rename to addons/mrp_byproduct/i18n/sq.po diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_byproduct/i18n/sr.po similarity index 100% rename from addons/mrp_subproduct/i18n/sr.po rename to addons/mrp_byproduct/i18n/sr.po diff --git a/addons/mrp_subproduct/i18n/sr@latin.po b/addons/mrp_byproduct/i18n/sr@latin.po similarity index 100% rename from addons/mrp_subproduct/i18n/sr@latin.po rename to addons/mrp_byproduct/i18n/sr@latin.po diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po similarity index 100% rename from addons/mrp_subproduct/i18n/sv.po rename to addons/mrp_byproduct/i18n/sv.po diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_byproduct/i18n/tlh.po similarity index 100% rename from addons/mrp_subproduct/i18n/tlh.po rename to addons/mrp_byproduct/i18n/tlh.po diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_byproduct/i18n/tr.po similarity index 100% rename from addons/mrp_subproduct/i18n/tr.po rename to addons/mrp_byproduct/i18n/tr.po diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_byproduct/i18n/uk.po similarity index 100% rename from addons/mrp_subproduct/i18n/uk.po rename to addons/mrp_byproduct/i18n/uk.po diff --git a/addons/mrp_subproduct/i18n/vi.po b/addons/mrp_byproduct/i18n/vi.po similarity index 100% rename from addons/mrp_subproduct/i18n/vi.po rename to addons/mrp_byproduct/i18n/vi.po diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po similarity index 100% rename from addons/mrp_subproduct/i18n/zh_CN.po rename to addons/mrp_byproduct/i18n/zh_CN.po diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_byproduct/i18n/zh_TW.po similarity index 100% rename from addons/mrp_subproduct/i18n/zh_TW.po rename to addons/mrp_byproduct/i18n/zh_TW.po diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_byproduct/mrp_byproduct.py similarity index 93% rename from addons/mrp_subproduct/mrp_subproduct.py rename to addons/mrp_byproduct/mrp_byproduct.py index 1475ed091e7..9caf626834a 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_byproduct/mrp_byproduct.py @@ -31,10 +31,10 @@ class mrp_subproduct(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), - 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of subproducts will be set on the production orders using this BoM.\ - 'Fixed' depicts a situation where the quantity of created subproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\ + 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of byproducts will be set on the production orders using this BoM.\ + 'Fixed' depicts a situation where the quantity of created byproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\ By opposition, 'Variable' means that the quantity will be computed as\ - '(quantity of subproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"), + '(quantity of byproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"), 'bom_id': fields.many2one('mrp.bom', 'BoM'), } _defaults={ @@ -71,7 +71,7 @@ class mrp_bom(osv.osv): _inherit='mrp.bom' _columns={ - 'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'sub_products'), + 'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'Byproducts'), } mrp_bom() @@ -118,7 +118,7 @@ class mrp_production(osv.osv): def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None): """Compute the factor to compute the qty of procucts to produce for the given production_id. By default, it's always equal to the quantity encoded in the production order or the production wizard, but with - the module mrp_subproduct installed it can differ for subproducts having type 'variable'. + the module mrp_byproduct installed it can differ for byproducts having type 'variable'. :param production_id: ID of the mrp.order :param move_id: ID of the stock move that needs to be produced. Identify the product to produce. :return: The factor to apply to the quantity that we should produce for the given production order and stock move. diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_byproduct/mrp_byproduct_view.xml similarity index 87% rename from addons/mrp_subproduct/mrp_subproduct_view.xml rename to addons/mrp_byproduct/mrp_byproduct_view.xml index b9e8fcc41ed..32e8a696369 100644 --- a/addons/mrp_subproduct/mrp_subproduct_view.xml +++ b/addons/mrp_byproduct/mrp_byproduct_view.xml @@ -7,15 +7,15 @@ - + - + -
+ diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_byproduct/security/ir.model.access.csv similarity index 100% rename from addons/mrp_subproduct/security/ir.model.access.csv rename to addons/mrp_byproduct/security/ir.model.access.csv diff --git a/addons/mrp_subproduct/test/mrp_subproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml similarity index 100% rename from addons/mrp_subproduct/test/mrp_subproduct.yml rename to addons/mrp_byproduct/test/mrp_byproduct.yml diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 9f6671c3b2b..90330c4c988 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -87,11 +87,11 @@ class mrp_production_workcenter_line(osv.osv): _columns = { 'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('pause','Pending'),('startworking', 'In Progress'),('done','Finished')],'Status', readonly=True, - help="* When a work order is created it is set in 'Draft' state.\n" \ - "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \ - "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \ - "* When the user cancels the work order it will be set in 'Canceled' state.\n" \ - "* When order is completely processed that time it is set in 'Finished' state."), + help="* When a work order is created it is set in 'Draft' status.\n" \ + "* When user sets work order in start mode that time it will be set in 'In Progress' status.\n" \ + "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' status.\n" \ + "* When the user cancels the work order it will be set in 'Canceled' status.\n" \ + "* When order is completely processed that time it is set in 'Finished' status."), 'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'), 'date_planned': fields.datetime('Scheduled Date', select=True), 'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'), diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index c1ac8f809ce..bc9b9413c65 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -131,16 +131,16 @@ class mrp_repair(osv.osv): ('invoice_except','Invoice Exception'), ('done','Repaired') ], 'Status', readonly=True, - help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed repair order. \ - \n* The \'Confirmed\' state is used when a user confirms the repair order. \ - \n* The \'Ready to Repair\' state is used to start to repairing, user can start repairing only after repair order is confirmed. \ - \n* The \'To be Invoiced\' state is used to generate the invoice before or after repairing done. \ - \n* The \'Done\' state is set when repairing is completed.\ - \n* The \'Cancelled\' state is used when user cancel repair order.'), + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed repair order. \ + \n* The \'Confirmed\' status is used when a user confirms the repair order. \ + \n* The \'Ready to Repair\' status is used to start to repairing, user can start repairing only after repair order is confirmed. \ + \n* The \'To be Invoiced\' status is used to generate the invoice before or after repairing done. \ + \n* The \'Done\' status is set when repairing is completed.\ + \n* The \'Cancelled\' status is used when user cancel repair order.'), 'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)]}), 'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}), 'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}), - 'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."), + 'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."), 'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'), 'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'), @@ -707,10 +707,10 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): ('confirmed','Confirmed'), ('done','Done'), ('cancel','Cancelled')], 'Status', required=True, readonly=True, - help=' * The \'Draft\' state is set automatically as draft when repair order in draft state. \ - \n* The \'Confirmed\' state is set automatically as confirm when repair order in confirm state. \ - \n* The \'Done\' state is set automatically when repair order is completed.\ - \n* The \'Cancelled\' state is set automatically when user cancel repair order.'), + help=' * The \'Draft\' status is set automatically as draft when repair order in draft status. \ + \n* The \'Confirmed\' status is set automatically as confirm when repair order in confirm status. \ + \n* The \'Done\' status is set automatically when repair order is completed.\ + \n* The \'Cancelled\' status is set automatically when user cancel repair order.'), } _defaults = { 'state': lambda *a: 'draft', diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 788c301a04f..f219f4111ca 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -66,7 +66,7 @@ class pos_config(osv.osv): 'iface_vkeyboard' : fields.boolean('Virtual KeyBoard Interface'), 'iface_print_via_proxy' : fields.boolean('Print via Proxy'), - 'state' : fields.selection(POS_CONFIG_STATE, 'State', required=True, readonly=True), + 'state' : fields.selection(POS_CONFIG_STATE, 'Status', required=True, readonly=True), 'sequence_id' : fields.many2one('ir.sequence', 'Order IDs Sequence', readonly=True, help="This sequence is automatically created by OpenERP but you can change it "\ "to customize the reference numbers of your orders."), @@ -197,7 +197,7 @@ class pos_session(osv.osv): 'start_at' : fields.datetime('Opening Date', readonly=True), 'stop_at' : fields.datetime('Closing Date', readonly=True), - 'state' : fields.selection(POS_SESSION_STATE, 'State', + 'state' : fields.selection(POS_SESSION_STATE, 'Status', required=True, readonly=True, select=1), diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 66b7e3b6eb5..1ee55f736aa 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -1039,7 +1039,7 @@ - + diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml index 1d89d28c5f9..3671408b760 100644 --- a/addons/point_of_sale/report/pos_payment_report_user.rml +++ b/addons/point_of_sale/report/pos_payment_report_user.rml @@ -194,7 +194,7 @@ Total: - [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]] + [[ formatLang(pos_payment_user_total(data['form']), currency_obj = company.currency_id) or removeParentNode('blockTable')]] diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 1ad03c5ead1..bd174b12fda 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -938,10 +938,11 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.renderElement(); }, addPaymentLine: function(newPaymentLine) { + var self = this; var x = new module.PaymentlineWidget(null, { payment_line: newPaymentLine }); - x.on_delete.add(_.bind(this.deleteLine, this, x)); + x.on('delete_payment_line', self, self.deleteLine); x.appendTo(this.$('#paymentlines')); }, renderElement: function() { diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 47a527a010d..28ab79c65b2 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -142,7 +142,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, click_handler: function() { this.order.selectLine(this.model); - this.on_selected(); + this.trigger('order_line_selected'); }, renderElement: function() { this._super(); @@ -153,10 +153,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, refresh: function(){ this.renderElement(); - this.on_refresh(); + this.trigger('order_line_refreshed'); }, - on_selected: function() {}, - on_refresh: function(){}, }); module.OrderWidget = module.PosBaseWidget.extend({ @@ -230,8 +228,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa model: orderLine, order: this.pos.get('selectedOrder'), }); - line.on_selected.add(_.bind(this.update_numpad, this)); - line.on_refresh.add(_.bind(this.update_summary, this)); + line.on('order_line_selected', self, self.update_numpad); + line.on('order_line_refreshed', self, self.update_summary); line.appendTo($content); }, this)); this.update_numpad(); @@ -303,7 +301,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.payment_line = options.payment_line; this.payment_line.bind('change', this.changedAmount, this); }, - on_delete: function() {}, changeAmount: function(event) { var newAmount; newAmount = event.currentTarget.value; @@ -317,10 +314,13 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.renderElement(); }, renderElement: function() { + var self = this; this.name = this.payment_line.get_cashregister().get('journal_id')[1]; this._super(); this.$('input').keyup(_.bind(this.changeAmount, this)); - this.$('.delete-payment-line').click(this.on_delete); + this.$('.delete-payment-line').click(function() { + self.trigger('delete_payment_line'); + }); }, }); @@ -1055,8 +1055,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.pos.barcode_reader.disconnect(); return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe( _.bind(function(res) { - return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) { - var action = result.result; + return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(action) { action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}}); //self.destroy(); this.do_action(action); diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py index 4e7965f8e97..7c88986169e 100644 --- a/addons/point_of_sale/wizard/pos_session_opening.py +++ b/addons/point_of_sale/wizard/pos_session_opening.py @@ -16,8 +16,8 @@ class pos_session_opening(osv.osv_memory): 'pos_state' : fields.related('pos_session_id', 'state', type='selection', selection=pos_session.POS_SESSION_STATE, - string='Session State', readonly=True), - 'pos_state_str' : fields.char('State', 32, readonly=True), + string='Session Status', readonly=True), + 'pos_state_str' : fields.char('Status', 32, readonly=True), 'show_config' : fields.boolean('Show Config', readonly=True), 'pos_session_name' : fields.related('pos_session_id', 'name', type='char', size=64, readonly=True), diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml index a88c8ce7835..e177b07eab9 100644 --- a/addons/portal_claim/security/portal_security.xml +++ b/addons/portal_claim/security/portal_security.xml @@ -5,7 +5,7 @@ Portal Personal Claims - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in', [user.partner_id.id])] diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml index 316fb1b4a15..1247d25365a 100644 --- a/addons/portal_project/security/portal_security.xml +++ b/addons/portal_project/security/portal_security.xml @@ -5,7 +5,7 @@ Portal Personal Task - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in', [user.partner_id.id])] diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml index d58e160051b..9527f1f9628 100644 --- a/addons/portal_project_issue/security/portal_security.xml +++ b/addons/portal_project_issue/security/portal_security.xml @@ -5,7 +5,7 @@ Portal Personal Issues - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in', [user.partner_id.id])] diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml index 5786fbc52ad..6b25d87b791 100644 --- a/addons/portal_sale/portal_sale_view.xml +++ b/addons/portal_sale/portal_sale_view.xml @@ -13,7 +13,7 @@ tree,form,calendar,graph {"search_default_draft":1} - You dont have any quotation. + You don't have any quotation. @@ -23,7 +23,7 @@ tree,form,calendar,graph {"search_default_sales":1} - You dont have any sale order. + You don't have any sale order. @@ -34,7 +34,7 @@ [('type','=','out')] {'default_type': 'out', 'contact_display': 'partner_address'} - You dont have any delivery order. + You don't have any delivery order. @@ -55,7 +55,7 @@ [('type','=','out_invoice')] {'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'} - You dont have any invoice. + You don't have any invoice. @@ -65,7 +65,7 @@ {'type':'receipt'} current - You dont have any payment. + You don't have any payment. Portal Personal Quotations/Sales Orders - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in',[user.partner_id.id])] Portal Personal Delivery Orders - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in',[user.partner_id.id])] Portal Personal Delivery Orders Out - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in',[user.partner_id.id])] Portal Personal Account Invoices - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in',[user.partner_id.id])] Portal Personal Payments - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in',[user.partner_id.id])] Portal Personal Contacts - [('message_follower_ids','in',user.partner_id.id)] + [('message_follower_ids','in',[user.partner_id.id])] diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js index c214dbb0fdf..2405f6d2aa5 100644 --- a/addons/process/static/src/js/process.js +++ b/addons/process/static/src/js/process.js @@ -176,6 +176,11 @@ instance.web.ViewManager.include({ var notes = new_notes.substring(0,60) +'..'; } r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"}); + r['image']('/web/static/src/img/icons/gtk-info.png', nodes.x, nodes.y+75, 16, 16) + .attr({"cursor": "pointer", "title": "Help"}) + .click(function() { + window.open(nodes.url || "http://doc.openerp.com/v6.1/index.php?model=" + nodes.model); + }); if(nodes.menu) { r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16) .attr({"cursor": "pointer", "title": nodes.menu.name}) diff --git a/addons/process/static/src/xml/process.xml b/addons/process/static/src/xml/process.xml index b1a39aa6ce8..d6229b686f3 100644 --- a/addons/process/static/src/xml/process.xml +++ b/addons/process/static/src/xml/process.xml @@ -16,7 +16,7 @@

- () + ()

@@ -25,7 +25,7 @@ -

+

diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po index b4541872669..be374ec29cd 100644 --- a/addons/procurement/i18n/ru.po +++ b/addons/procurement/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-08-30 18:15+0000\n" +"PO-Revision-Date: 2012-10-24 16:47+0000\n" "Last-Translator: Chertykov Denis \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: 2012-10-19 05:32+0000\n" -"X-Generator: Launchpad (build 16165)\n" +"X-Launchpad-Export-Date: 2012-10-25 05:35+0000\n" +"X-Generator: Launchpad (build 16179)\n" #. module: procurement #: view:make.procurement:0 @@ -51,7 +51,7 @@ msgstr "Группировать по ..." #. module: procurement #: help:stock.warehouse.orderpoint,procurement_draft_ids:0 msgid "Draft procurement of the product and location of that orderpoint" -msgstr "Черновик закупки ТМЦ и положение точки заказа" +msgstr "Черновик снабжения ТМЦ и положение точки заказа" #. module: procurement #: code:addons/procurement/procurement.py:291 @@ -380,8 +380,7 @@ msgstr "Количество" #: code:addons/procurement/procurement.py:379 #, python-format msgid "Not enough stock and no minimum orderpoint rule defined." -msgstr "" -"Не достаточный запас и не определено правило минимальной точки заказа." +msgstr "Не достаточен запас и нет правила минимума точки заказа." #. module: procurement #: code:addons/procurement/procurement.py:137 diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index b21cef30773..55a291bd3c2 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -113,8 +113,8 @@ class procurement_order(osv.osv): ('ready','Ready'), ('done','Done'), ('waiting','Waiting')], 'Status', required=True, - help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\ - \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'), + help='When a procurement is created the status is set to \'Draft\'.\n If the procurement is confirmed, the status is set to \'Confirmed\'.\ + \nAfter confirming the status is set to \'Running\'.\n If any exception arises in the order then the status is set to \'Exception\'.\n Once the exception is removed the status becomes \'Ready\'.\n It is in \'Waiting\'. status when the procurement is waiting for another one to finish.'), 'note': fields.text('Note'), 'company_id': fields.many2one('res.company','Company',required=True), } diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml index 2e72dfdbadc..321f05bb223 100644 --- a/addons/procurement/wizard/schedulers_all_view.xml +++ b/addons/procurement/wizard/schedulers_all_view.xml @@ -2,10 +2,10 @@ - + - Compute Schedulers + Run Schedulers procurement.order.compute.all @@ -13,7 +13,7 @@
-
@@ -21,7 +21,7 @@ - - + @@ -236,7 +236,7 @@

Click to define a new product.

- You must define a product for everything you sell, wether it's + You must define a product for everything you sell, whether it's a physical product, a consumable or a service you offer to customers.

@@ -284,7 +284,7 @@

Click to define a new product.

- You must define a product for everything you purchase, wheter + You must define a product for everything you purchase, whether it's a physical product, a consumable or services you buy to subcontractants.

diff --git a/addons/product_expiry/i18n/ru.po b/addons/product_expiry/i18n/ru.po index 86ccf672713..186124080e5 100644 --- a/addons/product_expiry/i18n/ru.po +++ b/addons/product_expiry/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2010-11-22 07:21+0000\n" +"PO-Revision-Date: 2012-10-24 05:12+0000\n" "Last-Translator: Chertykov Denis \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: 2012-10-19 05:28+0000\n" -"X-Generator: Launchpad (build 16165)\n" +"X-Launchpad-Export-Date: 2012-10-25 05:35+0000\n" +"X-Generator: Launchpad (build 16179)\n" #. module: product_expiry #: model:ir.model,name:product_expiry.model_stock_production_lot @@ -162,7 +162,7 @@ msgstr "" #. module: product_expiry #: field:product.product,alert_time:0 msgid "Product Alert Time" -msgstr "" +msgstr "Время оповещения товара" #~ msgid "" #~ "Error: The default UOM and the purchase UOM must be in the same category." diff --git a/addons/project/project.py b/addons/project/project.py index 9a022fffa90..3b0057c67b7 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -721,11 +721,11 @@ class task(base_stage, osv.osv): 'stage_id': fields.many2one('project.task.type', 'Stage', domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=_TASK_STATE, string="State", readonly=True, - help='The state is set to \'Draft\', when a case is created.\ - If the case is in progress the state is set to \'Open\'.\ - When the case is over, the state is set to \'Done\'.\ - If the case needs to be reviewed then the state is \ + selection=_TASK_STATE, string="Status", readonly=True, + help='The status is set to \'Draft\', when a case is created.\ + If the case is in progress the status is set to \'Open\'.\ + When the case is over, the status is set to \'Done\'.\ + If the case needs to be reviewed then the status is \ set to \'Pending\'.'), 'categ_ids': fields.many2many('project.category', string='Tags'), 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', @@ -777,7 +777,6 @@ class task(base_stage, osv.osv): _defaults = { 'stage_id': _get_default_stage_id, 'project_id': _get_default_project_id, - 'state': 'draft', 'kanban_state': 'normal', 'priority': '2', 'progress': 0, @@ -1030,7 +1029,6 @@ class task(base_stage, osv.osv): 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False, 'planned_hours': delegate_data['planned_hours'] or 0.0, 'parent_ids': [(6, 0, [task.id])], - 'state': 'draft', 'description': delegate_data['new_task_description'] or '', 'child_ids': [], 'work_ids': [] diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d7aaee96f2f..0de5e1773b1 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -378,20 +378,18 @@

- - -
@@ -417,10 +415,10 @@ - - + + @@ -788,7 +786,6 @@ - res.company.task.config diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 6c86fbbb198..1467ce55fab 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -77,7 +77,7 @@ - +