Feat: credito view

__init__.py

@@ -10,6 +10,7 @@ def register():
         invoice.InvoiceLine,
         sale.Sale,
         sale.Line,
+        sale.SaleLineDeletedLog,
         user.User,
         production.Production,
         report_close_statement.ReportCloseStatementStart,

invoice.py

@@ -1,6 +1,4 @@
-from trytond.pool import Pool, PoolMeta
+from trytond.pool import PoolMeta
-from trytond.model import ModelView, fields
-from trytond.exceptions import UserError
 from trytond.pyson import Eval
 
 
@@ -13,4 +11,3 @@ class InvoiceLine(metaclass=PoolMeta):
 
         cls.product.states['required'] = (Eval('type') == 'line')
         cls.unit_price.domain = []
-

product.py

@@ -1,6 +1,6 @@
-from trytond.pool import Pool, PoolMeta
+from trytond.pool import PoolMeta
 from trytond.model import fields
-from trytond.pyson import Eval, Bool
+from trytond.pyson import Eval
 
 
 class Product(metaclass=PoolMeta):

production.py

@@ -1,23 +1,21 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 from decimal import Decimal
-
 from trytond.pool import Pool, PoolMeta
 from trytond.model import fields
-from trytond.modules.product import price_digits, round_price
-
-from trytond.exceptions import UserError
 
 
 BOM_CHANGES = ['bom', 'product', 'quantity', 'uom', 'warehouse', 'location',
                'company', 'inputs', 'outputs']
 
+
 class Production(metaclass=PoolMeta):
     "Production"
     __name__ = 'production'
 
-
+    @fields.depends(
-    @fields.depends(*BOM_CHANGES)
+        'bom', 'product', 'uom', 'quantity', 'company', 'inputs', 'outputs',
+        methods=['_explode_move_values'])
     def explode_bom(self):
         pool = Pool()
         Uom = pool.get('product.uom')
@@ -29,32 +27,29 @@ class Production(metaclass=PoolMeta):
 
         inputs = []
         for input_ in self.bom.inputs:
-            if input_.product.producible:
+            # if input_.product.producible:
-                for input_ in input_.product.template.boms.inputs:
+            #     for input_ in input_.product.template.boms.inputs:
             quantity = input_.compute_quantity(factor)
-                    move = self._explode_move_values(
+            move = self._explode_move_values('input', input_, quantity)
-                        self.picking_location, self.location, self.company,
-                        input_, quantity)
             if move:
                 inputs.append(move)
