Merge lp:~pexego/openobject-addons/6.1-pexego-sale_commission into lp:~pexego/openobject-addons/6.1-pexego

[Javier]

[lp:~pexego/openobject-addons/6.1-pexego-sale_commission]

25. By Javier on 2013-11-26

[ADD]:sale_commission: Modificaciones en la generación de factura. 3 opciones de desglose

26. By Javier on 2013-11-26

[MERGE]

27. By Javier on 2013-11-27

[ADD]sale_commission: traducciones

28. By Javier on 2013-12-02

[FIX]:sale_commission: improved onchange_product_id of sale.order.line

29. By Javier on 2013-12-19

[FIX] sale_commission: Bug en product_id_change2 corregido

30. By Javier on 2013-12-31

[FIX]sale_commission: Modificaciones para que no borre los agentes de las lineas de venta en el cliente gtk

31. By Javier on 2014-01-07

[FIX]sale_commission: No permitir borrar comisiones si se han usado en algún lado, domain en los diarios para que solo muestre los de tipo compras

32. By Javier on 2014-03-13

[FIX] sale_commission: Modificacion para tener en cuenta las facturas rectificativas

=== modified file 'sale_commission/__init__.py'
--- sale_commission/__init__.py	2012-07-13 10:51:04 +0000
+++ sale_commission/__init__.py	2014-03-13 12:35:19 +0000
@@ -28,6 +28,7 @@
 import sale_order
 import stock_picking
 import wizard
+import product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'sale_commission/i18n/es.po'
--- sale_commission/i18n/es.po	2012-07-13 10:51:04 +0000
+++ sale_commission/i18n/es.po	2014-03-13 12:35:19 +0000
@@ -1,18 +1,18 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* sale_commission
+#	* sale_commission
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.1\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-02 11:44+0000\n"
-"PO-Revision-Date: 2011-05-02 14:17+0100\n"
-"Last-Translator: Raimon Esteve <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-27 09:45+0000\n"
+"PO-Revision-Date: 2013-11-27 09:45+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
 #. module: sale_commission
@@ -26,6 +26,11 @@
 msgstr "Factura Nº"
 
 #. module: sale_commission
+#: view:sale.agent:0
+msgid "Saleagent"
+msgstr "Agente"
+
+#. module: sale_commission
 #: selection:sale.agent,settlement:0
 msgid "Monthly"
 msgstr "Mensual"
@@ -76,11 +81,6 @@
 msgstr "Resumen de facturas"
 
 #. module: sale_commission
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale_commission
 #: field:settlement.agent,total_sections:0
 msgid "Total sections"
 msgstr "Total tramos"
@@ -96,6 +96,7 @@
 msgstr "Informe de liquidación"
 
 #. module: sale_commission
+#: model:ir.actions.act_window,name:sale_commission.action_recalculate_commission
 #: view:recalculate.commission.wizard:0
 msgid "Recalculate agents commissions"
 msgstr "Recalcular comisiones"
@@ -106,6 +107,7 @@
 msgstr "Resumen de agentes"
 
 #. module: sale_commission
+#: view:commission:0
 #: view:res.partner:0
 #: view:sale.order:0
 msgid "Agents and Commissions"
@@ -123,6 +125,11 @@
 msgstr "Liquidación de agente"
 
 #. module: sale_commission
+#: selection:settled.invoice.wizard,mode:0
+msgid "for each sale invoice"
+msgstr "por cada factura de venta"
+
+#. module: sale_commission
 #: view:account.invoice.line:0
 msgid "Notes"
 msgstr "Notas"
@@ -133,7 +140,7 @@
 msgstr "Anual"
 
 #. module: sale_commission
-#: code:addons/sale_commission/settled.py:193
+#: code:addons/sale_commission/settled.py:190
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -178,6 +185,7 @@
 #: field:invoice.line.agent,agent_id:0
 #: field:res.partner.agent,agent_id:0
 #: view:sale.agent:0
+#: field:sale.line.agent,agent_id:0
 #: field:sale.order.agent,agent_id:0
 #: view:settled.invoice.agent:0
 #: field:settled.invoice.agent,agent_id:0
@@ -192,26 +200,30 @@
 msgstr "Resumen de liquidaciones de agentes"
 
 #. module: sale_commission
-#: model:ir.actions.act_window,name:sale_commission.action_recalculate_commission
-msgid "Recalculate agents commissions "
-msgstr "Recalcular comisiones de agentes "
-
-#. module: sale_commission
+#: field:commission,product_agent_ids:0
+#: field:product.agent.commission,agent_ids:0
+#: field:product.product,product_agent_ids:0
 #: field:res.partner,commission_ids:0
 #: view:res.partner.agent:0
 #: field:sale.order,sale_agent_ids:0
 #: view:sale.order.agent:0
+#: field:sale.order.line,line_agent_ids:0
 #: view:stock.picking:0
 msgid "Agents"
 msgstr "Agentes"
 
 #. module: sale_commission
-#: code:addons/sale_commission/wizard/wizard_invoice.py:55
+#: code:addons/sale_commission/wizard/wizard_invoice.py:56
 #, python-format
 msgid "No Invoices were created"
 msgstr "No se crearon facturas"
 
 #. module: sale_commission
+#: field:settled.invoice.wizard,mode:0
+msgid "A line"
+msgstr "Una linea"
+
+#. module: sale_commission
 #: view:settled.wizard:0
 msgid "Select period to Settle"
 msgstr "Seleccionar período a liquidar"
@@ -220,13 +232,14 @@
 #: model:ir.model,name:sale_commission.model_res_partner
 #: field:res.partner.agent,partner_id:0
 #: field:sale.agent,partner_id:0
+#: field:settled.invoice.agent,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: sale_commission
-#: model:ir.model,name:sale_commission.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
+#: view:sale.order:0
+msgid "Agents and Commisions"
+msgstr "Agentes y comisiones"
 
 #. module: sale_commission
 #: report:settlement.report:0
@@ -287,12 +300,6 @@
 msgstr "Estado"
 
 #. module: sale_commission
-#: code:addons/sale_commission/settled.py:251
-#, python-format
-msgid "Error, partner fail !"
-msgstr "Error, fallo en la empresa !"
-
-#. module: sale_commission
 #: model:ir.model,name:sale_commission.model_stock_picking
 msgid "Picking List"
 msgstr "Albarán"
@@ -323,6 +330,12 @@
 msgstr "IMPORTE FACTURADO"
 
 #. module: sale_commission
