full rework of the output order
This commit is contained in:
		@@ -527,113 +527,103 @@
 | 
			
		||||
        <translation>Path to export: </translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="27"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="34"/>
 | 
			
		||||
        <source>Choose</source>
 | 
			
		||||
        <translation>Choose</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="34"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="73"/>
 | 
			
		||||
        <source>Print header</source>
 | 
			
		||||
        <translation>Print header</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="101"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="146"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="24"/>
 | 
			
		||||
        <source>Date</source>
 | 
			
		||||
        <translation>Date</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="106"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="25"/>
 | 
			
		||||
        <source>Goods name</source>
 | 
			
		||||
        <translation>Goods name</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="111"/>
 | 
			
		||||
        <source>Goods price</source>
 | 
			
		||||
        <translation>Goods price</translation>
 | 
			
		||||
        <translation type="vanished">Goods price</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="116"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="26"/>
 | 
			
		||||
        <source>Goods price per unit</source>
 | 
			
		||||
        <translation type="unfinished"></translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="27"/>
 | 
			
		||||
        <source>Goods quantity</source>
 | 
			
		||||
        <translation>Goods quantity</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="121"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="28"/>
 | 
			
		||||
        <source>Goods net weight</source>
 | 
			
		||||
        <translation>Goods net weight</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="126"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="29"/>
 | 
			
		||||
        <source>Goods total</source>
 | 
			
		||||
        <translation>Goods total</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="131"/>
 | 
			
		||||
        <source>position</source>
 | 
			
		||||
        <translation>position</translation>
 | 
			
		||||
        <translation type="vanished">position</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="136"/>
 | 
			
		||||
        <source>name</source>
 | 
			
		||||
        <translation>name</translation>
 | 
			
		||||
        <translation type="vanished">name</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="141"/>
 | 
			
		||||
        <source>1</source>
 | 
			
		||||
        <translation>1</translation>
 | 
			
		||||
        <translation type="vanished">1</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="156"/>
 | 
			
		||||
        <source>Name</source>
 | 
			
		||||
        <translation>Name</translation>
 | 
			
		||||
        <translation type="vanished">Name</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="151"/>
 | 
			
		||||
        <source>2</source>
 | 
			
		||||
        <translation>2</translation>
 | 
			
		||||
        <translation type="vanished">2</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="166"/>
 | 
			
		||||
        <source>Price</source>
 | 
			
		||||
        <translation>Price</translation>
 | 
			
		||||
        <translation type="vanished">Price</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="161"/>
 | 
			
		||||
        <source>3</source>
 | 
			
		||||
        <translation>3</translation>
 | 
			
		||||
        <translation type="vanished">3</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="176"/>
 | 
			
		||||
        <source>Quantity</source>
 | 
			
		||||
        <translation>Quantity</translation>
 | 
			
		||||
        <translation type="vanished">Quantity</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="171"/>
 | 
			
		||||
        <source>4</source>
 | 
			
		||||
        <translation>4</translation>
 | 
			
		||||
        <translation type="vanished">4</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="186"/>
 | 
			
		||||
        <source>Net weight</source>
 | 
			
		||||
        <translation>Net Weight</translation>
 | 
			
		||||
        <translation type="vanished">Net Weight</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="181"/>
 | 
			
		||||
        <source>5</source>
 | 
			
		||||
        <translation>5</translation>
 | 
			
		||||
        <translation type="vanished">5</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="191"/>
 | 
			
		||||
        <source>6</source>
 | 
			
		||||
        <translation>6</translation>
 | 
			
		||||
        <translation type="vanished">6</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="196"/>
 | 
			
		||||
        <source>Total price</source>
 | 
			
		||||
        <translation>Total price</translation>
 | 
			
		||||
        <translation type="vanished">Total price</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="41"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="27"/>
 | 
			
		||||
        <source>Print total</source>
 | 
			
		||||
        <translation>Print total</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
@@ -641,7 +631,7 @@
 | 
			
		||||
<context>
 | 
			
		||||
    <name>QObject</name>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../main.cpp" line="63"/>
 | 
			
		||||
        <location filename="../main.cpp" line="64"/>
 | 
			
		||||
        <source>Using locale: </source>
 | 
			
		||||
        <translation>Using locale: </translation>
 | 
			
		||||
    </message>
 | 
			
		||||
 
 | 
			
		||||
