Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-596084-fka into lp:openobject-addons/7.0

  1. 7.0-opw-596084-fka
  2. Merge into 7.0
Proposed by Foram Katharotiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-596084-fka
Merge into: lp:openobject-addons/7.0
Diff against target: 89 lines (+44/-4)
2 files modified
account/account_invoice_view.xml (+4/-4)
sale/sale_view.xml (+40/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-596084-fka
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) Pending
Naresh(OpenERP) Pending
Review via email: mp+197018@code.launchpad.net

Description of the change

Hello,

I have fix the issue of discount in invoice.without installing sale module you can not use the discount in account invoice.

Thanks,
FKA

To post a comment you must log in.

Unmerged revisions

9580. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9579. By Foram Katharotiya (OpenERP)

[IMP] remove 'sale.group_discount_per_so_line' group from account invoice

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice_view.xml'
2--- account/account_invoice_view.xml 2013-09-20 09:50:26 +0000
3+++ account/account_invoice_view.xml 2013-11-28 08:40:24 +0000
4@@ -35,7 +35,7 @@
5 <field name="quantity"/>
6 <field name="uos_id" groups="product.group_uom"/>
7 <field name="price_unit"/>
8- <field name="discount" groups="sale.group_discount_per_so_line"/>
9+ <field name="discount"/>
10 <field name="price_subtotal"/>
11 </tree>
12 </field>
13@@ -56,7 +56,7 @@
14 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
15 </div>
16 <field name="price_unit"/>
17- <field name="discount" groups="sale.group_discount_per_so_line"/>
18+ <field name="discount"/>
19 </group>
20 <group>
21 <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
22@@ -205,7 +205,7 @@
23 <field name="uos_id" groups="product.group_uom"
24 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
25 <field name="price_unit"/>
26- <field name="discount" groups="sale.group_discount_per_so_line"/>
27+ <field name="discount"/>
28 <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
29 domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
30 <field name="price_subtotal"/>
31@@ -362,7 +362,7 @@
32 <field name="uos_id" groups="product.group_uom"
33 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
34 <field name="price_unit"/>
35- <field name="discount" groups="sale.group_discount_per_so_line"/>
36+ <field name="discount" />
37 <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
38 domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
39 <field name="price_subtotal"/>
40
41=== modified file 'sale/sale_view.xml'
42--- sale/sale_view.xml 2013-11-06 07:27:45 +0000
43+++ sale/sale_view.xml 2013-11-28 08:40:24 +0000
44@@ -549,5 +549,45 @@
45 <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
46 <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>
47
48+ <record id="inherit_view_invoice_line_tree" model="ir.ui.view">
49+ <field name="name">inherit.view.invoice.line.tree</field>
50+ <field name="model">account.invoice.line</field>
51+ <field name="inherit_id" ref="account.view_invoice_line_tree"/>
52+ <field name="arch" type="xml">
53+ <field name="discount" position="attributes">
54+ <attribute name="groups">sale.group_discount_per_so_line</attribute>
55+ </field>
56+ </field>
57+ </record>
58+ <record id="inherit_view_invoice_line_form" model="ir.ui.view">
59+ <field name="name">inherit.view.invoice.line.form</field>
60+ <field name="model">account.invoice.line</field>
61+ <field name="inherit_id" ref="account.view_invoice_line_form"/>
62+ <field name="arch" type="xml">
63+ <field name="discount" position="attributes">
64+ <attribute name="groups">sale.group_discount_per_so_line</attribute>
65+ </field>
66+ </field>
67+ </record>
68+ <record id="inherit_invoice_supplier_form" model="ir.ui.view">
69+ <field name="name">inherit.invoice.supplier.form</field>
70+ <field name="model">account.invoice</field>
71+ <field name="inherit_id" ref="account.invoice_supplier_form"/>
72+ <field name="arch" type="xml">
73+ <field name="discount" position="attributes">
74+ <attribute name="groups">sale.group_discount_per_so_line</attribute>
75+ </field>
76+ </field>
77+ </record>
78+ <record id="inherit_invoice_form" model="ir.ui.view">
79+ <field name="name">inherit.invoice.form</field>
80+ <field name="model">account.invoice</field>
81+ <field name="inherit_id" ref="account.invoice_form"/>
82+ <field name="arch" type="xml">
83+ <field name="discount" position="attributes">
84+ <attribute name="groups">sale.group_discount_per_so_line</attribute>
85+ </field>
86+ </field>
87+ </record>
88 </data>
89 </openerp>