04.01.26

modules/purchase_trade/fee.py

@@ -21,117 +21,6 @@ from trytond.exceptions import UserWarning, UserError
 
 logger = logging.getLogger(__name__)
 
-VALTYPE = [
-    ('priced', 'Price'),
-    ('pur. priced', 'Pur. price'),
-    ('pur. efp', 'Pur. efp'),
-    ('sale priced', 'Sale price'),
-    ('sale efp', 'Sale efp'),
-    ('line fee', 'Line fee'),
-    ('pur. fee', 'Pur. fee'),
-    ('sale fee', 'Sale fee'),
-    ('shipment fee', 'Shipment fee'),
-    ('market', 'Market'),
-    ('derivative', 'Derivative'),
-]
-
-class Valuation(ModelSQL,ModelView):
-    "Valuation"
-    __name__ = 'valuation.valuation'
-
-    purchase = fields.Many2One('purchase.purchase',"Purchase")
-    line = fields.Many2One('purchase.line',"Purch. Line")
-    date = fields.Date("Date")
-    type = fields.Selection(VALTYPE, "Type")
-    reference = fields.Char("Reference")
-    counterparty = fields.Many2One('party.party',"Counterparty")
-    product = fields.Many2One('product.product',"Product")
-    state = fields.Char("State")
-    price = fields.Numeric("Price",digits='unit')
-    currency = fields.Many2One('currency.currency',"Cur")
-    quantity = fields.Numeric("Quantity",digits='unit')
-    unit = fields.Many2One('product.uom',"Unit")
-    amount = fields.Numeric("Amount",digits='unit')
-    mtm = fields.Numeric("Mtm",digits='unit')
-    lot = fields.Many2One('lot.lot',"Lot")
-
-class ValuationDyn(ModelSQL,ModelView):
-    "Valuation"
-    __name__ = 'valuation.valuation.dyn'
-
-    r_purchase = fields.Many2One('purchase.purchase',"Purchase")
-    r_line = fields.Many2One('purchase.line',"Line")
-    r_date = fields.Date("Date")
-    r_type = fields.Selection(VALTYPE, "Type")
-    r_reference = fields.Char("Reference")
-    r_counterparty = fields.Many2One('party.party',"Counterparty")
-    r_product = fields.Many2One('product.product',"Product")
-    r_state = fields.Char("State")
-    r_price = fields.Numeric("Price",digits='r_unit')
-    r_currency = fields.Many2One('currency.currency',"Cur")
-    r_quantity = fields.Numeric("Quantity",digits='r_unit')
-    r_unit = fields.Many2One('product.uom',"Unit")
-    r_amount = fields.Numeric("Amount",digits='r_unit')
-    r_mtm = fields.Numeric("Mtm",digits='r_unit')
-    r_lot = fields.Many2One('lot.lot',"Lot")
-
-    @classmethod
-    def table_query(cls):
-        Valuation = Pool().get('valuation.valuation')
-        val = Valuation.__table__()
-        context = Transaction().context
-        group_pnl = context.get('group_pnl')
-        wh = (val.id > 0)
-        # query = val.select(
-        #         Literal(0).as_('create_uid'),
-        #         CurrentTimestamp().as_('create_date'),
-        #         Literal(None).as_('write_uid'),
-        #         Literal(None).as_('write_date'),
-        #         val.id.as_('id'),
-        #         val.purchase.as_('r_purchase'),
-        #         val.line.as_('r_line'),
-        #         val.date.as_('r_date'),
-        #         val.type.as_('r_type'),
-        #         val.reference.as_('r_reference'),
-        #         val.counterparty.as_('r_counterparty'),
-        #         val.product.as_('r_product'),
-        #         val.state.as_('r_state'),
-        #         val.price.as_('r_price'),
-        #         val.currency.as_('r_currency'),
-        #         val.quantity.as_('r_quantity'),
-        #         val.unit.as_('r_unit'),
-        #         val.amount.as_('r_amount'),
-        #         val.mtm.as_('r_mtm'),
-        #         val.lot.as_('r_lot'),
-        #         where=wh)
-            
-        #if group_pnl==True:
-        query = val.select(
-        Literal(0).as_('create_uid'),
-        CurrentTimestamp().as_('create_date'),
-        Literal(None).as_('write_uid'),
-        Literal(None).as_('write_date'),
-        Max(val.id).as_('id'),
-        Max(val.purchase).as_('r_purchase'),
-        Max(val.line).as_('r_line'),
-        Max(val.date).as_('r_date'),
-        val.type.as_('r_type'),
-        Max(val.reference).as_('r_reference'),
-        val.counterparty.as_('r_counterparty'),
-        Max(val.product).as_('r_product'),
-        val.state.as_('r_state'),
-        Avg(val.price).as_('r_price'),
-        Max(val.currency).as_('r_currency'),
-        Sum(val.quantity).as_('r_quantity'),
-        Max(val.unit).as_('r_unit'),
-        Sum(val.amount).as_('r_amount'),
-        Sum(val.mtm).as_('r_mtm'),
-        Max(val.lot).as_('r_lot'),
-        where=wh,
-        group_by=[val.type,val.counterparty,val.state])
-            
-        return query    
-
 def filter_state(state):
     def filter(func):
         @wraps(func)