diff --git a/locale/es.po b/locale/es.po index 512bcfb..eeffde2 100644 --- a/locale/es.po +++ b/locale/es.po @@ -330,10 +330,6 @@ msgctxt "field:crm.opportunity,party:" msgid "Party" msgstr "Terceros" -msgctxt "field:crm.opportunity,party_evaluations:" -msgid "Party Evaluations" -msgstr "Validación de Terceros" - msgctxt "field:crm.opportunity,party_validations:" msgid "Party Validations" msgstr "Validación Terceros" @@ -410,10 +406,6 @@ msgctxt "field:crm.opportunity.validation,opportunity:" msgid "Opportunity" msgstr "Oportunidad" -msgctxt "field:crm.opportunity.validation,origin:" -msgid "Opportunity" -msgstr "Oportunidad" - msgctxt "field:crm.opportunity.validation,party:" msgid "Party" msgstr "Terceros" @@ -430,10 +422,6 @@ msgctxt "field:crm.opportunity.validation,template:" msgid "Template Ask" msgstr "" -msgctxt "field:crm.opportunity.validation,user:" -msgid "User" -msgstr "Usuario" - msgctxt "field:crm.opportunity.validation,validated_by:" msgid "Validated By" msgstr "" @@ -566,75 +554,6 @@ msgctxt "field:crm.survey_template.line,type_response:" msgid "Type Response" msgstr "Tipo de Respuesta" -msgctxt "field:crm.validation,company:" -msgid "Company" -msgstr "Empresa" - -msgctxt "field:crm.validation,date_time:" -msgid "Date" -msgstr "Fecha Venta" - -msgctxt "field:crm.validation,lines:" -msgid "Lines" -msgstr "Líneas" - -msgctxt "field:crm.validation,notes:" -msgid "Notes" -msgstr "Observaciones" - -msgctxt "field:crm.validation,number:" -msgid "Number" -msgstr "Número" - -msgctxt "field:crm.validation,operator:" -msgid "Operator" -msgstr "Operador" - -msgctxt "field:crm.validation,opportunity:" -msgid "Opportunity" -msgstr "Oportunidad" - -msgctxt "field:crm.validation,state:" -msgid "State" -msgstr "Estado" - -msgctxt "field:crm.validation,template:" -msgid "Validation Template" -msgstr "Plantilla de Validación" - -msgctxt "field:crm.validation.line,comment:" -msgid "Comments" -msgstr "Comentarios" - -#, fuzzy -msgctxt "field:crm.validation.line,date_validation:" -msgid "Date" -msgstr "Fecha Venta" - -msgctxt "field:crm.validation.line,line_ask:" -msgid "Ask" -msgstr "Concepto" - -msgctxt "field:crm.validation.line,origin:" -msgid "Opportunity" -msgstr "Oportunidad" - -msgctxt "field:crm.validation.line,party:" -msgid "Party" -msgstr "Terceros" - -msgctxt "field:crm.validation.line,response:" -msgid "Response" -msgstr "Validación" - -msgctxt "field:crm.validation.line,sequence:" -msgid "Sequence" -msgstr "Secuencia" - -msgctxt "field:crm.validation.line,template_line:" -msgid "Template Line" -msgstr "Línea de Plantilla" - msgctxt "field:crm.validation_template,active:" msgid "Active" msgstr "Activo" @@ -643,9 +562,8 @@ msgctxt "field:crm.validation_template,code:" msgid "Code" msgstr "Código / Número Interno" -#, fuzzy msgctxt "field:crm.validation_template,lines:" -msgid "Lines" +msgid "Asks" msgstr "Líneas" msgctxt "field:crm.validation_template,name:" @@ -668,38 +586,10 @@ msgctxt "field:crm.validation_template.ask,template:" msgid "Template Validation" msgstr "Plantilla de Validación" -msgctxt "field:crm.validation_template.line,ask:" -msgid "Ask" -msgstr "Concepto" - -msgctxt "field:crm.validation_template.line,sequence:" -msgid "Sequence" -msgstr "Secuencia" - -msgctxt "field:crm.validation_template.line,template:" -msgid "Template Validation" -msgstr "Plantilla de Validación" - -msgctxt "field:crm.validation_template.line,type_response:" -msgid "Type Response" -msgstr "Tipo de Respuesta" - -msgctxt "field:party.party,company:" -msgid "Company" -msgstr "Empresa" - -msgctxt "field:party.party,opportunities:" -msgid "Opportunities" -msgstr "Oportunidades" - msgctxt "field:party.party,party_validations:" msgid "Party Validations" msgstr "Validación Terceros" -msgctxt "field:party.party,sales_count:" -msgid "Sales Count" -msgstr "" - msgctxt "help:crm.opportunity,amount:" msgid "Estimated revenue amount." msgstr "" @@ -768,14 +658,6 @@ msgctxt "model:crm.survey_template.line,name:" msgid "Survey Template Line" msgstr "Linea Plantillas de Encuesta" -msgctxt "model:crm.validation,name:" -msgid "Validation" -msgstr "Validación" - -msgctxt "model:crm.validation.line,name:" -msgid "Validation Line" -msgstr "" - msgctxt "model:crm.validation_template,name:" msgid "Validation Template" msgstr "Plantilla de Validación" @@ -784,10 +666,6 @@ msgctxt "model:crm.validation_template.ask,name:" msgid "Validation Template Ask" msgstr "" -msgctxt "model:crm.validation_template.line,name:" -msgid "Validation Template Line" -msgstr "" - msgctxt "model:ir.action,name:" msgid "CRM Cases" msgstr "Casos" @@ -876,14 +754,6 @@ msgctxt "model:ir.action.act_window.domain,name:" msgid "Client Validation" msgstr "Revisión por el Cliente" -msgctxt "model:ir.action.act_window.domain,name:" -msgid "Internal Validation" -msgstr "Validación Interna" - -msgctxt "model:ir.action.act_window.domain,name:" -msgid "Revision" -msgstr "Revisión" - msgctxt "" "model:ir.action.act_window.domain,name:act_crm_opportunity_form_domain_accepted" msgid "Accepted" @@ -2150,26 +2020,10 @@ msgctxt "selection:crm.customer_service,sexual_diversity:" msgid "BISEXUAL" msgstr "" -msgctxt "selection:crm.customer_service,sexual_diversity:" -msgid "GAY" -msgstr "" - -msgctxt "selection:crm.customer_service,sexual_diversity:" -msgid "HETEROSEXUAL" -msgstr "" - -msgctxt "selection:crm.customer_service,sexual_diversity:" -msgid "LESBIANA" -msgstr "" - msgctxt "selection:crm.customer_service,sexual_diversity:" msgid "N.A" msgstr "N.A" -msgctxt "selection:crm.customer_service,sexual_diversity:" -msgid "TRAVESTI" -msgstr "" - msgctxt "selection:crm.customer_service,state:" msgid "Cancelled" msgstr "Cancelado" @@ -2222,10 +2076,6 @@ msgctxt "selection:crm.opportunity,source:" msgid "WhatsApp" msgstr "" -msgctxt "selection:crm.opportunity,state:" -msgid "Acceptance" -msgstr "Aceptado" - msgctxt "selection:crm.opportunity,state:" msgid "Accepted" msgstr "Aceptado" @@ -2238,18 +2088,10 @@ msgctxt "selection:crm.opportunity,state:" msgid "Cancelled" msgstr "Anulado" -msgctxt "selection:crm.opportunity,state:" -msgid "Client Revision" -msgstr "Enviar al Cliente" - msgctxt "selection:crm.opportunity,state:" msgid "Customer Approbation" msgstr "Aprobación del Cliente" -msgctxt "selection:crm.opportunity,state:" -msgid "Internal Validation" -msgstr "Validación Interna" - msgctxt "selection:crm.opportunity,state:" msgid "Lost" msgstr "Perdida" @@ -2274,10 +2116,6 @@ msgctxt "selection:crm.opportunity,state:" msgid "Review" msgstr "Reconsideración" -msgctxt "selection:crm.opportunity,state:" -msgid "Revision" -msgstr "Revisión" - msgctxt "selection:crm.opportunity,type:" msgid "Contract" msgstr "Contrato" @@ -2326,22 +2164,6 @@ msgctxt "selection:crm.survey_template.line,type_response:" msgid "Yes or No" msgstr "Si o No" -msgctxt "selection:crm.validation,state:" -msgid "Cancelled" -msgstr "Anulado" - -msgctxt "selection:crm.validation,state:" -msgid "Done" -msgstr "Terminado" - -msgctxt "selection:crm.validation,state:" -msgid "Draft" -msgstr "Borrador" - -msgctxt "selection:crm.validation,state:" -msgid "Process" -msgstr "Proceso" - msgctxt "selection:crm.validation_template,type:" msgid "Client" msgstr "" @@ -2350,22 +2172,6 @@ msgctxt "selection:crm.validation_template,type:" msgid "Prospect" msgstr "Prospecto" -msgctxt "selection:crm.validation_template.line,type_response:" -msgid "Boolean" -msgstr "Booleano" - -msgctxt "selection:crm.validation_template.line,type_response:" -msgid "Free Text" -msgstr "Texto Libre" - -msgctxt "selection:crm.validation_template.line,type_response:" -msgid "Numeric 1-5" -msgstr "Numerico 1-5" - -msgctxt "selection:crm.validation_template.line,type_response:" -msgid "Yes or No" -msgstr "Si o No" - msgctxt "view:crm.activity:" msgid "Cancel" msgstr "Cancelar" @@ -2455,7 +2261,7 @@ msgid "Analysis" msgstr "Análisis" msgctxt "view:crm.opportunity:" -msgid "Cancel" +msgid "Cancelled" msgstr "Anulado" msgctxt "view:crm.opportunity:" @@ -2463,8 +2269,8 @@ msgid "Contracts" msgstr "Contratos" msgctxt "view:crm.opportunity:" -msgid "Internal Validation" -msgstr "Validación Interna" +msgid "Customer Approbation" +msgstr "Aprobación del Cliente" msgctxt "view:crm.opportunity:" msgid "Lost" @@ -2487,12 +2293,16 @@ msgid "Quotation" msgstr "Cotización" msgctxt "view:crm.opportunity:" -msgid "Review" -msgstr "Reconsideración" +msgid "Quote Approbation" +msgstr "Aprobacion Cotización" msgctxt "view:crm.opportunity:" -msgid "Revision" -msgstr "Revisión" +msgid "Quote Revision" +msgstr "Revisión Cotizacion" + +msgctxt "view:crm.opportunity:" +msgid "Review" +msgstr "Reconsideración" msgctxt "view:crm.survey.group:" msgid "Survey Group" @@ -2526,30 +2336,6 @@ msgctxt "view:crm.survey_template:" msgid "Lines" msgstr "Líneas" -msgctxt "view:crm.validation:" -msgid "Cancel" -msgstr "Cancelar" - -msgctxt "view:crm.validation:" -msgid "Done" -msgstr "Terminado" - -msgctxt "view:crm.validation:" -msgid "Draft" -msgstr "Borrador" - -msgctxt "view:crm.validation:" -msgid "Lines" -msgstr "Líneas" - -msgctxt "view:crm.validation:" -msgid "Notes" -msgstr "Observaciones" - -msgctxt "view:crm.validation:" -msgid "Process" -msgstr "Proceso" - msgctxt "view:crm.validation_template:" msgid "Lines" msgstr "Líneas" diff --git a/opportunity.py b/opportunity.py index 3736b8e..5a390c9 100644 --- a/opportunity.py +++ b/opportunity.py @@ -60,11 +60,14 @@ class Opportunity( _depends_stop = ['state'] number = fields.Char('Number', readonly=True, required=True, select=True) - reference = fields.Char('Reference', select=True) + reference = fields.Char('Reference', select=True, + states={ + 'readonly': ~Eval('state').in_(['prospecting', 'analysis', 'quote_revision', 'review']) + }) party = fields.Many2One( 'party.party', "Party", select=True, states={ - 'readonly': Eval('state').in_(['converted', 'lost', 'cancelled']), + 'readonly': ~Eval('state').in_(['prospecting', 'analysis', 'quote_revision', 'review']), 'required': ~Eval('state').in_(['lead', 'lost', 'cancelled']), }, context={ @@ -699,6 +702,10 @@ class CrmOpportunityLine(sequence_ordered(), ModelSQL, ModelView): states=_states, depends=_depends) unit_digits = fields.Function(fields.Integer('Unit Digits'), 'on_change_with_unit_digits') + # unit_digits = fields.Function(fields.Numeric('Unit Digits'), + # 'on_change_with_unit_digits') + description = fields.Function(fields.Text('Description'), + 'on_change_with_description') del _states, _depends @@ -724,6 +731,26 @@ class CrmOpportunityLine(sequence_ordered(), ModelSQL, ModelView): return self.unit.digits return 2 + # @fields.depends('product') + # def on_change_with_unit_digits(self, name=None): + # if self.product: + # return self.product.list_price_uom + + @fields.depends('product') + def on_change_with_description(self, name=None): + if self.product: + return self.product.description + + # Product = Pool().get('product.product') + # sale_line = SaleLine( + # type='line', + # product=self.product, + # sale=sale, + # description=None, + # ) + # return sale_line + + @fields.depends('product', 'unit') def on_change_product(self): if not self.product: diff --git a/party_validation.py b/party_validation.py index 22cb099..b6cc1f9 100644 --- a/party_validation.py +++ b/party_validation.py @@ -56,7 +56,8 @@ class ValidationAsk(ModelSQL, ModelView): # required=True, select=True, # sort=False, readonly=True comment = fields.Text('Comments') - validated_by = employee_field("Validated By") + # validated_by = employee_field("Validated By") + validated_by = fields.Many2One('res.user', 'User') blocked = fields.Boolean('Blocked', readonly=True) @classmethod @@ -70,6 +71,7 @@ class ValidationAsk(ModelSQL, ModelView): @fields.depends('response') def on_change_response(self): if self.response: + self.validated_by = Transaction().user self.date_validation = date.today() else: self.date_validation = None diff --git a/view/opportunity_line_form.xml b/view/opportunity_line_form.xml index fae2663..bfc212a 100644 --- a/view/opportunity_line_form.xml +++ b/view/opportunity_line_form.xml @@ -12,6 +12,7 @@ this repository contains the full copyright notices and license terms. -->