diff --git a/opportunity.py b/opportunity.py index 7fe67ab..631bf13 100644 --- a/opportunity.py +++ b/opportunity.py @@ -1311,7 +1311,7 @@ class OpportunityReport(CompanyReport): class OpportunityOnlyReport(CompanyReport): __name__ = 'crm.opportunity_only' - print("Hola") + class OpportunityWithoutTaxReport(CompanyReport): __name__ = 'crm.opportunity_without_tax' diff --git a/party_validation.py b/party_validation.py index 983456f..e6bb71f 100644 --- a/party_validation.py +++ b/party_validation.py @@ -8,7 +8,8 @@ from trytond.pool import Pool, PoolMeta from trytond.transaction import Transaction from .exceptions import CrmConfigurationError from trytond.i18n import gettext - +# from sql import Null, Literal +# from sql.functions import CurrentTimestamp from trytond.modules.company.model import employee_field, set_employee # STATES = {'readonly': (Eval('state') != 'draft')} @@ -80,37 +81,69 @@ class ValidationAsk(ModelSQL, ModelView): class ValidationHistoryAsk(ModelView, ModelSQL): "Validation History Ask" __name__ = "crm.opportunity.validation.history" - line_ask = fields.Char('Ask', required=True, select=True) - # response = fields.Boolean('Response') + #__id = fields.Integer('id') + id = fields.Integer('id') + company = fields.Many2One('company.company', 'Company') + # id = fields.Integer('id', required=True) + line_ask = fields.Char('Ask') + response = fields.Char('Response') + opportunity = fields.Integer('Opportunity') # sort=False, readonly=True comment = fields.Text('Comments') - validated_by = fields.Many2One('res.user', 'User') + validated_by = fields.Integer('Validated By') + @classmethod - def table_query_consult(cls): - Opportunity = Pool().get('crm.opportunity.validation') - print(Opportunity.__name__) - print(Opportunity._history) - opportunity = Opportunity.__table_history__() - query = opportunity.select( - opportunity.line_ask, - opportunity.validated_by + def table_query(cls): + OpportunityHistory = Pool().get('crm.opportunity.validation') + Opportunity = Pool().get('crm.opportunity') + # print(OpportunityHistory.__name__) + # print(Opportunity._history) + opportunityhistory = OpportunityHistory.__table_history__() + opportunity = Opportunity.__table__() + query = opportunityhistory.join(opportunity, + condition=opportunity.id==opportunityhistory.opportunity + ).select( + #opportunityhistory.__id.as_('__id'), + # opportunityhistory.__id__, + opportunityhistory.id, + opportunityhistory.create_uid, + opportunityhistory.create_date, + opportunityhistory.write_uid, + opportunityhistory.write_date, + # Literal(0).as_('create_uid'), + # CurrentTimestamp().as_('create_date'), + # cls.write_uid.sql_cast(Literal(Null)).as_('write_uid'), + # cls.write_date.sql_cast(Literal(Null)).as_('write_date'), + opportunity.company, + opportunityhistory.line_ask, + opportunityhistory.comment, + # opportunity.date_validation, + opportunityhistory.opportunity, + opportunityhistory.validated_by, + # opportunity.party, + # opportunity.response, + # opportunity.sequence, + # opportunity.template, + opportunityhistory.response, + ) - print(opportunity,'tabla') + print(opportunityhistory,'tabla') cursor = Transaction().connection.cursor() cursor.execute(*query) result = cursor.fetchall() - print(len(result),'result') - - return opportunity.select( - - # Max(opportunity.create_uid).as_('create_uid'), - # Max(opportunity.create_date).as_('create_date'), - # Max(opportunity.write_uid).as_('write_uid'), - # Max(opportunity.write_date).as_('write_date'), - opportunity.line_ask, - opportunity.validated_by - ) + print(query,'query') + print(result,'result') + return query + # return opportunity.select( + # + # # Max(opportunity.create_uid).as_('create_uid'), + # # Max(opportunity.create_date).as_('create_date'), + # # Max(opportunity.write_uid).as_('write_uid'), + # # Max(opportunity.write_date).as_('write_date'), + # opportunity.line_ask, + # opportunity.validated_by + # ) # class PartyValidationTraceability(ModelSQL, ModelView): diff --git a/party_validation.xml b/party_validation.xml index 4927b26..b3a0a3e 100644 --- a/party_validation.xml +++ b/party_validation.xml @@ -2,7 +2,23 @@ - + + + + + + + + + + + + + + + + + crm.opportunity.validation @@ -95,23 +111,6 @@ this repository contains the full copyright notices and license terms. --> - - - crm.opportunity.validation.history tree diff --git a/view/validation_history_form.xml b/view/validation_history_form.xml index 19fa5f7..c96be58 100644 --- a/view/validation_history_form.xml +++ b/view/validation_history_form.xml @@ -4,6 +4,6 @@ this repository contains the full copyright notices and license terms. -->