Menu item was renamed

titov-vv · Jun 8, 2024 · 13a18b0 · 13a18b0
1 parent 9438ac8
commit 13a18b0
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 48 deletions.
diff --git a/jal/languages/en.ts b/jal/languages/en.ts
@@ -5468,22 +5468,22 @@ Please select an account for import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="58"/>
+        <location filename="../data_export/taxes.py" line="59"/>
         <source>No report template found for section: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="71"/>
+        <location filename="../data_export/taxes.py" line="72"/>
         <source>Can&apos;t load tax report parameters from file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="74"/>
+        <location filename="../data_export/taxes.py" line="75"/>
         <source>There are no parameters found for tax report year: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="105"/>
+        <location filename="../data_export/taxes.py" line="108"/>
         <source>There are no information about tax treaty in tax report parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5496,32 +5496,27 @@ Please select an account for import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="265"/>
+        <location filename="../ui/tax_export_widget.ui" line="268"/>
         <source>Year:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="117"/>
-        <source>Use Sell currency rate for Buy and Sell operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/tax_export_widget.ui" line="134"/>
+        <location filename="../ui/tax_export_widget.ui" line="137"/>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="127"/>
+        <location filename="../ui/tax_export_widget.ui" line="130"/>
         <source>Foreign account to prepare tax report for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="178"/>
+        <location filename="../ui/tax_export_widget.ui" line="181"/>
         <source>Create tax form in &quot;Декларация&quot; program format (*.dcX)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="141"/>
+        <location filename="../ui/tax_export_widget.ui" line="144"/>
         <source>Excel file:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5531,13 +5526,13 @@ Please select an account for import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="272"/>
+        <location filename="../ui/tax_export_widget.ui" line="275"/>
         <source>Save Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/tax_export_widget.ui" line="47"/>
-        <location filename="../ui/tax_export_widget.ui" line="239"/>
+        <location filename="../ui/tax_export_widget.ui" line="242"/>
         <source>Select file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5547,12 +5542,12 @@ Please select an account for import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="258"/>
+        <location filename="../ui/tax_export_widget.ui" line="261"/>
         <source>Country:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="232"/>
+        <location filename="../ui/tax_export_widget.ui" line="235"/>
         <source>File where to store russian tax form</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5562,27 +5557,32 @@ Please select an account for import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="148"/>
+        <location filename="../ui/tax_export_widget.ui" line="117"/>
+        <source>Use Realization currency rate for Acquisition (one currency rate for all)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/tax_export_widget.ui" line="151"/>
         <source>Additional parameters (Russia)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="208"/>
+        <location filename="../ui/tax_export_widget.ui" line="211"/>
         <source>Output file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="225"/>
+        <location filename="../ui/tax_export_widget.ui" line="228"/>
         <source>Update only information about dividends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="242"/>
+        <location filename="../ui/tax_export_widget.ui" line="245"/>
         <source> ... </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="215"/>
+        <location filename="../ui/tax_export_widget.ui" line="218"/>
         <source>Use broker name as income source</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/jal/languages/ru.qm b/jal/languages/ru.qm
diff --git a/jal/languages/ru.ts b/jal/languages/ru.ts
@@ -5475,22 +5475,22 @@ Please select an account for import:</source>
         <translation>Неизвестная валюта: </translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="58"/>
+        <location filename="../data_export/taxes.py" line="59"/>
         <source>No report template found for section: </source>
         <translation>Не указан шаблон отчета для раздела: </translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="71"/>
+        <location filename="../data_export/taxes.py" line="72"/>
         <source>Can&apos;t load tax report parameters from file </source>
         <translation>Невозможно загрузить параметры налогового отчёта из файла </translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="74"/>
+        <location filename="../data_export/taxes.py" line="75"/>
         <source>There are no parameters found for tax report year: </source>
         <translation>Не заданы параметры налогового отчёта для года: </translation>
     </message>
     <message>
-        <location filename="../data_export/taxes.py" line="105"/>
+        <location filename="../data_export/taxes.py" line="108"/>
         <source>There are no information about tax treaty in tax report parameters</source>
         <translation>Нет информации о СоИДН в параметрах налогового отчёта</translation>
     </message>
@@ -5503,32 +5503,27 @@ Please select an account for import:</source>
         <translation>Налоги</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="265"/>
+        <location filename="../ui/tax_export_widget.ui" line="268"/>
         <source>Year:</source>
         <translation>Год:</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="117"/>
-        <source>Use Sell currency rate for Buy and Sell operations</source>
-        <translation>Использовать курс валюты Продажи для операций Покупки и Продажи</translation>
-    </message>
-    <message>
-        <location filename="../ui/tax_export_widget.ui" line="134"/>
+        <location filename="../ui/tax_export_widget.ui" line="137"/>
         <source>Account:</source>
         <translation>Счет:</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="127"/>