+#: field:commission,type:0
+#: field:sale.agent,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: sale_commission
 #: view:settled.invoice.wizard:0
 msgid "Create invoice"
 msgstr "Crear factura"
@@ -363,6 +376,11 @@
 msgstr "Comisión por defecto"
 
 #. module: sale_commission
+#: selection:settled.invoice.wizard,mode:0
+msgid "for each invoice line settled"
+msgstr "por cada linea de factura liquidada"
+
+#. module: sale_commission
 #: field:settlement,date:0
 msgid "Created Date"
 msgstr "Fecha de creación"
@@ -378,6 +396,11 @@
 msgstr "Código del agente"
 
 #. module: sale_commission
+#: view:product.product:0
+msgid "Agents and Products"
+msgstr "Agentes y productos"
+
+#. module: sale_commission
 #: view:settled.wizard:0
 msgid "Run Settlement Agents"
 msgstr "Ejecutar liquidaciones de agentes"
@@ -394,9 +417,9 @@
 msgstr "Agentes de ventas"
 
 #. module: sale_commission
-#: constraint:product.product:0
-msgid "Several dimension values for the same dimension type"
-msgstr "Varios valores de dimensión para el tipo de la misma dimensión"
+#: model:ir.model,name:sale_commission.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
 
 #. module: sale_commission
 #: view:commission:0
@@ -404,15 +427,20 @@
 msgstr "Info. general"
 
 #. module: sale_commission
+#: view:settlement:0
 #: view:settlement.agent:0
 #: field:settlement.agent,invoices:0
 msgid "Invoices"
 msgstr "Facturas"
 
 #. module: sale_commission
-#: field:product.product,commission_exent:0
-msgid "Commission exent"
-msgstr "Exento de comisiones"
+#: view:account.invoice.line:0
+#: field:account.invoice.line,commission_ids:0
+#: view:commission:0
+#: model:ir.ui.menu,name:sale_commission.menu_sale_commissions
+#: model:ir.ui.menu,name:sale_commission.menu_sale_commissions_conf
+msgid "Commissions"
+msgstr "Comisiones"
 
 #. module: sale_commission
 #: model:ir.ui.menu,name:sale_commission.menu_settlement
@@ -437,6 +465,11 @@
 msgstr "TOTAL :"
 
 #. module: sale_commission
+#: report:settlement.report:0
+msgid "PARTNER"
+msgstr "PARTNER"
+
+#. module: sale_commission
 #: model:ir.model,name:sale_commission.model_settled_invoice_wizard
 msgid "settled.invoice.wizard"
 msgstr "settled.invoice.wizard"
@@ -447,9 +480,9 @@
 msgstr "Facturado"
 
 #. module: sale_commission
-#: view:sale.agent:0
-msgid "Saleagent"
-msgstr "Agente"
+#: field:settled.invoice.agent,invoice_number:0
+msgid "Invoice no"
+msgstr "Factura nº"
 
 #. module: sale_commission
 #: field:sale.order.agent,sale_id:0
@@ -518,7 +551,7 @@
 msgstr "tramos"
 
 #. module: sale_commission
-#: code:addons/sale_commission/settled.py:193
+#: code:addons/sale_commission/settled.py:190
 #, python-format
 msgid "You can't delete it, if it isn't in cancel state."
 msgstr "No se puede borrar. No está en estado cancelado"
@@ -553,7 +586,17 @@
 msgstr "settled.wizard"
 
 #. module: sale_commission
-#: code:addons/sale_commission/wizard/wizard_invoice.py:55
+#: selection:settled.invoice.wizard,mode:0
+msgid "summary for each agent"
+msgstr "resumen por cada agente"
+
+#. module: sale_commission
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "¡La referencia debe ser única por compañía!"
+
+#. module: sale_commission
+#: code:addons/sale_commission/wizard/wizard_invoice.py:56
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -564,26 +607,24 @@
 msgstr "Entidad o empleado relacionado"
 
 #. module: sale_commission
-#: code:addons/sale_commission/settled.py:252
-#, python-format
-msgid "Agent to settle hasn't assigned partner."
-msgstr "El agente a liquidar no tiene una empresa asignada."
-
-#. module: sale_commission
 #: field:settled.invoice.agent,settlement_agent_id:0
 msgid "Agent settl."
 msgstr "Liq.de agente."
 
 #. module: sale_commission
+#: field:sale.line.agent,line_id:0
+msgid "Sale order line"
+msgstr "Linea del pedido"
+
+#. module: sale_commission
 #: field:settlement.line,commission:0
 msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: sale_commission
-#: field:commission,type:0
-#: field:sale.agent,type:0
-msgid "Type"
-msgstr "Tipo"
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
 
 #. module: sale_commission
 #: field:sale.agent,code:0
@@ -617,13 +658,9 @@
 msgstr "Factura"
 
 #. module: sale_commission
-#: view:account.invoice.line:0
-#: field:account.invoice.line,commission_ids:0
-#: view:commission:0
-#: model:ir.ui.menu,name:sale_commission.menu_sale_commissions
-#: model:ir.ui.menu,name:sale_commission.menu_sale_commissions_conf
-msgid "Commissions"
-msgstr "Comisiones"
+#: field:product.product,commission_exent:0
+msgid "Commission exent"
+msgstr "Exento de comisiones"
 
 #. module: sale_commission
 #: view:recalculate.commission.wizard:0
@@ -634,12 +671,18 @@
 msgstr "Cancelar"
 
 #. module: sale_commission
+#: model:ir.model,name:sale_commission.model_sale_line_agent
+msgid "sale.line.agent"
+msgstr "sale.line.agent"
+
+#. module: sale_commission
 #: help:sale.agent,partner_id:0
 msgid "Associated partner, is necessary for income invoices."
 msgstr "Empresa asociada, es necesario para las facturas entrantes generadas."
 
 #. module: sale_commission
 #: view:sale.agent:0
+#: view:settlement:0
 #: view:settlement.agent:0
 #: field:settlement.agent,settlement_id:0
 msgid "Settlement"
@@ -651,9 +694,9 @@
 msgstr "Retención aplicada"
 
 #. module: sale_commission
-#: field:settled.invoice.agent,invoice_number:0
-msgid "Invoice no"
-msgstr "Factura nº"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
 
 #. module: sale_commission
 #: report:settlement.report:0
@@ -661,9 +704,10 @@
 msgstr "FECHA FACTURA"
 
 #. module: sale_commission
