diff options
| author | Amit Patel <apa@tinyerp.com> | 2012-10-25 12:31:33 +0530 |
|---|---|---|
| committer | Amit Patel <apa@tinyerp.com> | 2012-10-25 12:31:33 +0530 |
| commit | 3e4e8006de2c4eb4ab77bbc3692ba0b9d3d4e4c8 (patch) | |
| tree | f9ec948c2332fbbfc7458e903d534526a50297cc | |
| parent | b59e7d17ed945dfadaf9f6140789bb2ecbca2617 (diff) | |
| parent | 013f14931bdc13c63fa6e169cf7fff364d5dda5a (diff) | |
[MERGE]:trunk
bzr revid: apa@tinyerp.com-20121025070133-x6g4can9le7p4d5z
167 files changed, 534 insertions, 657 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index 3e07f151de3..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), 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 1f0ce38a017..5ed373456f3 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -168,12 +168,15 @@ context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" domain="[('supplier', '=', True)]"/> <field name="fiscal_position" widget="selection"/> - <field name="origin"/> - <label for="reference_type"/> - <div> + <group> + <field name="origin"/> + <field name="supplier_invoice_number"/> + </group> + <label for="reference_type"/> + <div> <field name="reference_type" class="oe_inline oe_edit_only"/> <field name="reference" class="oe_inline"/> - </div> + </div> </group> <group> <field name="date_invoice"/> @@ -445,7 +448,7 @@ <field name="model">account.invoice</field> <field name="arch" type="xml"> <search string="Search Invoice"> - <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/> + <field name="number" string="Invoice" filter_domain="['|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self)]"/> <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/> <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/> <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1b614a1ee85..d9e95f15079 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1862,7 +1862,7 @@ <field name="model_id"/> <group expand="0" string="Group By..."> <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/> - <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> </field> @@ -2414,32 +2414,6 @@ <field name="view_mode">form</field> <field name="target">new</field> </record> - <record id="ir_actions_server_action_wizard_multi_chart" model="ir.actions.server"> - <field name="type">ir.actions.server</field> - <field name="condition">True</field> - <field name="state">code</field> - <field name="model_id" ref="base.model_ir_actions_todo"/> - <field eval="5" name="sequence"/> - <field name="code"> -# check for unconfigured companies -account_installer_obj = self.pool.get('account.installer') -account_installer_obj.check_unconfigured_cmp(cr, uid, context=context) -action_ids = [] -# fetch the act_window actions related to chart of account configuration -# we use ir.actions.todo to enable the possibility for other modules to insert their own -# wizards during the configuration process -ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_wizard_multi_chart') -if ref: - action_ids += [ref[1]] -ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_account_configuration_installer') -if ref: - action_ids += [ref[1]] -todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', action_ids)], context=context) -pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context) -action = pool.get('res.config').next(cr, uid, [], context) -</field> - <field name="name">New Company Financial Setting</field> - </record> <record id="account_account_graph" model="ir.ui.view"> <field name="name">account.account.graph</field> diff --git a/addons/account/installer.py b/addons/account/installer.py index 6173ea9213e..05a0f6b455e 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -119,15 +119,6 @@ class account_installer(osv.osv_memory): self.execute_simple(cr, uid, ids, context) super(account_installer, self).execute(cr, uid, ids, context=context) - def action_next(self, cr, uid, ids, context=None): - next = self.execute(cr, uid, ids, context=context) - for installer in self.browse(cr, uid, ids, context=context): - if installer.charts == 'l10n_be': - return {'type': 'ir.actions.act_window_close'} - else : - if next : return next - return self.next(cr, uid, ids, context=context) - def execute_simple(self, cr, uid, ids, context=None): if context is None: context = {} diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 00d5e520c42..fa2d071695b 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -91,7 +91,7 @@ class account_invoice_report(osv.osv): ('open','Open'), ('paid','Done'), ('cancel','Cancelled') - ], 'Invoice State', readonly=True), + ], 'Invoice Status', readonly=True), 'date_due': fields.date('Due Date', readonly=True), 'account_id': fields.many2one('account.account', 'Account',readonly=True), 'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True), diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 4c6f9b7a637..585798a5235 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -226,9 +226,9 @@ class account_asset_asset(osv.osv): 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'), 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', required=True, - help="When an asset is created, the state is 'Draft'.\n" \ - "If the asset is confirmed, the state goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \ - "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that state."), + help="When an asset is created, the status is 'Draft'.\n" \ + "If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \ + "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."), 'active': fields.boolean('Active'), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}), 'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\ diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index fceff99b3f2..0f6dca56d15 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -95,7 +95,7 @@ class payment_order(osv.osv): ('cancel', 'Cancelled'), ('open', 'Confirmed'), ('done', 'Done')], 'Status', select=True, - help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'), + help='When an order is placed the status is \'Draft\'.\n Once the bank is confirmed the status is set to \'Confirmed\'.\n Then the order is paid the status is \'Done\'.'), 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}), 'total': fields.function(_total, string="Total", type='float'), 'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}), diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 3ae421308b5..f25318727df 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -293,10 +293,10 @@ class account_voucher(osv.osv): ('proforma','Pro-forma'), ('posted','Posted') ], 'Status', readonly=True, size=32, - help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \ - \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \ - \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \ - \n* The \'Cancelled\' state is used when user cancel voucher.'), + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Voucher. \ + \n* The \'Pro-forma\' when voucher is in Pro-forma status,voucher does not have an voucher number. \ + \n* The \'Posted\' status is used when user create voucher,a voucher number is generated and voucher entries are created in account \ + \n* The \'Cancelled\' status is used when user cancel voucher.'), 'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}), 'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}), 'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."), diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index 53aa5cd4a0d..fdadfc6bc94 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -52,7 +52,7 @@ class sale_receipt_report(osv.osv): ('proforma','Pro-forma'), ('posted','Posted'), ('cancel','Cancelled') - ], 'Voucher State', readonly=True), + ], 'Voucher Status', readonly=True), 'pay_now':fields.selection([ ('pay_now','Pay Directly'), ('pay_later','Pay Later or Group Funds'), diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 1ce483a26cd..5ea8c59b848 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -255,27 +255,27 @@ class account_analytic_account(osv.osv): if context is None: context={} if context.get('current_model') == 'project.project': - cr.execute("select analytic_account_id from project_project") - project_ids = [x[0] for x in cr.fetchall()] + project_obj = self.pool.get("account.analytic.account") + project_ids = project_obj.search(cr, uid, args) return self.name_get(cr, uid, project_ids, context=context) if name: - account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context) - if not account: + account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context) + if not account_ids: names=map(lambda i : i.strip(),name.split('/')) for i in range(len(names)): dom=[('name', operator, names[i])] if i>0: - dom+=[('id','child_of',account)] - account = self.search(cr, uid, dom, limit=limit, context=context) - newacc = account + dom+=[('id','child_of',account_ids)] + account_ids = self.search(cr, uid, dom, limit=limit, context=context) + newacc = account_ids while newacc: newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context) - account += newacc + account_ids += newacc if args: - account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context) + account_ids = self.search(cr, uid, [('id', 'in', account_ids)] + args, limit=limit, context=context) else: - account = self.search(cr, uid, args, limit=limit, context=context) - return self.name_get(cr, uid, account, context=context) + account_ids = self.search(cr, uid, args, limit=limit, context=context) + return self.name_get(cr, uid, account_ids, context=context) def create(self, cr, uid, vals, context=None): contract = super(account_analytic_account, self).create(cr, uid, vals, context=context) diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index 8834645c460..2326a4184ae 100644 --- a/addons/anonymization/anonymization.py +++ b/addons/anonymization/anonymization.py @@ -32,13 +32,23 @@ import datetime from osv import fields, osv from tools.translate import _ +from itertools import groupby +from operator import itemgetter + FIELD_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('not_existing', 'Not Existing')] ANONYMIZATION_STATES = FIELD_STATES + [('unstable', 'Unstable')] +WIZARD_ANONYMIZATION_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('unstable', 'Unstable')] ANONYMIZATION_HISTORY_STATE = [('started', 'Started'), ('done', 'Done'), ('in_exception', 'Exception occured')] ANONYMIZATION_DIRECTION = [('clear -> anonymized', 'clear -> anonymized'), ('anonymized -> clear', 'anonymized -> clear')] +def group(lst, cols): + if isinstance(cols, basestring): + cols = [cols] + return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=itemgetter(*cols)), itemgetter(*cols))) + + class ir_model_fields_anonymization(osv.osv): _name = 'ir.model.fields.anonymization' _rec_name = 'field_id' @@ -207,8 +217,6 @@ class ir_model_fields_anonymization(osv.osv): 'state': lambda *a: 'clear', } -ir_model_fields_anonymization() - class ir_model_fields_anonymization_history(osv.osv): _name = 'ir.model.fields.anonymization.history' @@ -223,8 +231,6 @@ class ir_model_fields_anonymization_history(osv.osv): 'filepath': fields.char(string='File path', size=256, readonly=True), } -ir_model_fields_anonymization_history() - class ir_model_fields_anonymize_wizard(osv.osv_memory): _name = 'ir.model.fields.anonymize.wizard' @@ -250,8 +256,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): 'name': fields.char(size=64, string='File Name'), 'summary': fields.function(_get_summary, type='text', string='Summary'), 'file_export': fields.binary(string='Export'), - 'file_import': fields.binary(string='Import'), - 'state': fields.function(_get_state, string='Status', type='selection', selection=ANONYMIZATION_STATES, readonly=False), + 'file_import': fields.binary(string='Import', help="This is the file created by the anonymization process. It should have the '.pickle' extention."), + 'state': fields.function(_get_state, string='Status', type='selection', selection=WIZARD_ANONYMIZATION_STATES, readonly=False), 'msg': fields.text(string='Message'), } @@ -319,6 +325,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): # clicked in the menu and the fields are already anonymized placeholder.addnext(etree.Element('newline')) placeholder.addnext(etree.Element('field', {'name': 'file_import', 'required': "1"})) + placeholder.addnext(etree.Element('label', {'string': 'Anonymization file'})) eview.remove(placeholder) elif step == 'just_anonymized': # we just ran the anonymization process, we need the file export field @@ -500,7 +507,6 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): def reverse_anonymize_database(self, cr, uid, ids, context=None): """Set the 'clear' state to defined fields""" - ir_model_fields_anonymization_model = self.pool.get('ir.model.fields.anonymization') anonymization_history_model = self.pool.get('ir.model.fields.anonymization.history') @@ -524,23 +530,46 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): wizards = self.browse(cr, uid, ids, context=context) for wizard in wizards: if not wizard.file_import: - msg = "It is not possible to reverse the anonymization process without supplying anonymization export file." + msg = "It is not possible to reverse the anonymization process without supplying the anonymization export file." self._raise_after_history_update(cr, uid, history_id, 'Error !', msg) # reverse the anonymization: # load the pickle file content into a data structure: data = pickle.loads(base64.decodestring(wizard.file_import)) + migration_fix_obj = self.pool.get('ir.model.fields.anonymization.migration.fix') + fix_ids = migration_fix_obj.search(cr, uid, [('target_version', '=', '7.0')]) + fixes = migration_fix_obj.read(cr, uid, fix_ids, ['model_name', 'field_name', 'query', 'query_type', 'sequence']) + fixes = group(fixes, ('model_name', 'field_name')) + for line in data: table_name = self.pool.get(line['model_id'])._table - sql = "update %(table)s set %(field)s = %%(value)s where id = %%(id)s" % { - 'table': table_name, - 'field': line['field_id'], - } - cr.execute(sql, { - 'value': line['value'], - 'id': line['id'] - }) + + # check if custom sql exists: + key = (line['model_id'], line['field_id']) + custom_updates = fixes.get(key) + if custom_updates: + custom_updates.sort(itemgetter('sequence')) + queries = [(record['query'], record['query_type']) for record in custom_updates if record['query_type']] + else: + queries = [("update %(table)s set %(field)s = %%(value)s where id = %%(id)s" % { + 'table': table_name, + 'field': line['field_id'], + }, 'sql')] + + for query in queries: + if query[1] == 'sql': + sql = query[0] + cr.execute(sql, { + 'value': line['value'], + 'id': line['id'] + }) + elif query[1] == 'python': + raw_code = query[0] + code = raw_code % line + eval(code) + else: + raise Exception("Unknown query type '%s'. Valid types are: sql, python." % (query['query_type'], )) # update the anonymization fields: ir_model_fields_anonymization_model = self.pool.get('ir.model.fields.anonymization') @@ -589,7 +618,19 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): res = None return res -ir_model_fields_anonymize_wizard() +class ir_model_fields_anonymization_migration_fix(osv.osv): + _name = 'ir.model.fields.anonymization.migration.fix' + _order = "sequence" + + _columns = { + 'target_version': fields.char('Target Version'), + 'model_name': fields.char('Model'), + 'field_name': fields.char('Field'), + 'query': fields.text('Query'), + 'query_type': fields.selection(string='Query', selection=[('sql', 'sql'), ('python', 'python')]), + 'sequence': fields.integer('Sequence'), + } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml index 1a6c6c355d5..fca112eb266 100644 --- a/addons/anonymization/anonymization_view.xml +++ b/addons/anonymization/anonymization_view.xml @@ -14,7 +14,6 @@ <field name="model_id" on_change="onchange_model_id(model_id)" /> <field name="model_name" on_change="onchange_model_name(model_name)" /> <field name="field_id" - on_change="onchange_field_id(field_id, model_name)" domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" /> <field name="field_name" on_change="onchange_field_name(field_name, model_name)" /> diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 59196c4da87..69eee4f18e0 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -138,7 +138,7 @@ class res_users(osv.Model): for user in self.browse(cr, uid, ids, context)) _columns = { - 'state': fields.function(_get_state, string='State', type='selection', + 'state': fields.function(_get_state, string='Status', type='selection', selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]), } 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/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 @@ </h2> </div> <notebook> - <page string="Meeting Detail"> + <page string="Meeting Details"> <group> <group> <field name="date" string="Starting at"/> 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_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 @@ <label for="vat"/> <div> <field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701" class="oe_inline"/> - <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_inline"/> + <button colspan="2" name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/> <field name="vat_subjected" class="oe_inline"/> </div> </field> 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_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_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_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 60cde56ae1d..d6f0ed883c8 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -50,7 +50,7 @@ class crm_claim_stage(osv.osv): 'sequence': fields.integer('Sequence', help="Used to order stages. Lower is better."), 'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections', help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."), - 'state': fields.selection(crm.AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."), + 'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."), 'case_refused': fields.boolean('Refused stage', help='Refused stages are specific stages for done.'), 'case_default': fields.boolean('Common to All Teams', @@ -108,11 +108,11 @@ class crm_claim(base_stage, osv.osv): domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), 'cause': fields.text('Root Cause'), '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\'.'), } diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po index 88435961627..d92bca12fa9 100644 --- a/addons/crm_claim/i18n/ru.po +++ b/addons/crm_claim/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2011-03-16 00:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-10-24 05:01+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\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:33+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: crm_claim #: field:crm.claim.report,nbr:0 @@ -85,12 +85,12 @@ msgstr "" #: code:addons/crm_claim/crm_claim.py:132 #, python-format msgid "The claim '%s' has been opened." -msgstr "" +msgstr "Претензия '%s' была открыта" #. module: crm_claim #: view:crm.claim:0 msgid "Date Closed" -msgstr "" +msgstr "Дата закрытия" #. module: crm_claim #: view:crm.claim.report:0 @@ -151,12 +151,12 @@ msgstr "Ссылка" #. module: crm_claim #: view:crm.claim.report:0 msgid "Date of claim" -msgstr "" +msgstr "Дата претензии" #. module: crm_claim #: view:crm.claim:0 msgid "All pending Claims" -msgstr "" +msgstr "Все ожидающие претензии" #. module: crm_claim #: view:crm.claim.report:0 @@ -187,7 +187,7 @@ msgstr "Контрагент" #. module: crm_claim #: view:crm.claim.report:0 msgid "Month of claim" -msgstr "" +msgstr "Месяц претензии" #. module: crm_claim #: selection:crm.claim,type_action:0 @@ -227,7 +227,7 @@ msgstr "Отправить новое эл. письмо" #: selection:crm.claim,state:0 #: view:crm.claim.report:0 msgid "New" -msgstr "" +msgstr "Новый" #. module: crm_claim #: view:crm.claim:0 @@ -254,7 +254,7 @@ msgstr "Следующее действие" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Мои отделы продаж" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim3 @@ -321,7 +321,7 @@ msgstr "Контакт" #. module: crm_claim #: view:crm.claim.report:0 msgid "Month-1" -msgstr "" +msgstr "Месяц-1" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim @@ -380,7 +380,7 @@ msgstr "Дата изменения" #. module: crm_claim #: view:crm.claim.report:0 msgid "Year of claim" -msgstr "" +msgstr "Год претензи" #. module: crm_claim #: view:crm.claim.report:0 @@ -402,7 +402,7 @@ msgstr "Значение претензии" #. module: crm_claim #: view:crm.claim:0 msgid "Responsible User" -msgstr "" +msgstr "Ответственный пользователь" #. module: crm_claim #: help:crm.claim,email_cc:0 @@ -474,7 +474,7 @@ msgstr "Июнь" #. module: crm_claim #: view:res.partner:0 msgid "Partners Claim" -msgstr "" +msgstr "Претензии партнера" #. module: crm_claim #: field:crm.claim,partner_phone:0 @@ -489,7 +489,7 @@ msgstr "Пользователь" #. module: crm_claim #: field:crm.claim,active:0 msgid "Active" -msgstr "" +msgstr "Активен" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -621,13 +621,13 @@ msgstr "Открыть" #. module: crm_claim #: view:crm.claim:0 msgid "New Claims" -msgstr "" +msgstr "Новые претензии" #. module: crm_claim #: view:crm.claim:0 #: selection:crm.claim,state:0 msgid "In Progress" -msgstr "Выполняется" +msgstr "В работе" #. module: crm_claim #: view:crm.claim:0 @@ -638,17 +638,17 @@ msgstr "Ответственный" #. module: crm_claim #: view:crm.claim.report:0 msgid "Claims created in current year" -msgstr "" +msgstr "Претензии созданные в текущем году" #. module: crm_claim #: view:crm.claim:0 msgid "Unassigned Claims" -msgstr "" +msgstr "Не назначенные претензии" #. module: crm_claim #: view:crm.claim.report:0 msgid "Claims created in current month" -msgstr "" +msgstr "Претензии созданные в текущем месяце" #. module: crm_claim #: field:crm.claim.report,delay_expected:0 @@ -718,7 +718,7 @@ msgstr "Выполненные действия" #. module: crm_claim #: view:crm.claim.report:0 msgid "Claims created in last month" -msgstr "" +msgstr "Претензии созданные в прошлом месяце" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim5 @@ -760,7 +760,7 @@ msgstr "Год" #. module: crm_claim #: view:crm.claim.report:0 msgid "My company" -msgstr "" +msgstr "Моя компания" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -780,7 +780,7 @@ msgstr "Идентификатор" #. module: crm_claim #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников." #. module: crm_claim #: view:crm.claim:0 @@ -810,7 +810,7 @@ msgstr "Дата создания" #. module: crm_claim #: view:crm.claim:0 msgid "In Progress Claims" -msgstr "" +msgstr "Претензии \"В работе\"" #~ msgid "Probability" #~ msgstr "Вероятность" diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index ceffd282aa8..ddf624c03ac 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -73,10 +73,10 @@ class crm_helpdesk(base_state, base_stage, osv.osv): ('object_id.model', '=', 'crm.helpdesk')]"), 'duration': fields.float('Duration', states={'done': [('readonly', True)]}), 'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True, - help='The state is set to \'Draft\', when a case is created.\ - \nIf the case is in progress the state is set to \'Open\'.\ - \nWhen the case is over, the state is set to \'Done\'.\ - \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), + help='The status is set to \'Draft\', when a case is created.\ + \nIf the case is in progress the status is set to \'Open\'.\ + \nWhen the case is over, the status is set to \'Done\'.\ + \nIf the case needs to be reviewed then the status is set to \'Pending\'.'), } _defaults = { diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po index c0338447d34..452bdda501b 100644 --- a/addons/crm_helpdesk/i18n/ru.po +++ b/addons/crm_helpdesk/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2010-12-20 08:54+0000\n" +"PO-Revision-Date: 2012-10-24 05:08+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\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:34+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: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -46,7 +46,7 @@ msgstr "Март" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current year" -msgstr "" +msgstr "Запросы на техподдержку в текущем году" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -80,7 +80,7 @@ msgstr "Добавить внутреннею заметку" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Date of helpdesk requests" -msgstr "" +msgstr "Дата запросов техподдержки" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -95,7 +95,7 @@ msgstr "Сообщения" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My company" -msgstr "" +msgstr "Моя компания" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 @@ -156,7 +156,7 @@ msgstr "Раздел" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in last month" -msgstr "" +msgstr "последний месяц" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -166,14 +166,14 @@ msgstr "Отправить новое эл. письмо" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Helpdesk requests during last 7 days" -msgstr "" +msgstr "Запросы на техподдержку за последние 7 дней" #. module: crm_helpdesk #: view:crm.helpdesk:0 #: selection:crm.helpdesk,state:0 #: view:crm.helpdesk.report:0 msgid "New" -msgstr "" +msgstr "Новый" #. module: crm_helpdesk #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report @@ -207,7 +207,7 @@ msgstr "# Писем" #: view:crm.helpdesk:0 #: view:crm.helpdesk.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Мои отделы продаж" #. module: crm_helpdesk #: field:crm.helpdesk,create_date:0 @@ -252,7 +252,7 @@ msgstr "Категории" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "New Helpdesk Request" -msgstr "" +msgstr "Новый запрос техподдержки" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -267,13 +267,13 @@ msgstr "Даты" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month of helpdesk requests" -msgstr "" +msgstr "Месяц запросов техподдержки" #. module: crm_helpdesk #: code:addons/crm_helpdesk/crm_helpdesk.py:101 #, python-format msgid "No Subject" -msgstr "" +msgstr "Без темы" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -283,12 +283,12 @@ msgstr "№ техподдержки" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "All pending Helpdesk Request" -msgstr "" +msgstr "Все ожидающие запросы техподдержки" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Year of helpdesk requests" -msgstr "" +msgstr "Год запросов техподдержки" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -324,7 +324,7 @@ msgstr "Дата изменения" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current month" -msgstr "" +msgstr "Запросы техподдержки в текущем месяце" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -345,7 +345,7 @@ msgstr "Категория" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Responsible User" -msgstr "" +msgstr "Ответственный пользователь" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -361,7 +361,7 @@ msgstr "Планируемые затраты" #. module: crm_helpdesk #: help:crm.helpdesk,channel_id:0 msgid "Communication channel." -msgstr "" +msgstr "Канал общения" #. module: crm_helpdesk #: help:crm.helpdesk,email_cc:0 @@ -575,7 +575,7 @@ msgstr "Дерево поддержи" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 msgid "In Progress" -msgstr "" +msgstr "В работе" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -660,7 +660,7 @@ msgstr "Название" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month-1" -msgstr "" +msgstr "Месяц-1" #. module: crm_helpdesk #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main @@ -699,17 +699,17 @@ msgstr "" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Todays's Helpdesk Requests" -msgstr "" +msgstr "Запросы техподдержки за сегодня" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Request Date" -msgstr "" +msgstr "Дата запроса" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Open Helpdesk Request" -msgstr "" +msgstr "Открыть запрос техподдержки" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py index 9134f427c5d..69b2ba406ca 100644 --- a/addons/crm_partner_assign/partner_geo_assign.py +++ b/addons/crm_partner_assign/partner_geo_assign.py @@ -87,7 +87,7 @@ class res_partner(osv.osv): help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"), 'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\ 'Assigned Opportunities'), - 'grade_id': fields.many2one('res.partner.grade', 'Partner Grade'), + 'grade_id': fields.many2one('res.partner.grade', 'Partner Level'), 'activation' : fields.many2one('res.partner.activation', 'Activation', select=1), 'date_partnership' : fields.date('Partnership Date'), 'date_review' : fields.date('Latest Partner Review'), diff --git a/addons/document_page/i18n/ru.po b/addons/document_page/i18n/ru.po index 52b81a58fc2..6b0f0f158fb 100644 --- a/addons/document_page/i18n/ru.po +++ b/addons/document_page/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-08-13 12:11+0000\n" +"PO-Revision-Date: 2012-10-24 05:09+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-19 05:39+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: document_page #: field:document.page.type,template:0 @@ -270,7 +270,7 @@ msgstr "История всех страниц" #. module: document_page #: model:ir.model,name:document_page.model_wiki_wiki msgid "document.page" -msgstr "" +msgstr "document.page" #. module: document_page #: help:document.page.type,method:0 @@ -285,7 +285,7 @@ msgstr "Закрыть" #. module: document_page #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff msgid "wizard.document.page.history.show_diff" -msgstr "" +msgstr "wizard.document.page.history.show_diff" #. module: document_page #: field:document.page.history,wiki_id:0 @@ -357,7 +357,7 @@ msgstr "Это существенные изменения ?" #: model:ir.model,name:document_page.model_wiki_groups #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0 msgid "Document Types" -msgstr "" +msgstr "Типы документов" #. module: document_page #: view:document.page:0 @@ -374,7 +374,7 @@ msgstr "Изменено" #: field:document.page,type:0 #, python-format msgid "Type" -msgstr "" +msgstr "Тип" #. module: document_page #: view:document.page.type:0 view:document.page.page.open:0 diff --git a/addons/event/event.py b/addons/event/event.py index e30dda7be8d..0cff38fc9f8 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -201,7 +201,7 @@ class event_event(osv.osv): ('confirm', 'Confirmed'), ('done', 'Done')], 'Status', readonly=True, required=True, - help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'), + help='If event is created, the status is \'Draft\'.If event is confirmed for the particular dates the status is set to \'Confirmed\'. If the event is over, the status is set to \'Done\'.If event is cancelled the status is set to \'Cancelled\'.'), 'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'), 'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."), 'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."), @@ -330,7 +330,7 @@ class event_registration(osv.osv): _inherit = ['ir.needaction_mixin','mail.thread'] _columns = { 'id': fields.integer('ID'), - 'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"), + 'origin': fields.char('Source Document', size=124,readonly=True,help="Name of the sale order which create the registration"), 'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}), diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 98e71c83b13..8f010247ff5 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -15,7 +15,7 @@ id="event_main_menu" groups="base.group_user" sequence="80"/> - <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/> + <menuitem name="Events Organization" id="base.menu_event_main" parent="event_main_menu"/> <!-- EVENTS --> @@ -219,7 +219,7 @@ <field name="arch" type="xml"> <tree string="Events" fonts="bold:message_unread==True" colors="red:(register_min and register_min>register_current) or (register_max and register_max<register_current);grey:state=='cancel'"> <field name="name" string="Name"/> - <field name="type"/> + <field name="type" string="Event Category"/> <field name="date_begin"/> <field name="date_end"/> <field name="register_current"/> @@ -267,17 +267,17 @@ <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t> <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t> <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t> - <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t> - <t t-if="record.register_avail.raw_value != 0"> + <t t-if="record.register_avail.raw_value == 9999"><i>No ticket available.</i></t> + <t t-if="record.register_avail.raw_value != 9999"> <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i> <i> <t t-if="record.register_avail.raw_value > 1">tickets </t> - <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t> + <t t-if="record.register_avail.raw_value lte 1">ticket </t> available. </i> </t> </p> - <t t-if="record.register_avail.raw_value != 0"> + <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999"> <t t-if="!record.is_subscribed.raw_value"> <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/> <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button"> diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml index 6eda25fcc4d..8dbe5d485f9 100644 --- a/addons/event_moodle/wizard_moodle.xml +++ b/addons/event_moodle/wizard_moodle.xml @@ -8,7 +8,7 @@ <form string="Configure Moodle" version="7.0"> <header> <button type="object" name="configure_moodle" - string="Configure Moodle" class="oe_highlight" /> + string="Apply" class="oe_highlight" /> or <button string="Cancel" class="oe_link" special="cancel" /> </header> @@ -16,12 +16,12 @@ <separator string="Server" colspan="4"/> <field name="server_moodle"/> <newline/> - <separator string="Connexion with a Token" colspan="4"/> + <separator string="Connection with a Token" colspan="4"/> <label string="The easiest way to connect OpenERP with a moodle server is to create a 'token' in Moodle. It will be used to authenticate OpenERP as a trustable application." colspan="4"/> <field name="moodle_token"/> <newline/> - <separator string="Connexion with Password and Username" colspan="4"/> - <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has enough access rights" colspan="4"/> + <separator string="Connection with username and password" colspan="4"/> + <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has appropriate access rights." colspan="4"/> <field name="moodle_username"/> <field name="moodle_password"/> </group> diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 487e4f58782..ca2c689c512 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -233,7 +233,7 @@ hr_expense_expense() class product_product(osv.osv): _inherit = "product.product" _columns = { - 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."), + 'hr_expense_ok': fields.boolean('Can be Expensed', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."), } def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok): diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index b48f0786704..0977f3729b4 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -115,10 +115,10 @@ class hr_holidays(osv.osv): _columns = { 'name': fields.char('Description', size=64), 'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')], - 'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\ - \nThe state is \'To Approve\', when holiday request is confirmed by user.\ - \nThe state is \'Refused\', when holiday request is refused by manager.\ - \nThe state is \'Approved\', when holiday request is approved by manager.'), + 'Status', readonly=True, help='The status is set to \'To Submit\', when a holiday request is created.\ + \nThe status is \'To Approve\', when holiday request is confirmed by user.\ + \nThe status is \'Refused\', when holiday request is refused by manager.\ + \nThe status is \'Approved\', when holiday request is approved by manager.'), 'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True), 'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True), 'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index b56b49d3d99..d1f38ad4a0f 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -272,10 +272,10 @@ class hr_payslip(osv.osv): ('done', 'Done'), ('cancel', 'Rejected'), ], 'Status', select=True, readonly=True, - help='* When the payslip is created the state is \'Draft\'.\ - \n* If the payslip is under verification, the state is \'Waiting\'. \ - \n* If the payslip is confirmed then state is set to \'Done\'.\ - \n* When user cancel payslip the state is \'Rejected\'.'), + help='* When the payslip is created the status is \'Draft\'.\ + \n* If the payslip is under verification, the status is \'Waiting\'. \ + \n* If the payslip is confirmed then status is set to \'Done\'.\ + \n* When user cancel payslip the status is \'Rejected\'.'), # 'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 56c517620e0..049cb93ca1e 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -62,7 +62,7 @@ class hr_recruitment_stage(osv.osv): 'name': fields.char('Name', size=64, required=True, translate=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."), 'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."), - 'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change according to the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."), + 'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."), 'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."), 'requirements': fields.text('Requirements'), } @@ -189,11 +189,11 @@ class hr_applicant(base_stage, osv.Model): 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=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=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\'.'), 'categ_ids': fields.many2many('hr.applicant_category', string='Tags'), 'company_id': fields.many2one('res.company', 'Company'), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index e888da9ead7..d3faa3f37be 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -41,7 +41,7 @@ class hr_recruitment_report(osv.osv): _columns = { 'user_id': fields.many2one('res.users', 'User', readonly=True), 'nbr': fields.integer('# of Applications', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'month':fields.selection([('01', 'January'), ('02', 'February'), \ ('03', 'March'), ('04', 'April'),\ ('05', 'May'), ('06', 'June'), \ diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index 031a17baee0..3991696b331 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -33,7 +33,7 @@ class hr_so_project(osv.osv_memory): 'date': fields.datetime('Closing Date'), 'analytic_amount': fields.float('Minimum Analytic Amount'), 'name': fields.char('Employees name', size=32, required=True, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True), + 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'server_date': fields.datetime('Current Date', required=True, readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') } @@ -111,7 +111,7 @@ class hr_si_project(osv.osv_memory): _description = 'Sign In By Project' _columns = { 'name': fields.char('Employees name', size=32, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True), + 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'date': fields.datetime('Starting Date'), 'server_date': fields.datetime('Current Date', readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index e62134ee38a..f54ea1a4f18 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -206,9 +206,9 @@ class hr_timesheet_sheet(osv.osv): ('draft','Open'), ('confirm','Waiting Approval'), ('done','Approved')], 'Status', select=True, required=True, readonly=True, - help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \ - \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \ - \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'), + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed timesheet. \ + \n* The \'Confirmed\' status is used for to confirm the timesheet by user. \ + \n* The \'Done\' status is used when users timesheet is accepted by his/her senior.'), 'state_attendance' : fields.related('employee_id', 'state', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Current Status', readonly=True), 'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total"), 'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total"), diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index fc35a17377f..f5438432927 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -54,18 +54,18 @@ </header> <sheet> <label for="employee_id" class="oe_edit_only"/> - <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1> + <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/></h1> <group> <group> <label for="date_from" string="Timesheet Period"/> - <div><field name="date_from"/> to <field name="date_to"/></div> + <div><field name="date_from" class="oe_inline"/> to <field name="date_to" class="oe_inline"/></div> <field name="name" invisible="1"/> - <field name="department_id"/> + <field name="department_id" invisible="1"/> <field name="company_id" groups="base.group_multi_company"/> </group> <group> <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/> - <field name="total_timesheet" widget="float_time"/> + <field name="total_timesheet" widget="float_time" groups="base.group_hr_attendance"/> <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/> <field name="user_id" invisible="1"/> </group> @@ -76,8 +76,8 @@ </widget> </page> <page string="Daily"> - <group colspan="4" col="3"> - <field context="{'user_id':user_id}" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance"> + <group groups="base.group_hr_attendance"> + <field context="{'user_id':user_id}" name="attendances_ids" nolabel="1"> <tree string="Attendances" editable="bottom"> <field name="name"/> <field name="action"/> @@ -85,21 +85,19 @@ </tree> </field> <group> - <div align="right" groups="base.group_hr_manager,base.group_hr_attendance"> - <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" groups="base.group_hr_attendance"/> - <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" groups="base.group_hr_attendance"/> + <field name="state_attendance" nolabel="1"/> + <div align="right" groups="base.group_hr_manager"> + <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In"/> + <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out"/> </div> </group> </group> - <group col="4"> - <field name="state_attendance" groups="base.group_hr_attendance"/> - </group> - <field colspan="4" context="{'user_id':user_id}" name="timesheet_ids" nolabel="1"> + <field context="{'user_id':user_id}" name="timesheet_ids" nolabel="1"> <tree editable="top" string="Timesheet Lines"> <field name="date"/> <field domain="[('type','in',['normal', 'contract']), ('state', '<>', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/> <field name="name"/> - <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/> + <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time" string="Hours"/> <field name="to_invoice" widget="selection"/> <field invisible="1" name="journal_id"/> <field invisible="1" name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/> @@ -123,13 +121,13 @@ </form> </field> </page> - <page string="Summary"> - <field colspan="4" name="period_ids" nolabel="1"> + <page string="Summary" groups="base.group_hr_attendance"> + <field name="period_ids"> <tree colors="red:total_difference<0.1;blue:total_difference>=0.1" string="Period"> <field name="name"/> - <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/> + <field name="total_attendance" widget="float_time"/> <field name="total_timesheet" widget="float_time"/> - <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/> + <field name="total_difference" widget="float_time"/> </tree> </field> </page> diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml index 0c4ad857d3b..a5b2f779bd0 100644 --- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml +++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml @@ -12,7 +12,7 @@ <t t-esc="date.toString('MMM d')"/> </th> </t> - <th class="oe_timesheet_weekly_date_head">TOTAL</th> + <th class="oe_timesheet_weekly_date_head">Total</th> </tr> <tr t-foreach="widget.accounts" t-as="account"> <td class="oe_timesheet_weekly_account"><t t-esc="widget.account_names[account.account]"/></td> @@ -36,8 +36,8 @@ <tr> <td> <div class="oe_timesheet_weekly_adding_tot"> - <div class="oe_timesheet_weekly_adding"><button>Add Row</button></div> - <div class="oe_timesheet_weekly_tottot"><span>TOTAL</span></div> + <div class="oe_timesheet_weekly_adding"><button>Add a Project</button></div> + <div class="oe_timesheet_weekly_tottot"><span>Total</span></div> </div> </td> <t t-set="day_count" t-value="0"/> @@ -53,4 +53,4 @@ </table> </div> </t> -</templates>
\ No newline at end of file +</templates> 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 @@ <openerp> <data> - <record id="config_call_account_template_ar" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - <record id="config_call_account_template_at" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - <record id="config_call_account_template_ca" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - <record id="config_call_account_template_l10n_ch" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts for l10n_ch</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="sequence">4</field> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> </openerp> 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 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - - <record id="config_call_account_template_cl" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - - <record id="config_call_account_template_cn_chart" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - - <record id="config_call_account_template" model="ir.actions.todo"> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - <record id="config_call_account_template_de" model="ir.actions.todo"> - <field name="name">Generiert Kontenplan aus Vorlage</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - - <record id="config_call_account_template_ec" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data noupdate="1"> - - <record id="config_call_account_template" model="ir.actions.todo"> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <!-- This ir.actions.todo triggers the screen "Generate your chart of account - from a chart template" in the install wizard of the l10n_fr module --> - <record id="config_call_account_template_fr" model="ir.actions.todo"> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - - <record id="config_call_account_template_gr" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data noupdate="1"> - <record id="config_call_account_template_gt_minimal" model="ir.actions.todo"> - <field name="name">Generar la nomenclatura contable a partir de un modelo</field> - <field name="note">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.</field> - <!--<field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field>--> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> <!-- Moneda Quetzal --> 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 @@ <openerp> <data noupdate="1"> - <record id="config_call_account_template_hn_minimal" model="ir.actions.todo"> - <field name="name">Generar la nomenclatura contable a partir de un modelo</field> - <field name="note">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.</field> - <!--<field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field>--> - <field name="action_id" ref="account.action_wizard_multi_chart"/> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> <field name="state">open</field> </record> 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 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - - <record id="config_call_account_template_in_minimal" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - - <record id="config_call_account_template_generic" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> </openerp> 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 @@ <openerp> <data> - - <record id="config_call_account_template_lu" model="ir.actions.todo"> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - - <record id="config_call_account_template_ma" model="ir.actions.todo"> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> diff --git a/addons/l10n_mx/i18n/es_MX.po b/addons/l10n_mx/i18n/es_MX.po index eec525b5f53..305ec408af2 100644 --- a/addons/l10n_mx/i18n/es_MX.po +++ b/addons/l10n_mx/i18n/es_MX.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-23 04:48+0000\n" +"X-Launchpad-Export-Date: 2012-10-24 04:55+0000\n" "X-Generator: Launchpad (build 16179)\n" #. module: l10n_mx 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 @@ <openerp> <data> - - <record id="config_call_account_template_mx_chart" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - - <record id="config_call_account_template" model="ir.actions.todo"> - <field name="name">Genereer Grootboekrekingschema vanuit het Nederlandse Grootboek Template</field> - <field name="note">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. -</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ <openerp> <data> - <record id="config_call_account_template_pe" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - - <record id="config_call_account_template_pl_chart" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - - <record id="config_call_account_template_ro" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <openerp> <data> - <record id="config_call_account_template_syscohada" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp> 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 @@ </record> <!-- INSTALL ACTION --> - -<record id="config_call_account_template_th" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> - </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> + </record> </data> </openerp><!-- vim: set fdm=marker : --> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <openerp> <data> - <record id="config_call_account_template_tr_chart" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> </openerp> 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 @@ <?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
- <record id="view_wizard_multi_chart_uk" model="ir.ui.view">
- <field name="name">Generate Chart of Accounts from a Chart Template</field>
- <field name="model">wizard.multi.charts.accounts</field>
- <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
- <field name="arch" type="xml">
- <data>
-<!--
- <xpath expr="//group[@string='res_config_contents']/separator" position="attributes">
- <attribute name="string">
- Generate Your UK Accounting Chart from a Chart Template
- </attribute>
- </xpath>
- <xpath expr="//group[@string='res_config_contents']/label" position="attributes">
- <attribute name="string">SELECT 4 DIGIT ACCOUNTS. This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/ Financial Accounts/Generate Chart of Accounts from a Chart Template.</attribute>
- </xpath>
--->
- </data>
- </field>
- </record>
-
- <record id="action_wizard_multi_chart_uk" model="ir.actions.act_window">
- <field name="name">Generate UK Chart of Accounts from a Chart Template</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">wizard.multi.charts.accounts</field>
- <field name="view_id" ref="view_wizard_multi_chart_uk"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="l10n_uk_latest_wizard_id" model="ir.actions.todo">
- <field name="action_id" ref="action_wizard_multi_chart_uk"/>
- <field name="sequence">10</field>
- <field name="type">once</field>
+ <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
<field name="state">open</field>
</record>
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 @@ <openerp> <data> - - <record id="config_call_account_template" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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.</field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <record id="config_call_account_template_uy" model="ir.actions.todo"> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> </openerp> 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 @@ <openerp> <data> - - <record id="config_call_account_template_ve_chart" model="ir.actions.todo"> - <field name="name">Generate Chart of Accounts from a Chart Template</field> - <field name="note">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. - </field> - <field name="action_id" ref="account.action_wizard_multi_chart"/> - <field name="type">automatic</field> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> + <field name="state">open</field> </record> </data> 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"/> <!-- Left-side menu: Feeds --> - <menuitem id="mail.mail_feeds" name="Feeds & Mailbox" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/> + <menuitem id="mail.mail_feeds" name="Messages" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/> <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/> <record id="mail_inboxfeeds" model="ir.ui.menu"> @@ -79,4 +79,4 @@ <field name="parent_id" ref="mail.mail_feeds"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> 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 92b47ff66e1..8a36d4b0a13 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -473,12 +473,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 8d8e77bf75e..8b09d4ff0a0 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -668,7 +668,7 @@ <page string="Consumed Products"> <group> <group string="Products to Consume"> - <field name="move_lines" nolabel="1"> + <field name="move_lines" nolabel="1" options="{'reload_on_button': true}"> <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume"> <field name="product_id"/> <field name="product_qty" string="Quantity"/> @@ -692,7 +692,7 @@ </tree> </field> </group> - <group string="Consumed Product"> + <group string="Consumed Products"> <field name="move_lines2" nolabel="1"> <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom"> <field name="product_id" readonly="1"/> diff --git a/addons/mrp_subproduct/__init__.py b/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 <http://www.gnu.org/licenses/>. # ############################################################################## -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 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 index cb0507473b6..cb0507473b6 100644 --- a/addons/mrp_subproduct/i18n/ab.po +++ b/addons/mrp_byproduct/i18n/ab.po diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_byproduct/i18n/ar.po index 31c1855cf84..31c1855cf84 100644 --- a/addons/mrp_subproduct/i18n/ar.po +++ b/addons/mrp_byproduct/i18n/ar.po diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_byproduct/i18n/bg.po index b193d7f1656..b193d7f1656 100644 --- a/addons/mrp_subproduct/i18n/bg.po +++ b/addons/mrp_byproduct/i18n/bg.po diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_byproduct/i18n/bs.po index 34f27c74b47..34f27c74b47 100644 --- a/addons/mrp_subproduct/i18n/bs.po +++ b/addons/mrp_byproduct/i18n/bs.po diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_byproduct/i18n/ca.po index 7a73bdbb4fc..7a73bdbb4fc 100644 --- a/addons/mrp_subproduct/i18n/ca.po +++ b/addons/mrp_byproduct/i18n/ca.po diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_byproduct/i18n/cs.po index a55705d2f3d..a55705d2f3d 100644 --- a/addons/mrp_subproduct/i18n/cs.po +++ b/addons/mrp_byproduct/i18n/cs.po diff --git a/addons/mrp_subproduct/i18n/da.po b/addons/mrp_byproduct/i18n/da.po index e9528af8342..e9528af8342 100644 --- a/addons/mrp_subproduct/i18n/da.po +++ b/addons/mrp_byproduct/i18n/da.po diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po index 90cbe47afed..90cbe47afed 100644 --- a/addons/mrp_subproduct/i18n/de.po +++ b/addons/mrp_byproduct/i18n/de.po diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_byproduct/i18n/es.po index b620686de2d..b620686de2d 100644 --- a/addons/mrp_subproduct/i18n/es.po +++ b/addons/mrp_byproduct/i18n/es.po diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_byproduct/i18n/es_AR.po index 44bda1db8aa..44bda1db8aa 100644 --- a/addons/mrp_subproduct/i18n/es_AR.po +++ b/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 index 397a1ed992e..397a1ed992e 100644 --- a/addons/mrp_subproduct/i18n/es_CR.po +++ b/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 index b1726ea8837..b1726ea8837 100644 --- a/addons/mrp_subproduct/i18n/es_EC.po +++ b/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 index adafa31e20b..adafa31e20b 100644 --- a/addons/mrp_subproduct/i18n/es_MX.po +++ b/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 index adafa31e20b..adafa31e20b 100644 --- a/addons/mrp_subproduct/i18n/es_VE.po +++ b/addons/mrp_byproduct/i18n/es_VE.po diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_byproduct/i18n/et.po index ef99950da2b..ef99950da2b 100644 --- a/addons/mrp_subproduct/i18n/et.po +++ b/addons/mrp_byproduct/i18n/et.po diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_byproduct/i18n/fi.po index ec18e259f19..ec18e259f19 100644 --- a/addons/mrp_subproduct/i18n/fi.po +++ b/addons/mrp_byproduct/i18n/fi.po diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po index 6d45d471c9d..6d45d471c9d 100644 --- a/addons/mrp_subproduct/i18n/fr.po +++ b/addons/mrp_byproduct/i18n/fr.po diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_byproduct/i18n/gl.po index 864003eaf4d..864003eaf4d 100644 --- a/addons/mrp_subproduct/i18n/gl.po +++ b/addons/mrp_byproduct/i18n/gl.po diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_byproduct/i18n/hr.po index e96230f6c73..e96230f6c73 100644 --- a/addons/mrp_subproduct/i18n/hr.po +++ b/addons/mrp_byproduct/i18n/hr.po diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_byproduct/i18n/hu.po index c878b309fd0..c878b309fd0 100644 --- a/addons/mrp_subproduct/i18n/hu.po +++ b/addons/mrp_byproduct/i18n/hu.po diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_byproduct/i18n/id.po index 48e444b6610..48e444b6610 100644 --- a/addons/mrp_subproduct/i18n/id.po +++ b/addons/mrp_byproduct/i18n/id.po diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_byproduct/i18n/it.po index a5b081e482a..a5b081e482a 100644 --- a/addons/mrp_subproduct/i18n/it.po +++ b/addons/mrp_byproduct/i18n/it.po diff --git a/addons/mrp_subproduct/i18n/ja.po b/addons/mrp_byproduct/i18n/ja.po index 3745b1eb42f..3745b1eb42f 100644 --- a/addons/mrp_subproduct/i18n/ja.po +++ b/addons/mrp_byproduct/i18n/ja.po diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_byproduct/i18n/ko.po index 8c7789a6d7c..8c7789a6d7c 100644 --- a/addons/mrp_subproduct/i18n/ko.po +++ b/addons/mrp_byproduct/i18n/ko.po diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_byproduct/i18n/lt.po index 34a30101804..34a30101804 100644 --- a/addons/mrp_subproduct/i18n/lt.po +++ b/addons/mrp_byproduct/i18n/lt.po diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_byproduct/i18n/mn.po index 9296c108c55..9296c108c55 100644 --- a/addons/mrp_subproduct/i18n/mn.po +++ b/addons/mrp_byproduct/i18n/mn.po diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_byproduct/i18n/mrp_subproduct.pot index 40f1683ec75..40f1683ec75 100644 --- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot +++ b/addons/mrp_byproduct/i18n/mrp_subproduct.pot diff --git a/addons/mrp_subproduct/i18n/nb.po b/addons/mrp_byproduct/i18n/nb.po index 328b86235b2..328b86235b2 100644 --- a/addons/mrp_subproduct/i18n/nb.po +++ b/addons/mrp_byproduct/i18n/nb.po diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_byproduct/i18n/nl.po index b59764b925d..b59764b925d 100644 --- a/addons/mrp_subproduct/i18n/nl.po +++ b/addons/mrp_byproduct/i18n/nl.po diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_byproduct/i18n/nl_BE.po index 26073a1c465..26073a1c465 100644 --- a/addons/mrp_subproduct/i18n/nl_BE.po +++ b/addons/mrp_byproduct/i18n/nl_BE.po diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_byproduct/i18n/oc.po index b56078ac176..b56078ac176 100644 --- a/addons/mrp_subproduct/i18n/oc.po +++ b/addons/mrp_byproduct/i18n/oc.po diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_byproduct/i18n/pl.po index 15ade180f53..15ade180f53 100644 --- a/addons/mrp_subproduct/i18n/pl.po +++ b/addons/mrp_byproduct/i18n/pl.po diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_byproduct/i18n/pt.po index 0c55abf9d8b..0c55abf9d8b 100644 --- a/addons/mrp_subproduct/i18n/pt.po +++ b/addons/mrp_byproduct/i18n/pt.po diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_byproduct/i18n/pt_BR.po index 9c080372bda..9c080372bda 100644 --- a/addons/mrp_subproduct/i18n/pt_BR.po +++ b/addons/mrp_byproduct/i18n/pt_BR.po diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_byproduct/i18n/ro.po index 5b4651e67a8..5b4651e67a8 100644 --- a/addons/mrp_subproduct/i18n/ro.po +++ b/addons/mrp_byproduct/i18n/ro.po diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_byproduct/i18n/ru.po index 8643b2f11d1..8643b2f11d1 100644 --- a/addons/mrp_subproduct/i18n/ru.po +++ b/addons/mrp_byproduct/i18n/ru.po diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_byproduct/i18n/sk.po index 80316bb40e4..80316bb40e4 100644 --- a/addons/mrp_subproduct/i18n/sk.po +++ b/addons/mrp_byproduct/i18n/sk.po diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_byproduct/i18n/sl.po index 1daae54756c..1daae54756c 100644 --- a/addons/mrp_subproduct/i18n/sl.po +++ b/addons/mrp_byproduct/i18n/sl.po diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_byproduct/i18n/sq.po index b6b0b4994b1..b6b0b4994b1 100644 --- a/addons/mrp_subproduct/i18n/sq.po +++ b/addons/mrp_byproduct/i18n/sq.po diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_byproduct/i18n/sr.po index 0f490d35dcd..0f490d35dcd 100644 --- a/addons/mrp_subproduct/i18n/sr.po +++ b/addons/mrp_byproduct/i18n/sr.po diff --git a/addons/mrp_subproduct/i18n/sr@latin.po b/addons/mrp_byproduct/i18n/sr@latin.po index ff29f099431..ff29f099431 100644 --- a/addons/mrp_subproduct/i18n/sr@latin.po +++ b/addons/mrp_byproduct/i18n/sr@latin.po diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po index 23a980d1999..23a980d1999 100644 --- a/addons/mrp_subproduct/i18n/sv.po +++ b/addons/mrp_byproduct/i18n/sv.po diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_byproduct/i18n/tlh.po index ed8b7e4818f..ed8b7e4818f 100644 --- a/addons/mrp_subproduct/i18n/tlh.po +++ b/addons/mrp_byproduct/i18n/tlh.po diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_byproduct/i18n/tr.po index eac7e3e5c98..eac7e3e5c98 100644 --- a/addons/mrp_subproduct/i18n/tr.po +++ b/addons/mrp_byproduct/i18n/tr.po diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_byproduct/i18n/uk.po index ae23206bb87..ae23206bb87 100644 --- a/addons/mrp_subproduct/i18n/uk.po +++ b/addons/mrp_byproduct/i18n/uk.po diff --git a/addons/mrp_subproduct/i18n/vi.po b/addons/mrp_byproduct/i18n/vi.po index 24eb28359b9..24eb28359b9 100644 --- a/addons/mrp_subproduct/i18n/vi.po +++ b/addons/mrp_byproduct/i18n/vi.po diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po index 9a2adfa33c8..9a2adfa33c8 100644 --- a/addons/mrp_subproduct/i18n/zh_CN.po +++ b/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 index d0df115fc17..d0df115fc17 100644 --- a/addons/mrp_subproduct/i18n/zh_TW.po +++ b/addons/mrp_byproduct/i18n/zh_TW.po diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/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 index b9e8fcc41ed..32e8a696369 100644 --- a/addons/mrp_subproduct/mrp_subproduct_view.xml +++ b/addons/mrp_byproduct/mrp_byproduct_view.xml @@ -7,15 +7,15 @@ <field name="inherit_id" ref="mrp.mrp_bom_form_view"/> <field name="arch" type="xml"> <notebook position="inside"> - <page string="Sub Products" position="inside"> + <page string="Byproducts" position="inside"> <field name="sub_products"> - <tree string="sub products" editable="top"> + <tree string="Byproducts" editable="top"> <field name="product_id" on_change="onchange_product_id(product_id)"/> <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/> <field name="product_qty"/> <field name="subproduct_type"/> </tree> - <form string="Sub Products"> + <form string="Byproducts"> <field name="product_id" on_change="onchange_product_id(product_id)"/> <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/> <field name="product_qty"/> diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_byproduct/security/ir.model.access.csv index e91c8158d19..e91c8158d19 100644 --- a/addons/mrp_subproduct/security/ir.model.access.csv +++ b/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 index 99da9f22baf..99da9f22baf 100644 --- a/addons/mrp_subproduct/test/mrp_subproduct.yml +++ b/addons/mrp_byproduct/test/mrp_byproduct.yml diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index ffe0305d5f1..4bca93d260f 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -76,11 +76,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_planned': fields.datetime('Scheduled Date', select=True), 'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'), 'date_start': fields.datetime('Start Date'), 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 @@ <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/> - <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/> </group> </search> 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 3f0e439cfba..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'); + }); }, }); 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/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 <EMAIL@ADDRESS>\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 <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\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 @@ <openerp> <data> - <!-- Compute Schedulers --> + <!-- Run Schedulers --> <record id="view_compute_schedulers_wizard" model="ir.ui.view"> - <field name="name">Compute Schedulers</field> + <field name="name">Run Schedulers</field> <field name="model">procurement.order.compute.all</field> <field name="arch" type="xml"> <form string="Scheduler Parameters" version="7.0"> @@ -13,7 +13,7 @@ <field name="automatic"/> </group> <footer> - <button name="procure_calculation" string="Compute Schedulers" type="object" class="oe_highlight" /> + <button name="procure_calculation" string="Run Schedulers" type="object" class="oe_highlight" /> or <button string="Cancel" class="oe_link" special="cancel" /> </footer> @@ -21,7 +21,7 @@ </field> </record> - <act_window name="Compute Schedulers" + <act_window name="Run Schedulers" res_model="procurement.order.compute.all" src_model="procurement.order" view_mode="form" 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 <EMAIL@ADDRESS>\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 <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\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 56d7fef0e49..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', 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 @@ <field name="inherit_id" ref="project.view_task_tree2" /> <field name="arch" type="xml"> <field name="remaining_hours" position="after"> - <field string="Timebox" name="timebox_id" invisible=" not context.get('gtd', False)"/> + <field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/> <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/> <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/> </field> @@ -91,7 +91,7 @@ <field name="arch" type="xml"> <field name="progress" position="after"> <field name="context_id" widget="selection" options='{"no_open": True}'/> - <field name="timebox_id" widget="selection" options='{"no_open": True}'/> + <field name="timebox_id" widget="selection" options='{"no_open": True}' string="Timeframe"/> </field> </field> </record> diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 1cb5b20edbd..770c226fc2f 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -227,11 +227,11 @@ class project_issue(base_stage, osv.osv): 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Description'), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=_ISSUE_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=_ISSUE_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\'.'), 'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1), 'email_cc': fields.char('Watchers Emails', size=256, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index b19238200e5..db6c532d503 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -116,8 +116,8 @@ class project_phase(osv.osv): 'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}, help="The resources on the project can be computed automatically by the scheduler."), 'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True, - help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ - \n If the phase is over, the states is set to \'Done\'.'), + help='If the phase is created the status \'Draft\'.\n If the phase is started, the status becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' status.\ + \n If the phase is over, the status is set to \'Done\'.'), 'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"), } _defaults = { diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index db6ed8b80be..0f0e99244a5 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -167,7 +167,7 @@ class purchase_order(osv.osv): 'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]), 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."), 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True), - 'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True), + 'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True), 'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}), 'validator' : fields.many2one('res.users', 'Validated by', readonly=True), 'notes': fields.text('Terms and Conditions'), @@ -809,10 +809,10 @@ class purchase_order_line(osv.osv): 'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',), 'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True, - help=' * The \'Draft\' state is set automatically when purchase order in draft state. \ - \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \ - \n* The \'Done\' state is set automatically when purchase order is set as done. \ - \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'), + help=' * The \'Draft\' status is set automatically when purchase order in draft status. \ + \n* The \'Confirmed\' status is set automatically as confirm when purchase order in confirm status. \ + \n* The \'Done\' status is set automatically when purchase order is set as done. \ + \n* The \'Cancelled\' status is set automatically when user cancel purchase order.'), 'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), 'invoiced': fields.boolean('Invoiced', readonly=True), 'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner", store=True), diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 1ec1cd452c9..6c766e1d828 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -82,7 +82,7 @@ action="base.action_partner_supplier_form" sequence="15"/> <!--Inventory control--> - <menuitem id="menu_procurement_management_inventory" name="Receive Products" + <menuitem id="menu_procurement_management_inventory" name="Incoming Products" parent="base.menu_purchase_root" sequence="4"/> <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory" name="Incoming Shipments" sequence="9"/> @@ -264,7 +264,7 @@ <label for="notes"/> <field name="notes"/> </page> - <page string="Reception & Invoicing"> + <page string="Incoming Shipments & Invoices"> <group> <group> <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/> @@ -358,7 +358,7 @@ <field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/> <field name="origin"/> - <field name="amount_untaxed" sum="Total Untaxed amount"/> + <field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed"/> <field name="amount_total" sum="Total amount"/> <field name="state"/> </tree> diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index f4bd4fee425..76ffddcb85f 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -40,7 +40,7 @@ class purchase_report(osv.osv): ('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), - ('cancel', 'Cancelled')],'Order State', readonly=True), + ('cancel', 'Cancelled')],'Order Status', readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True), 'location_id': fields.many2one('stock.location', 'Destination', readonly=True), diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 8954de6c1dc..ea2346d3aab 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -34,7 +34,7 @@ class purchase_requisition(osv.osv): _inherit = ['mail.thread', 'ir.needaction_mixin'] _columns = { 'name': fields.char('Requisition Reference', size=32,required=True), - 'origin': fields.char('Source', size=32), + 'origin': fields.char('Source Document', size=32), 'date_start': fields.datetime('Requisition Date'), 'date_end': fields.datetime('Requisition Deadline'), 'user_id': fields.many2one('res.users', 'Responsible'), diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po index 7a7f5e82dbd..a5192a83647 100644 --- a/addons/resource/i18n/ru.po +++ b/addons/resource/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-05-10 18:26+0000\n" +"PO-Revision-Date: 2012-10-23 18:55+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\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:30+0000\n" -"X-Generator: Launchpad (build 16165)\n" +"X-Launchpad-Export-Date: 2012-10-24 04:55+0000\n" +"X-Generator: Launchpad (build 16179)\n" #. module: resource #: help:resource.calendar.leaves,resource_id:0 @@ -107,7 +107,7 @@ msgstr "Рабочее время начнется с" #. module: resource #: constraint:resource.calendar.leaves:0 msgid "Error! leave start-date must be lower then leave end-date." -msgstr "" +msgstr "Ошибка! Дата начала отгула должна быть раньше даты завершения." #. module: resource #: model:ir.model,name:resource.model_resource_calendar @@ -324,7 +324,7 @@ msgstr "(отпуск)" #: code:addons/resource/resource.py:392 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "Ошибка конфигурации!" #. module: resource #: selection:resource.resource,resource_type:0 diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po index b689b1b1946..a67f7c78b4c 100644 --- a/addons/sale/i18n/ru.po +++ b/addons/sale/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-09-20 07:29+0000\n" -"PO-Revision-Date: 2012-09-10 14:56+0000\n" +"PO-Revision-Date: 2012-10-23 18:53+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n" -"X-Generator: Launchpad (build 16165)\n" +"X-Launchpad-Export-Date: 2012-10-24 04:55+0000\n" +"X-Generator: Launchpad (build 16179)\n" #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:215 @@ -235,7 +235,7 @@ msgstr "В счет" #: view:sale.order.line:0 #: field:sale.report,product_uom:0 msgid "Unit of Measure" -msgstr "" +msgstr "Единицы измерения" #. module: sale #: help:sale.order,date_confirm:0 @@ -264,7 +264,7 @@ msgstr "" #. module: sale #: selection:sale.advance.payment.inv,advance_payment_method:0 msgid "Invoice the whole sale order" -msgstr "" +msgstr "Выставить счет на весь заказ продажи" #. module: sale #: field:sale.order,project_id:0 @@ -304,12 +304,12 @@ msgstr "Исключение счета" #. module: sale #: view:account.config.settings:0 msgid "0" -msgstr "" +msgstr "0" #. module: sale #: selection:sale.order,state:0 msgid "Draft Quotation" -msgstr "" +msgstr "Черновик предложения" #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:124 @@ -359,23 +359,23 @@ msgstr "Вес" #. module: sale #: view:sale.config.settings:0 msgid "Warehouse Features" -msgstr "" +msgstr "Особенности склада" #. module: sale #: view:sale.order:0 msgid "Quotation " -msgstr "" +msgstr "Предложение " #. module: sale #: field:sale.order.line,product_uom:0 msgid "Unit of Measure " -msgstr "" +msgstr "Единица измерения " #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:148 #, python-format msgid "Incorrect Data" -msgstr "" +msgstr "Неверные данные" #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:149 @@ -401,7 +401,7 @@ msgstr "Заказ" #. module: sale #: field:sale.order,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Сообщения" #. module: sale #: selection:sale.report,month:0 @@ -422,7 +422,7 @@ msgstr "Сумма до налогов" #. module: sale #: field:sale.config.settings,module_project:0 msgid "Project" -msgstr "" +msgstr "Проект" #. module: sale #: code:addons/sale/sale.py:319 @@ -433,7 +433,7 @@ msgstr "" #: code:addons/sale/wizard/sale_make_invoice_advance.py:123 #, python-format msgid "Error!" -msgstr "" +msgstr "Ошибка!" #. module: sale #: report:sale.order:0 @@ -467,7 +467,7 @@ msgstr "Позиции заказа продаж относящиеся к мо #. module: sale #: selection:sale.order,state:0 msgid "Quotation Sent" -msgstr "" +msgstr "Предложение отправлено" #. module: sale #: help:sale.order,message_unread:0 @@ -528,12 +528,12 @@ msgstr "Налог" #: code:addons/sale/sale.py:986 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Неверное действие!" #. module: sale #: view:sale.report:0 msgid "Reference Unit of Measure" -msgstr "" +msgstr "Базовая единица измерения" #. module: sale #: field:sale.report,date_confirm:0 @@ -572,7 +572,7 @@ msgstr "Факс :" #. module: sale #: view:sale.order:0 msgid "(update)" -msgstr "" +msgstr "(обновление)" #. module: sale #: help:sale.config.settings,group_discount_per_so_line:0 @@ -635,7 +635,7 @@ msgstr "Подтвердить" #. module: sale #: view:sale.order:0 msgid "Unread messages" -msgstr "" +msgstr "Непрочитанные сообщения" #. module: sale #: field:sale.order,partner_shipping_id:0 @@ -673,12 +673,12 @@ msgstr "Заказы продаж, которые еще не были подт #. module: sale #: field:sale.order,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Непрочитанные сообщения" #. module: sale #: view:sale.order:0 msgid "Print" -msgstr "" +msgstr "Печать" #. module: sale #: report:sale.order:0 @@ -793,12 +793,12 @@ msgstr "Год заказа в заказе продаж" #. module: sale #: field:sale.config.settings,module_sale_stock:0 msgid "Sale and Warehouse Management" -msgstr "" +msgstr "Управление продажами и складом" #. module: sale #: model:ir.model,name:sale.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: sale #: field:sale.advance.payment.inv,qtty:0 @@ -842,7 +842,7 @@ msgstr "" #. module: sale #: view:sale.config.settings:0 msgid "Default Options" -msgstr "" +msgstr "Параметры по умолчанию" #. module: sale #: code:addons/sale/sale.py:963 @@ -850,12 +850,12 @@ msgstr "" #: code:addons/sale/wizard/sale_make_invoice_advance.py:142 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "Ошибка конфигурации!" #. module: sale #: field:account.config.settings,group_analytic_account_for_sales:0 msgid "Analytic accounting for sales" -msgstr "" +msgstr "Аналитический учет для продаж" #. module: sale #: view:sale.order:0 diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 0ae2e4f7133..f592a8fd66c 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -55,7 +55,7 @@ class sale_report(osv.osv): ('invoice_except', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled') - ], 'Order State', readonly=True), + ], 'Order Status', readonly=True), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), } diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 222426f881b..9c7f07edb25 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -187,7 +187,7 @@ class sale_order(osv.osv): ('manual', 'Sale to Invoice'), ('invoice_except', 'Invoice Exception'), ('done', 'Done'), - ], 'Status', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the processing of a document linked to the sale order. \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), + ], 'Status', readonly=True, help="Gives the status of the quotation or sales order. \nThe exception status is automatically set when a cancel operation occurs in the processing of a document linked to the sale order. \nThe 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), 'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}), 'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."), 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), @@ -728,11 +728,11 @@ class sale_order_line(osv.osv): 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}), 'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}), 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True, - help='* The \'Draft\' state is set when the related sales order in draft state. \ - \n* The \'Confirmed\' state is set when the related sales order is confirmed. \ - \n* The \'Exception\' state is set when the related sales order is set as exception. \ - \n* The \'Done\' state is set when the sales order line has been picked. \ - \n* The \'Cancelled\' state is set when a user cancel the sales order related.'), + help='* The \'Draft\' status is set when the related sales order in draft status. \ + \n* The \'Confirmed\' status is set when the related sales order is confirmed. \ + \n* The \'Exception\' status is set when the related sales order is set as exception. \ + \n* The \'Done\' status is set when the sales order line has been picked. \ + \n* The \'Cancelled\' status is set when a user cancel the sales order related.'), 'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'), 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'), 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 4d57dfcf9e0..a5d7b9d3af2 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -131,7 +131,24 @@ <field name="arch" type="xml"> <tree string="Sales Orders" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')"> <field name="message_unread" invisible="1"/> - <field name="name"/> + <field name="name" string="Order Number"/> + <field name="date_order"/> + <field name="partner_id"/> + <field name="user_id"/> + <field name="amount_total" sum="Total Tax Included"/> + <field name="state"/> + </tree> + </field> + </record> + + <record id="view_quotation_tree" model="ir.ui.view"> + <field name="name">sale.order.tree</field> + <field name="model">sale.order</field> + <field name="priority">4</field> + <field name="arch" type="xml"> + <tree string="Quotation" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')"> + <field name="message_unread" invisible="1"/> + <field name="name" string="Quotation Number"/> <field name="date_order"/> <field name="partner_id"/> <field name="user_id"/> @@ -357,7 +374,7 @@ </record> <record id="action_order_form" model="ir.actions.act_window"> - <field name="name">Sales Orders</field> + <field name="name">Sale Orders</field> <field name="type">ir.actions.act_window</field> <field name="res_model">sale.order</field> <field name="view_type">form</field> @@ -404,6 +421,7 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">sale.order</field> <field name="view_type">form</field> + <field name="view_id" ref="view_quotation_tree"/> <field name="view_mode">tree,form,calendar,graph</field> <field name="context">{'show_address': 1}</field> <field name="domain">[('state','in',('draft','sent','cancel'))]</field> diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py index 04587c1e679..a523c0551f2 100644 --- a/addons/sale_stock/report/sale_report.py +++ b/addons/sale_stock/report/sale_report.py @@ -36,7 +36,7 @@ class sale_report(osv.osv): ('invoice_except', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled') - ], 'Order State', readonly=True), + ], 'Order Status', readonly=True), } def init(self, cr): diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 9611c97ac60..5d30dc9a249 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -123,9 +123,9 @@ class sale_order(osv.osv): ('shipping_except', 'Shipping Exception'), ('invoice_except', 'Invoice Exception'), ('done', 'Done'), - ], 'Status', readonly=True,help="Gives the state of the quotation or sales order.\ - \nThe exception state is automatically set when a cancel operation occurs \ - in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\nThe 'Waiting Schedule' state is set when the invoice is confirmed\ + ], 'Status', readonly=True,help="Gives the status of the quotation or sales order.\ + \nThe exception status is automatically set when a cancel operation occurs \ + in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\nThe 'Waiting Schedule' status is set when the invoice is confirmed\ but waiting for the scheduler to run on the order date.", select=True), 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."), 'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 3908fecd850..f71b42300fb 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -39,7 +39,7 @@ <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',False)]}"/> </group> <group name="delay" position="after"> - <group name="store" string="Storage Localisation"> + <group name="store" string="Storage Localization"> <field name="loc_rack"/> <field name="loc_row"/> <field name="loc_case"/> @@ -101,7 +101,7 @@ </group> </group> <group name="status" position="after" version="7.0"> - <group name="store" string="Storage Localisation"> + <group name="store" string="Storage Localization"> <field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/> <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/> diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 765599aa842..729e0976f94 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -627,7 +627,7 @@ class stock_picking(osv.osv): _columns = { 'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), - 'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True), + 'origin': fields.char('Source Document', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True), 'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True), 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."), 'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), @@ -653,8 +653,8 @@ class stock_picking(osv.osv): * Cancelled: has been cancelled, can't be confirmed anymore""" ), 'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date", - store=True, type='datetime', string='Scheduled Date', select=1, help="Scheduled date for the shipment to be processed"), - 'date': fields.datetime('Date', help="Creation date, usually the date of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), + store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"), + 'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'date_done': fields.datetime('Date Done', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date", store=True, type='datetime', string='Max. Expected Date', select=2), @@ -3039,7 +3039,7 @@ class stock_picking_in(osv.osv): ('assigned', 'Ready to Receive'), ('done', 'Received'), ('cancel', 'Cancelled'),], - 'State', readonly=True, select=True, + 'Status', readonly=True, select=True, help="""* Draft: not confirmed yet and will not be scheduled until confirmed\n * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n * Waiting Availability: still waiting for the availability of products\n @@ -3084,7 +3084,7 @@ class stock_picking_out(osv.osv): ('assigned', 'Ready to Deliver'), ('done', 'Delivered'), ('cancel', 'Cancelled'),], - 'State', readonly=True, select=True, + 'Status', readonly=True, select=True, help="""* Draft: not confirmed yet and will not be scheduled until confirmed\n * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n * Waiting Availability: still waiting for the availability of products\n diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 806c723dc73..78a7fdb9da0 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -810,7 +810,7 @@ <field name="product_id"/> <field name="stock_journal_id"/> <group expand="0" string="Group By..."> - <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> @@ -873,7 +873,7 @@ <field name="arch" type="xml"> <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date < current_date" string="Delivery Orders"> <field name="name"/> - <field name="partner_id"/> + <field name="partner_id" string="Customer"/> <field name="origin"/> <field name="min_date"/> <field name="date"/> @@ -1004,7 +1004,7 @@ <field name="arch" type="xml"> <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> - <field name="partner_id"/> + <field name="partner_id" string="Supplier"/> <field name="backorder_id"/> <field name="origin"/> <field name="date"/> @@ -1478,7 +1478,7 @@ </record> <record id="action_reception_picking_move" model="ir.actions.act_window"> - <field name="name">Receive Products</field> + <field name="name">Incoming Products</field> <field name="res_model">stock.move</field> <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> diff --git a/addons/survey/survey.py b/addons/survey/survey.py index d01140092d4..b57f778a5cc 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -77,6 +77,7 @@ class survey(osv.osv): 'tot_comp_survey': lambda * a: 0, 'send_response': lambda * a: 1, 'response_user': lambda * a:1, + 'date_open': fields.datetime.now, } def survey_open(self, cr, uid, ids, arg): @@ -151,8 +152,7 @@ class survey(osv.osv): pages = sur['page_ids'] if not pages: raise osv.except_osv(_('Warning!'), _('This survey has no question defined. Please define the questions and answers first.')) - else: - context.update({'active':False,'survey_id': ids[0]}) + context.update({'active':False,'survey_id': ids[0]}) return { 'view_type': 'form', 'view_mode': 'form', @@ -163,9 +163,12 @@ class survey(osv.osv): 'context': context } def test_survey(self, cr, uid, ids, context=None): - sur_obj = self.read(cr, uid, ids,['title'], context=context) + sur_obj = self.read(cr, uid, ids,['title','page_ids'], context=context) for sur in sur_obj: name = sur['title'] + pages = sur['page_ids'] + if not pages: + raise osv.except_osv(_('Warning!'), _('This survey has no pages defined. Please define pages first.')) context.update({'active':True,'survey_id': ids[0]}) return { 'view_type': 'form', diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 0247a205700..c01e8b45ce2 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -38,24 +38,24 @@ <div class="oe_title"> <label for="title" class="oe_edit_only"/> <h1> - <field name="title"/> + <field name="title" attrs="{'readonly':[('state','=','close')]}"/> </h1> </div> <group> <group> <field name="id" invisible="1"/> - <field name="responsible_id" class="oe_inline"/> - <field name="send_response"/> - <field name="type"/> + <field name="responsible_id" class="oe_inline" attrs="{'readonly':[('state','=','close')]}"/> + <field name="send_response" attrs="{'readonly':[('state','=','close')]}"/> + <field name="type" attrs="{'readonly':[('state','=','close')]}"/> </group> <group> - <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/> - <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/> + <field name="max_response_limit" attrs="{'readonly':[('state','=','close')]}"/> + <field name="response_user" attrs="{'readonly':[('state','=','close')]}"/> </group> </group> <notebook> <page string="Survey Details"> - <field name="page_ids" colspan="4" mode="tree"> + <field name="page_ids" colspan="4" mode="tree" attrs="{'readonly':[('state','=','close')]}"> <form string="Survey Page" version="7.0"> <sheet> <label for="title" class="oe_edit_only"/> @@ -212,7 +212,7 @@ </sheet> </form> </field> - <field name="note" placeholder="Survey description..."/> + <field name="note" placeholder="Survey description..." attrs="{'readonly':[('state','=','close')]}"/> </page> <page string="Invited User"> <field name="invited_user_ids" readonly="1"/> diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index 8ece1e184cf..f1a96fa154a 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -134,6 +134,8 @@ class survey_question_wiz(osv.osv_memory): page_number += 1 if sur_name_rec.page_no > - 1: pre_button = True + else: + flag = True else: if sur_name_rec.page_no != 0: p_id = p_id[sur_name_rec.page_no - 1] @@ -146,7 +148,15 @@ class survey_question_wiz(osv.osv_memory): pre_button = True if flag: pag_rec = page_obj.browse(cr, uid, p_id, context=context) - xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title or sur_rec.title)}) + note = False + question_ids = [] + if pag_rec: + title = pag_rec.title + note = pag_rec.note + question_ids = pag_rec.question_ids + else: + title = sur_rec.title + xml_form = etree.Element('form', {'string': tools.ustr(title)}) if context.has_key('active') and context.get('active',False) and context.has_key('edit'): context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer}) xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'}) @@ -174,10 +184,10 @@ class survey_question_wiz(osv.osv_memory): fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}} etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0),'modifiers':'{"invisible":true}'}) - if pag_rec.note: - for que_test in pag_rec.note.split('\n'): + if note: + for que_test in note.split('\n'): etree.SubElement(xml_form, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"}) - que_ids = pag_rec.question_ids + que_ids = question_ids qu_no = 0 for que in que_ids: @@ -429,13 +439,13 @@ class survey_question_wiz(osv.osv_memory): vals['attachment_ids'] = [(0,0,{'name': a_name, 'datas_fname': a_name, 'datas': str(a_content).encode('base64')}) - for a_name, a_content in attachments] + for a_name, a_content in attachments.items()] self.pool.get('mail.mail').create(cr, uid, vals, context=context) xml_form = etree.Element('form', {'string': _('Complete Survey Answer')}) xml_footer = etree.SubElement(xml_form, 'footer', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'}) - etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"}) + etree.SubElement(xml_form, 'separator', {'string': 'Survey Completed', 'colspan': "4"}) etree.SubElement(xml_form, 'label', {'string': 'Thanks for your Answer'}) etree.SubElement(xml_form, 'newline') etree.SubElement(xml_footer, 'button', {'special':"cancel",'string':"OK",'colspan':"2",'class':'oe_highlight'}) diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 5677a985e09..936e3363bde 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -50,9 +50,6 @@ class survey_send_invitation(osv.osv_memory): _defaults = { 'send_mail': lambda *a: 1, 'send_mail_existing': lambda *a: 1, - 'mail_subject': lambda *a: "Invitation", - 'mail_subject_existing': lambda *a: "Invitation", - 'mail_from': lambda *a: tools.config['email_from'] } def genpasswd(self): @@ -67,14 +64,23 @@ class survey_send_invitation(osv.osv_memory): msg = "" name = "" for sur in survey_obj.browse(cr, uid, context.get('active_ids', []), context=context): - name += "\t --> " + sur.title + "\n" + name += "\n --> " + sur.title + "\n" if sur.state != 'open': msg += sur.title + "\n" + data['mail_subject'] = _("Invitation for %s") % (sur.title) + data['mail_subject_existing'] = _("Invitation for %s") % (sur.title) + data['mail_from'] = sur.responsible_id.email if msg: - raise osv.except_osv(_('Warning!'), _('%sSurvey is not in open state') % msg) - data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \ - \n ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s - \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,''' + raise osv.except_osv(_('Warning!'), _('The following surveys are not in open state: %s') % msg) + data['mail'] = _(''' +Hello %%(name)s, \n\n +Would you please spent some of your time to fill-in our survey: \n%s\n +You can access this survey with the following parameters: + URL: %s + Your login ID: %%(login)s\n + Your password: %%(passwd)s\n +\n\n +Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)) return data def create_report(self, cr, uid, res_ids, report_name=False, file_name=False): @@ -176,7 +182,7 @@ class survey_send_invitation(osv.osv_memory): vals['attachment_ids'] = [(0,0,{'name': a_name, 'datas_fname': a_name, 'datas': str(a_content).encode('base64')}) - for a_name, a_content in attachments] + for a_name, a_content in attachments.items()] ans = self.pool.get('mail.mail').create(cr, uid, vals, context=context) if ans: res_data = {'name': partner.name or _('Unknown'), diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml index 340cb58b5cf..a611973d772 100644 --- a/addons/survey/wizard/survey_send_invitation.xml +++ b/addons/survey/wizard/survey_send_invitation.xml @@ -16,7 +16,7 @@ </header> <group col="4"> <separator string="Select Partner" colspan="4"/> - <field name="partner_ids" nolabel="1" colspan="4"/> + <field name="partner_ids" nolabel="1" colspan="4" widget="many2many_tags"/> <separator colspan="4" string="Send Mail for New User"/> <field name="send_mail" nolabel="1"/> <field name="mail_subject" colspan="3"/> |