+        <location filename="../ui/tax_export_widget.ui" line="130"/>
         <source>Foreign account to prepare tax report for</source>
         <translation>Зарубежный счёт для которого нужно подготовить отчёт</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="178"/>
+        <location filename="../ui/tax_export_widget.ui" line="181"/>
         <source>Create tax form in &quot;Декларация&quot; program format (*.dcX)</source>
         <translation>Создать файл 3-НФДЛ в формате программы &quot;Декларация&quot; (*.dcX)</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="141"/>
+        <location filename="../ui/tax_export_widget.ui" line="144"/>
         <source>Excel file:</source>
         <translation>Файл Excel:</translation>
     </message>
@@ -5538,13 +5533,13 @@ Please select an account for import:</source>
         <translation>Файл для сохранения расчёта в формате Excel</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="272"/>
+        <location filename="../ui/tax_export_widget.ui" line="275"/>
         <source>Save Report</source>
         <translation>Сохранить Отчёт</translation>
     </message>
     <message>
         <location filename="../ui/tax_export_widget.ui" line="47"/>
-        <location filename="../ui/tax_export_widget.ui" line="239"/>
+        <location filename="../ui/tax_export_widget.ui" line="242"/>
         <source>Select file</source>
         <translation>Выберит файл</translation>
     </message>
@@ -5554,12 +5549,12 @@ Please select an account for import:</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="258"/>
+        <location filename="../ui/tax_export_widget.ui" line="261"/>
         <source>Country:</source>
         <translation>Страна:</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="232"/>
+        <location filename="../ui/tax_export_widget.ui" line="235"/>
         <source>File where to store russian tax form</source>
         <translation>Файл для сохранения декларации 3-НДФЛ</translation>
     </message>
@@ -5569,27 +5564,32 @@ Please select an account for import:</source>
         <translation>Дополнительные параметры (Португалия)</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="148"/>
+        <location filename="../ui/tax_export_widget.ui" line="117"/>
+        <source>Use Realization currency rate for Acquisition (one currency rate for all)</source>
+        <translation>Использовать для Приобретения курс валюты при Реализации (один курс для всего)</translation>
+    </message>
+    <message>
+        <location filename="../ui/tax_export_widget.ui" line="151"/>
         <source>Additional parameters (Russia)</source>
         <translation>Дополнительные параметры (Россия)</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="208"/>
+        <location filename="../ui/tax_export_widget.ui" line="211"/>
         <source>Output file:</source>
         <translation>Файл с результатом:</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="225"/>
+        <location filename="../ui/tax_export_widget.ui" line="228"/>
         <source>Update only information about dividends</source>
         <translation>Обновить только информацию о дивидендах</translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="242"/>
+        <location filename="../ui/tax_export_widget.ui" line="245"/>
         <source> ... </source>
         <translation> ... </translation>
     </message>
     <message>
-        <location filename="../ui/tax_export_widget.ui" line="215"/>
+        <location filename="../ui/tax_export_widget.ui" line="218"/>
         <source>Use broker name as income source</source>
         <translation>Использовать название брокера как источник выплаты</translation>
     </message>

diff --git a/jal/ui/tax_export_widget.ui b/jal/ui/tax_export_widget.ui
@@ -114,7 +114,10 @@
       <item>
        <widget class="QCheckBox" name="Pt_OneCurrencyRate">
         <property name="text">
-         <string>Use Sell currency rate for Buy and Sell operations</string>
+         <string>Use Realization currency rate for Acquisition (one currency rate for all)</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>

diff --git a/jal/ui/ui_tax_export_widget.py b/jal/ui/ui_tax_export_widget.py
@@ -77,6 +77,7 @@ def setupUi(self, TaxWidget):
         self.PtLayout.setContentsMargins(0, 0, 0, 0)
         self.Pt_OneCurrencyRate = QCheckBox(self.PtBox)
         self.Pt_OneCurrencyRate.setObjectName(u"Pt_OneCurrencyRate")
+        self.Pt_OneCurrencyRate.setChecked(True)
 
         self.PtLayout.addWidget(self.Pt_OneCurrencyRate)
 
@@ -189,7 +190,7 @@ def retranslateUi(self, TaxWidget):
 #endif // QT_CONFIG(tooltip)
         self.NoSettlement.setText(QCoreApplication.translate("TaxWidget", u"Do not use settlement date for currency rates", None))
         self.PtBox.setTitle(QCoreApplication.translate("TaxWidget", u"Additional parameters (Portugal)", None))
-        self.Pt_OneCurrencyRate.setText(QCoreApplication.translate("TaxWidget", u"Use Sell currency rate for Buy and Sell operations", None))
+        self.Pt_OneCurrencyRate.setText(QCoreApplication.translate("TaxWidget", u"Use Realization currency rate for Acquisition (one currency rate for all)", None))
 #if QT_CONFIG(tooltip)
         self.AccountWidget.setToolTip(QCoreApplication.translate("TaxWidget", u"Foreign account to prepare tax report for", None))
 #endif // QT_CONFIG(tooltip)