-#: code:addons/sale_commission/invoice.py:82
-#: code:addons/sale_commission/partner_agent.py:80
-#: code:addons/sale_commission/sale_order.py:67
+#: code:addons/sale_commission/invoice.py:91
+#: code:addons/sale_commission/partner_agent.py:81
+#: code:addons/sale_commission/sale_order.py:68
+#: code:addons/sale_commission/sale_order.py:152
 #, python-format
 msgid "Fee installments!"
 msgstr "Fee installments!"
@@ -679,9 +723,10 @@
 msgstr "Líneas de detalle"
 
 #. module: sale_commission
-#: code:addons/sale_commission/invoice.py:84
-#: code:addons/sale_commission/partner_agent.py:81
-#: code:addons/sale_commission/sale_order.py:68
+#: code:addons/sale_commission/invoice.py:93
+#: code:addons/sale_commission/partner_agent.py:82
+#: code:addons/sale_commission/sale_order.py:69
+#: code:addons/sale_commission/sale_order.py:153
 #, python-format
 msgid "A commission has been assigned by sections that does not match that defined for the agent by default, so that these sections shall apply only on this bill."
 msgstr "Se ha asignado una comisión por tramos que no coincide con la definida por defecto para el agente, por lo que ese tramo solo se aplica a esta factura"
@@ -693,6 +738,7 @@
 
 #. module: sale_commission
 #: model:ir.model,name:sale_commission.model_product_product
+#: field:product.agent.commission,product_id:0
 msgid "Product"
 msgstr "Producto"
 
@@ -702,6 +748,12 @@
 msgstr "Período de liquidación"
 
 #. module: sale_commission
+#: view:commission:0
+#: view:product.product:0
+msgid "Agents/Commissions"
+msgstr "Agents/Commissions"
+
+#. module: sale_commission
 #: field:sale.agent,customer:0
 msgid "Customer"
 msgstr "Cliente"
@@ -758,14 +810,22 @@
 msgstr "Importe liquidado"
 
 #. module: sale_commission
+#: model:ir.model,name:sale_commission.model_product_agent_commission
+msgid "product.agent.commission"
+msgstr "product.agent.commission"
+
+#. module: sale_commission
 #: field:invoice.line.agent,commission_id:0
+#: field:product.agent.commission,commission_id:0
 #: field:res.partner.agent,commission_id:0
+#: field:sale.line.agent,commission_id:0
 #: field:sale.order.agent,commission_id:0
 msgid "Applied commission"
 msgstr "Comisión aplicada"
 
 #. module: sale_commission
 #: field:invoice.line.agent,settled:0
+#: view:settlement:0
 #: selection:settlement,state:0
 msgid "Settled"
 msgstr "Liquidado"

