Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-commiter/openobject-addons/dev-addons2-rha1 into lp:~openerp/openobject-addons/trunk-fix-osvmem-read

  1. dev-addons2-rha1
  2. Merge into trunk-fix-osvmem-read
Proposed by Rifakat Husen (OpenERP)
Status: Merged
Merged at revision: 4403
Proposed branch: lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
Merge into: lp:~openerp/openobject-addons/trunk-fix-osvmem-read
Diff against target: 293 lines (+61/-11)
19 files modified
account/report/account_balance.py (+2/-0)
account/wizard/account_move_journal.py (+1/-1)
account/wizard/account_open_closed_fiscalyear.py (+2/-0)
account/wizard/account_report_balance_sheet.py (+8/-0)
account/wizard/account_report_common.py (+4/-1)
account/wizard/account_report_common_account.py (+6/-0)
account/wizard/account_report_common_journal.py (+8/-0)
account/wizard/account_report_common_partner.py (+6/-0)
account/wizard/account_report_general_ledger.py (+1/-1)
account/wizard/account_report_partner_balance.py (+1/-1)
account/wizard/account_report_partner_ledger.py (+1/-1)
account/wizard/account_report_profit_loss.py (+1/-1)
account/wizard/account_validate_account_move.py (+3/-0)
account/wizard/account_vat.py (+3/-0)
auction/wizard/auction_lots_invoice.py (+2/-2)
mrp/mrp.py (+2/-1)
product/pricelist.py (+1/-1)
stock/stock.py (+8/-0)
stock/wizard/stock_invoice_onshipping.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+48772@code.launchpad.net

Description of the change

