Skip to content

Commit dda3dac

Browse files
committedJun 28, 2019
[FIX] account_billing and account_invoice_line_sale_info
1 parent 531c7d8 commit dda3dac

File tree

12 files changed

+17
-573
lines changed

12 files changed

+17
-573
lines changed
 

‎account_billing/models/account_billing.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,10 @@ def action_cancel(self):
202202
@api.multi
203203
def invoice_relate_billing_tree_view(self):
204204
self.ensure_one()
205-
action = self.env.ref('account.action_invoice_tree1')
205+
if self.bill_type == 'out_invoice':
206+
action = self.env.ref('account.action_invoice_tree1')
207+
if self.bill_type == 'in_invoice':
208+
action = self.env.ref('account.action_vendor_bill_template')
206209
result = action.read()[0]
207210
result.update({'domain': [('id', 'in', self.invoice_ids.ids)]})
208211
return result

‎account_billing/views/account_invoice_view.xml

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
<odoo>
2-
<record id="invoice_form_inherit_account_billing" model="ir.ui.view">
3-
<field name="name">account.invoice.form.inherit.view</field>
2+
<record id="invoice_supplier_form" model="ir.ui.view">
3+
<field name="name">account.invoice.supplier.form.inherit.view.billing</field>
4+
<field name="model">account.invoice</field>
5+
<field name="inherit_id" ref="account.invoice_supplier_form"/>
6+
<field name="arch" type="xml">
7+
<xpath expr="/form/sheet/group/group[1]" position="inside">
8+
<field name="billing_id" attrs="{'invisible': [('billing_id', '=', False)]}"/>
9+
</xpath>
10+
</field>
11+
</record>
12+
13+
<record id="invoice_form" model="ir.ui.view">
14+
<field name="name">account.invoice.form.inherit.view.billing</field>
415
<field name="model">account.invoice</field>
516
<field name="inherit_id" ref="account.invoice_form"/>
617
<field name="arch" type="xml">

‎account_invoice_line_sale_info0/README.rst

-82
This file was deleted.

‎account_invoice_line_sale_info0/__init__.py

-3
This file was deleted.

‎account_invoice_line_sale_info0/__manifest__.py

-19
This file was deleted.

‎account_invoice_line_sale_info0/models/__init__.py

-3
This file was deleted.

‎account_invoice_line_sale_info0/models/account_invoice_line.py

-21
This file was deleted.

‎account_invoice_line_sale_info0/readme/CONTRIBUTORS.rst

-1
This file was deleted.

‎account_invoice_line_sale_info0/readme/DESCRIPTION.rst

-2
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.