=== modified file 'sale_commission/invoice.py'
--- sale_commission/invoice.py	2012-07-13 10:51:04 +0000
+++ sale_commission/invoice.py	2014-03-13 12:35:19 +0000
@@ -31,20 +31,25 @@
     _name = "invoice.line.agent"
 
     _columns = {
-        'invoice_line_id':fields.many2one('account.invoice.line', 'Invoice Line', required=True, ondelete='cascade', help=''),
+        'invoice_line_id':fields.many2one('account.invoice.line', 'Invoice Line', required=False, ondelete='cascade', help=''),
         'invoice_id':fields.related('invoice_line_id', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice'),
         'invoice_date':fields.related('invoice_id',type='date_invoice', readonly=True),
         'agent_id': fields.many2one('sale.agent', 'Agent', required=True, ondelete='cascade', help=''),
-        'commission_id':fields.many2one('commission', 'Applied commission', required=True, ondelete='cascade', help=''),
+        'commission_id':fields.many2one('commission', 'Applied commission', required=True, help=''),
         'settled':fields.boolean('Settled', readonly=True),
         'quantity':fields.float('Settled amount')
     }
     _defaults = {
         'settled': lambda *a: False,
-        'quantity':lambda *a: 0
      }
 
 
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({'settled': False})
+        return super(invoice_line_agent, self).copy_data(cr, uid, id, default, context=context)
+
     def calculate_commission (self, cr, uid, ids):
         for line_agent in self.browse(cr,uid,ids):
              if  line_agent.commission_id.type == 'fijo' and line_agent.commission_id.fix_qty:
@@ -126,9 +131,15 @@
     def _refund_cleanup_lines(self, cr, uid, lines):
         """ugly function to map all fields of account.invoice.line when creates refund invoice"""
         res = super(account_invoice, self)._refund_cleanup_lines(cr, uid, lines)
+        # import ipdb; ipdb.set_trace()
         for line in res:
             if 'commission_ids' in line[2]:
-                line[2]['commission_ids'] = [(6,0, line[2].get('commission_ids', [])) ]
+                duply_ids = []
+                for cm_id in line[2].get('commission_ids', []):
+                    dup_id = self.pool.get("invoice.line.agent").copy(cr, uid, cm_id, {'settled': False} )
+                    duply_ids.append(dup_id)
+                # line[2]['commission_ids'] = [(6,0, line[2].get('commission_ids', [])) ]
+                line[2]['commission_ids'] = [(6,0, duply_ids) ]
             
         return res
 

=== modified file 'sale_commission/partner_agent.py'
--- sale_commission/partner_agent.py	2012-07-13 10:51:04 +0000
+++ sale_commission/partner_agent.py	2014-03-13 12:35:19 +0000
@@ -50,7 +50,7 @@
     _columns = {
         'partner_id':fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help='', select=1),
         'agent_id':fields.many2one('sale.agent', 'Agent', required=True, ondelete='cascade', help=''),
-        'commission_id':fields.many2one('commission', 'Applied commission', required=True, ondelete='cascade', help=''),
+        'commission_id':fields.many2one('commission', 'Applied commission', required=True, help=''),
         'type': fields.related('agent_id', 'type', type="selection", selection=[('asesor', 'Adviser'), ('comercial', 'Commercial')], readonly=True,
                     store={'sale.agent': (_get_partner_agents_to_update_from_sale_agents, ['type'], 10),
                             'res.partner.agent': (lambda self, cr, uid, ids, c={}: ids, None, 20)})

=== added file 'sale_commission/product.py'
--- sale_commission/product.py	1970-01-01 00:00:00 +0000
+++ sale_commission/product.py	2014-03-13 12:35:19 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Pexego Sistemas Informáticos (<http://www.pexego.es>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+"""Modificamos las ventas para incluir el comportamiento de comisiones"""
+from osv import fields, osv
+
+class product_agent_commission(osv.osv):
+    _name = "product.agent.commission"
+    _rec_name = "commission_id"
+
+    _columns = {
+        'product_id':fields.many2one('product.product', 'Product', required=False, ondelete='cascade', help=''),
+        'commission_id':fields.many2one('commission', 'Applied commission', required=True, help=''),
+        'agent_ids':fields.many2many('sale.agent', 'product_agent_sale_agent_rel', 'product_commission_id','agent_id','Agents'),
+    }
+
+product_agent_commission()
+
+class product_product(osv.osv):
+
+    _inherit = 'product.product'
+    _columns = {
+        'product_agent_ids':fields.one2many('product.agent.commission', 'product_id', 'Agents')
+    }
+
+
+product_product()
+

=== modified file 'sale_commission/product_view.xml'
--- sale_commission/product_view.xml	2012-07-13 10:51:04 +0000
+++ sale_commission/product_view.xml	2014-03-13 12:35:19 +0000
@@ -11,6 +11,30 @@
                 <field name="company_id" position="after">
                     <field name="commission_exent"/>
                 </field>
+               
+                <xpath expr="/form/notebook/page[@string='Procurement &amp; Locations']/group[3]" position="after">
+                    <group colspan="2" col="2">
+                        <separator colspan="2" string="Agents/Commissions"/>
+                        <field name="product_agent_ids" nolabel="1" mode="tree,form">
+                            <tree string="Agents and Products" editable="top">
+                               <!--  <field name="agent_ids" on_change="onchange_agent_id(agent_id)"/>
+                                <field name="commission_id" on_change="onchange_commission_id(agent_id,commission_id)"/> -->
+                                <field name="agent_ids">
+                                    <tree>
+                                        <field name="name"/>
+                                    </tree>
+                                </field>
+                                <field name="commission_id"/>
+                            </tree>
+                            <form>
+                                <field name="commission_id"/>
+                                <separator colspan="4" string="Agents/Commissions"/>
+                                <field name="agent_ids"  colspan="4" nolabel="1"/>
+                               
+                            </form>
+                        </field>
+                    </group>
+                </xpath>
             </field>
         </record>
 

=== modified file 'sale_commission/sale_order.py'
--- sale_commission/sale_order.py	2013-11-20 16:40:20 +0000
+++ sale_commission/sale_order.py	2014-03-13 12:35:19 +0000
@@ -40,7 +40,7 @@
     _columns = {
         'sale_id':fields.many2one('sale.order', 'Sale order', required=False, ondelete='cascade', help=''),
         'agent_id':fields.many2one('sale.agent', 'Agent', required=True, ondelete='cascade', help=''),
-        'commission_id':fields.many2one('commission', 'Applied commission', required=True, ondelete='cascade', help=''),
+        'commission_id':fields.many2one('commission', 'Applied commission', required=True, help=''),
     }
 
     def onchange_agent_id(self, cr, uid, ids, agent_id):
@@ -80,7 +80,6 @@
         'sale_agent_ids':fields.one2many('sale.order.agent', 'sale_id', 'Agents', states={'draft': [('readonly', False)]})
     }
 
-
     def onchange_partner_id(self, cr, uid, ids, part):
         """heredamos el evento de cambio del campo partner_id para actualizar el campo agent_id"""
         sale_agent_ids=[]
@@ -116,36 +115,149 @@
                 self.pool.get('stock.picking').write(cr, uid, pickings, {'agent_ids': [[6, 0, agents]] })
         return res
 
+    def create(self, cr, uid, values, context=None):
+        """
+        Para que el cliente gtk no borre el agente al darle a guardar
+        """
+        res = super(sale_order, self).create(cr, uid, values, context=context)
+        if 'sale_agent_ids' in values:
+            for sale_order_agent in values['sale_agent_ids']:
+                self.pool.get('sale.order.agent').write(cr, uid, sale_order_agent[1], {'sale_id':res})
+        return res
+
 sale_order()
 
+class sale_line_agent(osv.osv):
+    _name = "sale.line.agent"
+    _rec_name = "agent_id"
+
+    _columns = {
+        'line_id':fields.many2one('sale.order.line', 'Sale order line', required=False, ondelete='cascade', help=''),
+        'agent_id':fields.many2one('sale.agent', 'Agent', required=True, ondelete='cascade', help=''),
+        'commission_id':fields.many2one('commission', 'Applied commission', required=True, help=''),
+    }
+
+    def onchange_agent_id(self, cr, uid, ids, agent_id):
+        """al cambiar el agente cargamos sus comisión"""
+        result = {}
+        v = {}
+        if agent_id:
+            agent = self.pool.get('sale.agent').browse(cr, uid, agent_id)
+            v['commission_id'] = agent.commission.id
+
+        result['value'] = v
+        return result
+
+    def onchange_commission_id(self, cr, uid, ids, agent_id=False, commission_id=False):
+        """al cambiar la comisión comprobamos la selección"""
+        result = {}
+
+        if commission_id:
+            partner_commission = self.pool.get('commission').browse(cr, uid, commission_id)
+            if partner_commission.sections:
+                if agent_id:
+                    agent = self.pool.get('sale.agent').browse(cr, uid, agent_id)
+                    if agent.commission.id !=  partner_commission.id:
+                        result['warning'] = {}
+                        result['warning']['title'] = _('Fee installments!')
+                        result['warning']['message'] = _('A commission has been assigned by sections that does not match that defined for the agent by default, so that these sections shall apply only on this bill.')
+        return result
+sale_line_agent()
+
 
 class sale_order_line(osv.osv):
     """Modificamos las lineas ventas para incluir las comisiones en las facturas creadas desde ventas"""
 
     _inherit = "sale.order.line"
-
+    _columns = {
+         'line_agent_ids':fields.one2many('sale.line.agent', 'line_id', 'Agents', states={'draft': [('readonly', False)]})
+    }
 
     def invoice_line_create(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-
+        
         res = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context)
-        so_ref = self.browse(cr,uid,ids)[0].order_id
-        for so_agent_id in so_ref.sale_agent_ids:
-            inv_lines = self.pool.get('account.invoice.line').browse(cr, uid, res)
-            for inv_line in inv_lines:
-                if inv_line.product_id and inv_line.product_id.commission_exent != True:
-                    vals = {
-                        'invoice_line_id': inv_line.id,
-                        'agent_id': so_agent_id.agent_id.id,
-                        'commission_id': so_agent_id.commission_id.id,
-                        'settled': False
-                    }
-                    line_agent_id=self.pool.get('invoice.line.agent').create(cr, uid, vals)
-                    self.pool.get('invoice.line.agent').calculate_commission(cr, uid, [line_agent_id])
+        for inv_line in self.pool.get('account.invoice.line').browse(cr, uid, res):
+            list_ids = [x.id for x in inv_line.commission_ids]
+            self.pool.get('invoice.line.agent').calculate_commission(cr,uid,list_ids)
+        return res
+
+    def _create_invoice_line_agent(self,cr,uid,ids,agent_id,commission_id):
+        vals = {
+            'agent_id' : agent_id,
+            'commission_id' :commission_id,
+            'settled': False
+        }
+        line_agent_id=self.pool.get('invoice.line.agent').create(cr, uid, vals)
+        return line_agent_id
+
+    def _prepare_order_line_invoice_line(self, cr, uid, line, account_id=False, context=None):
+        res = super(sale_order_line,self)._prepare_order_line_invoice_line(cr,uid,line,account_id,context)
+        list_ids = []
+        if not line.product_id.commission_exent:
+            if not line.line_agent_ids: #si la linea no tiene comissiones arrastro los del pedido a la linea de factura
+                for so_comm in line.order_id.sale_agent_ids:
+                    line_agent_id= self._create_invoice_line_agent(cr,uid,[],so_comm.agent_id.id,so_comm.commission_id.id)
+                    list_ids.append(line_agent_id)
+            
+            else:
+                for l_comm in line.line_agent_ids:
+                    line_agent_id= self._create_invoice_line_agent(cr,uid,[],l_comm.agent_id.id,l_comm.commission_id.id)
+                    list_ids.append(line_agent_id)
+        res['commission_ids'] = [(6,0,list_ids)]
+        return res
+
+    def _create_line_commission(self,cr,uid,ids,agent_id,commission_id):
+        sale_line_agent = self.pool.get("sale.line.agent")
+        vals={
+            'agent_id' : agent_id,
+            'commission_id' : commission_id
+        }
+        if ids:
+            vals['line_id'] = ids[0]
+        return sale_line_agent.create(cr,uid,vals)
+    def product_id_change2(self, cr, uid, ids,pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False,sale_agent_ids=False,context=None):
+        res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,uom, qty_uos, uos, name, partner_id,lang, update_tax, date_order,packaging,fiscal_position,flag,context)
+        if product:
+            list_agent_ids = []
+            product_obj = self.pool.get("product.product").browse(cr,uid,product)
+            # order_obj = self.pool.get("sale.order").browse(cr,uid,context['order_id'])
+            sale_line_agent = self.pool.get("sale.line.agent")    
+            if ids:
+                sale_line_agent.unlink(cr,uid,sale_line_agent.search(cr,uid,[('line_id','in',ids)]))
+                res['value']['line_agent_ids'] = []
+            if not product_obj.commission_exent:
+                order_comm_ids = [x[1] for x in sale_agent_ids if x[0] != 2]
+                order_agent_ids = [ x.agent_id.id for x in self.pool.get("sale.order.agent").browse(cr,uid,order_comm_ids)]
+                # order_agent_ids = [x.agent_id.id for x in order_obj.sale_agent_ids]
+                dic= {}
+                for prod_record in product_obj.product_agent_ids:
+                    if not prod_record.agent_ids: #no hay agentes especificados para la comisión: se usan los agentes del pedido
+                        for agent_id in order_agent_ids:
+                            if agent_id not in dic:
+                                dic[agent_id] = prod_record.commission_id.id
+                    else:
+                        for agent_id in prod_record.agent_ids:
+                            if agent_id.id in order_agent_ids:
+                                dic[agent_id.id] = prod_record.commission_id.id
+
+                for k in dic:
+                    line_agent_id = self._create_line_commission(cr,uid,ids,k,dic[k])
+                    list_agent_ids.append(int(line_agent_id))
+                res['value']['line_agent_ids'] = list_agent_ids
+        return res
+
+    def create(self, cr, uid, values, context=None):
+        """
+        Para que el cliente gtk no borre el agente de la linea al darle a guardar
+        """
+        res = super(sale_order_line, self).create(cr, uid, values, context=context)
+        if 'line_agent_ids' in values:
+            for sale_line_agent in values['line_agent_ids']:
+                self.pool.get('sale.line.agent').write(cr, uid, sale_line_agent[1], {'line_id':res})
         return res
 
 sale_order_line()
