details: https://code.openbravo.com/erp/devel/pi/rev/86519330809e changeset: 18487:86519330809e user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Nov 06 12:04:27 2012 +0100 summary: [Quotations] Development.
details: https://code.openbravo.com/erp/devel/pi/rev/92468ca78e25 changeset: 18488:92468ca78e25 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Wed Oct 31 17:53:17 2012 +0100 summary: Quotations dataset details: https://code.openbravo.com/erp/devel/pi/rev/758b7049ab9b changeset: 18489:758b7049ab9b user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Nov 06 12:06:02 2012 +0100 summary: [Qutations] Template. diffstat: modules/org.openbravo.v3/src-db/database/configScript.xml | 54 +- referencedata/standard/Initial_Setup.xml | 138 +- src-db/database/model/functions/C_ORDER_POST1.xml | 47 +- src-db/database/model/tables/C_DOCTYPE.xml | 7 + src-db/database/model/tables/C_ORDER.xml | 22 + src-db/database/model/tables/C_ORDERLINE.xml | 7 + src-db/database/model/tables/C_REJECT_REASON.xml | 56 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_COLUMN.xml | 597 +- src-db/database/sourcedata/AD_DATASET.xml | 2 +- src-db/database/sourcedata/AD_ELEMENT.xml | 96 + src-db/database/sourcedata/AD_FIELD.xml | 6724 +++++++++- src-db/database/sourcedata/AD_MENU.xml | 24 + src-db/database/sourcedata/AD_MESSAGE.xml | 22 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_PROCESS.xml | 20 + src-db/database/sourcedata/AD_PROCESS_PARA.xml | 18 + src-db/database/sourcedata/AD_REF_LIST.xml | 33 + src-db/database/sourcedata/AD_TAB.xml | 274 +- src-db/database/sourcedata/AD_TABLE.xml | 21 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 55 + src-db/database/sourcedata/AD_TREENODE.xml | 50 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 3 +- src-db/database/sourcedata/AD_WINDOW.xml | 30 + src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml | 52 + src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml | 23 + src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 18 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 64 + src/org/openbravo/erpCommon/ad_actionButton/ActionButtonUtility.java | 24 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 480 + src/org/openbravo/erpReports/C_QuotationJR.jrxml | 444 + 31 files changed, 9344 insertions(+), 95 deletions(-) diffs (truncated from 12042 to 300 lines): diff -r cc2b5aba968d -r 758b7049ab9b modules/org.openbravo.v3/src-db/database/configScript.xml --- a/modules/org.openbravo.v3/src-db/database/configScript.xml Mon Nov 05 18:05:24 2012 +0100 +++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Tue Nov 06 12:06:02 2012 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <vector> - <versionInfo version="3.0.18066"/> + <versionInfo version="3.0.18388"/> <columnDataChange tablename="AD_PROCESS" columnname="ISACTIVE" pkRow="800026"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -93,6 +93,10 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="560493C813AE4B94A2425E3E4B62C525"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="454"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -1641,6 +1645,14 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="131D2328537D4A7CB79C80D3F51DB743"> + <oldValue><![CDATA[N]]></oldValue> + <newValue><![CDATA[Y]]></newValue> + </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="SHOWINRELATION" pkRow="131D2328537D4A7CB79C80D3F51DB743"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="2828AC0401C54F0FBE5B4E8CFC799B76"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -1657,6 +1669,10 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="56C90AF5286248D2804D12424D687AC1"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="58795D116FE0409BAAF58D2F25CBA831"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -1665,6 +1681,10 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="5AD6C314A13748D0ACEE3F13E02151E4"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="61B11EA6D16C4948910D06E49A728085"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -1681,6 +1701,10 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="6DA4FBB672494411AC03A3FC0461510F"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="81B33EDA88214F5DA19A5557B12857A2"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -1753,6 +1777,10 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="A8EA2AAB13E749E7A3FCF943EA7E569A"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="AFCAC02426F149D0B1F71C6923057A5E"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -1765,18 +1793,42 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="CD8714FABB325FB2E040007F01000C99"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="SHOWINRELATION" pkRow="CD8714FABB325FB2E040007F01000C99"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="SHOWINRELATION" pkRow="D541361A945E4B09960FAC33C5B7224B"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="ECB95BA0DE8111DD80EA001B388C05F0"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="EF7F184AFEE543378001EE67730D9414"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="F0363F8EA42311DD993B001B388C05F0"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="F44FF03EE81042088D5945B75DE4AB37"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISSAMELINE" pkRow="F9EFB543E0244AB090036F2EA6959122"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> + <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="FE2DA84E05CE4AC5B3CFF13989FA3394"> + <oldValue><![CDATA[Y]]></oldValue> + <newValue><![CDATA[N]]></newValue> + </columnDataChange> <columnDataChange tablename="AD_WINDOW" columnname="ISACTIVE" pkRow="194"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> diff -r cc2b5aba968d -r 758b7049ab9b referencedata/standard/Initial_Setup.xml --- a/referencedata/standard/Initial_Setup.xml Mon Nov 05 18:05:24 2012 +0100 +++ b/referencedata/standard/Initial_Setup.xml Tue Nov 06 12:06:02 2012 +0100 @@ -398,6 +398,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="0CD50184705A42CCBECA4EC967646440" identifier="MM Shipment"> <id>0CD50184705A42CCBECA4EC967646440</id> @@ -422,6 +423,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="15C8DCE82DA841968ABCD614FED68576" identifier="Proposal"> <id>15C8DCE82DA841968ABCD614FED68576</id> @@ -446,6 +448,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="15F495A6290040F194A9AA4622FE0C01" identifier="Prepay Order"> <id>15F495A6290040F194A9AA4622FE0C01</id> @@ -470,6 +473,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="2030AD7DD4284E2B936E261662EF735A" identifier="MM Receipt"> <id>2030AD7DD4284E2B936E261662EF735A</id> @@ -494,6 +498,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="2D7C15F0F44E4F289A729415EFD700C1" identifier="Return Material"> <id>2D7C15F0F44E4F289A729415EFD700C1</id> @@ -518,30 +523,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> - </DocumentType> -<DocumentType id="56AA9305B32C44A08554D3DB16E2B4E2" identifier="Return Material Sales Invoice"> - <id>56AA9305B32C44A08554D3DB16E2B4E2</id> - <active>true</active> - <name>Return Material Sales Invoice</name> - <printText>Return Material Sales Invoice</printText> - <description xsi:nil="true"/> - <documentCategory>ARI_RM</documentCategory> - <salesTransaction>true</salesTransaction> - <sOSubType xsi:nil="true"/> - <documentTypeForShipment xsi:nil="true"/> - <documentTypeForInvoice xsi:nil="true"/> - <sequencedDocument>true</sequencedDocument> - <documentSequence id="CD179732385848B09607674D35D1C447" entity-name="ADSequence" identifier="Return Material Sales Invoice"/> - <gLCategory id="102C08DF5D4341D5B7FDF758632503D2" entity-name="FinancialMgmtGLCategory" identifier="AR Invoice"/> - <comments xsi:nil="true"/> - <default>false</default> - <numberOfCopies>1</numberOfCopies> - <table id="318" entity-name="ADTable" identifier="C_Invoice"/> - <filterByOrganization>false</filterByOrganization> - <documentCancelled xsi:nil="true"/> - <expense>false</expense> - <reversal>false</reversal> - <return>true</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="3DDDC41E36534A79B7CC1B725472882D" identifier="Inventory Move"> <id>3DDDC41E36534A79B7CC1B725472882D</id> @@ -566,6 +548,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="40EE9B1CD3B345FABEFDA62B407B407F" identifier="AR Invoice"> <id>40EE9B1CD3B345FABEFDA62B407B407F</id> @@ -590,6 +573,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="42B7DE94BC324C3F9CC0934375E90FFF" identifier="AP CreditMemo"> <id>42B7DE94BC324C3F9CC0934375E90FFF</id> @@ -614,6 +598,7 @@ <expense>false</expense> <reversal>true</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="51005B2C07EB41C5A2E7C25A4640ACD7" identifier="GL Journal"> <id>51005B2C07EB41C5A2E7C25A4640ACD7</id> @@ -638,6 +623,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="511A9371A0F74195AA3F6D66C722729D" identifier="POS Order"> <id>511A9371A0F74195AA3F6D66C722729D</id> @@ -662,6 +648,32 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> + </DocumentType> + <DocumentType id="56AA9305B32C44A08554D3DB16E2B4E2" identifier="Return Material Sales Invoice"> + <id>56AA9305B32C44A08554D3DB16E2B4E2</id> + <active>true</active> + <name>Return Material Sales Invoice</name> + <printText>Return Material Sales Invoice</printText> + <description xsi:nil="true"/> + <documentCategory>ARI_RM</documentCategory> + <salesTransaction>true</salesTransaction> + <sOSubType xsi:nil="true"/> + <documentTypeForShipment xsi:nil="true"/> + <documentTypeForInvoice xsi:nil="true"/> + <sequencedDocument>true</sequencedDocument> + <documentSequence id="CD179732385848B09607674D35D1C447" entity-name="ADSequence" identifier="Return Material Sales Invoice"/> + <gLCategory id="102C08DF5D4341D5B7FDF758632503D2" entity-name="FinancialMgmtGLCategory" identifier="AR Invoice"/> + <comments xsi:nil="true"/> + <default>false</default> + <numberOfCopies>1</numberOfCopies> + <table id="318" entity-name="ADTable" identifier="C_Invoice"/> + <filterByOrganization>false</filterByOrganization> + <documentCancelled xsi:nil="true"/> + <expense>false</expense> + <reversal>false</reversal> + <return>true</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="5C6E02993E9B4FCA81C07955EF676C62" identifier="AP Invoice"> <id>5C6E02993E9B4FCA81C07955EF676C62</id> @@ -686,6 +698,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="5E2546B377D04D4FB346C48683A2EF31" identifier="RTV Shipment"> <id>5E2546B377D04D4FB346C48683A2EF31</id> @@ -710,6 +723,7 @@ <expense>false</expense> <reversal>false</reversal> <return>true</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="5EA6556D24034412B5F26F6BA7245318" identifier="Matched Invoices"> <id>5EA6556D24034412B5F26F6BA7245318</id> @@ -734,6 +748,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="6543EB94DC664371BAF61B8E8AC121F3" identifier="Bank Statement"> <id>6543EB94DC664371BAF61B8E8AC121F3</id> @@ -758,6 +773,7 @@ <expense>false</expense> <reversal>false</reversal> <return>false</return> + <documentTypeForOrder xsi:nil="true"/> </DocumentType> <DocumentType id="67C3266D11A04078B7A14AC21E91C711" identifier="Reversed Sales Invoice"> <id>67C3266D11A04078B7A14AC21E91C711</id> @@ -782,6 +798,7 @@ <expense>false</expense> <reversal>false</reversal> <return>true</return> ------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
