Merge lp:~lin-yu/account-invoicing/add_account_invoce_line into lp:~account-core-editors/account-invoicing/7.0

[LIN Yu]

[ADD] Module account invoice line

Invoice Line
==================================================
* Create a menu for read Only list View of account invoice line
* Add part of invoice header infomation in invoice line list view

[Stéphane Bidoul (Acsone) (sbi)]

Hello,

At first glance I have the feeling this account_invoice_line module is doing many different things. Perhaps is it better to split it in separate modules with narrower goals?

Regards,

-sbi

[LIN Yu (lin-yu)]

Hello Stéphanie,

I have removed non relevant fields and views and resubmit the proposal,
please review it.

Best regards,
LIN Yu

On 08/27/2013 02:51 PM, Stéphane Bidoul (Acsone) wrote:
> Hello,
>
> At first glance I have the feeling this account_invoice_line module is doing many different things. Perhaps is it better to split it in separate modules with narrower goals?
>
> Regards,
>
> -sbi

--
LIN Yu

LIN Yu
/Project Manager/
--
*Elico Corporation, Shanghai
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 1691 1351
Office: + 86 21 6211 8017/27
Skype: llccluf
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Dear Lin,

Thank you for this contribs ! At first glance, the view in "Reporting -> Accounting -> Invoicing" or something like this seems to provide that feature or am I wrong ?

I rather prefer to have a module that extend this feature then, for that reason i disapprove the MP.

If you have any good reason not to do it there, please let us knoe !

Regards,

Joël

review: Disapprove (code review, no tests)

Unmerged revisions

20. By LIN Yu on 2013-08-28

[FIX] Change Module account_invoice_line: remove non relevent functions

19. By LIN Yu on 2013-08-26

[ADD] account_invoice_line

