parent
8a3f183375
commit
4525b2ad5a
|
@ -43,9 +43,6 @@ type TaxReturn struct {
|
||||||
// district taxes
|
// district taxes
|
||||||
DistrictTaxes []*DistrictTaxes `json:"DistrictTaxes"`
|
DistrictTaxes []*DistrictTaxes `json:"DistrictTaxes"`
|
||||||
|
|
||||||
// estimated report
|
|
||||||
EstimatedReport *TaxReturnPanel `json:"EstimatedReport,omitempty"`
|
|
||||||
|
|
||||||
// excess tax collected
|
// excess tax collected
|
||||||
ExcessTaxCollected float64 `json:"ExcessTaxCollected,omitempty"`
|
ExcessTaxCollected float64 `json:"ExcessTaxCollected,omitempty"`
|
||||||
|
|
||||||
|
@ -142,10 +139,6 @@ func (m *TaxReturn) Validate(formats strfmt.Registry) error {
|
||||||
res = append(res, err)
|
res = append(res, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := m.validateEstimatedReport(formats); err != nil {
|
|
||||||
res = append(res, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := m.validateSummaryReport(formats); err != nil {
|
if err := m.validateSummaryReport(formats); err != nil {
|
||||||
res = append(res, err)
|
res = append(res, err)
|
||||||
}
|
}
|
||||||
|
@ -256,24 +249,6 @@ func (m *TaxReturn) validateDistrictTaxes(formats strfmt.Registry) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *TaxReturn) validateEstimatedReport(formats strfmt.Registry) error {
|
|
||||||
|
|
||||||
if swag.IsZero(m.EstimatedReport) { // not required
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if m.EstimatedReport != nil {
|
|
||||||
if err := m.EstimatedReport.Validate(formats); err != nil {
|
|
||||||
if ve, ok := err.(*errors.Validation); ok {
|
|
||||||
return ve.ValidateName("EstimatedReport")
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *TaxReturn) validateSummaryReport(formats strfmt.Registry) error {
|
func (m *TaxReturn) validateSummaryReport(formats strfmt.Registry) error {
|
||||||
|
|
||||||
if swag.IsZero(m.SummaryReport) { // not required
|
if swag.IsZero(m.SummaryReport) { // not required
|
||||||
|
|
|
@ -328,8 +328,6 @@ definitions:
|
||||||
format: double
|
format: double
|
||||||
SummaryReport:
|
SummaryReport:
|
||||||
$ref: "#/definitions/TaxReturnPanel"
|
$ref: "#/definitions/TaxReturnPanel"
|
||||||
EstimatedReport:
|
|
||||||
$ref: "#/definitions/TaxReturnPanel"
|
|
||||||
CountyReports:
|
CountyReports:
|
||||||
items:
|
items:
|
||||||
$ref: "#/definitions/TaxReturnPanel"
|
$ref: "#/definitions/TaxReturnPanel"
|
||||||
|
|
Loading…
Reference in New Issue