Permalink
Browse files

fixes for formatmanager, discount now in xtable, v 1.2 beta2

  • Loading branch information...
1 parent 0371177 commit 050bc8b79b697496169f78e90f324c5cdf1c2fcf @anti43 committed Jan 10, 2013
@@ -421,7 +421,8 @@ public static SubItem getRandomItem() {
getInttype() != TYPE_TEXT ? String.valueOf(FormatNumber.formatLokalCurrency(this.getTotalTaxValue())) : "",
getInttype() != TYPE_TEXT ? String.valueOf(FormatNumber.formatLokalCurrency(this.__getTotalbrutvalue())) : "",
__getLinkurl(),
- __getCname()
+ __getCname(),
+ getInttype() != TYPE_TEXT ? String.valueOf(FormatNumber.formatLokalCurrency(this.__getDiscount())) : ""
///////////////////////////////////////////////////////////////////////////////
};
List<String> l = Arrays.asList(possibleCols);
@@ -30,7 +30,7 @@
*
* Full Version number
*/
- public static final String VERSION = "Yabs-1.2-Beta1";
+ public static final String VERSION = "Yabs-1.2-Beta2";
/**
* The original database version of this release
@@ -251,7 +251,6 @@ MPControlPanel.jButton13.toolTipText=Format manager
MPControlPanel.jButton13.text=Format Manager
ControlPanel_Formats.jButton5.toolTipText=Save
ControlPanel_Formats.labeledCombobox3._Label=Type
-ControlPanel_Formats.labeledSpinner1._Label=Min. Start
ControlPanel_Formats.jLabel2.text=Minimal value for the numeric part:
ItemPanel.border.title=Item Details
ItemPanel.border.title_1=Item Details
@@ -1327,7 +1326,6 @@ LoginToInstanceScreen.jCheckBox1.text=Remember me
LoginToInstanceScreen.jCheckBox2.text=Autologin
LoginToInstanceScreen.jLabel5.text=Instance
LoginToInstanceScreen.jButton2.text=
-ControlPanel_Formats.labeledSpinner2._Label=Position
ControlPanel_Formats.jLabel4.text=Start position for the dynamic part (per user):
wizard_DBSettings_manage_1.labeledTextField4._Label=User
wizard_DBSettings_manage_1.labeledTextField5._Label=Password
@@ -2011,3 +2009,5 @@ ControlPanel_External.jCheckBox4.text=Start Office automatically
MPView.jMenuItem50.text=Change language from file
ContactPanel.filetab.TabConstraints.tabTitle=Files
ProductOrderPanel.groupnameselect._Label=Group
+ControlPanel_Formats.minstart._Label=Min. Start
+ControlPanel_Formats.positionstart._Label=Position
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.6" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
@@ -18,7 +18,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-115,0,0,3,-81"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-115,0,0,3,-89"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -87,13 +87,13 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
- <Component id="jScrollPane1" alignment="0" pref="302" max="32767" attributes="1"/>
+ <Component id="jScrollPane1" alignment="0" pref="308" max="32767" attributes="1"/>
<Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
<Component id="jButton5" min="-2" max="-2" attributes="0"/>
<Component id="jPanel3" alignment="0" max="32767" attributes="1"/>
</Group>
</Group>
- <EmptySpace pref="17" max="32767" attributes="0"/>
+ <EmptySpace pref="23" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -170,8 +170,8 @@
<Component id="jLabel3" pref="501" max="32767" attributes="1"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="labeledSpinner1" min="-2" max="-2" attributes="0"/>
- <Component id="labeledSpinner2" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="minstart" min="-2" max="-2" attributes="0"/>
+ <Component id="positionstart" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="locales" alignment="0" min="-2" pref="246" max="-2" attributes="1"/>
</Group>
<EmptySpace min="0" pref="255" max="32767" attributes="0"/>
@@ -201,11 +201,11 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
- <Component id="labeledSpinner1" min="-2" max="-2" attributes="0"/>
+ <Component id="minstart" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="labeledSpinner2" min="-2" max="-2" attributes="0"/>
+ <Component id="positionstart" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
@@ -247,12 +247,12 @@
<Property name="name" type="java.lang.String" value="labeledTextField1" noResource="true"/>
</Properties>
</Component>
- <Component class="mpv5.ui.beans.LabeledSpinner" name="labeledSpinner1">
+ <Component class="mpv5.ui.beans.LabeledSpinner" name="minstart">
<Properties>
<Property name="_Label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ControlPanel_Formats.labeledSpinner1._Label" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+ <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ControlPanel_Formats.minstart._Label" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
- <Property name="name" type="java.lang.String" value="labeledSpinner1" noResource="true"/>
+ <Property name="name" type="java.lang.String" value="minstart" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel4">
@@ -266,12 +266,12 @@
<Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
</Properties>
</Component>
- <Component class="mpv5.ui.beans.LabeledSpinner" name="labeledSpinner2">
+ <Component class="mpv5.ui.beans.LabeledSpinner" name="positionstart">
<Properties>
<Property name="_Label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ControlPanel_Formats.labeledSpinner2._Label" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+ <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ControlPanel_Formats.positionstart._Label" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
- <Property name="name" type="java.lang.String" value="labeledSpinner2" noResource="true"/>
+ <Property name="name" type="java.lang.String" value="positionstart" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel3">
Oops, something went wrong.

0 comments on commit 050bc8b

Please sign in to comment.