Account: Improve osv memory wizards

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/report/account_balance.py'
--- account/report/account_balance.py 2011-01-14 00:11:01 +0000
+++ account/report/account_balance.py 2011-02-07 11:16:20 +0000
@@ -71,6 +71,8 @@
71 def lines(self, form, ids=[], done=None):#, level=1):71 def lines(self, form, ids=[], done=None):#, level=1):
72 def _process_child(accounts, disp_acc, parent):72 def _process_child(accounts, disp_acc, parent):
73 account_rec = [acct for acct in accounts if acct['id']==parent][0]73 account_rec = [acct for acct in accounts if acct['id']==parent][0]
74 if isinstance(account_rec['parent_id'], tuple):
75 account_rec['parent_id'] = account_rec['parent_id'][0]
74 currency_obj = self.pool.get('res.currency')76 currency_obj = self.pool.get('res.currency')
75 acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])77 acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])
76 currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id78 currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id
7779
=== modified file 'account/wizard/account_move_journal.py'
--- account/wizard/account_move_journal.py 2011-01-17 11:40:49 +0000
+++ account/wizard/account_move_journal.py 2011-02-07 11:16:20 +0000
@@ -148,7 +148,7 @@
148148
149 journal_id = self._get_journal(cr, uid, context)149 journal_id = self._get_journal(cr, uid, context)
150 period_id = self._get_period(cr, uid, context)150 period_id = self._get_period(cr, uid, context)
151 target_move = self.read(cr, uid, ids, [])[0]['target_move']151 target_move = self.read(cr, uid, ids, [], context=context)[0]['target_move']
152152
153 name = _("Journal Items")153 name = _("Journal Items")
154 if journal_id:154 if journal_id:
155155
=== modified file 'account/wizard/account_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_open_closed_fiscalyear.py 2011-02-07 11:16:20 +0000
@@ -35,6 +35,8 @@
35 move_obj = self.pool.get('account.move')35 move_obj = self.pool.get('account.move')
3636
37 data = self.read(cr, uid, ids, [], context=context)[0]37 data = self.read(cr, uid, ids, [], context=context)[0]
38 if isinstance(data['fyear_id'], tuple):
39 data['fyear_id'] = data['fyear_id'][0]
38 data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)40 data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
39 if not data_fyear.end_journal_period_id:41 if not data_fyear.end_journal_period_id:
40 raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))42 raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
4143
=== modified file 'account/wizard/account_report_balance_sheet.py'
--- account/wizard/account_report_balance_sheet.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_balance_sheet.py 2011-02-07 11:16:20 +0000
@@ -66,6 +66,14 @@
66 if context is None:66 if context is None:
67 context = {}67 context = {}
68 data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])68 data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
69
70 for field in data['form'].keys():
71 if isinstance(data['form'][field], tuple):
72 data['form'][field] = data['form'][field][0]
73 for ctx_field in data['form']['used_context'].keys():
74 if isinstance(data['form']['used_context'][ctx_field], tuple):
75 data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
76
69 if not data['form']['reserve_account_id']:77 if not data['form']['reserve_account_id']:
70 raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))78 raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
71 data = self.pre_print_report(cr, uid, ids, data, context=context)79 data = self.pre_print_report(cr, uid, ids, data, context=context)
7280
=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common.py 2011-02-07 11:16:20 +0000
@@ -131,7 +131,10 @@
131 data = {}131 data = {}
132 data['ids'] = context.get('active_ids', [])132 data['ids'] = context.get('active_ids', [])
133 data['model'] = context.get('active_model', 'ir.ui.menu')133 data['model'] = context.get('active_model', 'ir.ui.menu')
134 data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'])[0]134 data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'], context=context)[0]
135 for field in data['form'].keys():
136 if isinstance(data['form'][field], tuple):
137 data['form'][field] = data['form'][field][0]
135 used_context = self._build_contexts(cr, uid, ids, data, context=context)138 used_context = self._build_contexts(cr, uid, ids, data, context=context)
136 data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []139 data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
137 data['form']['used_context'] = used_context140 data['form']['used_context'] = used_context
138141
=== modified file 'account/wizard/account_report_common_account.py'
--- account/wizard/account_report_common_account.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common_account.py 2011-02-07 11:16:20 +0000
@@ -39,6 +39,12 @@
39 if context is None:39 if context is None:
40 context = {}40 context = {}
41 data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])41 data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
42 for field in data['form'].keys():
43 if isinstance(data['form'][field], tuple):
44 data['form'][field] = data['form'][field][0]
45 for ctx_field in data['form']['used_context'].keys():
46 if isinstance(data['form']['used_context'][ctx_field], tuple):
47 data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
42 return data48 return data
4349
44account_common_account_report()50account_common_account_report()
4551
=== modified file 'account/wizard/account_report_common_journal.py'
--- account/wizard/account_report_common_journal.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common_journal.py 2011-02-07 11:16:20 +0000
@@ -42,6 +42,14 @@
42 if context is None:42 if context is None:
43 context = {}43 context = {}
44 data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0])44 data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0])
45
46 for field in data['form'].keys():
47 if isinstance(data['form'][field], tuple):
48 data['form'][field] = data['form'][field][0]
49 for ctx_field in data['form']['used_context'].keys():
50 if isinstance(data['form']['used_context'][ctx_field], tuple):
51 data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
52
45 fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)53 fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)
46 period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)54 period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
47 data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)55 data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
4856
=== modified file 'account/wizard/account_report_common_partner.py'
--- account/wizard/account_report_common_partner.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common_partner.py 2011-02-07 11:16:20 +0000
@@ -40,6 +40,12 @@
40 if context is None:40 if context is None:
41 context = {}41 context = {}
42 data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])42 data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
43 for field in data['form'].keys():
44 if isinstance(data['form'][field], tuple):
45 data['form'][field] = data['form'][field][0]
46 for ctx_field in data['form']['used_context'].keys():
47 if isinstance(data['form']['used_context'][ctx_field], tuple):
48 data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
43 return data49 return data
4450
45account_common_partner_report()51account_common_partner_report()
4652
=== modified file 'account/wizard/account_report_general_ledger.py'
--- account/wizard/account_report_general_ledger.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_general_ledger.py 2011-02-07 11:16:20 +0000
@@ -50,7 +50,7 @@
50 if context is None:50 if context is None:
51 context = {}51 context = {}
52 data = self.pre_print_report(cr, uid, ids, data, context=context)52 data = self.pre_print_report(cr, uid, ids, data, context=context)
53 data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'])[0])53 data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'], context=context)[0])
54 if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record54 if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
55 data['form'].update({'initial_balance': False})55 data['form'].update({'initial_balance': False})
56 if data['form']['landscape']:56 if data['form']['landscape']:
5757
=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_partner_balance.py 2011-02-07 11:16:20 +0000
@@ -42,7 +42,7 @@
42 if context is None:42 if context is None:
43 context = {}43 context = {}
44 data = self.pre_print_report(cr, uid, ids, data, context=context)44 data = self.pre_print_report(cr, uid, ids, data, context=context)
45 data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])45 data['form'].update(self.read(cr, uid, ids, ['display_partner'], context=context)[0])
46 return {46 return {
47 'type': 'ir.actions.report.xml',47 'type': 'ir.actions.report.xml',
48 'report_name': 'account.partner.balance',48 'report_name': 'account.partner.balance',
4949
=== modified file 'account/wizard/account_report_partner_ledger.py'
--- account/wizard/account_report_partner_ledger.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_partner_ledger.py 2011-02-07 11:16:20 +0000
@@ -47,7 +47,7 @@
47 if context is None:47 if context is None:
48 context = {}48 context = {}
49 data = self.pre_print_report(cr, uid, ids, data, context=context)49 data = self.pre_print_report(cr, uid, ids, data, context=context)
50 data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])50 data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'], context=context)[0])
51 if data['form']['page_split']:51 if data['form']['page_split']:
52 return {52 return {
53 'type': 'ir.actions.report.xml',53 'type': 'ir.actions.report.xml',
5454
=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_profit_loss.py 2011-02-07 11:16:20 +0000
@@ -42,7 +42,7 @@
42 if context is None:42 if context is None:
43 context = {}43 context = {}
44 data = self.pre_print_report(cr, uid, ids, data, context=context)44 data = self.pre_print_report(cr, uid, ids, data, context=context)
45 data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])45 data['form'].update(self.read(cr, uid, ids, ['display_type'], context=context)[0])
46 if data['form']['display_type']:46 if data['form']['display_type']:
47 return {47 return {
48 'type': 'ir.actions.report.xml',48 'type': 'ir.actions.report.xml',
4949
=== modified file 'account/wizard/account_validate_account_move.py'
--- account/wizard/account_validate_account_move.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_validate_account_move.py 2011-02-07 11:16:20 +0000
@@ -34,6 +34,9 @@
34 if context is None:34 if context is None:
35 context = {}35 context = {}
36 data = self.read(cr, uid, ids, context=context)[0]36 data = self.read(cr, uid, ids, context=context)[0]
37 for field in data.keys():
38 if isinstance(data[field], tuple):
39 data[field] = data[field][0]
37 ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])40 ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
38 if not ids_move:41 if not ids_move:
39 raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))42 raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
4043
=== modified file 'account/wizard/account_vat.py'
--- account/wizard/account_vat.py 2011-01-14 00:11:01 +0000
+++ account/wizard/account_vat.py 2011-02-07 11:16:20 +0000
@@ -47,6 +47,9 @@
47 datas = {'ids': context.get('active_ids', [])}47 datas = {'ids': context.get('active_ids', [])}
48 datas['model'] = 'account.tax.code'48 datas['model'] = 'account.tax.code'
49 datas['form'] = self.read(cr, uid, ids)[0]49 datas['form'] = self.read(cr, uid, ids)[0]
50 for field in datas['form'].keys():
51 if isinstance(datas['form'][field], tuple):
52 datas['form'][field] = datas['form'][field][0]
50 datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id53 datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id
51 return {54 return {
52 'type': 'ir.actions.report.xml',55 'type': 'ir.actions.report.xml',
5356
=== modified file 'auction/wizard/auction_lots_invoice.py'
--- auction/wizard/auction_lots_invoice.py 2011-01-14 00:11:01 +0000
+++ auction/wizard/auction_lots_invoice.py 2011-02-07 11:16:20 +0000
@@ -46,7 +46,7 @@
46 @param context: A standard dictionary46 @param context: A standard dictionary
47 @return: A dictionary which of fields with values.47 @return: A dictionary which of fields with values.
48 """48 """
49 if context is None: 49 if context is None:
50 context = {}50 context = {}
51 res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)51 res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
52 service = netsvc.LocalService("object_proxy")52 service = netsvc.LocalService("object_proxy")
@@ -103,7 +103,7 @@
103 @param ids: List of Auction lots make invoice buyer’s IDs103 @param ids: List of Auction lots make invoice buyer’s IDs
104 @return: dictionary of account invoice form.104 @return: dictionary of account invoice form.
105 """105 """
106 if context is None: 106 if context is None:
107 context = {}107 context = {}
108 service = netsvc.LocalService("object_proxy")108 service = netsvc.LocalService("object_proxy")
109 datas = {'ids' : context.get('active_ids',[])}109 datas = {'ids' : context.get('active_ids',[])}
110110
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2011-01-17 13:51:36 +0000
+++ mrp/mrp.py 2011-02-07 11:16:20 +0000
@@ -573,6 +573,7 @@
573 """573 """
574 results = []574 results = []
575 bom_obj = self.pool.get('mrp.bom')575 bom_obj = self.pool.get('mrp.bom')
576 uom_obj = self.pool.get('product.uom')
576 prod_line_obj = self.pool.get('mrp.production.product.line')577 prod_line_obj = self.pool.get('mrp.production.product.line')
577 workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')578 workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
578 for production in self.browse(cr, uid, ids):579 for production in self.browse(cr, uid, ids):
@@ -590,7 +591,7 @@
590 if not bom_id:591 if not bom_id:
591 raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))592 raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
592593
593 factor = production.product_qty * production.product_uom.factor / bom_point.product_uom.factor594 factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
594 res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)595 res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
595 results = res[0]596 results = res[0]
596 results2 = res[1]597 results2 = res[1]
597598
=== modified file 'product/pricelist.py'
--- product/pricelist.py 2011-01-17 08:00:48 +0000
+++ product/pricelist.py 2011-02-07 11:16:20 +0000
@@ -264,7 +264,7 @@
264 product_obj.price_get(cr, uid, [product_id],264 product_obj.price_get(cr, uid, [product_id],
265 price_type.field)[product_id], round=False, context=context)265 price_type.field)[product_id], round=False, context=context)
266266
267 if price:267 if price or price == 0.0:
268 price_limit = price268 price_limit = price
269269
270 price = price * (1.0+(res['price_discount'] or 0.0))270 price = price * (1.0+(res['price_discount'] or 0.0))
271271
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-01-24 16:13:46 +0000
+++ stock/stock.py 2011-02-07 11:16:20 +0000
@@ -1886,6 +1886,14 @@
1886 @return: True1886 @return: True
1887 """1887 """
1888 self.write(cr, uid, ids, {'state': 'confirmed'})1888 self.write(cr, uid, ids, {'state': 'confirmed'})
1889
1890 # fix for bug lp:707031
1891 # called write of related picking because changing move availability does
1892 # not trigger workflow of picking in order to change the state of picking
1893 wf_service = netsvc.LocalService('workflow')
1894 for move in self.browse(cr, uid, ids, context):
1895 if move.picking_id:
1896 wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
1889 return True1897 return True
18901898
1891 #1899 #
18921900
=== modified file 'stock/wizard/stock_invoice_onshipping.py'
--- stock/wizard/stock_invoice_onshipping.py 2011-01-17 08:00:48 +0000
+++ stock/wizard/stock_invoice_onshipping.py 2011-02-07 11:16:20 +0000
@@ -127,7 +127,7 @@
127 res = picking_pool.action_invoice_create(cr, uid, active_ids,127 res = picking_pool.action_invoice_create(cr, uid, active_ids,
128 journal_id = onshipdata_obj[0]['journal_id'],128 journal_id = onshipdata_obj[0]['journal_id'],
129 group = onshipdata_obj[0]['group'],129 group = onshipdata_obj[0]['group'],
130 type = None,130 type = context.get('inv_type'),
131 context=context)131 context=context)
132 return res132 return res
133133

Subscribers

People subscribed via source and target branches