OneTeam/trytondo-sale_fast_food
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Se corrigen errores en 6.8

Browse Source
This commit is contained in:
sinergia 2023-12-11 20:41:19 -05:00
parent 741d8f4ad3
commit eb934a3de9
4 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
report_close_statement.py
View File

@ -43,10 +43,11 @@ class ReportCloseStatementStart(ModelView):
@classmethod @classmethod
def default_shop(cls): def default_shop(cls):
context = Transaction().context context = Transaction().context
shop = context['shop'] if context:
shop = context['shop']
if shop: if shop:
return shop return shop
return
class PrintReportCloseStatement(Wizard): class PrintReportCloseStatement(Wizard):
@ -108,10 +109,10 @@ class CashRegister(Report):
return return
journals = [j.id for j in device.journals] journals = [j.id for j in device.journals]
statements = Statement.search([ statements = Statement.search([
('journal', 'in', journals), ('journal', 'in', journals),
('state', 'in', ['validated', 'posted']), ('state', 'in', ['validated', 'posted']),
('date', '=', date) ('date', '=', date)
]) ])
return statements return statements
def _get_invoices_by_subtype(date, shop): def _get_invoices_by_subtype(date, shop):
@ -173,7 +174,7 @@ class CashRegister(Report):
amount_tips.append(info_pizzas_sold['amount_tip']) amount_tips.append(info_pizzas_sold['amount_tip'])
total_amount += sale.total_amount total_amount += sale.total_amount
untaxed_amount_for_tax = round((tax_amount * 100)/Decimal('8.0'), 2) untaxed_amount_for_tax = round((tax_amount * 100) / Decimal('8.0'), 2)
statements = cls._get_statements_by_date(data['date']) statements = cls._get_statements_by_date(data['date'])
if statements: if statements:
@ -184,7 +185,7 @@ class CashRegister(Report):
'total_amount': sum( 'total_amount': sum(
(line.amount for line in statement.lines (line.amount for line in statement.lines
if line.description), Decimal(0)) if line.description), Decimal(0))
} for statement in statements] } for statement in statements]
report_context['total_statements'] = sum( report_context['total_statements'] = sum(
[s['total_amount'] for s in report_context['statements']]) [s['total_amount'] for s in report_context['statements']])

4
sale.py
View File

@ -126,10 +126,6 @@ class Sale(metaclass=PoolMeta):
@classmethod @classmethod
def get_invoice(cls, record): 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: if record.state != 'draft' and record.invoices:
invoice = record.invoices[0] invoice = record.invoices[0]
data = {} data = {}

104
sale.xml
View File

@ -2,55 +2,57 @@
<!--This file file is part of Tryton. The COPYRIGHT file at the top level <!--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. --> of this repository contains the full copyright notices and license terms. -->
<tryton> <tryton>
<record model="ir.ui.view" id="sale_view_tree"> <data>
<field name="model">sale.sale</field> <record model="ir.ui.view" id="sale_view_tree">
<field name="inherit" ref="sale.sale_view_tree"/> <field name="model">sale.sale</field>
<field name="name">sale_tree</field> <field name="inherit" ref="sale.sale_view_tree"/>
</record> <field name="name">sale_tree</field>
<record model="ir.ui.view" id="sale_view_form"> </record>
<field name="model">sale.sale</field> <record model="ir.ui.view" id="sale_view_form">
<field name="inherit" ref="sale.sale_view_form"/> <field name="model">sale.sale</field>
<field name="name">sale_form</field> <field name="inherit" ref="sale.sale_view_form"/>
</record> <field name="name">sale_form</field>
<record model="ir.ui.view" id="sale_line_view_form"> </record>
<field name="model">sale.line</field> <record model="ir.ui.view" id="sale_line_view_form">
<field name="inherit" ref="sale.sale_line_view_form"/> <field name="model">sale.line</field>
<field name="name">sale_line_form</field> <field name="inherit" ref="sale.sale_line_view_form"/>
</record> <field name="name">sale_line_form</field>
<record model="ir.model.button" id="sale_add_pizza_button"> </record>
<field name="name">add_pizza</field> <record model="ir.model.button" id="sale_add_pizza_button">
<field name="string">Add Pizza</field> <field name="name">add_pizza</field>
<field name="model" search="[('model', '=', 'sale.sale')]"/> <field name="string">Add Pizza</field>
</record> <field name="model" search="[('model', '=', 'sale.sale')]"/>
<record model="ir.model.button" id="sale_order_kitchen_button"> </record>
<field name="name">kitchen</field> <record model="ir.model.button" id="sale_order_kitchen_button">
<field name="string">Kitchen</field> <field name="name">kitchen</field>
<field name="model" search="[('model', '=', 'sale.sale')]"/> <field name="string">Kitchen</field>
</record> <field name="model" search="[('model', '=', 'sale.sale')]"/>
<record model="ir.model.button" id="sale_order_bar_button"> </record>
<field name="name">bar</field> <record model="ir.model.button" id="sale_order_bar_button">
<field name="string">Bar</field> <field name="name">bar</field>
<field name="model" search="[('model', '=', 'sale.sale')]"/> <field name="string">Bar</field>
</record> <field name="model" search="[('model', '=', 'sale.sale')]"/>
<record model="ir.model.button" id="sale_print_bill_button"> </record>
<field name="name">print_bill</field> <record model="ir.model.button" id="sale_print_bill_button">
<field name="string">Bill</field> <field name="name">print_bill</field>
<field name="model" search="[('model', '=', 'sale.sale')]"/> <field name="string">Bill</field>
</record> <field name="model" search="[('model', '=', 'sale.sale')]"/>
<record model="ir.model.button" id="sale_impreso_button"> </record>
<field name="name">impreso</field> <record model="ir.model.button" id="sale_impreso_button">
<field name="string">Impreso</field> <field name="name">impreso</field>
<field name="model" search="[('model', '=', 'sale.sale')]"/> <field name="string">Impreso</field>
</record> <field name="model" search="[('model', '=', 'sale.sale')]"/>
<record model="ir.action.report" id="report_customer_order"> </record>
<field name="name">Customer Order</field> <record model="ir.action.report" id="report_customer_order">
<field name="model">sale.sale</field> <field name="name">Customer Order</field>
<field name="report_name">sale.customer_order</field> <field name="model">sale.sale</field>
<field name="report">sale_fast_food/report/customer_order.fodt</field> <field name="report_name">sale.customer_order</field>
</record> <field name="report">sale_fast_food/report/customer_order.fodt</field>
<record model="ir.action.keyword" id="report_customer_order_keyword"> </record>
<field name="keyword">form_print</field> <record model="ir.action.keyword" id="report_customer_order_keyword">
<field name="model">sale.sale,-1</field> <field name="keyword">form_print</field>
<field name="action" ref="report_customer_order"/> <field name="model">sale.sale,-1</field>
</record> <field name="action" ref="report_customer_order"/>
</record>
</data>
</tryton> </tryton>

7
view/sale_form.xml
View File

@ -12,8 +12,9 @@ this repository contains the full copyright notices and license terms. -->
</group> </group>
<newline/> <newline/>
</xpath> </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']"
<label name="total_discount"/> position="after">
<field name="total_discount"/> <label name="total_discount"/>
<field name="total_discount"/>
</xpath> </xpath>
</data> </data>