Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-909124-new-mdi into
lp:openobject-addons.
Requested reviews:
Divyesh Makwana(OpenERP) (mdi-openerp)
qdp (OpenERP) (qdp)
Related bugs:
Bug #909124 in OpenERP Addons: "[trunk] new module
account_bank_statement_extension conflicts with point_of_sale"
https://bugs.launchpad.net/openobject-addons/+bug/909124
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-909124-new-mdi/+merge/87229
Hello Sir,
I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/909124
"new module account_bank_statement_extension conflicts with point_of_sale".
Thanks and Regards,
Divyesh Makwana(MDI)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-909124-new-mdi/+merge/87229
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-909124-new-mdi.
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py 2011-12-31 07:57:20 +0000
+++ account/account_bank_statement.py 2012-01-02 09:19:24 +0000
@@ -468,6 +468,7 @@
required=True),
'statement_id': fields.many2one('account.bank.statement', 'Statement',
select=True, required=True, ondelete='cascade'),
+ 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'move_ids': fields.many2many('account.move',
'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
=== modified file 'account_bank_statement_extensions/account_bank_statement.py'
--- account_bank_statement_extensions/account_bank_statement.py 2011-12-23 16:25:28 +0000
+++ account_bank_statement_extensions/account_bank_statement.py 2012-01-02 09:19:24 +0000
@@ -111,7 +111,6 @@
help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
'globalisation_amount': fields.related('globalisation_id', 'amount', type='float',
relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True),
- 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')],
'State', required=True, readonly=True),
'counterparty_name': fields.char('Counterparty Name', size=35),
@@ -133,4 +132,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 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py 2011-12-31 07:57:20 +0000
+++ point_of_sale/point_of_sale.py 2012-01-02 09:19:24 +0000
@@ -596,7 +596,6 @@
class account_bank_statement_line(osv.osv):
_inherit = 'account.bank.statement.line'
_columns= {
- 'journal_id': fields.related('statement_id','journal_id','name', store=True, string='Journal', type='char', size=64),
'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
}
account_bank_statement_line()
=== modified file 'point_of_sale/point_of_sale_demo.xml'
--- point_of_sale/point_of_sale_demo.xml 2011-12-22 13:09:47 +0000
+++ point_of_sale/point_of_sale_demo.xml 2012-01-02 09:19:24 +0000
@@ -108,7 +108,7 @@
<field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
<field name="company_id" ref="base.main_company"/>
<field name="account_id" ref="account.a_recv"/>
- <field name="journal_id">Cash Journal - (test)</field>
+ <field name="journal_id" ref="account.cash_journal"/>
<field eval="[(6,0,[])]" name="move_ids"/>
<field name="date" eval="time.strftime('%Y-%m-%d')"/>
<field eval="450.0" name="amount"/>
_______________________________________________
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