-                        quantity = Uom.compute_qty(input_.uom, quantity,
+                quantity = Uom.compute_qty(
-                                                   input_.product.default_uom, round=False)
+                    input_.uom, quantity,
-            else:
-                quantity = input_.compute_quantity(factor)
-                move = self._explode_move_values(
-                    self.picking_location, self.location, self.company,
-                    input_, quantity)
-                if move:
-                    inputs.append(move)
-                    quantity = Uom.compute_qty(input_.uom, quantity,
                     input_.product.default_uom, round=False)
+            # else:
+            #     quantity = input_.compute_quantity(factor)
+            #     move = self._explode_move_values('output', input_, quantity)
+            #     if move:
+            #         inputs.append(move)
+            #         quantity = Uom.compute_qty(
+                # input_.uom, quantity,
+            #   input_.product.default_uom, round=False)
         self.inputs = inputs
 
         outputs = []
         for output in self.bom.outputs:
             quantity = output.compute_quantity(factor)
-            move = self._explode_move_values(
+            move = self._explode_move_values('output', output,
-                self.location, self.output_location, self.company, output,
                                              quantity)
             if move:
                 move.unit_price = Decimal(0)

report_close_statement.py

@@ -43,10 +43,11 @@ class ReportCloseStatementStart(ModelView):
     @classmethod
     def default_shop(cls):
         context = Transaction().context
+        if context:
             shop = context['shop']
-
             if shop:
                 return shop
+        return
 
 
 class PrintReportCloseStatement(Wizard):

sale.py

@@ -13,11 +13,19 @@ class Sale(metaclass=PoolMeta):
     __name__ = 'sale.sale'
 
     pizza_number = fields.Integer("Number pizza")
+    credito = fields.Boolean("Credito")
     total_discount = fields.Function(
         Monetary(
             "Total Discount", digits='currency', currency='currency'),
         'get_amount')
-    total_discount_cache = fields.Numeric("Total Discount cache", digits='currency')
+    total_discount_cache = fields.Numeric(
+        "Total Discount cache", digits='currency')
+    total_tip = fields.Function(
+        Monetary(
+            "Total Tip", digits='currency', currency='currency'),
+        'get_amount')
+    total_tip_cache = fields.Numeric(
+        "Total Tip cache", digits="currency")
 
     @classmethod
     def __setup__(cls):
@@ -40,6 +48,7 @@ class Sale(metaclass=PoolMeta):
         self.tax_amount = Decimal('0.0')
         self.total_amount = Decimal('0.0')
         self.total_discount = Decimal('0.0')
+        self.total_tip = Decimal('0.0')
 
         if self.lines:
             for line in self.lines:
@@ -50,6 +59,7 @@ class Sale(metaclass=PoolMeta):
             self.tax_amount = self.currency.round(self.tax_amount)
         self.total_amount = self.untaxed_amount + self.tax_amount
         if self.currency:
+            self.total_tip = self.currency.round(self.total_tip)
             self.total_discount = self.currency.round(self.total_discount)
             self.total_amount = self.currency.round(self.total_amount)
 
@@ -60,6 +70,7 @@ class Sale(metaclass=PoolMeta):
             sale.tax_amount_cache = sale.tax_amount
             sale.total_amount_cache = sale.total_amount
             sale.total_discount_cache = sale.total_discount
+            sale.total_tip_cache = sale.total_tip
         cls.save(sales)
 
     @classmethod
@@ -68,6 +79,7 @@ class Sale(metaclass=PoolMeta):
         tax_amount = {}
         total_amount = {}
         total_discount = {}
+        total_tip = {}
         if {'tax_amount', 'total_amount'} & set(names):
             compute_taxes = True
         else:
@@ -83,6 +95,7 @@ class Sale(metaclass=PoolMeta):
                     and sale.total_amount_cache is not None):
                 untaxed_amount[sale.id] = sale.untaxed_amount_cache
                 total_discount[sale.id] = sale.total_discount_cache
+                total_tip[sale.id] = sale.total_tip_cache
                 if compute_taxes:
                     tax_amount[sale.id] = sale.tax_amount_cache
                     total_amount[sale.id] = sale.total_amount_cache
@@ -91,8 +104,16 @@ class Sale(metaclass=PoolMeta):
                     (line.amount for line in sale.lines
                         if line.type == 'line'), Decimal(0)), 2)
                 total_discount[sale.id] = round(sum(
-                    (line.discount_amount for line in sale.lines
+                    (line.discount_amount * Decimal(
-                        if line.type == 'line'), Decimal(0)), 2)
+                        line.quantity) for line in sale.lines
+                        if line.discount_amount and line.type == 'line'
+                     ), Decimal(0)), 2)
+                total_tip[sale.id] = round(
+                    sum((
+                        line.amount for line in sale.lines
+                        if line.product and line.product.tip and (
+                                line.type == 'line')
+                    ), Decimal(0)), 2)
                 if compute_taxes:
                     tax_amount[sale.id] = sale.get_tax_amount()
                     total_amount[sale.id] = (
@@ -103,6 +124,7 @@ class Sale(metaclass=PoolMeta):
             'tax_amount': tax_amount,
             'total_amount': total_amount,
             'total_discount': total_discount,
+            'total_tip': total_tip
             }
         for key in list(result.keys()):
             if key not in names:
@@ -125,10 +147,6 @@ class Sale(metaclass=PoolMeta):
 
     @classmethod
     def get_invoice(cls, record):
-        pool = Pool()
-        ctx = Transaction().context
-        Shop = pool.get('sale.shop')
-        shop = Shop.search([('id', '=', ctx["shop"])])[0]
         if record.state != 'draft' and record.invoices:
             invoice = record.invoices[0]
             data = {}
@@ -150,6 +168,7 @@ class Sale(metaclass=PoolMeta):
         data = {}
         shop = Shop.search([('id', '=', ctx["shop"])])[0]
         data["shop_name"] = shop.name
+        data["shop_nit"] = shop.company.party.tax_identifier.code
         data["shop_address"] = shop.address.street
         data['invoice'] = cls.get_invoice(record)
         data["party"] = record.party.name