-
-
-

=== modified file 'sale_commission/sale_order_view.xml'
--- sale_commission/sale_order_view.xml	2012-07-13 10:51:04 +0000
+++ sale_commission/sale_order_view.xml	2014-03-13 12:35:19 +0000
@@ -2,19 +2,6 @@
 <openerp>
     <data>
 
-        <!--record id="view_order_comm_tree" model="ir.ui.view">
-            <field name="name">sale.order.comm.tree</field>
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                    <field name="partner_shipping_id" position="after">
-                        <field name="agent_code" select="2"/>
-                        <field name="country" select="2"/>
-                    </field>
-            </field>
-        </record-->
-
         <record id="view_order_agent_form_inherit" model="ir.ui.view">
             <field name="name">sale.agent.order.inherit.form</field>
             <field name="model">sale.order</field>
@@ -32,6 +19,19 @@
                         </field>
                     </group>
                 </field>
+                 <xpath expr="//field[@name='order_line']/form/notebook/page[@string='History']" position="after">
+                    <page string='Agents and Commisions'>
+                        <field name="line_agent_ids" nolabel="1" colspan="4">
+                            <tree string="Agents and Commissions" editable="top">
+                                <field name="agent_id" on_change="onchange_agent_id(agent_id)" />
+                                <field name="commission_id" on_change="onchange_commission_id(agent_id,commission_id)"/>
+                            </tree>
+                        </field>
+                    </page>
+                </xpath>
+                <xpath expr="//field[@name='order_line']/form/notebook/page[@string='Order Line']/group[1]/field[@name='product_id']" position="replace">
+                     <field colspan="3" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom, 'force_product_uom': True,'order_id': parent.id,'sale_agent_ids': parent.sale_agent_ids}" name="product_id" on_change="product_id_change2(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False,parent.sale_agent_ids,context)"/>
+                </xpath>
             </field>
         </record>
 

=== modified file 'sale_commission/saleagent.py'
--- sale_commission/saleagent.py	2012-07-13 10:51:04 +0000
+++ sale_commission/saleagent.py	2014-03-13 12:35:19 +0000
@@ -32,7 +32,8 @@
         'name': fields.char('Name', size=64, required=True),
         'type': fields.selection((('fijo', 'Fix percentage'), ('tramos', 'By sections')), 'Type', required=True),
         'fix_qty': fields.float('Fix Percentage'),
