unifield-wm

Merge lp:~unifield-team/unifield-wm/UF_1536 into lp:unifield-wm

  1. UF_1536
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 1840
Proposed branch: lp:~unifield-team/unifield-wm/UF_1536
Merge into: lp:unifield-wm
Diff against target: 25 lines (+2/-2)
2 files modified
account_msf/invoice.py (+1/-1)
register_accounting/wizard/import_invoice_on_registers_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UF_1536
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+194300@code.launchpad.net
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
1=== modified file 'account_msf/invoice.py'
2--- account_msf/invoice.py 2013-03-11 10:50:12 +0000
3+++ account_msf/invoice.py 2013-11-07 08:54:17 +0000
4@@ -250,7 +250,7 @@
5 if inv.type != 'out_invoice' or inv.is_debit_note == False:
6 raise osv.except_osv(_('Error'), _('You can only do import invoice on a Debit Note!'))
7 w_id = self.pool.get('debit.note.import.invoice').create(cr, uid, {'invoice_id': inv.id, 'currency_id': inv.currency_id.id,
8- 'partner_id': inv.partner_id.id})
9+ 'partner_id': inv.partner_id.id}, context=context)
10 context.update({
11 'active_id': inv.id,
12 'active_ids': ids,
13
14=== modified file 'register_accounting/wizard/import_invoice_on_registers_view.xml'
15--- register_accounting/wizard/import_invoice_on_registers_view.xml 2013-03-07 10:41:30 +0000
16+++ register_accounting/wizard/import_invoice_on_registers_view.xml 2013-11-07 08:54:17 +0000
17@@ -32,7 +32,7 @@
18 <form string="Import Entries">
19 <group colspan="4" expand="1">
20 <separator string="Payable and Receivables" colspan="4"/>
21- <field name="line_ids" domain="[('ready_for_import_in_register','=',True), ('currency_id', '=', currency_id)]"
22+ <field name="line_ids" domain="[('ready_for_import_in_register','=',True), ('currency_id', '=', currency_id), ('invoice_line_id', '=', False)]"
23 context="{'from': 'wizard_import_invoice'}" colspan="4" nolabel="1">
24 <tree string="Account Entry Lines" editable="top" noteditable="True">
25 <field name="invoice"/>

Subscribers

People subscribed via source and target branches