Skip to content
This repository has been archived by the owner on Feb 20, 2022. It is now read-only.

Commit

Permalink
working on productorders
Browse files Browse the repository at this point in the history
  • Loading branch information
@anti43
anti43 committed Dec 30, 2012
1 parent 2588fbe commit a49a228
Show file tree
Hide file tree
Showing 9 changed files with 5,718 additions and 5,858 deletions.
380 changes: 191 additions & 189 deletions src/enoa/connection/NoaConnectionLocalServer.java
View file

Large diffs are not rendered by default.

4,745 changes: 2,374 additions & 2,371 deletions src/mpv5/db/common/DatabaseObject.java
View file

Large diffs are not rendered by default.

1,779 changes: 894 additions & 885 deletions src/mpv5/db/objects/SubItem.java
View file

Large diffs are not rendered by default.

633 changes: 319 additions & 314 deletions src/mpv5/logging/Log.java
View file

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions src/mpv5/resources/languages/Panels.properties
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1859,11 +1859,8 @@ ProductOrderPanel.rightpane.border.title=Data
ProductOrderPanel.number._Label=Number ProductOrderPanel.number._Label=Number
ProductOrderPanel.addedby.toolTipText=Added by ProductOrderPanel.addedby.toolTipText=Added by
ProductOrderPanel.addedby.text= ProductOrderPanel.addedby.text=
ProductOrderPanel.jLabel4.text=Group:
ProductOrderPanel.button_order2.text=Add
ProductOrderPanel.discount.text=0 ProductOrderPanel.discount.text=0
ProductOrderPanel.status._Label=Status ProductOrderPanel.status._Label=Status
ProductOrderPanel.accountselect._Label=Account
ProductOrderPanel.jLabel5.text_1=Discount ProductOrderPanel.jLabel5.text_1=Discount
ProductOrderPanel.staus_icon.text= ProductOrderPanel.staus_icon.text=
ProductOrderPanel.type.text=Product Order ProductOrderPanel.type.text=Product Order
Expand Down Expand Up @@ -1893,7 +1890,6 @@ ProductOrderPanel.date1._Label=Add. Date
ProductOrderPanel.contactcity.text=City ProductOrderPanel.contactcity.text=City
ProductOrderPanel.contactname._Label=Name ProductOrderPanel.contactname._Label=Name
ProductOrderPanel.jPanel3.TabConstraints.tabTitle=Notes ProductOrderPanel.jPanel3.TabConstraints.tabTitle=Notes
ProductOrderPanel.jButton2.text=Contact Details
ProductOrderPanel.button_preview.text=Preview ProductOrderPanel.button_preview.text=Preview
ProductOrderPanel.jPanel2.border.title=Contact ProductOrderPanel.jPanel2.border.title=Contact
ProductOrderPanel.tooffer.name=toorder1 ProductOrderPanel.tooffer.name=toorder1
Expand Down Expand Up @@ -1974,7 +1970,6 @@ ProductPanel.calcResult._Label=Price
ProductPanel.jButton3.text=% ProductPanel.jButton3.text=%
MPView.jMenuItem48.text=Update Yabs MPView.jMenuItem48.text=Update Yabs
MPView.jMenuItem48.text_1=Stock Manager MPView.jMenuItem48.text_1=Stock Manager
ContactPanel.jPanel2.TabConstraints.tabTitle=Files
ContactPanel.addfile1.text= ContactPanel.addfile1.text=
ContactPanel.jButton6.text=Reload ContactPanel.jButton6.text=Reload
ContactPanel.removefile1.text= ContactPanel.removefile1.text=
Expand Down Expand Up @@ -2014,3 +2009,5 @@ JournalPanel.jPanel10.border.title=Filter
ControlPanel_External.jButton6.text=Let Yabs decide ControlPanel_External.jButton6.text=Let Yabs decide
ControlPanel_External.jCheckBox4.text=Start Office automatically ControlPanel_External.jCheckBox4.text=Start Office automatically
MPView.jMenuItem50.text=Change language from file MPView.jMenuItem50.text=Change language from file
ContactPanel.filetab.TabConstraints.tabTitle=Files
ProductOrderPanel.groupnameselect._Label=Group
32 changes: 13 additions & 19 deletions src/mpv5/ui/panels/ContactPanel.form
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<Component id="jToolBar2" min="-2" max="-2" attributes="0"/> <Component id="jToolBar2" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace pref="26" max="32767" attributes="0"/> <EmptySpace pref="36" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
Expand Down Expand Up @@ -224,7 +224,6 @@
<Dimension value="[100, 22]"/> <Dimension value="[100, 22]"/>
</Property> </Property>
<Property name="name" type="java.lang.String" value="customer" noResource="true"/> <Property name="name" type="java.lang.String" value="customer" noResource="true"/>
<Property name="opaque" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[140, 22]"/> <Dimension value="[140, 22]"/>
</Property> </Property>
Expand Down Expand Up @@ -253,7 +252,6 @@
<Dimension value="[100, 22]"/> <Dimension value="[100, 22]"/>
</Property> </Property>
<Property name="name" type="java.lang.String" value="supplier" noResource="true"/> <Property name="name" type="java.lang.String" value="supplier" noResource="true"/>
<Property name="opaque" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[140, 22]"/> <Dimension value="[140, 22]"/>
</Property> </Property>
Expand Down Expand Up @@ -282,7 +280,6 @@
<Dimension value="[100, 22]"/> <Dimension value="[100, 22]"/>
</Property> </Property>
<Property name="name" type="java.lang.String" value="manufacturer" noResource="true"/> <Property name="name" type="java.lang.String" value="manufacturer" noResource="true"/>
<Property name="opaque" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[140, 22]"/> <Dimension value="[140, 22]"/>
</Property> </Property>
Expand Down Expand Up @@ -311,7 +308,6 @@
<Dimension value="[100, 22]"/> <Dimension value="[100, 22]"/>
</Property> </Property>
<Property name="name" type="java.lang.String" value="company" noResource="true"/> <Property name="name" type="java.lang.String" value="company" noResource="true"/>
<Property name="opaque" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[190, 22]"/> <Dimension value="[190, 22]"/>
</Property> </Property>
Expand Down Expand Up @@ -467,7 +463,7 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jToolBar3" min="-2" max="-2" attributes="0"/> <Component id="jToolBar3" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jScrollPane2" pref="63" max="32767" attributes="2"/> <Component id="jScrollPane2" pref="69" max="32767" attributes="2"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
Expand Down Expand Up @@ -1197,7 +1193,7 @@
</Group> </Group>
<Component id="button_order1" min="-2" pref="167" max="-2" attributes="0"/> <Component id="button_order1" min="-2" pref="167" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="32767" attributes="0"/> <EmptySpace pref="64" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
Expand Down Expand Up @@ -1512,7 +1508,7 @@
<Component id="bankname" alignment="2" min="-2" max="-2" attributes="0"/> <Component id="bankname" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="bankcurrency" alignment="2" min="-2" max="-2" attributes="0"/> <Component id="bankcurrency" alignment="2" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace pref="82" max="32767" attributes="0"/> <EmptySpace pref="98" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
Expand Down Expand Up @@ -1624,12 +1620,12 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" alignment="1" pref="974" max="32767" attributes="0"/> <Component id="jScrollPane1" alignment="1" pref="981" max="32767" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" alignment="0" pref="148" max="32767" attributes="0"/> <Component id="jScrollPane1" alignment="0" pref="163" max="32767" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
Expand Down Expand Up @@ -1688,13 +1684,13 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jPanel6" min="-2" pref="539" max="-2" attributes="0"/> <Component id="jPanel6" min="-2" pref="539" max="-2" attributes="0"/>
<EmptySpace pref="439" max="32767" attributes="0"/> <EmptySpace pref="446" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel6" alignment="0" pref="152" max="32767" attributes="0"/> <Component id="jPanel6" alignment="0" pref="167" max="32767" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
Expand Down Expand Up @@ -1760,15 +1756,15 @@
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel2"> <Container class="javax.swing.JPanel" name="filetab">
<Properties> <Properties>
<Property name="name" type="java.lang.String" value="jPanel2" noResource="true"/> <Property name="name" type="java.lang.String" value="filetab" noResource="true"/>
</Properties> </Properties>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
<JTabbedPaneConstraints tabName="Files"> <JTabbedPaneConstraints tabName="Files">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.jPanel2.TabConstraints.tabTitle" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/> <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.filetab.TabConstraints.tabTitle" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property> </Property>
</JTabbedPaneConstraints> </JTabbedPaneConstraints>
</Constraint> </Constraint>
Expand All @@ -1785,7 +1781,7 @@
<Component id="removefile1" min="-2" pref="40" max="-2" attributes="0"/> <Component id="removefile1" min="-2" pref="40" max="-2" attributes="0"/>
<EmptySpace pref="766" max="32767" attributes="0"/> <EmptySpace pref="766" max="32767" attributes="0"/>
</Group> </Group>
<Component id="jScrollPane5" alignment="0" pref="978" max="32767" attributes="0"/> <Component id="jScrollPane5" alignment="0" pref="985" max="32767" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
Expand All @@ -1797,7 +1793,7 @@
<Component id="addfile1" alignment="2" min="-2" max="-2" attributes="1"/> <Component id="addfile1" alignment="2" min="-2" max="-2" attributes="1"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane5" pref="117" max="32767" attributes="2"/> <Component id="jScrollPane5" pref="136" max="32767" attributes="2"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
Expand Down Expand Up @@ -1843,7 +1839,6 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.addfile1.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/> <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.addfile1.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="addfile1" noResource="true"/> <Property name="name" type="java.lang.String" value="addfile1" noResource="true"/>
</Properties> </Properties>
<Events> <Events>
Expand All @@ -1858,7 +1853,6 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.removefile1.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/> <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.removefile1.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="removefile1" noResource="true"/> <Property name="name" type="java.lang.String" value="removefile1" noResource="true"/>
</Properties> </Properties>
<Events> <Events>
Expand Down
Loading

0 comments on commit a49a228

Please sign in to comment.