odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] English Improvement 

bzr revid: kum@tinyerp.co.in-20091125093144-4pburrqn0rhq6y39
This commit is contained in:
kum (Open ERP) 2009-11-25 15:01:44 +05:30
parent 8198853ac9
commit 38caea46b0
40 changed files with 342 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account/account.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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:

16
addons/account/account_bank_statement.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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()

16
addons/account/account_move_line.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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]

8
addons/account/account_view.xml
View File

@ -796,10 +796,10 @@
<field name="model">account.move.line</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Move Lines">
<search string="Search Entry Lines">
<group col='10' colspan='4'>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
<filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
<filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
<separator orientation="vertical"/>
<field name="date" select='1'/>
<field name="account_id" select='1'/>
@ -1088,7 +1088,7 @@
<!--
TODO:
Print Journal (and change state)
Close Journal (and verify that there is no draft move lines)
Close Journal (and verify that there is no draft Entry Lines)
-->
<record id="view_journal_period_tree" model="ir.ui.view">

12
addons/account/invoice.py
View File

@ -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,

6
addons/account/wizard/wizard_validate_account_move.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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 {}

6
addons/account_date_check/account_date_check.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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

6
addons/account_payment/account_move_line.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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.

6
addons/account_payment/wizard/wizard_payment_order.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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 = {

38
addons/crm_configuration/crm_config.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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:

12
addons/delivery/partner.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -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()

8
addons/delivery/sale.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
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),
}

112
addons/document_ics/document_ics_config_wizard.py
View File

@ -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()

2
addons/mrp/company.py
View File

@ -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."),

12
addons/mrp/mrp.py
View File