-        'sections': fields.one2many('commission.section', 'commission_id', 'Sections')
+        'sections': fields.one2many('commission.section', 'commission_id', 'Sections'),
+        'product_agent_ids':fields.one2many('product.agent.commission', 'commission_id', 'Agents')
     }
     _defaults = {
         'type' : lambda *a: 'fijo',
@@ -40,9 +41,8 @@
 
     def calcula_tramos(self, cr, uid, ids, base):
         commission = self.browse(cr, uid, ids)[0]
-        #Cálculo de tramos
         for section in commission.sections:
-            if base >= section.commission_from and (base < section.commission_until or section.commission_until == 0):
+            if abs(base) >= section.commission_from and (abs(base) < section.commission_until or section.commission_until == 0):
                 res = base * section.percent / 100.0
                 return res
         return 0.0
@@ -59,7 +59,7 @@
         'commission_from': fields.float('From'),
         'commission_until': fields.float('Until'),
         'percent': fields.float('Percent'),
-        'commission_id': fields.many2one('commission', 'Commission')
+        'commission_id': fields.many2one('commission', 'Commission', required=True)
 
     }
 

=== modified file 'sale_commission/saleagent_view.xml'
--- sale_commission/saleagent_view.xml	2012-07-13 10:51:04 +0000
+++ sale_commission/saleagent_view.xml	2014-03-13 12:35:19 +0000
@@ -128,7 +128,21 @@
                             </tree>
                         </field>
                     </group>
-         
+                    <field name="product_agent_ids" nolabel="1" colspan="4">
+                            <tree string="Agents and Commissions" editable="top">
+                                <field name="agent_ids">
+                                    <tree>
+                                        <field name="name"/>
+                                    </tree>
+                                </field>
+                                <field name="product_id"/>
+                            </tree>
+                            <form>
+                                <field name="product_id"/>
+                                <separator colspan="4" string="Agents/Commissions"/>
+                                <field name="agent_ids"  colspan="4" nolabel="1"/>
+                            </form>
+                    </field>
                 </form>
             </field>
         </record>

=== modified file 'sale_commission/security/ir.model.access.csv'
--- sale_commission/security/ir.model.access.csv	2012-07-13 10:51:04 +0000
+++ sale_commission/security/ir.model.access.csv	2014-03-13 12:35:19 +0000
@@ -26,3 +26,6 @@
 "access_settled_invoice_agent_salesman","access_settled_invoice_agent_salesman","model_settled_invoice_agent","base.group_sale_salesman",1,0,0,0
 "access_settled_invoice_agent_sale_manager","access_settled_invoice_agent_sale_manager","model_settled_invoice_agent","base.group_sale_manager",1,1,1,1
 "access_settled_invoice_agent_partner_manager","access_settled_invoice_agent_partner_manager","model_settled_invoice_agent","base.group_partner_manager",1,0,0,0
+"access_sale_line_agent_salesman","access_sale_line_agent_salesman","model_sale_line_agent","base.group_sale_salesman",1,1,1,1
+"access_product_agent_commission_salesman","access_product_agent_commission_salesman","model_product_agent_commission","base.group_sale_salesman",1,0,0,0
+"access_product_agent_commission_sale_manager","access_product_agent_commission_sale_manager","model_product_agent_commission","base.group_sale_manager",1,1,1,1
\ No newline at end of file

=== modified file 'sale_commission/settled.py'
--- sale_commission/settled.py	2013-10-16 10:36:21 +0000
+++ sale_commission/settled.py	2014-03-13 12:35:19 +0000
@@ -94,14 +94,13 @@
               'INNER JOIN invoice_line_agent ON invoice_line_agent.invoice_line_id=account_invoice_line.id ' \
               'INNER JOIN account_invoice ON account_invoice_line.invoice_id = account_invoice.id ' \
               'WHERE invoice_line_agent.agent_id in (' + ",".join(map(str, context['active_ids'])) + ') AND invoice_line_agent.settled=False ' \
-              'AND account_invoice.state<>\'draft\' AND account_invoice.type=\'out_invoice\''\
+              'AND account_invoice.state not in (\'draft\',\'cancel\') AND account_invoice.type in (\'out_invoice\',\'out_refund\')'\
               'AND account_invoice.date_invoice >= \'' + o.date_from + '\' AND account_invoice.date_invoice <= \'' + o.date_to +'\''\
               ' AND account_invoice.company_id = ' + str(user.company_id.id)
 
             cr.execute(sql)
             res = cr.fetchall()
             inv_line_agent_ids = [x[0] for x in res]
-
             self.pool.get ('invoice.line.agent').calculate_commission( cr, uid, inv_line_agent_ids)
 
 
@@ -141,13 +140,13 @@
         'state': lambda *a: 'settled'
     }
 
-    def action_invoice_create(self, cursor, user, ids, journal_id, product_id, context=None):
+    def action_invoice_create(self, cursor, user, ids, journal_id, product_id,mode,context=None):
 
         agents_pool=self.pool.get('settlement.agent')
         res={}
         for settlement in self.browse(cursor, user, ids, context=context):
             settlement_agent_ids = map(lambda x: x.id, settlement.settlement_agent_id)
-            invoices_agent = agents_pool.action_invoice_create(cursor, user, settlement_agent_ids, journal_id, product_id)
+            invoices_agent = agents_pool.action_invoice_create(cursor, user, settlement_agent_ids, journal_id, product_id,mode)
 
             res[settlement.id] = invoices_agent.values()
         return res
@@ -198,7 +197,7 @@
     """Liquidaciones de Agentes"""
 
     _name = 'settlement.agent'
-
+    _rec_name = 'agent_id'
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
         '''Call after the creation of the invoice line'''
         return
@@ -232,7 +231,7 @@
         return False
 
 
-    def action_invoice_create(self, cursor, user, ids, journal_id, product_id, context=None):
+    def action_invoice_create(self, cursor, user, ids, journal_id, product_id,mode,context=None):
         '''Return ids of created invoices for the settlements'''
 
         invoice_obj = self.pool.get('account.invoice')
@@ -241,12 +240,12 @@
         res = {}
 
         for settlement in self.browse(cursor, user, ids, context=context):
