[FIX] ajustes varios

__openerp__.py

@@ -4,7 +4,7 @@
     'category': 'sale',
     'sequence': 6,
     'summary': "Discount on total in Sale and invoice with Discount limit and approval",
-    'author': 'Cybrosys Techno Solutions',
+    'author': 'Cybrosys Techno Solutions - EIRU',
     'company': 'Cybrosys Techno Solutions',
     'website': 'http://www.cybrosys.com',
 

models/account_invoice.py

@@ -27,13 +27,13 @@ class AccountInvoice(models.Model):
         self.amount_discount = disc
         self.amount_total = self.amount_untaxed + self.amount_tax
 
-    discount_type = fields.Selection([('percent', 'Percentage'), ('amount', 'Amount')], 'Discount Type', readonly=True,
+    discount_type = fields.Selection([('percent', 'Porcentaje'), ('amount', 'Monto')], 'Tipo de Descuento', readonly=True,
                                      states={'draft': [('readonly', False)]})
-    discount_rate = fields.Float('Discount Rate',
+    discount_rate = fields.Float('Descuento',
                                  digits_compute=dp.get_precision('Account'),
                                  readonly=True,
                                  states={'draft': [('readonly', False)]})
-    amount_discount = fields.Float(string='Discount',
+    amount_discount = fields.Float(string='Descuento',
                                    digits=dp.get_precision('Account'),
                                    readonly=True, compute='_compute_amount')
     amount_untaxed = fields.Float(string='Subtotal', digits=dp.get_precision('Account'),
@@ -84,4 +84,3 @@ class AccountInvoice(models.Model):
             'discount_rate': self.discount_rate,
         })
         return res
-

models/sale.py

@@ -101,9 +101,14 @@ class SaleOrder(osv.Model):
 class SaleOrderLine(osv.Model):
     _inherit = "sale.order.line"
 
+
+
     _columns = {
-    'discount': fields.float(string='Discount (%)',
-                            digits=(16, 10),
-                            # digits= dp.get_precision('Discount'),
-                            default=0.0),
-    }
+        'discount': fields.float(string='Discount (%)',digits=(16, 10),default=0.0),
+        'discount_amount':fields.float(compute='_discount_line',string='Descuento (Monto)',default=0.0)
+    }
+
+    @api.depends('discount')
+    def _discount_line(self):
+        for line in self:
+            line.discount_amount = line.price_unit * ((line.discount or 0.0)/100.0) * line.product_uom_qty

views/sale_order_report.xml

@@ -19,6 +19,7 @@
                     </tr>
                     <!--</t>-->
              </xpath>
+            
 
             <!--<xpath expr="//div[@class='col-xs-4 pull-right']" position="before">-->
                     <!--<div class="col-xs-4">-->

views/sale_view.xml

@@ -21,6 +21,11 @@
                 <xpath expr="//tree/field[@name='discount']" position="attributes">
                     <attribute name="digits">(16, 2)</attribute>
                 </xpath>
+
+                <xpath expr="//tree[@string='Sales Order Lines']//field[@name='discount']" position="after">
+                    <field name="discount_amount"/>
+                </xpath>
+
                 <xpath expr="//group[@name='sale_total']" position="replace">
                     <group col="4">
                         <group name="discount" colspan="2">
@@ -46,4 +51,4 @@
             </field>
         </record>
     </data>
-</openerp>
+</openerp>