NaNtic
/
trytond-agronomics
mirror of https://github.com/NaN-tic/trytond-agronomics.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX alcahol volumn + remove quality confirm + add product list invisible fields

This commit is contained in:
Raimon Esteve 2021-07-16 12:13:10 +02:00
parent e85cd62e35
commit 46b2d41ecc
5 changed files with 100 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
product.py
View File

@ -93,11 +93,11 @@ class Product(WineMixin, metaclass=PoolMeta):
'bottled-wine']
)
}, depends=['agronomic_type'])
alcohol_volume = fields.Numeric('Alcohol Volume', digits=(16, 2), states={
alcohol_volume = fields.Function(fields.Numeric('Alcohol Volume', digits=(16, 2), states={
'invisible': ~ Eval('agronomic_type').in_(
['wine', 'unfiltered-wine', 'filtered-wine', 'clarified-wine',
'bottled-wine']
)}, depends=['agronomic_type'])
)}, depends=['agronomic_type']), 'get_alcohol_volume')
@classmethod
def validate(cls, products):
@ -113,6 +113,12 @@ class Product(WineMixin, metaclass=PoolMeta):
raise UserError(gettext('agronomics.msg_variety_limit',
product=product.rec_name))
def get_alcohol_volume(self, name):
if self.template.capacity and self.wine_alcohol_content:
return Decimal(
(float(self.template.capacity) * float(self.wine_alcohol_content))
/ 100).quantize(Decimal(str(10 ** -2)))
class ProductCrop(ModelSQL):
"Product - Crop"

3
quality.py
View File

@ -57,9 +57,6 @@ class QualityTest(metaclass=PoolMeta):
values[key + '_success'] = line.success
if values:
values['wine_quality_confirm'] = today
values['wine_quality_success'] = test.success
to_write.extend(([test.document], values))
if to_write:

6
view/product_form.xml
View File

@ -19,12 +19,6 @@
</xpath>
<xpath expr="/form/notebook" position="inside">
<page string="Quality" id="agronomics-quality" col="6">
<label name="wine_quality_confirm"/>
<field name="wine_quality_confirm"/>
<label name="wine_quality_success"/>
<field name="wine_quality_success"/>
<newline/>
<label name="wine_likely_alcohol_content"/>
<field name="wine_likely_alcohol_content"/>
<label name="wine_likely_alcohol_content_confirm"/>

94
view/product_list.xml
View File