-
+            if (not settlement.total_sections) and (not settlement.total):
+                continue
             payment_term_id = False
             partner = settlement.agent_id and settlement.agent_id.partner_id
             if not partner:
-                raise osv.except_osv(_('Error, partner fail !'),
-                    _('Agent to settle hasn\'t assigned partner.'))
+                continue
 
            #El tipo es de facura de proveedor
             account_id = partner.property_account_payable.id
@@ -299,31 +298,50 @@
                 )
             else:
                 tax_ids = map(lambda x: x.id, taxes)
-            for invoice in settlement.invoices:
-                origin = invoice.invoice_number
-                name = invoice.invoice_number
-                price_unit = invoice.settled_amount
-                discount = 0
-
-                #set UoS if it's a sale and the picking doesn't have one
-                uos_id =  False
-
-                account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
+
+            account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
+            uos_id =  False  #set UoS if it's a sale and the picking doesn't have one
+            if mode == 'invoice':
+                for invoice in settlement.invoices:
+                    invoice_line_id = invoice_line_obj.create(cursor, user, {
+                        'name': invoice.invoice_number,
+                        'origin': invoice.invoice_number,
+                        'invoice_id': invoice_id,
+                        'uos_id': uos_id,
+                        'product_id': product.id,
+                        'account_id': account_id,
+                        'price_unit': invoice.settled_amount,
+                        'discount': 0,
+                        'quantity': 1,
+                        'invoice_line_tax_id': [(6, 0, tax_ids)],
+                        }, context=context)            
+            elif mode == 'line':
+                for line in settlement.lines:
+                    invoice_line_id = invoice_line_obj.create(cursor, user, {
+                        'name': line.invoice_id.number,
+                        'origin': line.invoice_id.number,
+                        'invoice_id': invoice_id,
+                        'uos_id': uos_id,
+                        'product_id': product.id,
+                        'account_id': account_id,
+                        'price_unit': line.commission,
+                        'discount': 0,
+                        'quantity': 1,
+                        'invoice_line_tax_id': [(6, 0, tax_ids)],
+                        }, context=context)
+            elif mode == 'agent':
                 invoice_line_id = invoice_line_obj.create(cursor, user, {
-                    'name': name,
-                    'origin': origin,
-                    'invoice_id': invoice_id,
-                    'uos_id': uos_id,
-                    'product_id': product.id,
-                    'account_id': account_id,
-                    'price_unit': price_unit,
-                    'discount': discount,
-                    'quantity': 1,
-                    'invoice_line_tax_id': [(6, 0, tax_ids)],
-                    #'account_analytic_id': account_analytic_id,
-                    }, context=context)
-                self._invoice_line_hook(cursor, user, invoice, invoice_line_id)
-
+                        'name': settlement.settlement_id.name or '',
+                        'origin': settlement.settlement_id.name or '',
+                        'invoice_id': invoice_id,
+                        'uos_id': uos_id,
+                        'product_id': product.id,
+                        'account_id': account_id,
+                        'price_unit': settlement.total,
+                        'discount': 0,
+                        'quantity': 1,
+                        'invoice_line_tax_id': [(6, 0, tax_ids)],
+                        }, context=context)
             invoice_obj.button_compute(cursor, user, [invoice_id], context=context,
                     set_total=(type in ('in_invoice', 'in_refund')))
             self._invoice_hook(cursor, user, settlement, invoice_id)
@@ -338,7 +356,7 @@
               'INNER JOIN invoice_line_agent ON invoice_line_agent.invoice_line_id=account_invoice_line.id ' \
               'INNER JOIN account_invoice ON account_invoice_line.invoice_id = account_invoice.id ' \
               'WHERE invoice_line_agent.agent_id=' + str(set_agent.agent_id.id) + ' AND invoice_line_agent.settled=True ' \
-              'AND account_invoice.state<>\'draft\' AND account_invoice.type=\'out_invoice\''\
+              'AND account_invoice.state not in (\'draft\',\'cancel\') AND account_invoice.type=\'out_invoice\''\
               'AND account_invoice.date_invoice >= \'' + date_from + '\' AND account_invoice.date_invoice <= \'' + date_to +'\''\
               ' AND account_invoice.company_id = ' + str(user.company_id.id)
 
@@ -352,13 +370,14 @@
               'INNER JOIN invoice_line_agent ON invoice_line_agent.invoice_line_id=account_invoice_line.id ' \
               'INNER JOIN account_invoice ON account_invoice_line.invoice_id = account_invoice.id ' \
               'WHERE invoice_line_agent.agent_id=' + str(set_agent.agent_id.id) + ' AND invoice_line_agent.settled=False ' \
-              'AND account_invoice.state<>\'draft\' AND account_invoice.type=\'out_invoice\''\
+              'AND account_invoice.state not in (\'draft\',\'cancel\') AND account_invoice.type in (\'out_invoice\',\'out_refund\')'\
               'AND account_invoice.date_invoice >= \'' + date_from + '\' AND account_invoice.date_invoice <= \'' + date_to +'\''\
               ' AND account_invoice.company_id = ' + str(user.company_id.id)
        
         cr.execute(sql)
         res = cr.fetchall()
         inv_line_ids = [x[0] for x in res]
+
         total_per = 0
         total_sections = 0
         total = 0
@@ -380,14 +399,17 @@
             if line.commission_id.type == "tramos":
                 if line.invoice_line_id.product_id.commission_exent != True:
                     # Hacemos un agregado de la base de cálculo agrupándolo por las distintas comisiones en tramos que tenga el agente asignadas
+                    if line.invoice_line_id.invoice_id.type == 'out_refund':
+                        sign_price = - line.invoice_line_id.price_subtotal
+                    else:
+                        sign_price = line.invoice_line_id.price_subtotal
+
                     if  line.commission_id.id in sections:
-                        sections[line.commission_id.id]['base'] = sections[line.commission_id.id]['base'] + line.invoice_line_id.price_subtotal
+                        sections[line.commission_id.id]['base'] = sections[line.commission_id.id]['base'] + sign_price
                         sections[line.commission_id.id]['lines'].append(line)                   # Añade la línea de la que se añade esta base para el cálculo por tramos
                     else:
-                        sections[line.commission_id.id] = {'type': line.commission_id, 'base':line.invoice_line_id.price_subtotal, 'lines':[line]}
-
+                        sections[line.commission_id.id] = {'type': line.commission_id, 'base':sign_price, 'lines':[line]}
         #Tramos para cada tipo de comisión creados 
