Merge lp:~vauxoo/addons-vauxoo/7.0-invoice-discount-luist into lp:addons-vauxoo/7.0

[Luis Torres - http://www.vauxoo.com]

Se agregaron fields function para obtener los montos de la cantidad sin descuento y el monto del descuento para las facturas y las lineas de las facturas.

[lp:~vauxoo/addons-vauxoo/7.0-invoice-discount-luist]

1135. By Luis Torres - http://www.vauxoo.com on 2014-09-23

[IMP][invoice_discount]Was added that active the action to set the discount on lines of invoice

[Moisés López - http://www.vauxoo.com (moylop260)]

LuisT,
Agrega los campos a la vista tree de account.invoice.line, también, por favor.
(con invisible=True, por ahora).

Pon los nombres de string y traducción de los mismos, mas descriptivas, ya que se repiten con los originales.

review: Needs Fixing

[lp:~vauxoo/addons-vauxoo/7.0-invoice-discount-luist]

1136. By Luis Torres - http://www.vauxoo.com on 2014-09-25

[IMP][invoice_discount]Was completed the string and help in fields, added fields to view tree of account_invoice_line

[Luis Torres - http://www.vauxoo.com (luis-cleto-)]

Se cambio el string a los campos agregados, y se coloco ayuda a estos

review: Needs Resubmitting

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr)]

@Luis
Puedes realizar las correcciones que te comento abajo, no son de funcionalidad.

[lp:~vauxoo/addons-vauxoo/7.0-invoice-discount-luist]

1137. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2014-10-02

[IMP][invoice_discount] Changed some translations, changed noupdate 0 to 1 and changed in credits 2010 to 2014

=== added directory 'invoice_discount'
=== added file 'invoice_discount/__init__.py'
--- invoice_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ invoice_discount/__init__.py	2014-10-02 16:52:39 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([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 model

=== added file 'invoice_discount/__openerp__.py'
--- invoice_discount/__openerp__.py	1970-01-01 00:00:00 +0000
+++ invoice_discount/__openerp__.py	2014-10-02 16:52:39 +0000
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([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 Discount",
+    "version": "1.0",
+    "author": "Vauxoo",
+    "category": "Generic Modules",
+    "description": """
+        Fields to get the amount without discount and discount in lines to
+        invoice.
+    """,
+    "website": "http://www.vauxoo.com/",
+    "license": "AGPL-3",
+    "depends": [
+        "account",
+        "sale",
+    ],
+    "demo": [],
+    "data": [
+        "view/invoice_view.xml",
+        'view/config_settings_action.xml',
+    ],
+    "test": [],
+    "installable": True,
+    "active": False,
+}

=== added directory 'invoice_discount/i18n'
=== added file 'invoice_discount/i18n/es.po'
--- invoice_discount/i18n/es.po	1970-01-01 00:00:00 +0000
+++ invoice_discount/i18n/es.po	2014-10-02 16:52:39 +0000
@@ -0,0 +1,68 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* invoice_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-25 21:17+0000\n"
+"PO-Revision-Date: 2014-09-25 21:17+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: invoice_discount
+#: help:account.invoice,subtotal_wo_discount:0
+msgid "Amount without apply the                                                 discount of the lines of the                                                 invoice."
+msgstr "Monto sin aplicar el descuento de las líneas de la factura."
+
+#. module: invoice_discount
+#: field:account.invoice.line,discount_amount:0
+msgid "Discount Amount"
+msgstr "Monto descuento"
+
+#. module: invoice_discount
+#: help:account.invoice.line,subtotal_wo_discount:0
+msgid "Amount without apply                                                 the discount of the line, is                                                 calculated as Qty * Price Unit"
+msgstr "Monto sin aplicar el descuento de la línea, es calculado con Cantidad * Precio Unitario"
+
+#. module: invoice_discount
+#: model:ir.model,name:invoice_discount.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "Configuración de las ventas"
+
+#. module: invoice_discount
+#: help:account.invoice,discount_amount:0
+msgid "Total of discount apply in                                            each line of the invoice."
+msgstr "Descuento total aplicado en cada una de las líneas de la factura."
+
+#. module: invoice_discount
+#: model:ir.model,name:invoice_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: invoice_discount
+#: field:account.invoice,subtotal_wo_discount:0
+#: field:account.invoice.line,subtotal_wo_discount:0
+msgid "SubTotal w/o Discount"
+msgstr "SubTotal sin descuento"
+
+#. module: invoice_discount
+#: field:account.invoice,discount_amount:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: invoice_discount
+#: help:account.invoice.line,discount_amount:0
+msgid "Amount total of the discount,                                           is calculated as Discount *                                            SubTotal w/o Discount / 100."
+msgstr "Monto total de el descuento, es calculado con Descuento * SubTotal sin Descuento / 100."
+
+#. module: invoice_discount
+#: model:ir.model,name:invoice_discount.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+

=== added file 'invoice_discount/i18n/es_MX.po'
--- invoice_discount/i18n/es_MX.po	1970-01-01 00:00:00 +0000
+++ invoice_discount/i18n/es_MX.po	2014-10-02 16:52:39 +0000
@@ -0,0 +1,17 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* invoice_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-25 21:17+0000\n"
+"PO-Revision-Date: 2014-09-25 21:17+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"
+

=== added directory 'invoice_discount/model'
=== added file 'invoice_discount/model/__init__.py'
--- invoice_discount/model/__init__.py	1970-01-01 00:00:00 +0000
+++ invoice_discount/model/__init__.py	2014-10-02 16:52:39 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([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 config_settings
+import invoice

=== added file 'invoice_discount/model/config_settings.py'
--- invoice_discount/model/config_settings.py	1970-01-01 00:00:00 +0000
+++ invoice_discount/model/config_settings.py	2014-10-02 16:52:39 +0000
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([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/>.
+#
+##############################################################################
+'''
+File to add functionalitity in account.invoice.line to get the amount without
+discount and the value of the discount
+'''
+from openerp.osv import osv
+
+
+class sale_config_settings(osv.TransientModel):
+    _inherit = 'sale.config.settings'
+
+    def get_default_sale_config_settings(self, cr, uid, fields, context=None):
+        return {'group_discount_per_so_line': True}
+
+    def action_sale_config_settings(self, cr, uid, context=None):
+        res = self.create(cr, uid, {'group_discount_per_so_line': True},
+                          context=context)
+        self.execute(cr, uid, [res], context=context)
+        return True

=== added file 'invoice_discount/model/invoice.py'
--- invoice_discount/model/invoice.py	1970-01-01 00:00:00 +0000
+++ invoice_discount/model/invoice.py	2014-10-02 16:52:39 +0000
@@ -0,0 +1,159 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([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/>.
+#
+##############################################################################
+'''
+File to add functionalitity in account.invoice.line to get the amount without
+discount and the value of the discount
+'''
+from openerp.osv import osv, fields
+
+
+class account_invoice_line(osv.osv):
+
+    '''
+    Inherit from account.invoice.line to get by line the amount without
+    discount and the amount of this
+    '''
+    _inherit = 'account.invoice.line'
+
+    def _get_subtotal_without_discount(self, cr, uid, ids, args, field_name,
+                                       context=None):
+        '''
+        Method to get the subtotal of the amount without discount
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param field_name: field that call the method
+        @param arg: Extra arguments
+        @param context: A standard dictionary
+        @return : Dict with values
+        '''
+        context = context or {}
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = (line.quantity * line.price_unit)
+        return res
+
+    def _get_discount(self, cr, uid, ids, args, field_name, context=None):
+        '''
+        Method to get the amount of discount, is used subtraction by rounding
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param field_name: field that call the method
+        @param arg: Extra arguments
+        @param context: A standard dictionary
+        @return : Dict with values
+        '''
+        context = context or {}
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = line.discount * line.subtotal_wo_discount / 100
+        return res
+
+    _columns = {
+        'subtotal_wo_discount': fields.function(_get_subtotal_without_discount,
+                                                string='SubTotal w/o Discount',
+                                                store=True, type='float',
+                                                help='Amount without apply \
+                                                the discount of the line, is \
+                                                calculated as Qty * Price Unit'
+                                                ),
+        'discount_amount': fields.function(_get_discount,
+                                           string='Discount Amount',
+                                           store=False, type='float',
+                                           help='Amount total of the discount,\
+                                           is calculated as Discount * \
+                                           SubTotal w/o Discount / 100.'),
+    }
+
+
+class account_invoice(osv.osv):
+    
+    '''
+    Inherit from account.invoice to get the amount total without discount and
+    the amount total of this, of all invoice lines.
+    '''
+    _inherit = 'account.invoice'
+
+    def _get_subtotal_without_discount(self, cr, uid, ids, args, field_name,
+                                       context=None):
+        '''
+        Method to get the subtotal of the amount without discount of the sum of
+        invoice lines.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param field_name: field that call the method
+        @param arg: Extra arguments
+        @param context: A standard dictionary
+        @return : Dict with values
+        '''
+        context = context or {}
+        total = 0.0
+        res = {}
+        for inv in self.browse(cr, uid, ids, context=context):
+            for line in inv.invoice_line:
+                total += line.subtotal_wo_discount
+            res[inv.id] = total
+        return res
+
+    def _get_discount(self, cr, uid, ids, args, field_name, context=None):
+        '''
+        Method to get the amount total of discount in the invoice lines.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param field_name: field that call the method
+        @param arg: Extra arguments
+        @param context: A standard dictionary
+        @return : Dict with values
+        '''
+        context = context or {}
+        total = 0.0
+        res = {}
+        for inv in self.browse(cr, uid, ids, context=context):
+            for line in inv.invoice_line:
+                total += line.discount_amount
+            res[inv.id] = total
+        return res
+
+    _columns = {
+        'subtotal_wo_discount': fields.function(_get_subtotal_without_discount,
+                                                string='SubTotal w/o Discount',
+                                                store=True, type='float',
+                                                help='Amount without apply the\
+                                                 discount of the lines of the \
+                                                invoice.'),
+        'discount_amount': fields.function(_get_discount, string='Discount',
+                                           store=False, type='float',
+                                           help='Total of discount apply in \
+                                           each line of the invoice.'),
+    }
+    

=== added directory 'invoice_discount/view'
=== added file 'invoice_discount/view/config_settings_action.xml'
--- invoice_discount/view/config_settings_action.xml	1970-01-01 00:00:00 +0000
+++ invoice_discount/view/config_settings_action.xml	2014-10-02 16:52:39 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <function model="sale.config.settings" name="action_sale_config_settings"/>
+    </data>
+</openerp>

=== added file 'invoice_discount/view/invoice_view.xml'
--- invoice_discount/view/invoice_view.xml	1970-01-01 00:00:00 +0000
+++ invoice_discount/view/invoice_view.xml	2014-10-02 16:52:39 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="view_account_invoice_form_inh_discount">
+            <field name="name">view.account.invoice.form.inh.discount</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='invoice_line_tax_id']" position="after">
+                    <field name="subtotal_wo_discount" invisible='1'/>
+                    <field name="discount_amount" invisible='1'/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_account_invoice_form_inh_discount_total">
+            <field name="name">view.account.invoice.form.inh.discount.total</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='residual']" position="after">
+                    <field name="subtotal_wo_discount" invisible='1'/>
+                    <field name="discount_amount" invisible='1'/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_account_invoice_tree_inh_discount">
+            <field name="name">view.account.invoice.tree.inh.discount</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="//field[@name='price_subtotal']" position="after">
+                    <field name="subtotal_wo_discount" invisible='1'/>
+                    <field name="discount_amount" invisible='1'/>
+                </xpath>
+            </field>
+        </record>
+        
+    </data>
+</openerp>