Change rec name product
This commit is contained in:
parent
193841268d
commit
7dd672ec23
|
@ -3,7 +3,7 @@
|
|||
from trytond.pool import Pool
|
||||
from . import sale
|
||||
from . import dash
|
||||
# from . import party
|
||||
from . import product
|
||||
|
||||
|
||||
def register():
|
||||
|
@ -12,7 +12,7 @@ def register():
|
|||
sale.AppDelivery,
|
||||
sale.AppSaleOrder,
|
||||
sale.AppTakeOrder,
|
||||
sale.AppOrderView,
|
||||
sale.AppOrderViewer,
|
||||
dash.DashApp,
|
||||
# party.Party,
|
||||
product.Product,
|
||||
module='dash_sale', type_='model')
|
||||
|
|
4
dash.py
4
dash.py
|
@ -13,7 +13,7 @@ class DashApp(metaclass=PoolMeta):
|
|||
'dash.app.delivery',
|
||||
'dash.app.sale_order',
|
||||
'dash.app.take_order',
|
||||
'dash.app.order_view'])
|
||||
'dash.app.order_viewer'])
|
||||
return origins
|
||||
|
||||
@classmethod
|
||||
|
@ -23,6 +23,6 @@ class DashApp(metaclass=PoolMeta):
|
|||
('delivery', 'Delivery'),
|
||||
('sale_order', 'Sale Order'),
|
||||
('take_order', 'Take Order'),
|
||||
('order_view', 'Order View'),
|
||||
('order_viewer', 'Order Viewer'),
|
||||
])
|
||||
return options
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
# 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 datetime import date
|
||||
from trytond.model import fields, ModelSQL, ModelView
|
||||
from trytond.pool import PoolMeta, Pool
|
||||
from trytond.transaction import Transaction
|
||||
from trytond.wizard import Wizard, StateTransition, StateView, Button
|
||||
|
||||
|
||||
|
||||
class Product(metaclass=PoolMeta):
|
||||
__name__ = 'product.product'
|
||||
short_name = fields.Char('Short Name')
|
||||
|
||||
def get_rec_name(self):
|
||||
super(Product, self).get_rec_name()
|
||||
print(' Yeaaaaaaaaaa ')
|
||||
return self.template.name
|
25
sale.py
25
sale.py
|
@ -203,6 +203,7 @@ class Sale(metaclass=PoolMeta):
|
|||
@classmethod
|
||||
def command(cls, args):
|
||||
Shop = Pool().get('sale.shop')
|
||||
ShopTable = Pool().get('sale.shop.table')
|
||||
Product = Pool().get('product.product')
|
||||
Party = Pool().get('party.party')
|
||||
Line = Pool().get('sale.line')
|
||||
|
@ -215,6 +216,10 @@ class Sale(metaclass=PoolMeta):
|
|||
if args['id'] > 0:
|
||||
action = 'edit'
|
||||
|
||||
table = None
|
||||
if args.get('table_assigned'):
|
||||
table_id = args.get('table_assigned')['id']
|
||||
table = ShopTable(table_id)
|
||||
if action == 'create':
|
||||
if context.get('shop'):
|
||||
shop = Shop(context['shop'])
|
||||
|
@ -249,6 +254,10 @@ class Sale(metaclass=PoolMeta):
|
|||
try:
|
||||
sale, = cls.create([to_create])
|
||||
sale.set_number([sale])
|
||||
ShopTable.write([table], {
|
||||
'state': 'occupied',
|
||||
'sale': sale.id,
|
||||
})
|
||||
return sale.id
|
||||
except Exception as e:
|
||||
print(e, 'error')
|
||||
|
@ -258,6 +267,14 @@ class Sale(metaclass=PoolMeta):
|
|||
to_write = {}
|
||||
if sale.table_assigned.id != args['table_assigned']['id']:
|
||||
to_write['table_assigned'] = args['table_assigned']['id']
|
||||
ShopTable.write([sale.table_assigned], {
|
||||
'state': 'available',
|
||||
'sale': None,
|
||||
})
|
||||
ShopTable.write([table], {
|
||||
'state': 'occupied',
|
||||
'sale': sale.id,
|
||||
})
|
||||
for v in args['lines']:
|
||||
line_id = v.get('id')
|
||||
if line_id < 0:
|
||||
|
@ -413,15 +430,15 @@ class AppTakeOrder(ModelSQL, ModelView):
|
|||
return Transaction().context.get('company') or None
|
||||
|
||||
|
||||
class AppOrderView(ModelSQL, ModelView):
|
||||
'App Order View'
|
||||
__name__ = 'dash.app.order_view'
|
||||
class AppOrderViewer(ModelSQL, ModelView):
|
||||
'App Order Viewer'
|
||||
__name__ = 'dash.app.order_viewer'
|
||||
company = fields.Many2One('company.company', 'Company', required=True)
|
||||
code = fields.Char('Code')
|
||||
|
||||
@classmethod
|
||||
def __setup__(cls):
|
||||
super(AppOrderView, cls).__setup__()
|
||||
super(AppOrderViewer, cls).__setup__()
|
||||
|
||||
@staticmethod
|
||||
def default_company():
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[tryton]
|
||||
version=6.0.1
|
||||
version=6.0.2
|
||||
depends:
|
||||
party
|
||||
product
|
||||
|
@ -11,4 +11,3 @@ depends:
|
|||
dash
|
||||
xml:
|
||||
sale.xml
|
||||
# party.xml
|
||||
|
|
Loading…
Reference in New Issue