-
         for tramo in sections:
             #Cálculo de la comisión  para cada tramo
             sections[tramo].update({'commission': sections[tramo]['type'].calcula_tramos(sections[tramo]['base'])})
@@ -395,7 +417,7 @@
             # reparto de la comisión para cada linea
             
             for linea_tramo in  sections[tramo]['lines']:
-                com_por_linea = sections[tramo]['commission']* (linea_tramo.invoice_line_id.price_subtotal/sections[tramo]['base'])
+                com_por_linea = sections[tramo]['commission']* (linea_tramo.invoice_line_id.price_subtotal/(abs(sections[tramo]['base']) or 1.0))
                 linea_tramo.write({'commission':com_por_linea})
                 inv_ag_ids = self.pool.get('invoice.line.agent').search(cr, uid, [('invoice_line_id', '=', linea_tramo.invoice_line_id.id), ('agent_id', '=', set_agent.agent_id.id)])
                 self.pool.get('invoice.line.agent').write(cr, uid, inv_ag_ids, {'settled': True, 'quantity': com_por_linea})
@@ -438,7 +460,11 @@
                 invoice_line_amount = line.invoice_line_id.price_subtotal
                 if commission_app.type=="fijo":
                     commission_per = commission_app.fix_qty
-                    amount = amount + line.invoice_line_id.price_subtotal * float(commission_per) / 100
+                    # Para tener en cuenta las rectificativas
+                    if line.invoice_line_id.invoice_id.type == 'out_refund':
+                        amount = amount - line.invoice_line_id.price_subtotal * float(commission_per) / 100
+                    else:
+                        amount = amount + line.invoice_line_id.price_subtotal * float(commission_per) / 100
 
                 elif commission_app.type=="tramos":
                     invoice_line_amount = 0

=== modified file 'sale_commission/stock_picking.py'
--- sale_commission/stock_picking.py	2012-07-13 10:51:04 +0000
+++ sale_commission/stock_picking.py	2014-03-13 12:35:19 +0000
@@ -44,22 +44,41 @@
         'agent_ids':fields.many2many('sale.agent','sale_agent_clinic_rel', 'agent_id', 'clinic_id', 'Agentes' )
     }
 
+    def _create_invoice_line_agent(self,cr,uid,ids,agent_id,commission_id,invoice_line_id):
+        vals = {
+            'agent_id' : agent_id,
+            'commission_id' : commission_id,
+            'settled': False,
+            'invoice_line_id' : invoice_line_id
+        }
+        line_agent_id=self.pool.get('invoice.line.agent').create(cr, uid, vals)
+        self.pool.get('invoice.line.agent').calculate_commission(cr, uid, [line_agent_id])
+        return line_agent_id
+
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
         '''Call after the creation of the invoice line'''
         super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id)
-
+        # import ipdb; ipdb.set_trace()
         if move_line and move_line.sale_line_id and move_line.sale_line_id.product_id.commission_exent != True :
             so_ref = move_line.sale_line_id.order_id
-            for so_agent_id in so_ref.sale_agent_ids:
-                vals = {
-                        'invoice_line_id': invoice_line_id,
-                        'agent_id': so_agent_id.agent_id.id,
-                        'commission_id': so_agent_id.commission_id.id,
-                        'settled': False
-                    }
-
-                line_agent_id=self.pool.get('invoice.line.agent').create(cursor, user, vals)
-                self.pool.get('invoice.line.agent').calculate_commission(cursor, user, [line_agent_id])
+            line =  move_line.sale_line_id
+            if not line.line_agent_ids: #si la linea no tiene comissiones arrastro los del pedido a la linea de factura
+                for so_comm in line.order_id.sale_agent_ids:
+                    line_agent_id= self._create_invoice_line_agent(cursor,user,[],so_comm.agent_id.id,so_comm.commission_id.id,invoice_line_id)
+            else:
+                for l_comm in line.line_agent_ids:
+                    line_agent_id= self._create_invoice_line_agent(cursor,user,[],l_comm.agent_id.id,l_comm.commission_id.id,invoice_line_id)
+
+            # for so_agent_id in so_ref.sale_agent_ids:
+            #     vals = {
+            #             'invoice_line_id': invoice_line_id,
+            #             'agent_id': so_agent_id.agent_id.id,
+            #             'commission_id': so_agent_id.commission_id.id,
+            #             'settled': False
+            #         }
+
+            #     line_agent_id=self.pool.get('invoice.line.agent').create(cursor, user, vals)
+            #     self.pool.get('invoice.line.agent').calculate_commission(cursor, user, [line_agent_id])
         return
 
 stock_picking()
\ No newline at end of file

=== modified file 'sale_commission/wizard/wizard_invoice.py'
--- sale_commission/wizard/wizard_invoice.py	2012-07-13 10:51:04 +0000
+++ sale_commission/wizard/wizard_invoice.py	2014-03-13 12:35:19 +0000
@@ -30,6 +30,7 @@
     _columns = {
         'journal_id':fields.many2one('account.journal', 'Target journal', required=True, select=1),
         'product_id':fields.many2one('product.product', 'Product for account', required=True, select=1),
+        'mode': fields.selection([('line', 'for each invoice line settled'),('invoice','for each sale invoice'),('agent','summary for each agent')], 'A line', required=True),
     }
     _defaults = {
     }
@@ -39,13 +40,13 @@
     def create_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-
+        # import ipdb; ipdb.set_trace()
         data_pool = self.pool.get('ir.model.data')
         settlement_obj = self.pool.get('settlement')
 
         for o in self.browse(cr, uid, ids, context=context):
             res = settlement_obj.action_invoice_create(cr, uid, context['active_ids'],
-                journal_id=o.journal_id.id, product_id=o.product_id.id, context=context)
+                journal_id=o.journal_id.id, product_id=o.product_id.id,mode=o.mode,context=context)
 
         invoice_ids = res.values()
 

=== modified file 'sale_commission/wizard/wizard_invoice.xml'
--- sale_commission/wizard/wizard_invoice.xml	2012-07-13 10:51:04 +0000
+++ sale_commission/wizard/wizard_invoice.xml	2014-03-13 12:35:19 +0000
@@ -8,10 +8,12 @@
             <field name="arch" type="xml">
               <form string="Create invoices">
                     <separator colspan="4" string="Create invoice" />
-                    <field name="journal_id"/>
+                    <field name="journal_id" domain="[('type','=','purchase')]"/>
                     <newline/>
                     <field name="product_id"/>
                     <newline/>
+                    <field name="mode"/>
+                    <newline/>
                     <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
                     <button name="create_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>