@@ -164,7 +183,8 @@ class Sale(metaclass=PoolMeta):
             "product": line.product.name if line.type != 'title' else None,
             "quantity": line.quantity if line.type != 'title' else None,
             "uom": line.unit.symbol if line.type != 'title' else None,
-            "unit_price": str(line.amount_w_tax) if line.type != 'title' else None,
+            "unit_price": str(line.amount_w_tax)
+            if line.type != 'title' else None,
             "taxes": str(round(line.taxes[0].rate * 100, 2)) + '%'
             if line.type != 'title' and line.taxes else None
         } for line in record.lines]
@@ -172,8 +192,10 @@ class Sale(metaclass=PoolMeta):
         data["total_discount"] = str(round(record.total_discount, 2))
         data["untaxed_amount"] = str(record.untaxed_amount)
         data["tax_amount"] = str(record.tax_amount)
+        data["total_tip"] = str(record.total_tip)
         data["total"] = str(record.total_amount)
-        data["state"] = "SUBTOTAL" if record.state == "draft" else "CUENTA FINAL"
+        data["state"] = \
+            "SUBTOTAL" if record.state == "draft" else "CUENTA FINAL"
 
         if record.payments:
             data['payments'] = [{
@@ -195,20 +217,18 @@ class Sale(metaclass=PoolMeta):
         data["city"] = report.invoice_address.subdivision_municipality.name
         data["zone"] = report.zone.name if report.zone else ""
         data["table"] = report.table.name if report.table else ""
-        # data["lines"] = [{
-        #    'type': line.type,
-        #    "product": line.product.name if line.type != 'title' else None,
-        #    "quantity": line.quantity if line.type != 'title' else None,
-        #    "uom": line.unit.name if line.type != 'title' else None}
-        #                 for line in report.lines]
-
         data["lines"] = [{
-            'type': line.type,
+            "type": line.type,
-            "product": line.product.name if line.type != 'title' else None,
+            "product": line.product.name if line.type != "title" else None,
-            "description": line.description if line.type != 'title' else None,
+            "description": line.description if line.type != "title" else None,
-            "quantity": line.quantity if line.type != 'title' else None,
+            "quantity": line.quantity if line.type != "title" else None,
-            "uom": line.unit.name if line.type != 'title' else None}
+            "uom": line.unit.name if line.type != "title" else None}
             for line in report.lines if not line.impreso]
+        data["deleted_lines"] = [{
+            "product": line.product.name,
+            "quantity": str(-1 * line.quantity),
+            "unit": line.unit.symbol
+        } for line in report.delete_lines if not line.printed]
 
         return data
 
@@ -231,6 +251,10 @@ class Sale(metaclass=PoolMeta):
             line.analytic_accounts = tuple()
             line.impreso = True
             line.save()
+
+        for line in record.delete_lines:
+            line.printed = True
+            line.save()
         record.save()
 
     @classmethod
@@ -254,13 +278,28 @@ class Sale(metaclass=PoolMeta):
             user_name = context['employee.rec_name']
         else:
             user_name = ""
-        content = {"content": str(json.dumps(bill)),
+
-                   "ip_printer": str(printer.ip_address),
+        content = {
-                   "user_name": user_name}
+            "content": str(json.dumps(bill)),
+            "printer_type": "",
+            "ip_printer": "",
+            "user_name": user_name,
+            "idVendor": "",
+            "idProduct": ""}
+
+        if printer.type_ == 'network':
+            content["printer_type"] = "Network"
+            content["ip_printer"] = str(printer.ip_address)
+        else:
+            if printer.type_ == 'usb':
+                content["printer_type"] = "USB"
+                content["idVendor"] = str(printer.idVendor)
+                content["idProduct"] = str(printer.idProduct)
+
         headers = {"accept": 'application/json',
                    'Content-Type': 'application/json'}
-
+        requests.post(
-        response = requests.post(url, data=json.dumps(content), headers=headers)
+            url, data=json.dumps(content), headers=headers, timeout=5)
 
     @classmethod
     @ModelView.button
@@ -283,13 +322,29 @@ class Sale(metaclass=PoolMeta):
             user_name = context['employee.rec_name']
         else:
             user_name = ""
+
         content = {"content": str(json.dumps(customer_order)),
-                   "ip_printer": str(printer.ip_address),
+                   "printer_type": "",
-                   "user_name": user_name}
+                   "ip_printer": "",
+                   "user_name": user_name,
+                   "idVendor": "",
+                   "idProduct": ""}
+
+        if printer.type_ == 'network':
+            content["printer_type"] = "Network"
+            content["ip_printer"] = str(printer.ip_address)
+        else:
+            if printer.type_ == 'usb':
+                content["printer_type"] = "USB"
+                content["idVendor"] = str(printer.idVendor)
+                content["idProduct"] = str(printer.idProduct)
+
         headers = {"accept": 'application/json',
                    'Content-Type': 'application/json'}
         cls.impreso([record])