@@ -515,121 +515,111 @@
 | 
			
		||||
        <translation>Путь для экспорта: </translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="27"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="34"/>
 | 
			
		||||
        <source>Choose</source>
 | 
			
		||||
        <translation>Выбрать</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="34"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="73"/>
 | 
			
		||||
        <source>Print header</source>
 | 
			
		||||
        <translation>Печатать заголовок</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="101"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="146"/>
 | 
			
		||||
        <source>Date</source>
 | 
			
		||||
        <translation type="unfinished"></translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="106"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="25"/>
 | 
			
		||||
        <source>Goods name</source>
 | 
			
		||||
        <translation>Имя товара</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="111"/>
 | 
			
		||||
        <source>Goods price</source>
 | 
			
		||||
        <translation>Цена товара</translation>
 | 
			
		||||
        <translation type="vanished">Цена товара</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="116"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="26"/>
 | 
			
		||||
        <source>Goods price per unit</source>
 | 
			
		||||
        <translation type="unfinished"></translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="27"/>
 | 
			
		||||
        <source>Goods quantity</source>
 | 
			
		||||
        <translation>Количество товара</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="121"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="28"/>
 | 
			
		||||
        <source>Goods net weight</source>
 | 
			
		||||
        <translation>Масса нетто товара</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="126"/>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="29"/>
 | 
			
		||||
        <source>Goods total</source>
 | 
			
		||||
        <translation>Всего за товар</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="131"/>
 | 
			
		||||
        <source>position</source>
 | 
			
		||||
        <translation>позиция</translation>
 | 
			
		||||
        <translation type="vanished">позиция</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="136"/>
 | 
			
		||||
        <source>name</source>
 | 
			
		||||
        <translation>алиас</translation>
 | 
			
		||||
        <translation type="vanished">алиас</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="141"/>
 | 
			
		||||
        <source>1</source>
 | 
			
		||||
        <translation>1</translation>
 | 
			
		||||
        <translation type="vanished">1</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="156"/>
 | 
			
		||||
        <source>Name</source>
 | 
			
		||||
        <translation>Имя</translation>
 | 
			
		||||
        <translation type="vanished">Имя</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="151"/>
 | 
			
		||||
        <source>2</source>
 | 
			
		||||
        <translation>2</translation>
 | 
			
		||||
        <translation type="vanished">2</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="166"/>
 | 
			
		||||
        <source>Price</source>
 | 
			
		||||
        <translation>Цена</translation>
 | 
			
		||||
        <translation type="vanished">Цена</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="161"/>
 | 
			
		||||
        <source>3</source>
 | 
			
		||||
        <translation>3</translation>
 | 
			
		||||
        <translation type="vanished">3</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="176"/>
 | 
			
		||||
        <source>Quantity</source>
 | 
			
		||||
        <translation>Количество</translation>
 | 
			
		||||
        <translation type="vanished">Количество</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="171"/>
 | 
			
		||||
        <source>4</source>
 | 
			
		||||
        <translation>4</translation>
 | 
			
		||||
        <translation type="vanished">4</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="186"/>
 | 
			
		||||
        <source>Net weight</source>
 | 
			
		||||
        <translation>Масса нетто</translation>
 | 
			
		||||
        <translation type="vanished">Масса нетто</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="181"/>
 | 
			
		||||
        <source>5</source>
 | 
			
		||||
        <translation>5</translation>
 | 
			
		||||
        <translation type="vanished">5</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="191"/>
 | 
			
		||||
        <source>6</source>
 | 
			
		||||
        <translation type="unfinished">6</translation>
 | 
			
		||||
        <translation type="obsolete">6</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="196"/>
 | 
			
		||||
        <source>Total price</source>
 | 
			
		||||
        <translation>Всего</translation>
 | 
			
		||||
        <translation type="vanished">Всего</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="41"/>
 | 
			
		||||
        <location filename="../scenes/outputdialog.ui" line="27"/>
 | 
			
		||||
        <source>Print total</source>
 | 
			
		||||
        <translation>Печатать Итого</translation>
 | 
			
		||||
    </message>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../outputdialog.cpp" line="24"/>
 | 
			
		||||
        <source>Date</source>
 | 
			
		||||
        <translation type="unfinished"></translation>
 | 
			
		||||
    </message>
 | 
			
		||||
</context>
 | 
			
		||||
<context>
 | 
			
		||||
    <name>QObject</name>
 | 
			
		||||
    <message>
 | 
			
		||||
        <location filename="../main.cpp" line="63"/>
 | 
			
		||||
        <location filename="../main.cpp" line="64"/>
 | 
			
		||||
        <source>Using locale: </source>
 | 
			
		||||
        <translation>Использую локаль: </translation>
 | 
			
		||||
    </message>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user