@ -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 = {

28
addons/mrp/mrp_view.xml
View File

@ -4,7 +4,7 @@
<menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
groups="group_mrp_user,group_mrp_manager"/>
<menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
<menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/>
<!--
Property / Property Group
@ -670,7 +670,7 @@
</record>
<!--
Procurement
Requisition
-->
<record id="mrp_procurement_tree_view" model="ir.ui.view">
@ -678,7 +678,7 @@
<field name="model">mrp.procurement</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Procurement Lines">
<tree string="Requisition Lines">
<field name="name"/>
<field name="product_id"/>
<field name="product_qty"/>
@ -696,10 +696,10 @@
<field name="model">mrp.procurement</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Procurement">
<form string="Requisition">
<group col="2" colspan="2">
<separator colspan="2" string="References"/>
<field name="name" select="1" string="Procurement Reason"/>
<field name="name" select="1" string="Requisition Reason"/>
<field name="origin" select="2"/>
</group>
<group col="2" colspan="2">
@ -709,7 +709,7 @@
<field name="priority" groups="base.group_extended"/>
</group>
<notebook colspan="4">
<page string="Procurement Details">
<page string="Requisition Details">
<separator colspan="4" string="Product &amp; Location"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="location_id" select="2"/>
@ -726,7 +726,7 @@
<button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
<button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
<button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/>
<button name="button_check" states="confirmed" string="Run procurement" icon="gtk-media-play"/>
<button name="button_check" states="confirmed" string="Run Requisition" icon="gtk-media-play"/>
<button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/>
</group>
</page>
@ -753,7 +753,7 @@
<field name="model">mrp.procurement</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Procurement">
<search string="Search Requisition">
<group col='8' colspan='4'>
<filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/>
<separator orientation="vertical"/>
@ -766,7 +766,7 @@
</field>
</record>
<record id="mrp_procurement_action" model="ir.actions.act_window">
<field name="name">Procurement Orders</field>
<field name="name">Requisition Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -776,7 +776,7 @@
<menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
<record id="mrp_procurement_action3" model="ir.actions.act_window">
<field name="name">Unscheduled procurements</field>
<field name="name">Unscheduled Requisitions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -786,7 +786,7 @@
<menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_useability_extended"/>
<record id="mrp_procurement_action5" model="ir.actions.act_window">
<field name="name">Procurement Exceptions</field>
<field name="name">Requisition Exceptions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -796,7 +796,7 @@
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_useability_extended"/>
<record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Procurement Exceptions to Fix</field>
<field name="name">Requisition Exceptions to Fix</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -807,7 +807,7 @@
<menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/>
<record id="mrp_procurement_action11" model="ir.actions.act_window">
<field name="name">Temporary Procurement Exceptions</field>
<field name="name">Temporary Requisition Exceptions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -817,7 +817,7 @@
<menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/>
<record id="mrp_procurement_new" model="ir.actions.act_window">
<field name="name">New Procurement</field>
<field name="name">New Requisition</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>

16
addons/mrp/mrp_wizard.xml
View File

@ -3,15 +3,15 @@
<data>
<wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="100"/>
<wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/>
<wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Requisitions Only" name="mrp.procurement.compute"/>
<menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
<wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
<menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
<wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Workcenter load"/>
<wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
<record id="ir_project_cost_structure" model="ir.values">
<field eval="'client_print_multi'" name="key2"/>
@ -22,18 +22,18 @@
</record>
<wizard
string="Procurement Request"
string="Requisition Request"
model="product.product"
name="product.product.procurement"
keyword="client_action_multi"
id="product_procurement_wizard"/>
<wizard
id="stock.track_line"
model="stock.move"
multi="True"
name="mrp.stock.move.track"
string="Track line"/>
string="Track line"/>
</data>
</openerp>

18
addons/mrp/mrp_workflow.xml
View File

@ -2,13 +2,13 @@
<openerp>
<data>
<!-- Production -->
<record id="wkf_prod" model="workflow">
<field name="name">mrp.production.basic</field>
<field name="osv">mrp.production</field>
<field name="on_create">True</field>
</record>
<record id="prod_act_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_prod"/>
<field name="flow_start">True</field>
@ -53,7 +53,7 @@
<field name="kind">function</field>
<field name="action">action_cancel()</field>
</record>
<record id="prod_trans_draft_ready" model="workflow.transition">
<field name="act_from" ref="prod_act_draft"/>
<field name="act_to" ref="prod_act_ready"/>
@ -112,15 +112,15 @@
<field name="act_to" ref="prod_act_cancel"/>
<field name="signal">button_cancel</field>
</record>
<!-- Procurement -->
<record id="wkf" model="workflow">
<field name="name">mrp.procurement.basic</field>
<field name="osv">mrp.procurement</field>
<field name="on_create">True</field>
</record>
<record id="act_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf"/>
<field name="flow_start">True</field>
@ -203,7 +203,7 @@
<field name="kind">function</field>
<field name="action">action_done()</field>
</record>
<record id="trans_draft_confirm" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
@ -322,13 +322,13 @@
<field name="act_to" ref="act_cancel"/>
<field name="signal">subflow.cancel</field>
</record>
<record id="trans_produce_make_done" model="workflow.transition">
<field name="act_from" ref="act_produce"/>
<field name="act_to" ref="act_make_done"/>
<field name="signal">subflow.done</field>
</record>
<record id="trans_produce_service_make_done" model="workflow.transition">
<field name="act_from" ref="act_produce_service"/>
<field name="act_to" ref="act_make_done"/>

2
addons/mrp/process/procurement_process.xml
View File

@ -207,7 +207,7 @@
<record id="process_transition_procureserviceproduct0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Procure Service Product&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Procure Service&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;In procurement order, if product type is service&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>

4
addons/mrp/process/service_product_process.xml
View File

@ -20,7 +20,7 @@
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
<field name="model_id" ref="mrp.model_mrp_procurement"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;If procurement is make to order&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;If Requisition is make to order&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;Service on Order&quot;&quot;&quot;" name="name"/>
<field name="process_id" ref="process_process_serviceproductprocess0"/>
<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
@ -58,7 +58,7 @@
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Stockable Order Request&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is buy&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;If Requisition method is Make to order and supply method is buy&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
<field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/>
</record>

4
addons/mrp/process/stockable_product_process.xml
View File

@ -69,7 +69,7 @@
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Stockable Request&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;If Product type is Stockable and Requisition method is make to stock&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
</record>
@ -78,7 +78,7 @@
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Stockable Production Order&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;If Requisition method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_production0"/>
<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
</record>

2
addons/mrp_jit/mrp_jit.xml
View File

@ -3,7 +3,7 @@
<data>
# -----------------------------------------------------------
# Procurement - Automatic schedule
# Requisition - Automatic schedule
# -----------------------------------------------------------
<record model="workflow.transition" id="mrp.trans_confirm_confirm_wait">

2
addons/mrp_repair/mrp_repair.py
View File

@ -106,7 +106,7 @@ class mrp_repair(osv.osv):
'fees_lines' : fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
'internal_notes' : fields.text('Internal Notes'),
'quotation_notes' : fields.text('Quotation Notes'),
'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a packing with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
'invoiced': fields.boolean('Invoiced', readonly=True),
'repaired' : fields.boolean('Repaired', readonly=True),
'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),

6
addons/product/product.py
View File

@ -245,11 +245,11 @@ class product_template(osv.osv):
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."),
'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way requisitions are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."),
'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."),
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."),
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy'])), help="Base price for computing the customer price. Sometimes called the catalog price."),
@ -441,7 +441,7 @@ class product_product(osv.osv):
'variants': fields.char('Variants', size=64),
'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
'ean13': fields.char('EAN13', size=13),
'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
'price_extra': fields.float('Variant Price Extra', digits=(16, int(config['price_accuracy']))),
'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
'pricelist_id': fields.dummy(string='Pricelist',relation='product.pricelist', type='many2one'),

56
addons/product/product_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem icon="terp-product" id="menu_main_product" name="Products"/>
<menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
<menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
<menuitem
id="menu_config_product"
name="Configuration"
@ -30,7 +30,7 @@
</search>
</field>
</record>
<record id="product_product_tree_view" model="ir.ui.view">
<field name="name">product.product.tree</field>
<field name="model">product.product</field>
@ -76,11 +76,11 @@
<field groups="base.group_extended" name="rental" select="2"/>
</group>
</group>
<notebook colspan="4">
<page string="Information">
<group colspan="2" col="2">
<separator string="Procurement" colspan="2"/>
<separator string=" Requisition" colspan="2"/>
<field name="type" select="2"/>
<field name="procure_method"/>
<field name="supply_method"/>
@ -114,7 +114,7 @@
</group>
</page>
<page string="Procurement &amp; Locations">
<page string="Requisition &amp; Locations">
<group colspan="2" col="2" name="delay">
<separator string="Delays" colspan="2"/>
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@ -185,11 +185,11 @@
<field name="res_model">product.product</field>
<field name="view_type">form</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
</record>
<menuitem action="product_normal_action" id="menu_products" parent="product.menu_products_products" sequence="1"/>
<record id="product_category_form_view" model="ir.ui.view">
<field name="name">product.category.form</field>
<field name="model">product.category</field>
@ -234,7 +234,7 @@
<field name="view_id" ref="product_category_tree_view"/>
</record>
<menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>
<record id="product_category_action_form" model="ir.actions.act_window">
<field name="name">Products Categories</field>
<field name="type">ir.actions.act_window</field>
@ -243,8 +243,8 @@
<field name="view_id" ref="product_category_list_view"/>
</record>
<menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>
<record id="product_normal_action_tree" model="ir.actions.act_window">
<field name="name">Products</field>
<field name="type">ir.actions.act_window</field>
@ -261,10 +261,10 @@
<field eval="'ir.actions.act_window,%d'%product_normal_action_tree" name="value"/>
<field eval="True" name="object"/>
</record>
<!-- Unit of Measure -->
<record id="product_uom_tree_view" model="ir.ui.view">
<field name="name">product.uom.tree</field>
<field name="model">product.uom</field>
@ -279,7 +279,7 @@
</tree>
</field>
</record>
<record id="product_uom_form_view" model="ir.ui.view">
<field name="name">product.uom.form</field>
<field name="model">product.uom</field>
@ -303,7 +303,7 @@
<field name="view_id" ref="product_uom_tree_view"/>
</record>
<menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
<record id="product_uom_categ_form_view" model="ir.ui.view">
<field name="name">product.uom.categ.form</field>
<field name="model">product.uom.categ</field>
@ -322,7 +322,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
<record id="product_ul_form_view" model="ir.ui.view">
<field name="name">product.ul.form.view</field>
<field name="model">product.ul</field>
@ -353,7 +353,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>
<record id="product_packaging_tree_view" model="ir.ui.view">
<field name="name">product.packaging.tree.view</field>
<field name="model">product.packaging</field>
@ -367,7 +367,7 @@
</tree>
</field>
</record>
<record id="product_packaging_form_view" model="ir.ui.view">
<field name="name">product.packaging.form.view</field>
<field name="model">product.packaging</field>
@ -395,7 +395,7 @@
</form>
</field>
</record>
<record id="product_supplierinfo_form_view" model="ir.ui.view">
<field name="name">product.supplierinfo.form.view</field>
<field name="model">product.supplierinfo</field>
@ -435,7 +435,7 @@
</tree>
</field>
</record>
<record id="product_variant_form_view" model="ir.ui.view">
<field name="name">product.variant.form</field>
<field name="model">product.product</field>
@ -452,7 +452,7 @@
</form>
</field>
</record>
<record id="product_variant_tree_view" model="ir.ui.view">
<field name="name">product.variant.tree</field>
<field name="model">product.product</field>
@ -482,7 +482,7 @@
</tree>
</field>
</record>
<record id="product_template_form_view" model="ir.ui.view">
<field name="name">product.template.product.form</field>
<field name="model">product.template</field>
@ -502,7 +502,7 @@
<notebook colspan="4">
<page string="Information">
<group colspan="2" col="2">
<separator string="Procurement" colspan="2"/>
<separator string="Requisition" colspan="2"/>
<field name="type" select="2"/>
<field name="procure_method"/>
<field name="supply_method"/>
@ -536,7 +536,7 @@
</group>
</page>
<page string="Procurement &amp; Locations">
<page string="Requisition &amp; Locations">
<group colspan="2" col="2" name="delay">
<separator string="Delays" colspan="2"/>
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@ -575,7 +575,7 @@
</form>
</field>
</record>
<record id="product_template_action_tree" model="ir.actions.act_window">
<field name="name">Product Templates</field>
<field name="type">ir.actions.act_window</field>
@ -583,8 +583,8 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_template_tree_view"/>
</record>
<menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
</data>
</openerp>

12
addons/profile_manufacturing/profile_manufacturing.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -30,7 +30,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
help="The JIT module allows you to not run the scheduler "\
"periodically. It's easier and faster for real time "\
"stock computation but, in counter-part, it manages less "\
"efficiently priorities in procurements."
"efficiently priorities in requisitions."
),
'sale_margin':fields.boolean('Margins on Sales Order',
help="Display margins on the sale order form."),
@ -46,7 +46,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
),
'mrp_operation': fields.boolean('Manufacturing Operations',
help="This module allows you to not only manage by production order "\
"but also by work order/operation. You will be able to planify, "\
"but also by work order/operation. You will be able to plan, "\
"analyse the cost, check times, ... on all operations of each "\
"manufacturing order"),
'stock_location': fields.boolean('Advanced Locations',
@ -70,9 +70,9 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
help="This module allows you to add sub poducts in mrp bom."),
'warning': fields.boolean('Warning',
help="Able you to set warnings on products and partners."),
'board_document':fields.boolean('Document Management',
'board_document':fields.boolean('Document Management',
help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
'mrp_repair': fields.boolean('Repair',
'mrp_repair': fields.boolean('Repair',
help="Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."),
}

34
addons/project_mrp/process/project_mrp_process.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
<!--
Process Node
-->
<record id="process_node_procuretasktask0" model="process.node">
<field name="menu_id" ref="project.menu_action_view_task"/>
<field name="model_id" ref="project.model_project_task"/>
@ -17,7 +17,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_saleordertask0" model="process.node">
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
@ -29,7 +29,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_mrptask0" model="process.node">
<field name="menu_id" ref="project.menu_action_view_task"/>
<field name="model_id" ref="project.model_project_task"/>
@ -41,19 +41,19 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<!--
<!--
Process Transition
-->
<record id="process_transition_procuretask0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Procure Task&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot; Requisition Task&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
<field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/>
</record>
<record id="process_transition_createtask0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Create Task&quot;&quot;&quot;" name="name"/>
@ -61,19 +61,19 @@
<field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/>
<field model="process.node" name="source_node_id" ref="process_node_saleordertask0"/>
</record>
<record id="process_transition_ordertask0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Order Task&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;If procure method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;If Requisition method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
<field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/>
</record>
<!--
<!--
Process Action
-->
<!-- <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">-->
<!-- <field eval="&quot;&quot;&quot;action_confirm&quot;&quot;&quot;" name="action"/>-->
<!-- <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
@ -91,9 +91,9 @@
<!-- <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">-->
<!-- <field eval="&quot;&quot;&quot;write({'state':'exception'})&quot;&quot;&quot;" name="action"/>-->
<!-- <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
<!-- <field eval="&quot;&quot;&quot;Run Procurement&quot;&quot;&quot;" name="name"/>-->
<!-- <field eval="&quot;&quot;&quot;Run Requisition&quot;&quot;&quot;" name="name"/>-->
<!-- <field name="transition_id" ref="process_transition_ordertask0"/>-->
<!-- </record>-->
</data>
</openerp>

8
addons/purchase/purchase.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -194,7 +194,7 @@ class purchase_order(osv.osv):
}, multi="sums"),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
'create_uid': fields.many2one('res.users', 'Responsible'),
'create_uid': fields.many2one('res.users', 'Responsible'),
}
_defaults = {
'date_order': lambda *a: time.strftime('%Y-%m-%d'),
@ -355,7 +355,7 @@ class purchase_order(osv.osv):
if pick.state not in ('draft','cancel'):
raise osv.except_osv(
_('Could not cancel purchase order !'),
_('You must first cancel all packing attached to this purchase order.'))
_('You must first cancel all picking attached to this purchase order.'))
for pick in purchase.picking_ids:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)

