diff --git a/addons/account/account.py b/addons/account/account.py index 1c45b6cd415..c7cd5b4c294 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -103,7 +103,7 @@ class account_payment_term_line(osv.osv): _constraints = [ (_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), ] - + account_payment_term_line() @@ -418,7 +418,7 @@ class account_account(osv.osv): line_obj = self.pool.get('account.move.line') account_ids = self.search(cr, uid, [('id', 'child_of', ids)]) if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]): - raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains account moves.')) + raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains Ledger Postings.')) return super(account_account, self).write(cr, uid, ids, vals, context=context) account_account() @@ -477,7 +477,7 @@ class account_journal(osv.osv): 'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), - 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), + 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new Ledger Postings to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), 'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"), 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ help="The sequence used for invoice numbers in this journal."), @@ -1413,11 +1413,11 @@ class account_tax(osv.osv): for tax in taxes: if (tax.type=='percent') and not tax.include_base_amount: tax_parent_tot += tax.amount - + for tax in taxes: if (tax.type=='fixed') and not tax.include_base_amount: cur_price_unit -= tax.amount - + for tax in taxes: if tax.type=='percent': if tax.include_base_amount: diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 2d6c725fcc0..53168202d2f 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -211,7 +211,7 @@ class account_bank_statement(osv.osv): 'period_id': st.period_id.id, 'currency_id': st.currency.id, } - + amount = res_currency_obj.compute(cr, uid, st.currency.id, company_currency_id, move.amount, context=context, account=acc_cur) @@ -247,7 +247,7 @@ class account_bank_statement(osv.osv): 'statement_id': st.id, 'journal_id': st.journal_id.id, 'period_id': st.period_id.id, - 'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False, + 'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False, }, context=context) @@ -280,7 +280,7 @@ class account_bank_statement(osv.osv): context=context): if line.state <> 'valid': raise osv.except_osv(_('Error !'), - _('Account move line "%s" is not valid') % line.name) + _('Ledger Posting line "%s" is not valid') % line.name) if move.reconcile_id and move.reconcile_id.line_ids: torec += map(lambda x: x.id, move.reconcile_id.line_ids) @@ -499,7 +499,7 @@ class account_bank_statement_reconcile_line(osv.osv): 'account_id': fields.many2one('account.account', 'Account', required=True), 'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'), 'amount': fields.float('Amount', required=True), - 'analytic_id': fields.many2one('account.analytic.account',"Analytic Account") + 'analytic_id': fields.many2one('account.analytic.account',"Analytic Account") } _defaults = { 'name': lambda *a: 'Write-Off', @@ -586,13 +586,13 @@ class account_bank_statement_line(osv.osv): 'note': fields.text('Notes'), 'reconcile_amount': fields.function(_reconcile_amount, string='Amount reconciled', method=True, type='float'), - 'sequence': fields.integer('Sequence'), + 'sequence': fields.integer('Sequence'), } _defaults = { 'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'), 'date': lambda *a: time.strftime('%Y-%m-%d'), 'type': lambda *a: 'general', - 'sequence': lambda *a: 10, + 'sequence': lambda *a: 10, } account_bank_statement_line() diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 1d0cdb95008..65c5a039a03 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -46,12 +46,12 @@ class account_move_line(osv.osv): if context.get('date_from', False) and context.get('date_to', False): where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move where date >= '" +context['date_from']+"' AND date <= '"+context['date_to']+"')" - + if state: if state.lower() not in ['all']: where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')" - - + + if context.get('periods', False): ids = ','.join([str(x) for x in context['periods']]) return obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids,where_move_state,where_move_lines_by_date) @@ -292,7 +292,7 @@ class account_move_line(osv.osv): if not len(res): return [('id', '=', '0')] return [('id', 'in', [x[0] for x in res])] - + def _invoice_search(self, cursor, user, obj, name, args): if not len(args): return [] @@ -550,7 +550,7 @@ class account_move_line(osv.osv): def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}): id_set = ','.join(map(str, ids)) - + lines = self.browse(cr, uid, ids, context=context) unrec_lines = filter(lambda x: not x['reconcile_id'], lines) credit = debit = 0.0 @@ -826,7 +826,7 @@ class account_move_line(osv.osv): if res: if res[1] != 'draft': raise osv.except_osv(_('UserError'), - _('The account move (%s) for centralisation ' \ + _('The Ledger Posting (%s) for centralisation ' \ 'has been confirmed!') % res[2]) vals['move_id'] = res[0] diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 487aa866059..e4e8882ebd5 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -796,10 +796,10 @@ account.move.line search - + - - + + @@ -1088,7 +1088,7 @@ diff --git a/addons/account/invoice.py b/addons/account/invoice.py index f49e092995e..373dbdff745 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -128,7 +128,7 @@ class account_invoice(osv.osv): else: debit+=debit_tmp credit+=credit_tmp - + if not inv.amount_total: result = 0.0 elif inv.type in ('out_invoice','in_refund'): @@ -139,7 +139,7 @@ class account_invoice(osv.osv): result = inv.amount_total - amount # Use is_zero function to avoid rounding trouble => should be fixed into ORM res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id,result) and result or 0.0 - + return res def _get_lines(self, cr, uid, ids, name, arg, context=None): @@ -260,7 +260,7 @@ class account_invoice(osv.osv): 'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}), 'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}), - 'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated account moves."), + 'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated Ledger Postings."), 'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])),string='Untaxed', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20), @@ -291,7 +291,7 @@ class account_invoice(osv.osv): 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ? 'account.move.line': (_get_invoice_from_line, None, 50), 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50), - }, help="The account moves of the invoice have been reconciled with account moves of the payment(s)."), + }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."), 'partner_bank': fields.many2one('res.partner.bank', 'Bank Account', help='The bank account to pay to or to be paid from'), 'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Entry Lines'), @@ -889,7 +889,7 @@ class account_invoice(osv.osv): date=context['date_p'] else: date=time.strftime('%Y-%m-%d') - + # Take the amount in currency and the currency of the payment if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']: amount_currency = context['amount_currency'] @@ -897,7 +897,7 @@ class account_invoice(osv.osv): else: amount_currency = False currency_id = False - + # Pay attention to the sign for both debit/credit AND amount_currency l1 = { 'debit': direction * pay_amount>0 and direction * pay_amount, diff --git a/addons/account/wizard/wizard_validate_account_move.py b/addons/account/wizard/wizard_validate_account_move.py index 6e9c9ccd742..3bce72005dc 100644 --- a/addons/account/wizard/wizard_validate_account_move.py +++ b/addons/account/wizard/wizard_validate_account_move.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -72,7 +72,7 @@ def _validate_move_lines(self, cr, uid, data, context={}): move_ids.append(line.move_id.id) move_ids = list(set(move_ids)) if not move_ids: - raise wizard.except_wizard(_('Warning'), _('Selected Move lines does not have any account move enties in draft state')) + raise wizard.except_wizard(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state')) res = move_obj.button_validate(cr, uid, move_ids, context) return {} diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py index e843c1e76e7..2c4d96dd040 100644 --- a/addons/account_date_check/account_date_check.py +++ b/addons/account_date_check/account_date_check.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -64,7 +64,7 @@ class account_move_line(osv.osv): if not journal.allow_date: period=self.pool.get('account.period').browse(cr,uid,[period_id])[0] if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') and time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'): - raise osv.except_osv(_('Error'),_('The date of your account move is not in the defined period !')) + raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !')) else: return True diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py index febaf80d8da..eb612148d99 100644 --- a/addons/account_payment/account_move_line.py +++ b/addons/account_payment/account_move_line.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -77,7 +77,7 @@ class account_move_line(osv.osv): def line2bank(self, cr, uid, ids, payment_type=None, context=None): """ - Try to return for each account move line a corresponding bank + Try to return for each Ledger Posting line a corresponding bank account according to the payment type. This work using one of the bank of the partner defined on the invoice eventually associated to the line. diff --git a/addons/account_payment/wizard/wizard_payment_order.py b/addons/account_payment/wizard/wizard_payment_order.py index a973c40378b..3fedbb652ef 100644 --- a/addons/account_payment/wizard/wizard_payment_order.py +++ b/addons/account_payment/wizard/wizard_payment_order.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -108,7 +108,7 @@ class wizard_payment_order(wizard.interface): - Small number of non-reconcilied move line , payment mode and bank account type, - Big number of partner and bank account. - If a type is given, unsuitable account move lines are ignored. + If a type is given, unsuitable account Entry lines are ignored. """ states = { diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py index f4873bb1735..326e360c5e5 100644 --- a/addons/crm_configuration/crm_config.py +++ b/addons/crm_configuration/crm_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -75,7 +75,7 @@ class crm_cases(osv.osv): 'partner_name2': fields.char('Employee Email', size=64), 'partner_phone': fields.char('Phone', size=32), 'partner_mobile': fields.char('Mobile', size=32), - 'child_ids': fields.one2many('crm.case', 'case_id', 'Events'), + 'child_ids': fields.one2many('crm.case', 'case_id', 'Events'), } def stage_next(self, cr, uid, ids, context={}): @@ -125,11 +125,11 @@ class crm_menu_config_wizard(osv.osv_memory): 'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), 'jobs': fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), 'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."), - 'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"), + 'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"), 'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 'claims': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), - 'phonecall': fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to planify a list of phone calls to process."), + 'phonecall': fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to plan a list of phone calls to process."), } _defaults = { 'meeting': lambda *args: True, @@ -190,42 +190,42 @@ crm_menu_config_wizard() class crm_generic_wizard(osv.osv_memory): _name = 'crm.generic_wizard' - - _columns = { + + _columns = { 'section_id': fields.many2one('crm.case.section', 'Section', required=True), 'user_id': fields.many2one('res.users', 'Responsible'), } - + def _get_default_section(self, cr, uid, context): case_id = context.get('active_id',False) if not case_id: return False - case_obj = self.pool.get('crm.case') + case_obj = self.pool.get('crm.case') case = case_obj.read(cr, uid, case_id, ['state','section_id']) if case['state'] in ('done'): - raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.')) + raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.')) return case['section_id'] - - + + _defaults = { 'section_id': _get_default_section - } + } def action_create(self, cr, uid, ids, context=None): - case_obj = self.pool.get('crm.case') + case_obj = self.pool.get('crm.case') case_id = context.get('active_id',[]) res = self.read(cr, uid, ids)[0] case = case_obj.read(cr, uid, case_id, ['state']) if case['state'] in ('done'): - raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.')) + raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.')) new_case_id = case_obj.copy(cr, uid, case_id, default= { 'section_id':res.get('section_id',False), 'user_id':res.get('user_id',False) }, context=context) - case_obj.write(cr, uid, case_id, {'case_id':new_case_id}, context=context) - case_obj.case_close(cr, uid, [case_id]) - return {} - + case_obj.write(cr, uid, case_id, {'case_id':new_case_id}, context=context) + case_obj.case_close(cr, uid, [case_id]) + return {} + crm_generic_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py index 841c56df9e5..e293af59937 100644 --- a/addons/delivery/partner.py +++ b/addons/delivery/partner.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -26,12 +26,12 @@ class res_partner(osv.osv): _columns = { 'property_delivery_carrier': fields.property( 'delivery.carrier', - type='many2one', - relation='delivery.carrier', - string="Delivery Method", + type='many2one', + relation='delivery.carrier', + string="Delivery Method", method=True, view_load=True, - help="This delivery method will be used when invoicing from packing."), + help="This delivery method will be used when invoicing from picking."), } res_partner() diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py index 5a902224883..a9f6e38a9e7 100644 --- a/addons/delivery/sale.py +++ b/addons/delivery/sale.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## import netsvc @@ -24,9 +24,9 @@ from osv import fields,osv # Overloaded sale_order to manage carriers : class sale_order(osv.osv): - _inherit = 'sale.order' + _inherit = 'sale.order' _columns = { - 'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packing."), + 'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on picking."), 'id': fields.integer('ID', readonly=True,invisible=True), } diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py index 21f472a55bd..a4e5c9017b3 100644 --- a/addons/document_ics/document_ics_config_wizard.py +++ b/addons/document_ics/document_ics_config_wizard.py @@ -28,47 +28,47 @@ import base64 import pooler SECTION_NAME = { - 'meeting' : 'Meetings', - 'lead':'Prospects', - 'opportunity':'Opportunities', - 'jobs':'Jobs', - 'bugs':'Bug Tracking', - 'fund':'Fund Raising', - 'helpdesk':'HelpDesk', - 'claims':'Claims', - 'phonecall':'Phone Calls', + 'meeting' : 'Meetings', + 'lead':'Prospects', + 'opportunity':'Opportunities', + 'jobs':'Jobs', + 'bugs':'Bug Tracking', + 'fund':'Fund Raising', + 'helpdesk':'HelpDesk', + 'claims':'Claims', + 'phonecall':'Phone Calls', } ICS_TAGS = { - 'summary':'Description', - 'uid':'Calendar Code' , - 'dtstart':'Date' , - 'dtend':'Deadline' , - 'url':'Partner Email' , - 'description':'Your action', + 'summary':'Description', + 'uid':'Calendar Code' , + 'dtstart':'Date' , + 'dtend':'Deadline' , + 'url':'Partner Email' , + 'description':'Your action', } class document_ics_crm_wizard(osv.osv_memory): _name='document.ics.crm.wizard' _columns = { - 'name':fields.char('Name', size=64), - 'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."), - 'lead' : fields.boolean('Prospect', help="Allows you to track and manage prospects which are pre-sales requests or contacts, the very first contact with a customer request."), - 'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), - 'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), - 'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."), - 'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"), - 'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), - 'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), - 'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), - 'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to planify a list of phone calls to process."), + 'name':fields.char('Name', size=64), + 'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."), + 'lead' : fields.boolean('Prospect', help="Allows you to track and manage prospects which are pre-sales requests or contacts, the very first contact with a customer request."), + 'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), + 'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), + 'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."), + 'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"), + 'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), + 'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), + 'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), + 'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to plan a list of phone calls to process."), } _defaults = { - 'meeting': lambda *args: True, - 'opportunity': lambda *args: True, - 'phonecall': lambda *args: True, + 'meeting': lambda *args: True, + 'opportunity': lambda *args: True, + 'phonecall': lambda *args: True, } - + def action_create(self, cr, uid, ids, context=None): data=self.read(cr, uid, ids, [])[0] dir_obj = self.pool.get('document.directory') @@ -85,46 +85,46 @@ class document_ics_crm_wizard(osv.osv_memory): section_id=self.pool.get('crm.case.section').search(cr, uid, [('name', '=', SECTION_NAME[section])]) if not section_id: continue - else: + else: object_id=self.pool.get('ir.model').search(cr, uid, [('name', '=', 'Case')])[0] - + vals_cont={ - 'name': SECTION_NAME[section], - 'sequence': 1, - 'directory_id': dir_id, - 'suffix': section, - 'extension': '.ics', - 'ics_object_id': object_id, - 'ics_domain': [('section_id', '=', section_id[0])], + 'name': SECTION_NAME[section], + 'sequence': 1, + 'directory_id': dir_id, + 'suffix': section, + 'extension': '.ics', + 'ics_object_id': object_id, + 'ics_domain': [('section_id', '=', section_id[0])], 'include_name' : False - } - + } + content_id = dir_cont_obj.create(cr, uid, vals_cont) - + ics_obj=self.pool.get('document.directory.ics.fields') for tag in ['description', 'url', 'summary', 'dtstart', 'dtend', 'uid']: field_id = self.pool.get('ir.model.fields').search(cr, uid, [('model_id.name', '=', 'Case'), ('field_description', '=', ICS_TAGS[tag])])[0] - vals_ics={ - 'field_id': field_id , - 'name': tag , - 'content_id': content_id , + vals_ics={ + 'field_id': field_id , + 'name': tag , + 'content_id': content_id , } ics_obj.create(cr, uid, vals_ics) return { - 'view_type': 'form', - "view_mode": 'form', - 'res_model': 'ir.actions.configuration.wizard', - 'type': 'ir.actions.act_window', - 'target':'new', + 'view_type': 'form', + "view_mode": 'form', + 'res_model': 'ir.actions.configuration.wizard', + 'type': 'ir.actions.act_window', + 'target':'new', } def action_cancel(self, cr, uid, ids, conect=None): return { - 'view_type': 'form', - "view_mode": 'form', - 'res_model': 'ir.actions.configuration.wizard', - 'type': 'ir.actions.act_window', - 'target':'new', + 'view_type': 'form', + "view_mode": 'form', + 'res_model': 'ir.actions.configuration.wizard', + 'type': 'ir.actions.act_window', + 'target':'new', } document_ics_crm_wizard() diff --git a/addons/mrp/company.py b/addons/mrp/company.py index 950205c5e5e..d9a4b5b94ba 100644 --- a/addons/mrp/company.py +++ b/addons/mrp/company.py @@ -26,7 +26,7 @@ class company(osv.osv): _columns = { 'schedule_range': fields.float('Scheduler Range', required=True, help="This is the time frame analysed by the scheduler when "\ - "computing procurements. All procurement that are not between "\ + "computing Requisitions. All Requisition that are not between "\ "today and today+range are skipped for futur computation."), 'po_lead': fields.float('Purchase Lead Time', required=True, help="This is the leads/security time for each purchase order."), diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index f5be0796450..261758908b9 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -191,7 +191,7 @@ class mrp_bom(osv.osv): 'product_qty': fields.float('Product Qty', required=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"), 'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"), - 'product_efficiency': fields.float('Product Efficiency', required=True, help="Efficiency on the production. A factor of 0.9 means a loss of 10% in the production."), + 'product_efficiency': fields.float('Product Efficiency', required=True, help="Material efficiency. A factor of 0.9 means a loss of 10% in the production."), 'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'), 'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True), 'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."), @@ -786,7 +786,7 @@ class mrp_procurement(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'origin': fields.char('Origin', size=64, - help="Reference of the document that created this procurement.\n" + help="Reference of the document that created this Requisition.\n" "This is automatically completed by Open ERP."), 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True), 'date_planned': fields.datetime('Scheduled date', required=True), @@ -803,7 +803,7 @@ class mrp_procurement(osv.osv): 'close_move': fields.boolean('Close Move at end', required=True), 'location_id': fields.many2one('stock.location', 'Location', required=True), 'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Requisition Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, - readonly=True, required=True, help="If you encode manually a procurement, you probably want to use" \ + readonly=True, required=True, help="If you encode manually a Requisition, you probably want to use" \ " a make to order method."), 'purchase_id': fields.many2one('purchase.order', 'Purchase Order'), @@ -1182,12 +1182,12 @@ class stock_warehouse_orderpoint(osv.osv): 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ), 'product_min_qty': fields.float('Min Quantity', required=True, help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\ - "a procurement to bring the virtual stock to the Max Quantity."), + "a requisition to bring the virtual stock to the Max Quantity."), 'product_max_qty': fields.float('Max Quantity', required=True, help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\ - "a procurement to bring the virtual stock to the Max Quantity."), + "a requisition to bring the virtual stock to the Max Quantity."), 'qty_multiple': fields.integer('Qty Multiple', required=True, - help="The procurement quantity will by rounded up to this multiple."), + help="The requisition quantity will by rounded up to this multiple."), 'procurement_id': fields.many2one('mrp.procurement', 'Purchase Order') } _defaults = { diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index ecfd9aa5257..b4c52271515 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -4,7 +4,7 @@ - + @@ -678,7 +678,7 @@ mrp.procurement tree - + @@ -696,10 +696,10 @@ mrp.procurement form -
+ - + @@ -709,7 +709,7 @@ - + @@ -726,7 +726,7 @@