From 69e3b4cb1fe2ec20d04791eedc683f5eb085c849 Mon Sep 17 00:00:00 2001 From: "ATP (OpenERP)" <> Date: Tue, 17 Aug 2010 13:38:46 +0530 Subject: [PATCH 01/10] [FIX] Undefined variables: crm_caldav bzr revid: hmo@tinyerp.com-20100817080846-2pxso2jyonclu0qi --- addons/crm_caldav/crm_caldav.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py index 0d46a5429eb..f9e8d0661c1 100644 --- a/addons/crm_caldav/crm_caldav.py +++ b/addons/crm_caldav/crm_caldav.py @@ -20,6 +20,7 @@ ############################################################################## from osv import fields, osv +from base_calendar import base_calendar from crm import crm from caldav import calendar from datetime import datetime From 2fea353d35eb6750b100d5fefc265a1512c9ff8d Mon Sep 17 00:00:00 2001 From: vra Date: Tue, 17 Aug 2010 14:19:09 +0530 Subject: [PATCH 02/10] [FIX][ADD] account: fixed the id for access added rights of accounting accontant group, added group in link (Journal Items - act window) in account move line object. bzr revid: vra@tinyerp.com-20100817084909-hsb7ami8kwzl4p35 --- addons/account/account_view.xml | 4 + addons/account/security/ir.model.access.csv | 98 +++++++++++---------- 2 files changed, 56 insertions(+), 46 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 12ac88cfa62..4426128a4f9 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1356,6 +1356,10 @@ res_model="account.move.line" src_model="account.move"/> + + + + diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 71d295eb565..8dbcf4ecf5b 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -157,50 +157,56 @@ "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_invoice",1,0,0,0 -"access_account_invoice","account.invoice","model_account_invoice","account.group_accounting_accountant",1,1,1,1 -"access_account_invoice_line","account.invoice.line","model_account_invoice_line","account.group_accounting_accountant",1,1,1,1 -"access_res_partner","res.partner","base.model_res_partner","account.group_accounting_accountant",1,1,1,1 -"access_account_account","account.account","model_account_account","account.group_accounting_accountant",1,0,0,0 -"access_account_account_type","account.type","model_account_account_type","account.group_accounting_accountant",1,0,0,0 -"access_account_tax","account.tax","model_account_tax","account.group_accounting_accountant",1,0,0,0 -"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0 -"access_account_invoice_tax","account.invoice.tax","model_account_invoice_tax","account.group_accounting_accountant",1,0,0,0 -"access_res_partner_address","res.partner.address","base.model_res_partner_address","account.group_accounting_accountant",1,1,1,1 -"access_account_move","account.move","model_account_move","account.group_accounting_accountant",1,1,1,1 -"access_account_move_line","account.move.line","model_account_move_line","account.group_accounting_accountant",1,1,1,1 -"access_res_partner_bank","res.partner.bank","base.model_res_partner_bank","account.group_accounting_accountant",1,0,0,0 -"access_res_partner_event","res.partner.event","base.model_res_partner_event","account.group_accounting_accountant",1,0,0,0 -"access_res_currency_rate","res.currency.rate","base.model_res_currency_rate","account.group_accounting_accountant",1,1,0,0 -"access_res_currency","res.currency","base.model_res_currency","account.group_accounting_accountant",1,1,0,0 -"access_product_template","product.template","product.model_product_template","account.group_accounting_accountant",1,0,0,0 -"access_product_product","product.product","product.model_product_product","account.group_accounting_accountant",1,0,0,0 -"access_product_category","product.category","product.model_product_category","account.group_accounting_accountant",1,0,0,0 -"access_product_pricelist","product.pricelist","product.model_product_pricelist","account.group_accounting_accountant",1,0,0,0 -"access_product_pricelist_version","product.pricelist.version","product.model_product_pricelist_version","account.group_accounting_accountant",1,0,0,0 -"access_product_pricelist_item","product.pricelist.item","product.model_product_pricelist_item","account.group_accounting_accountant",1,0,0,0 -"access_account_payment_term","account.payment.term","model_account_payment_term","account.group_accounting_accountant",1,0,0,0 -"access_res_payterm","res.payterm","base.model_res_payterm","account.group_accounting_accountant",1,0,0,0 -"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_accounting_accountant",1,0,0,0 -"access_account_journal","account.journal","model_account_journal","account.group_accounting_accountant",1,0,0,0 -"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_accounting_accountant",1,0,0,0 -"access_account_period","account.period","model_account_period","account.group_accounting_accountant",1,0,0,0 -"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_accounting_accountant",1,1,1,1 -"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0 -"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1 -"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1 +"access_account_invoice_accounting_accountant","account.invoice","model_account_invoice","account.group_accounting_accountant",1,1,1,1 +"access_account_invoice_line_accounting_accountant","account.invoice.line","model_account_invoice_line","account.group_accounting_accountant",1,1,1,1 +"access_res_partner_accounting_accountant","res.partner","base.model_res_partner","account.group_accounting_accountant",1,1,1,1 +"access_account_account_accounting_accountant","account.account","model_account_account","account.group_accounting_accountant",1,0,0,0 +"access_account_account_type_accounting_accountant","account.type","model_account_account_type","account.group_accounting_accountant",1,0,0,0 +"access_account_tax_accounting_accountant","account.tax","model_account_tax","account.group_accounting_accountant",1,0,0,0 +"access_account_tax_code_accounting_accountant","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0 +"access_account_invoice_tax_accounting_accountant","account.invoice.tax","model_account_invoice_tax","account.group_accounting_accountant",1,0,0,0 +"access_res_partner_address_accounting_accountant","res.partner.address","base.model_res_partner_address","account.group_accounting_accountant",1,1,1,1 +"access_account_move_accounting_accountant","account.move","model_account_move","account.group_accounting_accountant",1,1,1,1 +"access_account_move_line_accounting_accountant","account.move.line","model_account_move_line","account.group_accounting_accountant",1,1,1,1 +"access_res_partner_bank_accounting_accountant","res.partner.bank","base.model_res_partner_bank","account.group_accounting_accountant",1,0,0,0 +"access_res_partner_event_accounting_accountant","res.partner.event","base.model_res_partner_event","account.group_accounting_accountant",1,0,0,0 +"access_res_currency_rate_accounting_accountant","res.currency.rate","base.model_res_currency_rate","account.group_accounting_accountant",1,1,0,0 +"access_res_currency_accounting_accountant","res.currency","base.model_res_currency","account.group_accounting_accountant",1,1,0,0 +"access_product_template_accounting_accountant","product.template","product.model_product_template","account.group_accounting_accountant",1,0,0,0 +"access_product_product_accounting_accountant","product.product","product.model_product_product","account.group_accounting_accountant",1,0,0,0 +"access_product_category_accounting_accountant","product.category","product.model_product_category","account.group_accounting_accountant",1,0,0,0 +"access_product_pricelist_accounting_accountant","product.pricelist","product.model_product_pricelist","account.group_accounting_accountant",1,0,0,0 +"access_product_pricelist_version_accounting_accountant","product.pricelist.version","product.model_product_pricelist_version","account.group_accounting_accountant",1,0,0,0 +"access_product_pricelist_item_accounting_accountant","product.pricelist.item","product.model_product_pricelist_item","account.group_accounting_accountant",1,0,0,0 +"access_account_payment_term_accounting_accountant","account.payment.term","model_account_payment_term","account.group_accounting_accountant",1,0,0,0 +"access_res_payterm_accounting_accountant","res.payterm","base.model_res_payterm","account.group_accounting_accountant",1,0,0,0 +"access_account_payment_term_line_accounting_accountant","account.payment.term.line","model_account_payment_term_line","account.group_accounting_accountant",1,0,0,0 +"access_account_journal_accounting_accountant","account.journal","model_account_journal","account.group_accounting_accountant",1,0,0,0 +"access_account_fiscalyear_accounting_accountant","account.fiscalyear","model_account_fiscalyear","account.group_accounting_accountant",1,0,0,0 +"access_account_period_accounting_accountant","account.period","model_account_period","account.group_accounting_accountant",1,0,0,0 +"access_account_move_reconcile_accounting_accountant","account.move.reconcile","model_account_move_reconcile","account.group_accounting_accountant",1,1,1,1 +"access_account_tax_code_accounting_accountant","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0 +"access_account_bank_statement_accounting_accountant","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1 +"access_account_cashbox_line_accounting_accountant","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1 "access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_accounting_accountant",1,1,1,1 -"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1 -"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0 -"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0 -"access_temp_range","temp.range","model_temp_range","account.group_accounting_accountant",1,0,0,0 -"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_accounting_accountant",1,0,0,0 -"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_accounting_accountant",1,0,0,0 -"access_account_entries_report","account.entries.report","model_account_entries_report","account.group_accounting_accountant",1,0,0,0 -"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0 -"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_accounting_accountant",1,0,0,0 -"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_accounting_accountant",1,1,1,1 -"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_accounting_accountant",1,1,1,1 -"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0 -"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0 -"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0 -"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1 +"access_account_bank_statement_line_accounting_accountant","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1 +"access_account_invoice_report_accounting_accountant","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0 +"access_report_account_receivable_accounting_accountant","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0 +"access_temp_range_accounting_accountant","temp.range","model_temp_range","account.group_accounting_accountant",1,0,0,0 +"access_report_aged_receivable_accounting_accountant","report.aged.receivable","model_report_aged_receivable","account.group_accounting_accountant",1,0,0,0 +"access_report_invoice_created_accounting_accountant","report.invoice.created","model_report_invoice_created","account.group_accounting_accountant",1,0,0,0 +"access_account_entries_report_accounting_accountant","account.entries.report","model_account_entries_report","account.group_accounting_accountant",1,0,0,0 +"access_account_invoice_report_accounting_accountant","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0 +"access_account_journal_view_accounting_accountant","account.journal.view","model_account_journal_view","account.group_accounting_accountant",1,0,0,0 +"access_account_journal_period_accounting_accountant","account.journal.period","model_account_journal_period","account.group_accounting_accountant",1,1,1,1 +"access_account_journal_column_accounting_accountant","account.journal.column","model_account_journal_column","account.group_accounting_accountant",1,1,1,1 +"access_account_analytic_account_accounting_accountant","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0 +"access_account_analytic_line_accounting_accountant","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0 +"access_account_analytic_journal_accounting_accountant","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0 +"access_account_bank_statement_reconcile_accounting_accountant","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1 +"access_account_move_account_user","account.move","model_account_move","account.group_account_user",1,1,1,1 +"access_account_move_line_account_user","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1 +"access_account_journal_account_user","account.journal","model_account_journal","account.group_account_user",1,0,0,0 +"access_account_journal_view_account_user","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0 +"access_account_journal_period_account_user","account.journal.period","model_account_journal_period","account.group_account_user",1,0,0,0 +"access_account_journal_column_account_user","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0 From f511d838294f09b8b25325c6d62306962af69283 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 17 Aug 2010 14:44:43 +0530 Subject: [PATCH 03/10] [IMP] Account: Pay invoice wizard Clean bzr revid: mra@mra-laptop-20100817091443-ahew1a7iws1uszr9 --- addons/account/wizard/account_pay_invoice.py | 50 ++++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py index 2d59c556ba0..49a905836b2 100644 --- a/addons/account/wizard/account_pay_invoice.py +++ b/addons/account/wizard/account_pay_invoice.py @@ -18,6 +18,7 @@ # along with this program. If not, see . # ############################################################################## + import time from osv import fields, osv @@ -34,15 +35,15 @@ class account_invoice_pay_writeoff(osv.osv_memory): 'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', required=True), 'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', required=True), 'comment': fields.char('Comment', size=64, required=True), - 'analytic_id': fields.many2one('account.analytic.account','Analytic Account'), + 'analytic_id': fields.many2one('account.analytic.account','Analytic Account') } _defaults = { 'comment': 'Write-Off', - } + } def pay_and_reconcile_writeoff(self, cr, uid, ids, context=None): - data = self.read(cr, uid, ids,context=context)[0] - context.update({'write_off':data}) + data = self.read(cr, uid, ids, context=context)[0] + context.update({'write_off': data}) self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context) return {} @@ -60,26 +61,33 @@ class account_invoice_pay(osv.osv_memory): 'date': fields.date('Date payment', required=True), 'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True, domain=[('type','=','cash')]), 'period_id': fields.many2one('account.period', 'Period', required=True), - } + } def view_init(self, cr, uid, ids, context=None): - invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context) - if invoice.state in ['draft', 'proforma2', 'cancel']: - raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.')) + if context is None: + context = {} + if context.get('active_id', False): + invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context) + if invoice.state in ['draft', 'proforma2', 'cancel']: + raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.')) pass def _get_period(self, cr, uid, context=None): - ids = self.pool.get('account.period').find(cr, uid, context=context) period_id = False + ids = self.pool.get('account.period').find(cr, uid, context=context) if len(ids): period_id = ids[0] return period_id def _get_amount(self, cr, uid, context=None): - return self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context).residual + if context is None: + context = {} + if context.get('active_id', False): + return self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context).residual + return 0.0 _defaults = { - 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'date': time.strftime('%Y-%m-%d'), 'period_id': _get_period, 'amount': _get_amount, } @@ -87,10 +95,11 @@ class account_invoice_pay(osv.osv_memory): def wo_check(self, cr, uid, ids, context=None): cur_obj = self.pool.get('res.currency') mod_obj = self.pool.get('ir.model.data') + inv_obj = self.pool.get('account.invoice') if context is None: context = {} data = self.read(cr, uid, ids,context=context)[0] - invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context) + invoice = inv_obj.browse(cr, uid, context['active_id'], context) journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context) # Here we need that: @@ -114,11 +123,11 @@ class account_invoice_pay(osv.osv_memory): amount_paid = data['amount'] # Get the old payment if there are some if invoice.payment_ids: - debit=credit=0.0 + debit = credit = 0.0 for payment in invoice.payment_ids: - debit+=payment.debit - credit+=payment.credit - amount_paid+=abs(debit-credit) + debit += payment.debit + credit += payment.credit + amount_paid += abs(debit-credit) # Test if there is a difference according to currency rouding setting if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id, @@ -136,10 +145,11 @@ class account_invoice_pay(osv.osv_memory): 'views': [(resource_id,'form')], 'type': 'ir.actions.act_window', 'target': 'new', - } + } def pay_and_reconcile(self, cr, uid, ids, context=None): cur_obj = self.pool.get('res.currency') + inv_obj = self.pool.get('account.invoice') if context is None: context = {} data = self.read(cr, uid, ids, context=context)[0] @@ -154,8 +164,8 @@ class account_invoice_pay(osv.osv_memory): amount = data['amount'] - invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context) - journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context) + invoice = inv_obj.browse(cr, uid, context['active_id'], context=context) + journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context=context) # Compute the amount in company's currency, with the journal currency (which is equal to payment currency) # when it is needed : If payment currency (according to selected journal.currency) is <> from company currency if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id: @@ -181,7 +191,7 @@ class account_invoice_pay(osv.osv_memory): acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id if not acc_id: raise osv.except_osv(_('Error !'), _('Your journal must have a default credit and debit account.')) - self.pool.get('account.invoice').pay_and_reconcile(cr, uid, [context['active_id']], + inv_obj.pay_and_reconcile(cr, uid, [context['active_id']], amount, acc_id, data['period_id'], data['journal_id'], writeoff_account_id, data['period_id'], writeoff_journal_id, context, data['name']) return {} From 78f0a1722314f886d6a5afd981e24a631ae7dd79 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 17 Aug 2010 15:00:35 +0530 Subject: [PATCH 04/10] [REM]: crm: Removed unused method bzr revid: rpa@tinyerp.com-20100817093035-04dp869zp5wzybpr --- addons/crm/wizard/crm_partner_to_opportunity.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py index a1d15dcc732..f234f9caa92 100644 --- a/addons/crm/wizard/crm_partner_to_opportunity.py +++ b/addons/crm/wizard/crm_partner_to_opportunity.py @@ -58,12 +58,6 @@ class crm_partner2opportunity(osv.osv_memory): res.update({'partner_id': data and data[0] or False}) return res - def _select_data(self, cr, uid, data, context): - part_obj = self.pool.get('res.partner') - part = part_obj.read(cr, uid, data['id' ], ['name']) - return {'partner_id' : data['id'], 'name' : part['name'] } - - def make_opportunity(self, cr, uid, ids, context): """ @param self: The object pointer From 5322c62ebcb6b156d86fa788b0146dd439233374 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 17 Aug 2010 15:04:45 +0530 Subject: [PATCH 05/10] [FIX] calendar: access right bzr revid: hmo@tinyerp.com-20100817093445-0k5qdyn96u01pgez --- addons/base_calendar/security/ir.model.access.csv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv index f54b3f0470b..aa269e9ff18 100644 --- a/addons/base_calendar/security/ir.model.access.csv +++ b/addons/base_calendar/security/ir.model.access.csv @@ -1,6 +1,6 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_system",1,1,1,1 -"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_system",1,1,1,1 -"access_res_alarm","res.alarm","model_res_alarm","base.group_system",1,1,1,1 -"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_system",1,1,1,1 -"access_calendar_event","calendar.event.user","model_calendar_event","base.group_system",1,1,1,1 +"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1 +"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1 +"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1 +"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1 +"access_calendar_event","calendar.event","model_calendar_event","base.group_user",1,1,1,1 From 0dc844df5ca28a0c9e973573b8918867503216c6 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 17 Aug 2010 15:05:47 +0530 Subject: [PATCH 06/10] [IMP] CRM: Meeting Form View bzr revid: hmo@tinyerp.com-20100817093547-esyjm4rrp5rotuoa --- addons/crm/crm_meeting_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index af843666435..1e36e7f43cd 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -32,6 +32,7 @@ groups="base.group_extended" domain="[('object_id.model', '=', 'crm.meeting')]" /> + Date: Tue, 17 Aug 2010 15:39:52 +0530 Subject: [PATCH 07/10] [MOD/IMP] Lunch : Usability Improvements bzr revid: vir@tinyerp.com-20100817100952-augbpb170q6y3sfz --- addons/lunch/lunch.py | 4 +++- addons/lunch/lunch_view.xml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index caa77b63c01..06034df1688 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -141,6 +141,7 @@ class lunch_order(osv.osv): 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \ 'State', readonly=True, select=True), 'price': fields.function(_price_get, method=True, string="Price"), + 'category': fields.many2one('lunch.category','Category'), } _defaults = { @@ -198,7 +199,8 @@ class lunch_order(osv.osv): if not product: return {'value': {'price': 0.0}} price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price'] - return {'value': {'price': price}} + categ_id = self.pool.get('lunch.product').browse(cr, uid, product).category_id.id + return {'value': {'price': price,'category':categ_id}} lunch_order() diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 71a89124101..b0804cbb9b0 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -29,8 +29,9 @@ - + + @@ -48,6 +49,7 @@ + @@ -85,7 +87,9 @@ - + + + From 5dbdc3ccbedce925381beb6a37d2ed4ea4b2b093 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Tue, 17 Aug 2010 16:32:45 +0530 Subject: [PATCH 08/10] [Fix] stock: Fix the location_destination function bzr revid: sbh@tinyerp.com-20100817110245-g4tfa12s6l6o7xk9 --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 898ab01135f..244d9574f95 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1391,7 +1391,7 @@ class stock_move(osv.osv): if context.get('move_line', []): if context['move_line'][0]: if isinstance(context['move_line'][0], (tuple, list)): - return context['move_line'][0][2] and context['move_line'][0][2]['location_dest_id'] or False + return context['move_line'][0][2] and context['move_line'][0][2].get('location_dest_id',False) else: move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0], ['location_dest_id']) return move_list and move_list['location_dest_id'][0] or False From 2f80a95c91af65e02cbc092325e906c63a81faa7 Mon Sep 17 00:00:00 2001 From: "PSI(OpenERP)" <> Date: Tue, 17 Aug 2010 16:43:35 +0530 Subject: [PATCH 09/10] [IMP] Analytic account with group extended with all modules where it refrence bzr revid: mra@mra-laptop-20100817111335-8zu0l0tqno8dj5u9 --- addons/account/account_invoice_view.xml | 10 +- addons/account/account_menuitem.xml | 6 +- addons/account/account_move_line.py | 2 +- addons/account/account_view.xml | 30 +-- addons/account/board_account_view.xml | 2 +- addons/account/project/project_view.xml | 32 +-- .../wizard/account_analytic_chart_view.xml | 3 +- .../account_analytic_entries_report_view.xml | 2 +- .../wizard/account_move_journal_view.xml | 10 +- .../account_analytic_analysis_menu.xml | 6 +- .../account_analytic_default_view.xml | 5 +- .../account_analytic_plans.py | 16 +- .../account_analytic_plans_view.xml | 16 +- .../crossovered_budget_view.xml | 16 +- addons/auction/auction_view.xml | 182 +++++++++--------- addons/hr_expense/hr_expense_view.xml | 13 +- addons/hr_payroll/hr_payroll_view.xml | 14 +- addons/hr_timesheet/hr_timesheet_view.xml | 2 +- .../hr_timesheet_invoice_report_view.xml | 52 ++--- .../hr_timesheet_sheet_view.xml | 4 +- .../project_issue_sheet_view.xml | 8 +- .../project_planning_view.xml | 20 +- .../purchase_analytic_plans_view.xml | 2 +- addons/sale/report/sale_report_view.xml | 2 +- 24 files changed, 233 insertions(+), 222 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 5bcd3b36815..298b60d3964 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -62,7 +62,7 @@ - + @@ -154,7 +154,7 @@ -