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
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2013-09-20 09:50:26 +0000
+++ account/account_invoice_view.xml 2013-11-28 08:40:24 +0000
@@ -35,7 +35,7 @@
35 <field name="quantity"/>35 <field name="quantity"/>
36 <field name="uos_id" groups="product.group_uom"/>36 <field name="uos_id" groups="product.group_uom"/>
37 <field name="price_unit"/>37 <field name="price_unit"/>
38 <field name="discount" groups="sale.group_discount_per_so_line"/>38 <field name="discount"/>
39 <field name="price_subtotal"/>39 <field name="price_subtotal"/>
40 </tree>40 </tree>
41 </field>41 </field>
@@ -56,7 +56,7 @@
56 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)"/>56 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)"/>
57 </div>57 </div>
58 <field name="price_unit"/>58 <field name="price_unit"/>
59 <field name="discount" groups="sale.group_discount_per_so_line"/>59 <field name="discount"/>
60 </group>60 </group>
61 <group>61 <group>
62 <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"/>62 <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"/>
@@ -205,7 +205,7 @@
205 <field name="uos_id" groups="product.group_uom"205 <field name="uos_id" groups="product.group_uom"
206 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)"/>206 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)"/>
207 <field name="price_unit"/>207 <field name="price_unit"/>
208 <field name="discount" groups="sale.group_discount_per_so_line"/>208 <field name="discount"/>
209 <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"209 <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
210 domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>210 domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
211 <field name="price_subtotal"/>211 <field name="price_subtotal"/>
@@ -362,7 +362,7 @@
362 <field name="uos_id" groups="product.group_uom"362 <field name="uos_id" groups="product.group_uom"
363 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)"/>363 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)"/>
364 <field name="price_unit"/>364 <field name="price_unit"/>
365 <field name="discount" groups="sale.group_discount_per_so_line"/>365 <field name="discount" />
366 <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"366 <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
367 domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>367 domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
368 <field name="price_subtotal"/>368 <field name="price_subtotal"/>
369369
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2013-11-06 07:27:45 +0000
+++ sale/sale_view.xml 2013-11-28 08:40:24 +0000
@@ -549,5 +549,45 @@
549 <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>549 <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
550 <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>550 <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>
551551
552 <record id="inherit_view_invoice_line_tree" model="ir.ui.view">
553 <field name="name">inherit.view.invoice.line.tree</field>
554 <field name="model">account.invoice.line</field>
555 <field name="inherit_id" ref="account.view_invoice_line_tree"/>
556 <field name="arch" type="xml">
557 <field name="discount" position="attributes">
558 <attribute name="groups">sale.group_discount_per_so_line</attribute>
559 </field>
560 </field>
561 </record>
562 <record id="inherit_view_invoice_line_form" model="ir.ui.view">
563 <field name="name">inherit.view.invoice.line.form</field>
564 <field name="model">account.invoice.line</field>
565 <field name="inherit_id" ref="account.view_invoice_line_form"/>
566 <field name="arch" type="xml">
567 <field name="discount" position="attributes">
568 <attribute name="groups">sale.group_discount_per_so_line</attribute>
569 </field>
570 </field>
571 </record>
572 <record id="inherit_invoice_supplier_form" model="ir.ui.view">
573 <field name="name">inherit.invoice.supplier.form</field>
574 <field name="model">account.invoice</field>
575 <field name="inherit_id" ref="account.invoice_supplier_form"/>
576 <field name="arch" type="xml">
577 <field name="discount" position="attributes">
578 <attribute name="groups">sale.group_discount_per_so_line</attribute>
579 </field>
580 </field>
581 </record>
582 <record id="inherit_invoice_form" model="ir.ui.view">
583 <field name="name">inherit.invoice.form</field>
584 <field name="model">account.invoice</field>
585 <field name="inherit_id" ref="account.invoice_form"/>
586 <field name="arch" type="xml">
587 <field name="discount" position="attributes">
588 <attribute name="groups">sale.group_discount_per_so_line</attribute>
589 </field>
590 </field>
591 </record>
552 </data>592 </data>
553</openerp>593</openerp>