=== added directory 'account_invoice_line'
=== added file 'account_invoice_line/__init__.py'
--- account_invoice_line/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line/__init__.py	2013-08-28 02:14:15 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_invoice_line/__openerp__.py'
--- account_invoice_line/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line/__openerp__.py	2013-08-28 02:14:15 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: LIN Yu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Invoice Line',
+    'version': '1.1',
+    'category': 'Account',
+    'sequence': 19,
+    'summary': 'Invoice line',
+    'description': """
+Invoice Line
+==================================================
+* Create a menu for read Only list View of account invoice line
+* Add part of invoice header infomation in invoice line list view
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['account'],
+    'data': [
+        'account_view.xml',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_invoice_line/account.py'
--- account_invoice_line/account.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line/account.py	2013-08-28 02:14:15 +0000
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: LIN Yu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+import openerp.addons.decimal_precision as dp
+import time
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def _get_reference_type(self, cr, uid, context=None):
+        return [('none', _('Free Reference'))] #,
+    
+    _columns = {
+        'supplier_invoice_number': fields.char('Supplier Inv Ref', size=64, help="The reference of this invoice as provided by the supplier."),
+        'partner_ref': fields.related('partner_id','ref',type='char', size=64, string='Partner Ref'),
+        'reference_type': fields.selection(_get_reference_type, 'Payment Reference',
+            required=True, readonly=True, states={'draft':[('readonly',False)]}),
+    }
+account_invoice()
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+
+    def _amount_line_with_tax(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids, context=context):
+            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, partner=line.invoice_id.partner_id, force_excluded=True)
+            res[line.id] = taxes['total']
+            if line.invoice_id:
+                cur = line.invoice_id.currency_id
+                res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+        return res
+    
+    _columns = {
+        'amount_subtotal': fields.function(_amount_line_with_tax, string='Amount (Inc. Tax)', type='float', digits_compute=dp.get_precision('Account')),
+        'partner_ref': fields.related(
+                    'partner_id', 'ref',
+                    type='char', size=64,relation='res.partner',
+                    string='Partner Ref',select=1),
+        'type': fields.related(
+                    'invoice_id', 'type',
+                    type='char', size=64,relation='account.invoice',
+                    string='Type'),
+        'number': fields.related(
+                    'invoice_id', 'number',
+                    type='char', size=64,relation='account.invoice',
+                    string='Number',select=1),
+        'supplier_invoice_number': fields.related(
+                    'invoice_id', 'supplier_invoice_number',
+                    type='char', size=64,relation='account.invoice',
+                    string='Supplier Inv Ref',select=1),
+        'date_invoice': fields.related(
+                    'invoice_id', 'date_invoice',
+                    type='date', relation='account.invoice',
+                    string='Date Invoice',select=1),
+        'state': fields.related(
+                    'invoice_id', 'state',
+                    type='char', size=16,relation='account.invoice',
+                    string='State'),
+        'reference': fields.related(
+                    'invoice_id', 'reference',
+                    type='char', size=16,relation='account.invoice',
+                    string='Reference'),
+    }
+account_invoice_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_invoice_line/account_view.xml'
--- account_invoice_line/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_line/account_view.xml	2013-08-28 02:14:15 +0000
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+		<!-- Invoice Line by LY-->
+
+		<record id="account_invoice_line_tree" model="ir.ui.view">
+            <field name="name">account_invoice_line_tree</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="arch" type="xml">
+            
+            	<xpath expr="/tree" position="attributes">
+            		<attribute name="create">0</attribute>
+            		<attribute name="delete">0</attribute>
+            	</xpath>  
+            	<xpath expr="/tree/field[@name='name']" position="before">
+            		<field name="partner_ref"/>
+            		<field name="partner_id"/>
+            		<field name="supplier_invoice_number"/>
+            		<field name="number"/>
+            		<field name="date_invoice"/>
+            		<field name="invoice_id" invisible='1'/>
+            		<field name="origin"/>
+                </xpath>
+                <xpath expr="/tree/field[@name='quantity']" position="replace">
+            		<field name="product_id"/>
+            		<field name="quantity" sum="Quantity"/>
+                </xpath>
+                <xpath expr="//field[@name='price_subtotal']" position="replace">
+                	<field name="amount_subtotal" sum="Amount"/>
+					<field name="amount_subtotal" sum="Amount(Inc.Tax)"/>
+					<field name="state"/>
+					<field name="reference" string='Reference'/>
+		        </xpath>
+            </field>
+        </record>
+		<record id="account_invoice_line_search" model="ir.ui.view">
+            <field name="name">account.invoice.line.search.elico</field>
+            <field name="model">account.invoice.line</field>
+            <field name="arch" type="xml">
+            	<search string="Search Invoice">
+            		<field name="number" string="Number" filter_domain="['|','|',('number','ilike',self),('supplier_invoice_number','ilike',self),('origin','ilike',self)]"/>
+            		<field name="supplier_invoice_number" string="Supplier Invoice Number" />
+            		<field name="partner_id" string="Partner"/>
+            		<field name="partner_ref" string="Partner ref"/>
+            		<field name="product_id" string="Product" />
+            		<filter icon="terp-go-today" string="Draft" domain="[('state','=','draft')]" help="draft"/>
+            		<filter icon="terp-go-today" string="Open" domain="[('state','not in',('done','draft','cancel'))]" help="draft"/>
+            		<filter icon="terp-go-today" string="Paid" domain="[('state','=','done')]" help="Paid"/>
+            		<filter icon="terp-go-today" string="Cancel" domain="[('state','=','cancel')]" help="Cancel"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date_invoice','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_invoice','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                    <group expand="0" string="Group By...">
+                    	<filter icon="terp-partner" string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                    	<filter icon="terp-product" string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                    	<filter icon="terp-invoice" string="Invoice" domain="[]" context="{'group_by':'invoice_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+		
+		<record id="action_supplier_invoice_line" model="ir.actions.act_window">
+            <field name="name">Invoice Line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.line</field>
+            <field name="context">{}</field>
+            <field name="domain">[('type','=','in_invoice')]</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account.view_invoice_line_tree"/>
+            <field name="search_view_id" ref="account_invoice_line_search"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to check Invoice Line.
+              </p>
+            </field>
+        </record>
+		<menuitem id="suppler_invoice_line" name="Supplier Invoice Line" parent="account.menu_finance_payables" action="action_supplier_invoice_line" sequence="13"/>
+
+		
+		<record id="action_customer_invoice_line" model="ir.actions.act_window">
+            <field name="name">Invoice Line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.line</field>
+            <field name="context">{}</field>
+            <field name="domain">[('type','=','out_invoice')]</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account.view_invoice_line_tree"/>
+            <field name="search_view_id" ref="account_invoice_line_search"/>
+            <field name="help" type="html">
+        
+              <p class="oe_view_nocontent_create">
+                Click to check Invoice Line.
+              </p>
+            </field>
+        </record>
+		<menuitem id="customer_invoice_line" name="Customer Invoice Line" parent="account.menu_finance_receivables" action="action_customer_invoice_line" sequence="13"/>
+
+
+        <!--
+        Account Invoice
+        -->
+        <record model="ir.ui.view" id="invoice_ait_tree">
+            <field name="name">account.invoice.ait.tree</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_tree" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="before">
+                    <field name="partner_ref"/>
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="supplier_invoice_number"/>
+                </xpath>
+                <xpath expr="//field[@name='state']" position="before">
+                    <field name="reference"/>
+                    <field name="type" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="invoice_supplier_ait_form">
+            <field name="name">account.invoice.supplier.ait.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='price_subtotal']" position="after">
+                    <field name="amount_subtotal"/>
+                </xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="invoice_ait_form">
+            <field name="name">account.invoice.ait.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <field name="supplier_invoice_number"/>
+                </xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_account_invoice_ait_filter">
+            <field name="name">account.invoice.ait.select</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="partner_ref"/>
+                    <field name="supplier_invoice_number"/>
+                    
+                    <filter string="Invoice" icon="terp-partner" domain="[('type','=','in_invoice')]"/>
+                    <filter string="Refund" icon="terp-partner" domain="[('type','=','in_refund')]"/>
+                    <separator/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+
+</openerp>

=== added directory 'account_invoice_line/i18n'
=== added file 'account_invoice_line/i18n/zh_CN.po'
--- account_invoice_line/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ account_invoice_line/i18n/zh_CN.po	2013-08-28 02:14:15 +0000
@@ -0,0 +1,95 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* fc_account_invoice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-29 02:28+0000\n"
+"PO-Revision-Date: 2013-03-29 02:28+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account
+#: field:account.invoice,supplier_invoice_number:0
+msgid "Supplier Invoice Number"
+msgstr "增值税普票号码"
+
+#. module: account
+#: code:addons/account/account_invoice.py:92
+#, python-format
+msgid "Free Reference"
+msgstr "入库说明"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_none
+msgid "None"
+msgstr "无"
+
+#. module: fc_account_invoice
+#: field:account.invoice.type,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_13
+msgid "13%"
+msgstr "13%"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_normal
+msgid "Normal"
+msgstr "普票"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_17
+msgid "17%"
+msgstr "17%"
+
+#. module: fc_account_invoice
+#: model:ir.model,name:fc_account_invoice.model_stock_picking
+msgid "Picking List"
+msgstr "分拣单"
+
+#. module: fc_account_invoice
+#: model:ir.model,name:fc_account_invoice.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "发票明细"
+
+#. module: fc_account_invoice
+#: field:account.invoice.line,amount_subtotal:0
+msgid "Amount (Inc. Tax)"
+msgstr "金额(含税)"
+
+#. module: fc_account_invoice
+#: view:account.invoice.type:0
+msgid "invoice type"
+msgstr "发票税别"
+
+#. module: fc_account_invoice
+#: model:ir.model,name:fc_account_invoice.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: fc_account_invoice
+#: view:account.invoice:0
+#: field:account.invoice,account_invoice_type:0
+msgid "Invoice Type"
+msgstr "发票税别"
+
+#. module: fc_account_invoice
+#: code:addons/fc_account_invoice/account.py:42
+#, python-format
+msgid "Free Reference"
+msgstr "入库说明"
+
+#. module: fc_account_invoice
+#: field:account.invoice,partner_ref:0
+msgid "Partner Ref"
+msgstr "编号"
+

=== added directory 'account_invoice_line/static'
=== added directory 'account_invoice_line/static/description'
=== added file 'account_invoice_line/static/description/account_invoice_line.png'
Binary files account_invoice_line/static/description/account_invoice_line.png	1970-01-01 00:00:00 +0000 and account_invoice_line/static/description/account_invoice_line.png	2013-08-28 02:14:15 +0000 differ
=== added file 'account_invoice_line/static/description/index.html'
--- account_invoice_line/static/description/index.html	1970-01-01 00:00:00 +0000
+++ account_invoice_line/static/description/index.html	2013-08-28 02:14:15 +0000
@@ -0,0 +1,16 @@
+<section class="oe_container">
+    <div class="oe_row">
+    <h2 class="oe_slogan">account_invoice_line Module</h2> 
+    <h3 class="oe_slogan">Individual Invoices for Each Item Product in Invoices</h3>
+    <h4 class="oe_slogan"><a href="http://www.openerp.com.cn">By Elico Corp</a></h4>
+       <p>This module separates each item in the Customer and Supplier invoices into separate invoices. This allows for each of the separate invoices to be categorized by information type (i.e. company, item, V.A.T., account, etc.) enabling easier search and usage of different search filters.</p>
+                <p>This module also adds more fields that can be filled in the Supplier and Customer invoices which includes:<br>&nbsp; - &nbsp;Account<br>&nbsp; - &nbsp;Journal<br>&nbsp; - &nbsp;Supplier Inv. Ref.<br>&nbsp; - &nbsp;V.A.T. Date<br>&nbsp; - &nbsp;Invoice Type&nbsp;</p>
+        <div class="oe_row_img oe_centered oe_mt32">
+            <img class="oe_picture oe_screenshot" src="account_invoice_line.png">
+        </div>
+    </div>
+     <div class="oe_row oe_centeralign oe_more_space">
+            <a href="http://www.elico-corp.com" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
+        </div>
+        <h4 class="oe_slogan">or</h4>
+</section>
\ No newline at end of file