Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-no-osv-memory-vmt into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-no-osv-memory-vmt/+merge/73357
Changes to some addons so they work correctly with the changed osv_memory
(available in the similarly named server branch
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-no-osv-memory-vmt).
It is probably a good time to review those osv_memory model/table names.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-no-osv-memory-vmt/+merge/73357
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-no-osv-memory-vmt.
=== modified file 'account/account.py'
--- account/account.py 2011-08-22 10:34:57 +0000
+++ account/account.py 2011-08-30 11:30:28 +0000
@@ -1251,7 +1251,7 @@
context = {}
c = context.copy()
c['novalidate'] = True
- result = super(osv.osv, self).write(cr, uid, ids, vals, c)
+ result = super(account_move, self).write(cr, uid, ids, vals, c)
self.validate(cr, uid, ids, context=context)
return result
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2011-08-04 15:03:04 +0000
+++ account/account_move_line.py 2011-08-30 11:30:28 +0000
@@ -1296,7 +1296,7 @@
'user_id': uid
})]
- result = super(osv.osv, self).create(cr, uid, vals, context=context)
+ result = super(account_move_line, self).create(cr, uid, vals, context=context)
# CREATE Taxes
if vals.get('account_tax_id', False):
tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
=== modified file 'account/project/wizard/account_analytic_cost_ledger_for_journal_report.py'
--- account/project/wizard/account_analytic_cost_ledger_for_journal_report.py 2011-04-29 08:49:48 +0000
+++ account/project/wizard/account_analytic_cost_ledger_for_journal_report.py 2011-08-30 11:30:28 +0000
@@ -29,7 +29,7 @@
_columns = {
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
- 'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'Journal_id', 'Journals'),
+ 'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'journal_id', 'Journals'),
}
_defaults = {
=== modified file 'account/test/account_report.yml'
--- account/test/account_report.yml 2011-01-14 00:11:01 +0000
+++ account/test/account_report.yml 2011-08-30 11:30:28 +0000
@@ -147,7 +147,7 @@
!python {model: account.account}: |
ctx={}
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
- data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
+ data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False,'target_move': 'all'}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
-
@@ -156,7 +156,7 @@
!python {model: account.account}: |
ctx={}
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
- data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
+ data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True,'target_move': 'all'}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
-
=== modified file 'account/wizard/account_report_account_balance.py'
--- account/wizard/account_report_account_balance.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_account_balance.py 2011-08-30 11:30:28 +0000
@@ -19,13 +19,17 @@
#
##############################################################################
-from osv import osv
+from osv import osv, fields
class account_balance_report(osv.osv_memory):
_inherit = "account.common.account.report"
_name = 'account.balance.report'
_description = 'Trial Balance Report'
+ _columns = {
+ 'journal_ids': fields.many2many('account.journal', 'account_balance_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+ }
+
_defaults = {
'journal_ids': [],
}
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py 2011-04-15 10:09:01 +0000
+++ account/wizard/account_report_aged_partner_balance.py 2011-08-30 11:30:28 +0000
@@ -35,6 +35,7 @@
'direction_selection': fields.selection([('past','Past'),
('future','Future')],
'Analysis Direction', required=True),
+ 'journal_ids': fields.many2many('account.journal', 'account_aged_trial_balance_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults = {
'period_length': 30,
=== modified file 'account/wizard/account_report_balance_sheet.py'
--- account/wizard/account_report_balance_sheet.py 2011-06-08 10:04:27 +0000
+++ account/wizard/account_report_balance_sheet.py 2011-08-30 11:30:28 +0000
@@ -45,6 +45,7 @@
'(Profit: Amount will be added, Loss: Amount will be duducted), ' \
'which is calculated from Profilt & Loss Report',
domain = [('type','=','other')]),
+ 'journal_ids': fields.many2many('account.journal', 'account_bs_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults={
=== modified file 'account/wizard/account_report_central_journal.py'
--- account/wizard/account_report_central_journal.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_central_journal.py 2011-08-30 11:30:28 +0000
@@ -19,13 +19,17 @@
#
##############################################################################
-from osv import osv
+from osv import osv, fields
class account_central_journal(osv.osv_memory):
_name = 'account.central.journal'
_description = 'Account Central Journal'
_inherit = "account.common.journal.report"
+ _columns = {
+ 'journal_ids': fields.many2many('account.journal', 'account_central_journal_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+ }
+
def _print_report(self, cr, uid, ids, data, context=None):
data = self.pre_print_report(cr, uid, ids, data, context=context)
return {
=== modified file 'account/wizard/account_report_general_journal.py'
--- account/wizard/account_report_general_journal.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_general_journal.py 2011-08-30 11:30:28 +0000
@@ -19,17 +19,21 @@
#
##############################################################################
-from osv import osv
+from osv import osv, fields
class account_general_journal(osv.osv_memory):
_inherit = "account.common.journal.report"
_name = 'account.general.journal'
_description = 'Account General Journal'
+ _columns = {
+ 'journal_ids': fields.many2many('account.journal', 'account_general_journal_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+ }
+
def _print_report(self, cr, uid, ids, data, context=None):
data = self.pre_print_report(cr, uid, ids, data, context=context)
return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data}
account_general_journal()
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_report_general_ledger.py'
--- account/wizard/account_report_general_ledger.py 2011-05-18 12:59:26 +0000
+++ account/wizard/account_report_general_ledger.py 2011-08-30 11:30:28 +0000
@@ -32,6 +32,7 @@
help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'),
'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True),
+ 'journal_ids': fields.many2many('account.journal', 'account_report_general_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults = {
'landscape': True,
=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_partner_balance.py 2011-08-30 11:30:28 +0000
@@ -31,6 +31,7 @@
_columns = {
'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
,'Display Partners'),
+ 'journal_ids': fields.many2many('account.journal', 'account_partner_balance_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults = {
@@ -51,4 +52,4 @@
account_partner_balance()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_report_partner_ledger.py'
--- account/wizard/account_report_partner_ledger.py 2011-05-18 13:51:19 +0000
+++ account/wizard/account_report_partner_ledger.py 2011-08-30 11:30:28 +0000
@@ -35,6 +35,7 @@
'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods'), ('unreconciled', 'Unreconciled Entries')], "Filter by", required=True),
'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
+ 'journal_ids': fields.many2many('account.journal', 'account_partner_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults = {
'initial_balance': False,
=== modified file 'account/wizard/account_report_print_journal.py'
--- account/wizard/account_report_print_journal.py 2011-04-15 10:09:01 +0000
+++ account/wizard/account_report_print_journal.py 2011-08-30 11:30:28 +0000
@@ -30,6 +30,7 @@
'sort_selection': fields.selection([('date', 'Date'),
('ref', 'Reference Number'),],
'Entries Sorted by', required=True),
+ 'journal_ids': fields.many2many('account.journal', 'account_print_journal_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults = {
'sort_selection': 'date',
@@ -44,4 +45,4 @@
account_print_journal()
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py 2011-06-08 10:04:27 +0000
+++ account/wizard/account_report_profit_loss.py 2011-08-30 11:30:28 +0000
@@ -28,8 +28,10 @@
_inherit = "account.common.account.report"
_name = "account.pl.report"
_description = "Account Profit And Loss Report"
+
_columns = {
'display_type': fields.boolean("Landscape Mode"),
+ 'journal_ids': fields.many2many('account.journal', 'account_pl_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
}
_defaults = {
=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py 2011-07-01 23:41:24 +0000
+++ account_analytic_plans/account_analytic_plans.py 2011-08-30 11:30:28 +0000
@@ -366,7 +366,7 @@
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:
context = {}
- result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+ result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
return result
account_move_line()
@@ -496,4 +496,4 @@
}
account_bank_statement_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py 2011-05-06 12:28:19 +0000
+++ account_followup/wizard/account_followup_print.py 2011-08-30 11:30:28 +0000
@@ -115,7 +115,7 @@
_name = 'account.followup.print.all'
_description = 'Print Followup & Send Mail to Customers'
_columns = {
- 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True, domain="[('account_id.type', '=', 'receivable'), ('account_id.reconcile', '=', True), ('reconcile_id','=', False), ('state', '!=', 'draft'), ('account_id.active', '=', True), ('debit', '>', 0)]"),
+ 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True, domain="[('account_id.type', '=', 'receivable'), ('account_id.reconcile', '=', True), ('reconcile_id','=', False), ('state', '!=', 'draft'), ('account_id.active', '=', True), ('debit', '>', 0)]", no_foreign_keys=True),
'email_conf': fields.boolean('Send email confirmation'),
'email_subject': fields.char('Email Subject', size=64),
'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
=== modified file 'anonymization/anonymization.py'
--- anonymization/anonymization.py 2011-07-01 23:41:24 +0000
+++ anonymization/anonymization.py 2011-08-30 11:30:28 +0000
@@ -239,7 +239,7 @@
return res
_columns = {
- 'name': fields.char(size='64', string='File Name'),
+ 'name': fields.char(size=64, string='File Name'),
'summary': fields.function(_get_summary, type='text', string='Summary'),
'file_export': fields.binary(string='Export'),
'file_import': fields.binary(string='Import'),
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-08-27 23:31:30 +0000
+++ crm/crm.py 2011-08-30 11:30:28 +0000
@@ -405,7 +405,7 @@
default.update({ 'date_closed': False, })
if self._columns.get('date_open'):
default.update({ 'date_open': False })
- return super(osv.osv, self).copy(cr, uid, id, default, context=context)
+ return super(crm_case, self).copy(cr, uid, id, default, context=context)
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
mailgate_pool = self.pool.get('mailgate.thread')
=== modified file 'crm_partner_assign/test/test_crm_partner_assign.yml'
--- crm_partner_assign/test/test_crm_partner_assign.yml 2011-08-19 06:23:46 +0000
+++ crm_partner_assign/test/test_crm_partner_assign.yml 2011-08-30 11:30:28 +0000
@@ -65,7 +65,8 @@
'name': 'email',
'email_to': '[email protected]',
'email_from': 'Administrator <[email protected]>',
- 'reply_to': '[email protected]'
+ 'reply_to': '[email protected]',
+ 'state': 'draft',
}
ids = self.create(cr, uid, vals, context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
host = config.get('smtp_user', '127.0.0.1')
=== modified file 'crm_profiling/crm_profiling.py'
--- crm_profiling/crm_profiling.py 2011-01-14 00:11:01 +0000
+++ crm_profiling/crm_profiling.py 2011-08-30 11:30:28 +0000
@@ -264,7 +264,7 @@
}
_constraints = [
- (orm.orm._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
+ (osv.osv._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
]
def process_continue(self, cr, uid, ids, start=False):
=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out.py'
--- hr_attendance/wizard/hr_attendance_sign_in_out.py 2011-01-14 00:11:01 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out.py 2011-08-30 11:30:28 +0000
@@ -29,7 +29,7 @@
_columns = {
'name': fields.char('Employees name', size=32, required=True, readonly=True),
'last_time': fields.datetime('Your last sign out', required=True),
- 'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
+ 'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
}
def _get_empname(self, cr, uid, context=None):
@@ -52,10 +52,12 @@
def sign_in(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids, [], context=context)[0]
+ data['emp_id'] = data['emp_id'] and data['emp_id'][0]
return self.pool.get('hr.sign.in.out').sign_in(cr, uid, data, context)
def sign_out(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids, [], context=context)[0]
+ data['emp_id'] = data['emp_id'] and data['emp_id'][0]
return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
hr_si_so_ask()
@@ -68,7 +70,7 @@
_columns = {
'name': fields.char('Employees name', size=32, required=True, readonly=True),
'state': fields.char('Current state', size=32, required=True, readonly=True),
- 'emp_id': fields.char('Employee ID', size=32, required=True, readonly=True),
+ 'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
}
def _get_empid(self, cr, uid, context=None):
@@ -88,6 +90,7 @@
obj_model = self.pool.get('ir.model.data')
att_obj = self.pool.get('hr.attendance')
data = self.read(cr, uid, ids, [], context=context)[0]
+ data['emp_id'] = data['emp_id'] and data['emp_id'][0]
emp_id = data['emp_id']
att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
last_att = att_obj.browse(cr, uid, att_id, context=context)
@@ -113,6 +116,7 @@
obj_model = self.pool.get('ir.model.data')
att_obj = self.pool.get('hr.attendance')
data = self.read(cr, uid, ids, [], context=context)[0]
+ data['emp_id'] = data['emp_id'] and data['emp_id'][0]
emp_id = data['emp_id']
att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
last_att = att_obj.browse(cr, uid, att_id, context=context)
=== modified file 'idea/test/test_idea.yml'
--- idea/test/test_idea.yml 2011-01-14 00:11:01 +0000
+++ idea/test/test_idea.yml 2011-08-30 11:30:28 +0000
@@ -56,7 +56,7 @@
-
!python {model: idea.post.vote}: |
uid2 = ref('test_idea_user1')
- new_id = self.create(cr, uid2, {'vote': 50}, {"active_ids": [ref("idea_idea_0")]})
+ new_id = self.create(cr, uid2, {'vote': "50"}, {"active_ids": [ref("idea_idea_0")]})
self.do_vote(cr, uid2, [new_id], {"active_ids": [ref("idea_idea_0")]})
- |
@@ -69,7 +69,7 @@
-
!python {model: idea.post.vote}: |
uid2 = ref('test_idea_user2')
- new_id = self.create(cr, uid2, {'vote': 100, 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
+ new_id = self.create(cr, uid2, {'vote': "100", 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
self.do_vote(cr, uid2, [new_id], {'active_ids': [ref('idea_idea_0')]})
- |
=== modified file 'l10n_be/wizard/l10n_be_partner_vat_listing.py'
--- l10n_be/wizard/l10n_be_partner_vat_listing.py 2011-05-06 13:05:19 +0000
+++ l10n_be/wizard/l10n_be_partner_vat_listing.py 2011-08-30 11:30:28 +0000
@@ -117,7 +117,8 @@
""" Partner Vat Listing """
_name = "partner.vat.list_13"
_columns = {
- 'partner_ids': fields.many2many('vat.listing.clients', 'vat_partner_rel', 'vat_id', 'partner_id', 'Clients', required=False, help='You can remove clients/partners which you do not want to show in xml file'),
+ # TODO the referenced model has been deleted at revno 4672.1.2.
+ #'partner_ids': fields.many2many('vat.listing.clients', 'vat_partner_rel', 'vat_id', 'partner_id', 'Clients', required=False, help='You can remove clients/partners which you do not want to show in xml file'),
'name': fields.char('File Name', size=32),
'msg': fields.text('File created', size=64, readonly=True),
'file_save' : fields.binary('Save File', readonly=True),
@@ -127,7 +128,8 @@
return context.get('partner_ids', [])
_defaults={
- 'partner_ids': _get_partners
+ # TODO the referenced model has been deleted at revno 4672.1.2.
+ # 'partner_ids': _get_partners
}
def create_xml(self, cursor, user, ids, context=None):
=== modified file 'mrp/test/mrp_phantom_bom.yml'
--- mrp/test/mrp_phantom_bom.yml 2011-03-10 11:34:02 +0000
+++ mrp/test/mrp_phantom_bom.yml 2011-08-30 11:30:28 +0000
@@ -256,7 +256,7 @@
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
picking_ids = pick_obj.search(cr, uid, [('type','=','in'),('state','=','assigned')])
- partial = self.browse(cr, uid, 1, context)
+ partial = self.browse(cr, uid, ref('stock_partial_picking0'), context)
partial_datas = {
'delivery_date': partial.date
}
=== modified file 'mrp/test/mrp_procurement.yml'
--- mrp/test/mrp_procurement.yml 2011-01-14 00:11:01 +0000
+++ mrp/test/mrp_procurement.yml 2011-08-30 11:30:28 +0000
@@ -210,7 +210,7 @@
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
- partial = self.browse(cr, uid, 1, context)
+ partial = self.browse(cr, uid, ref('stock_partial_picking0'), context)
partial_datas = {
'delivery_date' : partial.date
}
@@ -246,7 +246,7 @@
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
- partial = self.browse(cr, uid, 1, context)
+ partial = self.browse(cr, uid, ref('stock_partial_picking0'), context)
partial_datas = {
'delivery_date': partial.date
}
=== modified file 'outlook/installer.py'
--- outlook/installer.py 2011-05-20 07:48:01 +0000
+++ outlook/installer.py 2011-08-30 11:30:28 +0000
@@ -41,7 +41,7 @@
'doc_name':fields.char('File name', size=64),
'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you would like to add to your email and its attachments."),
'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
- 'doc_file':fields.char('Installation Manual',size="264",help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
+ 'doc_file':fields.char('Installation Manual',size=264,help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
'description':fields.text('Description', readonly=True)
}
=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py 2011-07-08 09:22:32 +0000
+++ point_of_sale/point_of_sale.py 2011-08-30 11:30:28 +0000
@@ -553,7 +553,7 @@
args['ref'] = order.contract_number or None
statement_id = statement_obj.search(cr,uid, [
- ('journal_id', '=', data['journal']),
+ ('journal_id', '=', int(data['journal'])),
('company_id', '=', curr_company),
('user_id', '=', uid),
('state', '=', 'open')], context=context)
@@ -563,7 +563,7 @@
statement_id = statement_id[0]
args['statement_id'] = statement_id
args['pos_statement_id'] = order_id
- args['journal_id'] = data['journal']
+ args['journal_id'] = int(data['journal'])
args['type'] = 'customer'
args['ref'] = order.name
statement_line_obj.create(cr, uid, args, context=context)
=== modified file 'point_of_sale/test/point_of_sale_report.yml'
--- point_of_sale/test/point_of_sale_report.yml 2011-02-03 13:15:11 +0000
+++ point_of_sale/test/point_of_sale_report.yml 2011-08-30 11:30:28 +0000
@@ -53,6 +53,11 @@
file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
-
+ Create a record for the root user in pos.payment.report.user (used by the next python block).
+-
+ !record {model: pos.payment.report.user, id: pos_payment_report_user_1}:
+ user_id: []
+-
Print the POS Payment Report through the wizard
-
!python {model: ir.ui.menu}: |
=== modified file 'purchase/test/purchase_from_picking.yml'
--- purchase/test/purchase_from_picking.yml 2011-01-14 00:11:01 +0000
+++ purchase/test/purchase_from_picking.yml 2011-08-30 11:30:28 +0000
@@ -137,7 +137,7 @@
pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
pick_ids = [x.id for x in pur_id1.picking_ids]
id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.expenses_journal')},
- {'active_ids': pick_ids})
+ {'active_ids': pick_ids, 'active_model': 'stock.picking'})
self.create_invoice(cr, uid, [id], {"active_ids": pick_ids, "active_id": pick_ids[0]})
-
I check that an invoice_ids field of Delivery&Invoices gets bind with the value.
=== modified file 'sale/test/invoice_on_shipped_qty.yml'
--- sale/test/invoice_on_shipped_qty.yml 2011-01-14 00:11:01 +0000
+++ sale/test/invoice_on_shipped_qty.yml 2011-08-30 11:30:28 +0000
@@ -74,7 +74,7 @@
sale_id = sale_obj.browse(cr, uid, ref("sale_order_so6"))
ids = [x.id for x in sale_id.picking_ids]
wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')},
- {'active_ids': ids})
+ {'active_ids': ids, 'active_model': 'stock.picking'})
self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]})
-
I verify whether the invoice has been generated for SO
=== modified file 'sale/test/picking_order_policy.yml'
--- sale/test/picking_order_policy.yml 2011-01-14 00:11:01 +0000
+++ sale/test/picking_order_policy.yml 2011-08-30 11:30:28 +0000
@@ -67,7 +67,7 @@
sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7"))
ids = [x.id for x in sale_id.picking_ids]
wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')},
- {'active_ids': ids})
+ {'active_ids': ids, 'active_model': 'stock.picking'})
self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]})
-
I check that an invoice has been created.
=== modified file 'sale/wizard/sale_make_invoice_advance.py'
--- sale/wizard/sale_make_invoice_advance.py 2011-01-14 00:11:01 +0000
+++ sale/wizard/sale_make_invoice_advance.py 2011-08-30 11:30:28 +0000
@@ -27,8 +27,8 @@
_columns = {
'product_id': fields.many2one('product.product', 'Advance Product', required=True,
help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
- 'amount': fields.float('Advance Amount', size=(16, 2), required=True, help="The amount to be invoiced in advance."),
- 'qtty': fields.float('Quantity', size=(16, 2), required=True),
+ 'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
+ 'qtty': fields.float('Quantity', digits=(16, 2), required=True),
}
_defaults = {
'qtty': 1.0
@@ -173,4 +173,4 @@
sale_open_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'stock/wizard/stock_partial_move.py'
--- stock/wizard/stock_partial_move.py 2011-01-17 08:00:48 +0000
+++ stock/wizard/stock_partial_move.py 2011-08-30 11:30:28 +0000
@@ -25,22 +25,18 @@
class stock_partial_move_memory_out(osv.osv_memory):
+ _inherit = "stock.picking.memory.out"
_name = "stock.move.memory.out"
- _rec_name = 'product_id'
_columns = {
- 'product_id' : fields.many2one('product.product', string="Product", required=True),
- 'quantity' : fields.float("Quantity", required=True),
- 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
- 'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'),
- 'move_id' : fields.many2one('stock.move', "Move"),
'wizard_id' : fields.many2one('stock.partial.move', string="Wizard"),
- 'cost' : fields.float("Cost", help="Unit Cost for this product line"),
- 'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed"),
}
class stock_partial_move_memory_in(osv.osv_memory):
- _inherit = "stock.move.memory.out"
+ _inherit = "stock.picking.memory.in"
_name = "stock.move.memory.in"
+ _columns = {
+ 'wizard_id' : fields.many2one('stock.partial.move', string="Wizard"),
+ }
class stock_partial_move(osv.osv_memory):
_name = "stock.partial.move"
=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py 2011-05-02 18:46:43 +0000
+++ stock/wizard/stock_partial_picking.py 2011-08-30 11:30:28 +0000
@@ -24,15 +24,33 @@
from tools.translate import _
import time
+class stock_partial_picking_memory_out(osv.osv_memory):
+ _name = "stock.picking.memory.out"
+ _rec_name = 'product_id'
+ _columns = {
+ 'product_id' : fields.many2one('product.product', string="Product", required=True),
+ 'quantity' : fields.float("Quantity", required=True),
+ 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
+ 'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'),
+ 'move_id' : fields.many2one('stock.move', "Move"),
+ 'wizard_id' : fields.many2one('stock.partial.picking', string="Wizard"),
+ 'cost' : fields.float("Cost", help="Unit Cost for this product line"),
+ 'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed"),
+ }
+
+class stock_partial_picking_memory_in(osv.osv_memory):
+ _inherit = "stock.picking.memory.out"
+ _name = "stock.picking.memory.in"
+
class stock_partial_picking(osv.osv_memory):
_name = "stock.partial.picking"
_description = "Partial Picking"
_columns = {
'date': fields.datetime('Date', required=True),
- 'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
- 'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
+ 'product_moves_out' : fields.one2many('stock.picking.memory.out', 'wizard_id', 'Moves'),
+ 'product_moves_in' : fields.one2many('stock.picking.memory.in', 'wizard_id', 'Moves'),
}
-
+
def get_picking_type(self, cr, uid, picking, context=None):
picking_type = picking.type
for move in picking.move_lines:
@@ -169,5 +187,7 @@
return {'type': 'ir.actions.act_window_close'}
stock_partial_picking()
+stock_partial_picking_memory_out()
+stock_partial_picking_memory_in()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'stock_invoice_directly/test/stock_invoice_directly.yml'
--- stock_invoice_directly/test/stock_invoice_directly.yml 2011-01-14 00:11:01 +0000
+++ stock_invoice_directly/test/stock_invoice_directly.yml 2011-08-30 11:30:28 +0000
@@ -63,8 +63,8 @@
As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
-
!python {model: stock.invoice.onshipping}: |
- wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.bank_journal')},
- {'active_ids': [ref("stock_picking_out0")]})
+ wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.sales_journal')},
+ {'active_ids': [ref("stock_picking_out0")], "active_model": "stock.picking"})
self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US",
"search_default_available": 1, "tz": False, "active_model": "stock.picking",
"contact_display": "partner", "active_ids": [ref("stock_picking_out0")], "active_id": ref("stock_picking_out0")})
=== modified file 'stock_planning/stock_planning.py'
--- stock_planning/stock_planning.py 2011-07-01 23:41:24 +0000
+++ stock_planning/stock_planning.py 2011-08-30 11:30:28 +0000
@@ -41,7 +41,8 @@
'name': fields.char('Period Name', size=64, required=True),
'date_start': fields.datetime('Start Date', required=True),
'date_stop': fields.datetime('End Date', required=True),
- 'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State')
+ 'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State'),
+ 'planning_id': fields.many2one('stock.period.createlines', 'Stock Period Planning'),
}
_defaults = {
'state': 'draft'
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2011-03-10 06:02:06 +0000
+++ survey/wizard/survey_answer.py 2011-08-30 11:30:28 +0000
@@ -600,8 +600,9 @@
if not sur_name_read['store_ans']:
his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
- sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
- survey_obj.write(cr, uid, sur_name_read['survey_id'], {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
+ survey_id = int(sur_name_read['survey_id']) # This is a selection field (a string).
+ sur_rec = survey_obj.read(cr, uid, survey_id)
+ survey_obj.write(cr, uid, survey_id, {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
if context.has_key('cur_id'):
if context.has_key('request') and context.get('request',False):
self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
=== modified file 'survey/wizard/survey_print.py'
--- survey/wizard/survey_print.py 2011-03-14 10:27:42 +0000
+++ survey/wizard/survey_print.py 2011-08-30 11:30:28 +0000
@@ -27,7 +27,7 @@
class survey_print(osv.osv_memory):
_name = 'survey.print'
_columns = {
- 'survey_ids': fields.many2many('survey','survey_print',\
+ 'survey_ids': fields.many2many('survey','survey_print_survey_rel',\
'survey_id','print_id', "Survey", required="1"),
'orientation' : fields.selection([('vertical','Portrait(Vertical)'),\
('horizontal','Landscape(Horizontal)')], 'Orientation'),
=== modified file 'survey/wizard/survey_print_statistics.py'
--- survey/wizard/survey_print_statistics.py 2011-03-14 10:27:42 +0000
+++ survey/wizard/survey_print_statistics.py 2011-08-30 11:30:28 +0000
@@ -26,7 +26,7 @@
class survey_print_statistics(osv.osv_memory):
_name = 'survey.print.statistics'
_columns = {
- 'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id',\
+ 'survey_ids': fields.many2many('survey','survey_print_statistics_survey_rel','survey_id',\
'print_id', "Survey", required="1"),
}
=== modified file 'survey/wizard/survey_selection.py'
--- survey/wizard/survey_selection.py 2011-03-15 15:43:24 +0000
+++ survey/wizard/survey_selection.py 2011-08-30 11:30:28 +0000
@@ -64,7 +64,7 @@
survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
user_obj = self.pool.get('res.users')
- user_rec = user_obj.read(cr, uid, uid)
+ user_rec = user_obj.read(cr, uid, uid, ['groups_id', 'survey_id'], context)
if survey_user_group_id:
if survey_user_group_id == user_rec['groups_id']:
for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
@@ -123,7 +123,7 @@
if context is None: context = {}
this = self.browse(cr, uid, ids, context=context)[0]
- survey_id = this.survey_id
+ survey_id = int(this.survey_id) # This is a selection field (a string).
context.update({'survey_id': survey_id, 'sur_name_id': this.id})
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s' % (uid,survey_id))
=== modified file 'thunderbird/installer.py'
--- thunderbird/installer.py 2011-05-23 09:06:56 +0000
+++ thunderbird/installer.py 2011-08-30 11:30:28 +0000
@@ -41,7 +41,7 @@
'pdf_name':fields.char('File name', size=64),
'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
- 'pdf_file':fields.char('Installation Manual', size="264", help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
+ 'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
'description':fields.text('Description', readonly=True)
}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