16
addons/sale/process/sale_process.xml
View File

@ -32,8 +32,8 @@
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Sale Order Procurement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Procurement for each line&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Requisition for each line&quot;&quot;&quot;" name="note"/>
<field name="subflow_id" ref="process_process_salesprocess0"/>
<field name="process_id" ref="mrp.process_process_procurementprocess0"/>
<field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@ -66,8 +66,8 @@
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
<field name="model_id" ref="mrp.model_mrp_procurement"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;One procurement for each product.&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;Requisition&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;One requisition for each product.&quot;&quot;&quot;" name="note"/>
<field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
<field name="process_id" ref="process_process_salesprocess0"/>
<field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
@ -158,8 +158,8 @@
<record id="process_transition_saleprocurement0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Procurement is created after confirmation of sale order.&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;Sale Requisition&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Requisition is created after confirmation of sale order.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
<field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
</record>
@ -200,8 +200,8 @@
<record id="process_transition_saleorderprocurement0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;In sale order , procuerement for each line and it comes into the procurement order&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;Sale Requisition&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;In sale order , requisition for each line and it comes into the requisition order&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
<field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
</record>

6
addons/sale/sale.py
View File

@ -196,7 +196,7 @@ class sale_order(osv.osv):
('invoice_except', 'Invoice Exception'),
('done', 'Done'),
('cancel', 'Cancelled')
], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the packing list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Date Ordered'.", select=True),
], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Date Ordered'.", select=True),
'date_order': fields.date('Date Ordered', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
@ -217,8 +217,8 @@ class sale_order(osv.osv):
help="""The Shipping Policy is used to synchronise invoice and delivery operations.
- The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.
- The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
- The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all packing lists have been finished.
- The 'Invoice from the packing' choice is used to create an invoice during the packing process."""),
- The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
- The 'Invoice from the picking' choice is used to create an invoice during the packing process."""),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),

36
addons/sale/sale_view.xml
View File

@ -187,8 +187,8 @@
<button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
<button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Requisition" icon="gtk-ok"/>
<button name="ship_corrected" states="shipping_except" string="Requisition Corrected" icon="gtk-apply"/>
<button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
@ -218,7 +218,7 @@
</form>
</field>
</record>
<record id="view_sales_order_filter" model="ir.ui.view">
<field name="name">sale.order.list.select</field>
<field name="model">sale.order</field>
@ -240,14 +240,14 @@
</search>
</field>
</record>
<record id="action_order_form" model="ir.actions.act_window">
<field name="name">Sales Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
@ -258,7 +258,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
@ -268,7 +268,7 @@
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
@ -290,7 +290,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('shipping_except','invoice_except'))]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree2" id="menu_action_order_tree2" parent="menu_action_order_tree_all" groups="base.group_useability_extended"/>
@ -302,7 +302,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','manual')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree3" id="menu_action_order_tree3" parent="sale.menu_action_order_tree_all" groups="base.group_useability_extended"/>
@ -313,7 +313,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2" groups="base.group_useability_extended"/>
@ -325,7 +325,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft')]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1" groups="base.group_useability_extended"/>
@ -336,7 +336,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree" groups="base.group_useability_extended"/>
@ -347,7 +347,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree" groups="base.group_useability_extended"/>
@ -358,7 +358,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2" groups="base.group_useability_extended"/>
@ -369,7 +369,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_useability_extended"/>
@ -381,7 +381,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('date_order','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="view_order_line_graph" model="ir.ui.view">
@ -503,7 +503,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_order_line_tree2" id="menu_action_order_line_tree2" parent="sale.menu_action_order_line_tree1" groups="base.group_useability_extended"/>
@ -514,7 +514,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_order_line_tree3" id="menu_action_order_line_tree3" parent="sale.menu_action_order_line_tree2" groups="base.group_useability_extended"/>

50
addons/sale_journal/picking_journal_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">sale_journal.picking.journal</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Packing Journal">
<form string="Picking Journal">
<notebook>
<page string="Journal">
<separator string="Journal Information" colspan="4"/>
@ -24,7 +24,7 @@
<button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Packing">
<page string="Picking">
<button string="Cancel Packing" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
<newline/>
<field name="picking_stats_ids" colspan="4" nolabel="1"/>
@ -40,7 +40,7 @@
<field name="model">sale_journal.picking.journal</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Packing Journal">
<tree string="Picking Journal">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
@ -50,25 +50,25 @@
</field>
</record>
<record model="ir.actions.act_window" id="action_definition_picking_journal">
<field name="name">Packing journals</field>
<field name="name">Picking journals</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Packing Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
<record model="ir.actions.act_window" id="action_definition_picking_journal_tree">
<field name="name">Packing by journal</field>
<field name="name">Picking by journal</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<menuitem name="Packing by Journal" id="menu_definition_journal_picking_byjournal" parent="stock.menu_stock_root" action="action_definition_picking_journal_tree"/>
<menuitem name="Picking by Journal" id="menu_definition_journal_picking_byjournal" parent="stock.menu_stock_root" action="action_definition_picking_journal_tree"/>
<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_my">
<field name="name">My open packing journals</field>
@ -76,36 +76,36 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my" groups="base.group_useability_extended"/>
<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
<field name="name">Packing by journal</field>
<field name="name">Picking by journal</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_useability_extended"/>
<record model="ir.actions.act_window" id="action_invoice_type_tree">
<field name="name">Packing by invoice_method</field>
<field name="name">Picking by invoice_method</field>
<field name="name">sale_journal.invoice.type.tree</field>
<field name="res_model">sale_journal.invoice.type</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">tree</field>
</record>
<menuitem name="Packing to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>
<menuitem name="Packing by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>
<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>
<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>
<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
<field name="name">Packing to invoice</field>
<field name="name">Picking to invoice</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -115,7 +115,7 @@
<record model="ir.values" id="ir_open_invoice_type">
<field name="key2">tree_but_open</field>
<field name="model">sale_journal.invoice.type</field>
<field name="name">Packing to invoice</field>
<field name="name">Picking to invoice</field>
<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
<field name="object" eval="True"/>
</record>

26
addons/sale_journal/sale_journal_view.xml
View File

@ -30,7 +30,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
<record model="ir.ui.view" id="view_sale_journal_form">
@ -96,7 +96,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
<record model="ir.actions.act_window" id="action_definition_journal_tree">
@ -105,7 +105,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
<record model="ir.actions.act_window" id="action_definition_journal_tree_my">
@ -114,9 +114,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my" groups="base.group_useability_extended"/>
<record model="ir.actions.act_window" id="action_definition_journal_tree_all">
@ -125,9 +125,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all" groups="base.group_useability_extended"/>
<record model="ir.ui.view" id="sale_journal_sale_order">
@ -312,7 +312,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
<menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
@ -323,7 +323,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
@ -333,25 +333,25 @@
src_model="sale_journal.sale.journal"
id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
<act_window name="Assigned packing"
<act_window name="Assigned picking"
domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
res_model="stock.picking"
src_model="sale_journal.picking.journal"
id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
<act_window name="Confirmed packing"
<act_window name="Confirmed picking"
domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
res_model="stock.picking"
src_model="sale_journal.picking.journal"
id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
<act_window name="Assigned packing"
<act_window name="Assigned picking"
domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
res_model="stock.picking"
src_model="sale_journal.sale.journal"
id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
<act_window name="Confirmed packing"
<act_window name="Confirmed picking"
domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
res_model="stock.picking"
src_model="sale_journal.sale.journal"

4
addons/stock/stock.py
View File

@ -460,7 +460,7 @@ class stock_picking(osv.osv):
'date_done': fields.datetime('Date Done', help="Date of completion"),
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
method=True, store=True, type='datetime', string='Max. Planned Date', select=2),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'auto_picking': fields.boolean('Auto-Picking'),
'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
'invoice_state': fields.selection([
@ -1465,7 +1465,7 @@ class stock_picking_move_wizard(osv.osv_memory):
_columns = {
'name': fields.char('Name', size=64, invisible=True),
#'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines',readonly=True),
'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Move lines', required=True),
'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Entry lines', required=True),
'address_id': fields.many2one('res.partner.address', 'Dest. Address', invisible=True),
'picking_id': fields.many2one('stock.picking', 'Picking list', select=True, invisible=True),
}

38
addons/stock/stock_view.xml
View File

@ -462,7 +462,7 @@
<field name="model">stock.picking.move.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Move Lines">
<form string="Entry Lines">
<field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
<field name="picking_id" invisible="True"/>
<field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
@ -487,7 +487,7 @@
=============================
Packing
Picking
=============================
<record model="ir.ui.view" id="stock_picking_calendar">
<field name="name">stock.picking.calendar</field>
@ -507,7 +507,7 @@
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree color="red:state=='cancel'" string="Packing list">
<tree color="red:state=='cancel'" string="Picking list">
<field name="name"/>
<field name="origin"/>
<field name="address_id" select="1"/>
@ -524,7 +524,7 @@
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Packing list">
<form string="Picking list">
<group colspan="4" col="6">
<field name="address_id" select="2" context="{'contact_display':'partner'}"/>
<field name="type"/>
@ -606,7 +606,7 @@
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree color="red:state=='cancel'" string="Packing list">
<tree color="red:state=='cancel'" string="Picking list">
<field name="name"/>
<field name="origin"/>
<field name="address_id" select="1"/>
@ -622,7 +622,7 @@
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Packing list">
<form string="Picking list">
<group col="6" colspan="4">
<field name="address_id" select="1"/>
<field name="type"/>
@ -819,7 +819,7 @@
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Packing list">
<tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Picking list">
<field name="name"/>
<field name="origin"/>
<field name="address_id"/>
@ -836,7 +836,7 @@
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Packing list">
<form string="Picking list">
<group col="6" colspan="4">
<field name="address_id" select="2"/>
<field name="type"/>
@ -888,7 +888,7 @@
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
<button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(partial_picking)d" states="assigned" string="Packing Done" type="action" icon="gtk-execute"/>
<button name="%(partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
</group>
</page>
@ -939,7 +939,7 @@
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
<record id="action_picking_tree2" model="ir.actions.act_window">
<field name="name">Available Packing</field>
<field name="name">Available Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -969,7 +969,7 @@
<menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_useability_extended"/>
<record id="action_picking_tree3" model="ir.actions.act_window">
<field name="name">Confirmed Packing Waiting Availability</field>
<field name="name">Confirmed Picking Waiting Availability</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -1006,7 +1006,7 @@
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree color="red:state=='cancel'" string="Packing list">
<tree color="red:state=='cancel'" string="Picking list">
<field name="name"/>
<field name="origin"/>
<field name="address_id"/>
@ -1023,7 +1023,7 @@
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Input Packing List">
<form string="Input Picking List">
<group colspan="4" col="6">
<field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
<field name="type"/>
@ -1129,7 +1129,7 @@
<menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
<record id="action_picking_tree5" model="ir.actions.act_window">
<field name="name">Packing to Process</field>
<field name="name">Picking to Process</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -1159,7 +1159,7 @@
<menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_useability_extended"/>
<record id="action_picking_form" model="ir.actions.act_window">
<field name="name">New Reception Packing</field>
<field name="name">New Reception Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -1201,7 +1201,7 @@
<record id="action_picking_tree7" model="ir.actions.act_window">
<field name="name">Available Packing</field>
<field name="name">Available Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -1214,7 +1214,7 @@
<menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/>
<record id="action_picking_tree8" model="ir.actions.act_window">
<field name="name">Confirmed Packing Waiting Availability</field>
<field name="name">Confirmed Picking Waiting Availability</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -1227,7 +1227,7 @@
<menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/>
<record id="action_picking_tree9" model="ir.actions.act_window">
<field name="name">New Internal Packing</field>
<field name="name">New Internal Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -1341,7 +1341,7 @@
<menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_useability_extended"/>
<record id="action_picking_all" model="ir.actions.act_window">
<field name="name">Packing</field>
<field name="name">Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>

12
addons/stock/wizard/wizard_invoice_onshipping.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -32,7 +32,7 @@ invoice_form = """<?xml version="1.0"?>
<newline/>
<field name="type"/>
<newline/>
<field name="invoice_date" />
<field name="invoice_date" />
</form>
"""
@ -53,7 +53,7 @@ invoice_fields = {
'selection': [],
'required': True
},
'invoice_date': {'string': 'Invoiced date', 'type':'date' }
'invoice_date': {'string': 'Invoiced date', 'type':'date' }
}
def _get_type(obj, cr, uid, data, context):
@ -63,7 +63,7 @@ def _get_type(obj, cr, uid, data, context):
if pick.invoice_state == 'invoiced':
raise wizard.except_wizard(_('UserError'), _('Invoice is already created.'))
if pick.invoice_state == 'none':
raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Packing.'))
raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Picking.'))
if pick.move_lines:
usage = pick.move_lines[0].location_id.usage
@ -85,7 +85,7 @@ def _get_type(obj, cr, uid, data, context):
('out_refund', 'Customer Refund'),
('in_refund', 'Supplier Refund'),
]
if pick.type == 'out' and usage == 'supplier':
type = 'in_refund'
elif pick.type == 'out' and usage == 'customer':

12
addons/stock/wizard/wizard_partial_picking.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -32,8 +32,8 @@ _moves_arch = UpdateableStr()
_moves_fields = UpdateableDict()
_moves_arch_end = '''<?xml version="1.0"?>
<form string="Packing result">
<label string="The packing has been successfully made !" colspan="4"/>
<form string="Picking result">
<label string="The picking has been successfully made !" colspan="4"/>
<field name="back_order_notification" colspan="4" nolabel="1"/>
</form>'''
_moves_fields_end = {
@ -54,7 +54,7 @@ def _get_moves(self, cr, uid, data, context):
res = {}
_moves_fields.clear()
_moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make packing">']
_moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
for m in pick.move_lines:
quantity = m.product_qty
@ -208,7 +208,7 @@ def _do_split(self, cr, uid, data, context):
def _get_default(self, cr, uid, data, context):
if data['form']['back_order']:
data['form']['back_order_notification'] = _('Back Order %s Assigned to this Packing.') % (tools.ustr(data['form']['back_order']),)
data['form']['back_order_notification'] = _('Back Order %s Assigned to this Picking.') % (tools.ustr(data['form']['back_order']),)
return data['form']
class partial_picking(wizard.interface):

8
addons/stock/wizard/wizard_picking_make.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -24,14 +24,14 @@ import pooler
import netsvc
ARCH = '''<?xml version="1.0"?>
<form string="Make packing">
<form string="Make picking">
<field name="pickings" nolabel="1" colspan="4"
width="600" height="300"/>
</form>'''
FIELDS = {
'pickings': {
'string': 'Packing',
'string': 'Picking',
'type': 'one2many',
'relation': 'stock.picking',
'readonly': True,

8
addons/stock/wizard/wizard_return.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -77,7 +77,7 @@ def _create_returns(self, cr, uid, data, context):
else:
new_type='internal'
new_picking=pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
'move_lines':[], 'state':'draft', 'type':new_type,
'move_lines':[], 'state':'draft', 'type':new_type,
'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
new_location=move.location_dest_id.id
@ -101,7 +101,7 @@ def _action_open_window(self, cr, uid, data, context):
return {}
return {
'domain': "[('id', 'in', ["+str(res)+"])]",
'name': 'Packing List',
'name': 'Picking List',
'view_type':'form',
'view_mode':'tree,form',
'res_model':'stock.picking',

2
addons/stock_location/stock_view.xml
View File

@ -40,7 +40,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<page string="Procurement &amp; Locations">
<page string="Requisition &amp; Locations">
<field name="path_ids" editable="bottom" colspan="4" nolabel="1">
<tree string="Location Paths" editable="bottom">
<field name="location_from_id"/>