@ -9,30 +9,120 @@
<field name="alcohol_volume" tree_invisible="1"/>
<field name="container" tree_invisible="1"/>
<field name="capacity" tree_invisible="1"/>
<field name="wine_likely_alcohol_content" tree_invisible="1"/>
<field name="wine_likely_alcohol_content_comment" tree_invisible="1"/>
<field name="wine_likely_alcohol_content_confirm" tree_invisible="1"/>
<field name="wine_likely_alcohol_content_success" tree_invisible="1"/>
<field name="wine_botrytis" tree_invisible="1"/>
<field name="wine_botrytis_comment" tree_invisible="1"/>
<field name="wine_botrytis_confirm" tree_invisible="1"/>
<field name="wine_botrytis_success" tree_invisible="1"/>
<field name="wine_alcohol_content" tree_invisible="1"/>
<field name="wine_alcohol_content_comment" tree_invisible="1"/>
<field name="wine_alcohol_content_confirm" tree_invisible="1"/>
<field name="wine_alcohol_content_success" tree_invisible="1"/>
<field name="wine_density" tree_invisible="1"/>
<field name="wine_density_comment" tree_invisible="1"/>
<field name="wine_density_confirm" tree_invisible="1"/>
<field name="wine_density_success" tree_invisible="1"/>
<field name="wine_temperature" tree_invisible="1"/>
<field name="wine_temperature_comment" tree_invisible="1"/>
<field name="wine_temperature_confirm" tree_invisible="1"/>
<field name="wine_temperature_success" tree_invisible="1"/>
<field name="wine_ph" tree_invisible="1"/>
<field name="wine_ph_comment" tree_invisible="1"/>
<field name="wine_ph_confirm" tree_invisible="1"/>
<field name="wine_ph_success" tree_invisible="1"/>
<field name="wine_free_sulphur" tree_invisible="1"/>
<field name="wine_free_sulphur_comment" tree_invisible="1"/>
<field name="wine_free_sulphur_confirm" tree_invisible="1"/>
<field name="wine_free_sulphur_success" tree_invisible="1"/>
<field name="wine_total_sulphur" tree_invisible="1"/>
<field name="wine_total_sulphur_comment" tree_invisible="1"/>
<field name="wine_total_sulphur_confirm" tree_invisible="1"/>
<field name="wine_total_sulphur_success" tree_invisible="1"/>
<field name="wine_tartaric_acidity" tree_invisible="1"/>
<field name="wine_tartaric_acidity_comment" tree_invisible="1"/>
<field name="wine_tartaric_acidity_confirm" tree_invisible="1"/>
<field name="wine_tartaric_acidity_success" tree_invisible="1"/>
<field name="wine_volatility" tree_invisible="1"/>
<field name="wine_volatility_comment" tree_invisible="1"/>
<field name="wine_volatility_confirm" tree_invisible="1"/>
<field name="wine_volatility_success" tree_invisible="1"/>
<field name="wine_malic_acid" tree_invisible="1"/>
<field name="wine_malic_acid_comment" tree_invisible="1"/>
<field name="wine_malic_acid_confirm" tree_invisible="1"/>
<field name="wine_malic_acid_success" tree_invisible="1"/>
<field name="wine_lactic_acid" tree_invisible="1"/>
<field name="wine_lactic_acid_comment" tree_invisible="1"/>
<field name="wine_lactic_acid_confirm" tree_invisible="1"/>
<field name="wine_lactic_acid_success" tree_invisible="1"/>
<field name="wine_protein_stability" tree_invisible="1"/>
<field name="wine_protein_stability_comment" tree_invisible="1"/>
<field name="wine_protein_stability_confirm" tree_invisible="1"/>
<field name="wine_protein_stability_success" tree_invisible="1"/>
<field name="wine_tartaric_stability" tree_invisible="1"/>
<field name="wine_tartaric_stability_comment" tree_invisible="1"/>
<field name="wine_tartaric_stability_confirm" tree_invisible="1"/>
<field name="wine_tartaric_stability_success" tree_invisible="1"/>
<field name="wine_turbidity" tree_invisible="1"/>
<field name="wine_turbidity_comment" tree_invisible="1"/>
<field name="wine_turbidity_confirm" tree_invisible="1"/>
<field name="wine_turbidity_success" tree_invisible="1"/>
<field name="wine_glucose_fructose" tree_invisible="1"/>
<field name="wine_glucose_fructose_comment" tree_invisible="1"/>
<field name="wine_glucose_fructose_confirm" tree_invisible="1"/>
<field name="wine_glucose_fructose_success" tree_invisible="1"/>
<field name="wine_color_intensity" tree_invisible="1"/>
<field name="wine_color_intensity_comment" tree_invisible="1"/>
<field name="wine_color_intensity_confirm" tree_invisible="1"/>
<field name="wine_color_intensity_success" tree_invisible="1"/>
<field name="wine_tone" tree_invisible="1"/>
<field name="wine_tone_comment" tree_invisible="1"/>
<field name="wine_tone_confirm" tree_invisible="1"/>
<field name="wine_tone_success" tree_invisible="1"/>
<field name="wine_clogging" tree_invisible="1"/>
<field name="wine_clogging_comment" tree_invisible="1"/>
<field name="wine_clogging_confirm" tree_invisible="1"/>
<field name="wine_clogging_success" tree_invisible="1"/>
<field name="wine_overall_impression" tree_invisible="1"/>
<field name="wine_overall_impression_comment" tree_invisible="1"/>
<field name="wine_overall_impression_confirm" tree_invisible="1"/>
<field name="wine_overall_impression_success" tree_invisible="1"/>
<field name="wine_observing_phase" tree_invisible="1"/>
<field name="wine_observing_phase_comment" tree_invisible="1"/>
<field name="wine_observing_phase_confirm" tree_invisible="1"/>
<field name="wine_observing_phase_success" tree_invisible="1"/>
<field name="wine_smelling_phase" tree_invisible="1"/>
<field name="wine_smelling_phase_comment" tree_invisible="1"/>
<field name="wine_smelling_phase_confirm" tree_invisible="1"/>
<field name="wine_smelling_phase_success" tree_invisible="1"/>
<field name="wine_tasting_phase" tree_invisible="1"/>
<field name="wine_quality_confirm" tree_invisible="1"/>
<field name="wine_quality_success" tree_invisible="1"/>
<field name="wine_tasting_phase_comment" tree_invisible="1"/>
<field name="wine_tasting_phase_confirm" tree_invisible="1"/>
<field name="wine_tasting_phase_success" tree_invisible="1"/>
</xpath>
</data>

4
wine.py
View File

@ -13,10 +13,6 @@ _WINE_DIGITS = 4
class WineMixin(Model):
wine_quality_confirm = fields.Date('Quality Confirm', readonly=True)
wine_quality_success = fields.Boolean('Quality Success', readonly=True, states={
'invisible': ~Bool(Eval('wine_quality_confirm', None)),
}, depends=['wine_quality_confirm'])
wine_quality_comment = fields.Function(fields.Text('Wine Quality Comments'),
'get_wine_quality_comment')