-        response = requests.post(url, data=json.dumps(content),
+
+        requests.post(
+            url, data=str(json.dumps(content)),
             headers=headers)
 
     @classmethod
@@ -310,16 +365,33 @@ class Sale(metaclass=PoolMeta):
         url = f"http://{printer.api.ip_address}/order_bar"
         customer_order = cls.report_customer_order(records)
         cls.impreso([record])
+
         if 'employee.rec_name' in context.keys():
             user_name = context['employee.rec_name']
         else:
             user_name = ""
-        content = {"content": str(json.dumps(customer_order)),
+
-                   "ip_printer": str(printer.ip_address),
+        content = {
-                   "user_name": user_name}
+            "content": str(json.dumps(customer_order)),
-        headers = {"accept": 'application/json',
+            "printer_type": "",
+            "ip_printer": "",
+            "user_name": user_name,
+            "idVendor": "",
+            "idProduct": ""}
+
+        if printer.type_ == 'network':
+            content["printer_type"] = "Network"
+            content["ip_printer"] = str(printer.ip_address)
+        else:
+            if printer.type_ == 'usb':
+                content["printer_type"] = "USB"
+                content["idVendor"] = str(printer.idVendor)
+                content["idProduct"] = str(printer.idProduct)
+
+        headers = {
+            "accept": 'application/json',
             'Content-Type': 'application/json'}
-        response = requests.post(url, data=json.dumps(content),
+        requests.post(url, data=json.dumps(content),
                       headers=headers)
 
 
@@ -331,21 +403,37 @@ class Line(metaclass=PoolMeta):
     impreso = fields.Boolean("Impreso")
     bought_pizza = fields.Boolean("Sold pizza")
 
+    @classmethod
+    def delete(cls, lines):
+        for line in lines:
+            if line.impreso:
+                cls._create_sale_line_deleted_log(line)
+        super(Line, cls).delete(lines)
+
     @fields.depends('product', 'unit', 'sale',
                     '_parent_sale.party', '_parent_sale.invoice_party',
                     '_parent_sale.pizza_number',
+                    '_parent_product.template',
+                    '_parent_product._parent_template.pizza',
                     methods=['compute_taxes', 'compute_unit_price',
                              'on_change_with_amount'])
     def on_change_product(self):
         super(Line, self).on_change_product()
-        if self.product and self.product.pizza:
+        if self.product and self.product.template.pizza:
             self.pizza = self.sale.pizza_number
             self.bought_pizza = True
         else:
             self.bought_pizza = False
 
-    def get_production(self):
+    def get_production(self, product_quantities):
         "Return production for the sale line"
-        Production = super(Line, self).get_production()
+        Production = super(Line, self).get_production(product_quantities)
 
         return Production
+
+
+class SaleLineDeletedLog(metaclass=PoolMeta):
+    """Sale Line Deleted Log"""
+    __name__ = 'sale.line_deleted'
+
+    printed = fields.Boolean("Printed")

sale.xml

@@ -2,6 +2,7 @@
 <!--This file file is part of Tryton. The COPYRIGHT file at the top level
     of this repository contains the full copyright notices and license terms. -->
 <tryton>
+    <data>
 	<record model="ir.ui.view" id="sale_view_tree">
             <field name="model">sale.sale</field>
 	    <field name="inherit" ref="sale.sale_view_tree"/>
@@ -53,4 +54,5 @@
             <field name="model">sale.sale,-1</field>
             <field name="action" ref="report_customer_order"/>
 	</record>
+    </data>
 </tryton>

setup.py

@@ -127,7 +127,7 @@ setup(name=name,
         ],
     license='GPL-3',
     python_requires='>=3.7',
-    install_requires=requires,
+    # install_requires=requires,
     extras_require={
         'test': tests_require,
         },

tests/scenario_sale_fast_food.rst

@@ -0,0 +1,209 @@
+=============================
+Sale Line Delete Log Scenario
+=============================
+
+Imports::
+  >>> from decimal import Decimal
+  >>> from proteus import Model, Wizard
+  >>> from trytond.tests.tools import activate_modules
+  >>> from trytond.modules.company.tests.tools import create_company, get_company
+  >>> from trytond.modules.account.tests.tools import (
+  ...     create_chart, create_fiscalyear, create_tax, get_accounts)
+  >>> from trytond.modules.account_invoice.tests.tools import (
+  ...     create_payment_term, set_fiscalyear_invoice_sequences)
+  >>> import datetime as dt
+  >>> today = dt.date.today()
+  >>> from trytond.tests.tools import set_user
+  >>> from trytond.modules.sale_shop.tests.tools import create_shop
+  >>> from trytond.modules.sale_line_delete_log.sale import SaleLineDeleted
+
+Activate modules::
+
+  >>> config = activate_modules('sale_fast_food')
+
+Initial data::
+
+  >>> User = Model.get('res.user')
+  >>> Party = Model.get('party.party')
+  >>> Employee = Model.get('company.employee')
+  >>> Journal = Model.get('account.journal')
+  >>> PaymentMethod = Model.get('account.invoice.payment.method')
+  >>> Party = Model.get('party.party')
+  >>> ProductUom = Model.get('product.uom')
+  >>> ProductTemplate = Model.get('product.template')
+  >>> Sale = Model.get('sale.sale')
+  >>> SaleLine = Model.get('sale.line')
+
+Create company::
+
+  >>> _ = create_company()
+  >>> company = get_company()
+
+Set employee::
+
+  >>> employee_party = Party(name="Employee")
+  >>> employee_party.save()
+  >>> employee = Employee(party=employee_party)
+  >>> employee.save()
+  >>> user = User(config.user)
+  >>> user.employees.append(employee)
+  >>> user.employee = employee
+  >>> user.save()
+  >>> set_user(user.id)
+
+Create fiscal year::
+
+  >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear(company, today))
+  >>> fiscalyear.click('create_period')
+
+Create chart of accounts::
+
+  >>> _ = create_chart(company)
+  >>> accounts = get_accounts(company)
+  >>> revenue = accounts['revenue']
+  >>> expense = accounts['expense']
+  >>> cash = accounts['cash']
+
+  >>> cash_journal, = Journal.find([('type', '=', 'cash')])
+  >>> cash_journal.save()
+  >>> payment_method = PaymentMethod()
+  >>> payment_method.name = 'Cash'
+  >>> payment_method.journal = cash_journal
+  >>> payment_method.credit_account = cash
+  >>> payment_method.debit_account = cash
+  >>> payment_method.save()
+
+Create tax::
+
+  >>> tax = create_tax(Decimal('.10'))
+  >>> tax.save()
+
+Create parties::
+
+  >>> supplier = Party(name='Supplier')
+  >>> supplier.save()
+  >>> customer = Party(name='Customer')
+  >>> customer.save()
+
+Create account categories::
+
+  >>> ProductCategory = Model.get('product.category')
+  >>> account_category = ProductCategory(name="Account Category")
+  >>> account_category.accounting = True
+  >>> account_category.account_expense = expense
+  >>> account_category.account_revenue = revenue
+  >>> account_category.save()
+
+  >>> account_category_tax, = account_category.duplicate()
+  >>> account_category_tax.customer_taxes.append(tax)
+  >>> account_category_tax.save()
+
+Create product::
+
+  >>> unit, = ProductUom.find([('name', '=', 'Unit')])
+
+  >>> template = ProductTemplate()
+  >>> template.name = 'product'
+  >>> template.default_uom = unit
+  >>> template.type = 'goods'
+  >>> template.salable = True
+  >>> template.list_price = Decimal('10')
+  >>> template.account_category = account_category_tax
+  >>> template.save()
+  >>> product, = template.products
+
+  >>> template = ProductTemplate()
+  >>> template.name = 'service'
+  >>> template.default_uom = unit
+  >>> template.type = 'service'
+  >>> template.salable = True
+  >>> template.list_price = Decimal('30')
+  >>> template.account_category = account_category
+  >>> template.save()
+  >>> service, = template.products
+
+Create payment term::
+
+  >>> payment_term = create_payment_term()
+  >>> payment_term.save()
+
+Create product price list::
+
+    >>> ProductPriceList = Model.get('product.price_list')
+    >>> product_price_list = ProductPriceList()
+    >>> product_price_list.name = 'Price List'
+    >>> product_price_list.company = company
+    >>> product_price_list.save()
+
+Create an Inventory::
+
+  >>> Inventory = Model.get('stock.inventory')
+  >>> Location = Model.get('stock.location')
+  >>> storage, = Location.find([
+  ...         ('code', '=', 'STO'),
+  ...         ])
+  >>> inventory = Inventory()
+  >>> inventory.location = storage
+  >>> inventory_line = inventory.lines.new(product=product)
+  >>> inventory_line.quantity = 100.0
+  >>> inventory_line.expected_quantity = 0.0
+  >>> inventory.click('confirm')
+  >>> inventory.state
+  'done'
+
+Create Sale Shop::
+
+  >>> shop = create_shop(payment_term, product_price_list)
+  >>> shop.save()
+
+Save Sale Shop User::
+
+  >>> User = Model.get('res.user')
+  >>> user, = User.find([])
+  >>> user.shops.append(shop)
+  >>> user.shop = shop
+  >>> user.save()
+  >>> set_user(user)
+
+Sale 5 products::
+
+  >>> sale = Sale()
+  >>> sale.party = customer
+  >>> sale.payment_term = payment_term
+  >>> sale.invoice_method = 'order'
+  >>> sale_line = SaleLine()
+  >>> sale.lines.append(sale_line)
+  >>> sale_line.product = product
+  >>> sale_line.quantity = 2.0
+  >>> sale_line.impreso = True
+  >>> sale_line = SaleLine()
+  >>> sale.lines.append(sale_line)
+  >>> sale_line.type = 'comment'
+  >>> sale_line.description = 'Comment'
+  >>> sale_line = SaleLine()
+  >>> sale.lines.append(sale_line)
+  >>> sale_line.product = product
+  >>> sale_line.quantity = 3.0
+  >>> sale.save()
+  >>> len(sale.lines)
+  3
+  >>> sale.untaxed_amount, sale.tax_amount, sale.total_amount
+  (Decimal('50.00'), Decimal('5.00'), Decimal('55.00'))
+
+
+Create a sale line delete log it's was printed::
+
+  >>> sale.reload()
+  >>> sale.lines[0].delete()
+  >>> sale.lines[1].delete()
+  >>> sale.save()
+  >>> len(sale.lines)
+  1
+
+  >>> sale.reload()
+  >>> len(sale.delete_lines)
+  1
+
+  >>> sale.delete_lines[0]
+  proteus.Model.get('sale.line_deleted')(1)
+  >>> assert isinstance(sale.delete_lines[0], Model.get('sale.line_deleted')), "it's not instance    SaleLineDeleted"

tests/test_scenario.py

@@ -0,0 +1,8 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.tests.test_tryton import load_doc_tests
+
+
+def load_tests(*args, **kwargs):
+    return load_doc_tests(__name__, __file__, *args, **kwargs)

tryton.cfg

@@ -1,15 +1,18 @@
 [tryton]
-version=6.4
+version=6.8.0
 depends:
     ir
     res
     product
     sale
+    sale_discount
     sale_supply_production
-    #sale_printer
+    sale_line_delete_log
+    sale_printer
     production
     account_invoice
     sale_shop
+    sale_pos_table
 xml:
     product.xml
     sale.xml

user.py

@@ -1,5 +1,6 @@
 from trytond.model import fields
-from trytond.pool import Pool, PoolMeta
+from trytond.pool import PoolMeta
+
 
 class User(metaclass=PoolMeta):
     "User"

view/sale_form.xml

@@ -12,8 +12,16 @@ this repository contains the full copyright notices and license terms. -->
 	</group>
 	<newline/>
     </xpath>
-    <xpath expr="/form/notebook/page[@id='sale']/group[@id='amount']/field[@name='tax_amount']" position="after">
+    <xpath expr="/form/notebook/page[@id='sale']/group[@id='amount']/field[@name='tax_amount']"
+	   position="after">
 	    <label name="total_discount"/>
 	    <field name="total_discount"/>
+        <label name="total_tip"/>
+		<field name="total_tip"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='sale']/group[@id='amount']/field[@name='total_amount']"
+	   position="after">
+        <label name="credito"/>
+		<field name="credito"/>
     </xpath>
 </data>