diff --git a/locale/es.po b/locale/es.po index 3810771..92e0789 100644 --- a/locale/es.po +++ b/locale/es.po @@ -45,3 +45,27 @@ msgstr "Total Descuento" msgctxt "field:res.user,waiter:" msgid "Waiter" msgstr "Mesero" + +msgctxt "model:ir.ui.menu,name:menu_print_cash_register" +msgid "Print cash register" +msgstr "Imprimir arqueo de caja" + +msgctxt "field:sale.print_cash_register.start,date:" +msgid "Date" +msgstr "Fecha" + +msgctxt "field:sale.print_cash_register.start,shop:" +msgid "Shop" +msgstr "Tienda" + +msgctxt "wizard_button:sale.print_cash_register,start,end:" +msgid "Cancel" +msgstr "Cancelar" + +msgctxt "wizard_button:sale.print_cash_register,start,print_cash_register:" +msgid "Print Cash Register" +msgstr "Imprimir" + +msgctxt "model:ir.action,name:wizard_print_cash_register" +msgid "Print cash register" +msgstr "Imprimir arqueo de caja" \ No newline at end of file diff --git a/report/close_statement.fodt b/report/close_statement.fodt index 02f2c9d..110623d 100644 --- a/report/close_statement.fodt +++ b/report/close_statement.fodt @@ -4,21 +4,21 @@ LibreOffice/7.0.4.2$Linux_X86_64 LibreOffice_project/00$Build-22008-06-07T15:28:222009-01-10T16:03:331PT0S - 6482 + 5263 0 15843 - 7641 + 7299 true false view2 - 4420 - 11739 + 6846 + 7574 0 - 6482 + 5263 15841 - 14122 + 12561 0 0 false @@ -85,7 +85,7 @@ true true - 2149854 + 2335270 true false @@ -138,12 +138,14 @@ + + - - + + @@ -153,7 +155,7 @@ - + @@ -169,7 +171,7 @@ - + @@ -177,7 +179,7 @@ - + @@ -306,34 +308,47 @@ - + + + + + + + + - + - + - + - + - + + + + + + + - + - + @@ -344,754 +359,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + - + - - - - - - - - - + - + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - + + + - - - - - - - - - - - - + - + - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - + - + - + - - + + - - + + - - - - - - - - + + @@ -1128,8 +492,8 @@ - - + + /9j/4AAQSkZJRgABAQEAYABgAAD/4S6eRXhpZgAATU0AKgAAAAgABgALAAIAAAAmAAAIYgES AAMAAAABAAEAAAExAAIAAAAmAAAIiAEyAAIAAAAUAAAIrodpAAQAAAABAAAIwuocAAcAAAgM AAAAVgAAEUYc6gAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -2276,53 +1640,54 @@ - - NIT: 901575528 - Regimen ComĂșn - TRANSV 46 E 42 ESTE 789 32667 - SANTA ELENA - Cel: 3014287624 - - + + NIT: 901575528 + Regimen ComĂșn + TRANSV 46 E 42 ESTE 789 32667 + SANTA ELENA + Cel: 3014287624 + + - + - Base + Base - Impuestos + Impuestos - Total + Total - + - <untaxed_amount> + <untaxed_amount> - <tax_amount> + <tax_amount> - <total_amount> + <total_amount> - - + + - - + + + - PIZZAS VENDIDAS + Pizzas vendidas - <number_pizzas_sold> + <number_pizzas_sold> - + \ No newline at end of file diff --git a/report_close_statement.py b/report_close_statement.py index b33ddae..8ed4339 100644 --- a/report_close_statement.py +++ b/report_close_statement.py @@ -60,7 +60,7 @@ class CashRegister(Report): def get_number_pizzas_sold(lines): pizzas = 0 for line in lines: - if line.bought_pizza: + if line.bougth_pizza: pizzas += line.quantity return pizzas diff --git a/report_close_statement.xml b/report_close_statement.xml index e709db1..f091cea 100644 --- a/report_close_statement.xml +++ b/report_close_statement.xml @@ -20,9 +20,9 @@ this repository contains the full copyright notices and license terms. --> sale.print_cash_register + parent="sale.menu_sale" + action="wizard_print_cash_register" + id="menu_print_cash_register" + icon="tryton-print"/> \ No newline at end of file diff --git a/sale.py b/sale.py index b5e48ab..4d98998 100644 --- a/sale.py +++ b/sale.py @@ -329,7 +329,7 @@ class Line(metaclass=PoolMeta): pizza = fields.Integer("Pizza") impreso = fields.Boolean("Impreso") - bought_pizza = fields.Boolean("Sold pizza") + bougth_pizza = fields.Boolean("Sold pizza") @fields.depends('product', 'unit', 'sale', '_parent_sale.party', '_parent_sale.invoice_party', @@ -340,9 +340,9 @@ class Line(metaclass=PoolMeta): super(Line, self).on_change_product() if self.product and self.product.pizza: self.pizza = self.sale.pizza_number - self.bought_pizza = True + self.bougth_pizza = True else: - self.bought_pizza = False + self.bougth_pizza = False def get_production(self): "Return production for the sale line" diff --git a/view/sale_line_form.xml b/view/sale_line_form.xml index 5a0105a..7364776 100644 --- a/view/sale_line_form.xml +++ b/view/sale_line_form.xml @@ -7,7 +7,7 @@