details: https://code.openbravo.com/erp/devel/pi/rev/ab1bb30e3d60 changeset: 13620:ab1bb30e3d60 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Aug 30 12:27:52 2011 +0200 summary: [APRM]Fix column position inconsistency.
details: https://code.openbravo.com/erp/devel/pi/rev/a94dffaa83dd changeset: 13621:a94dffaa83dd user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Aug 30 12:29:57 2011 +0200 summary: Fixed issue 17948.Properly configure payment terms provided in F&B. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 4 +- referencedata/sampledata/F_B_International_Group.xml | 91 +-------- src-db/database/sourcedata/AD_COLUMN.xml | 4 +- 3 files changed, 16 insertions(+), 83 deletions(-) diffs (233 lines): diff -r 41a04622702b -r a94dffaa83dd modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Tue Aug 30 10:50:49 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Tue Aug 30 12:29:57 2011 +0200 @@ -333,7 +333,7 @@ <!--18096D8809024E67A36E636EA0D9D0E7--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--18096D8809024E67A36E636EA0D9D0E7--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--18096D8809024E67A36E636EA0D9D0E7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--18096D8809024E67A36E636EA0D9D0E7--> <POSITION><![CDATA[18]]></POSITION> +<!--18096D8809024E67A36E636EA0D9D0E7--> <POSITION><![CDATA[25]]></POSITION> <!--18096D8809024E67A36E636EA0D9D0E7--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--18096D8809024E67A36E636EA0D9D0E7--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--18096D8809024E67A36E636EA0D9D0E7--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -6383,7 +6383,7 @@ <!--F362B84F4718449EAD840F1C25667B37--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--F362B84F4718449EAD840F1C25667B37--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--F362B84F4718449EAD840F1C25667B37--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--F362B84F4718449EAD840F1C25667B37--> <POSITION><![CDATA[22]]></POSITION> +<!--F362B84F4718449EAD840F1C25667B37--> <POSITION><![CDATA[25]]></POSITION> <!--F362B84F4718449EAD840F1C25667B37--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--F362B84F4718449EAD840F1C25667B37--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--F362B84F4718449EAD840F1C25667B37--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r 41a04622702b -r a94dffaa83dd referencedata/sampledata/F_B_International_Group.xml --- a/referencedata/sampledata/F_B_International_Group.xml Tue Aug 30 10:50:49 2011 +0200 +++ b/referencedata/sampledata/F_B_International_Group.xml Tue Aug 30 12:29:57 2011 +0200 @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ob:Openbravo xmlns:ob="http://www.openbravo.com"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +<?xml version="1.0" encoding="UTF-8"?><ob:Openbravo xmlns:ob="http://www.openbravo.com"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <FinancialMgmtMatchingAlgorithm id="F6B492F80B6C4733AA653D8B45679B6C"> <id>F6B492F80B6C4733AA653D8B45679B6C</id> <client id="FF8080812AFBCB14012AFBD3E373001F"/> @@ -8156,7 +8155,7 @@ <widgetClass id="50F3F7AED43A4B31AF176F1AF0714284"/> <copiedFrom id="FF8080812C402030012C40246CA40009"/> <columnPosition>0</columnPosition> - <sequenceInColumn>1</sequenceInColumn> + <sequenceInColumn>0</sequenceInColumn> <visibleAtRole id="FF8080812AFBCB14012AFBD3E4340031"/> <visibleAtUser id="100"/> <relativePriority>0</relativePriority> @@ -8845,7 +8844,7 @@ <widgetClass id="0B90015CD9C84792A98F1E9357C262E2"/> <copiedFrom xsi:nil="true"/> <columnPosition>0</columnPosition> - <sequenceInColumn>2</sequenceInColumn> + <sequenceInColumn>1</sequenceInColumn> <visibleAtRole id="FF8080812AFBCB14012AFBD3E4340031"/> <visibleAtUser id="100"/> <relativePriority>6</relativePriority> @@ -10279,7 +10278,7 @@ <description xsi:nil="true"/> <comments xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> - <overduePaymentDaysRule>0</overduePaymentDaysRule> + <overduePaymentDaysRule>60</overduePaymentDaysRule> <maturityDate1 xsi:nil="true"/> <offsetMonthDue>0</offsetMonthDue> <nextBusinessDay>false</nextBusinessDay> @@ -10299,7 +10298,7 @@ <description xsi:nil="true"/> <comments xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> - <overduePaymentDaysRule>0</overduePaymentDaysRule> + <overduePaymentDaysRule>60</overduePaymentDaysRule> <maturityDate1 xsi:nil="true"/> <offsetMonthDue>0</offsetMonthDue> <nextBusinessDay>false</nextBusinessDay> @@ -10339,7 +10338,7 @@ <description xsi:nil="true"/> <comments xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> - <overduePaymentDaysRule>0</overduePaymentDaysRule> + <overduePaymentDaysRule>30</overduePaymentDaysRule> <maturityDate1 xsi:nil="true"/> <offsetMonthDue>0</offsetMonthDue> <nextBusinessDay>false</nextBusinessDay> @@ -328122,7 +328121,7 @@ <paymentTerms id="6D3B4000BE1E4E7EACFA36D97F6E35D5"/> <lineNo>20</lineNo> <percentageDue>40</percentageDue> - <rest>true</rest> + <rest>false</rest> <excludeTax>false</excludeTax> <formOfPayment xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> @@ -328144,7 +328143,7 @@ <paymentTerms id="65E174ADC0A147A8B4008F47B24A2333"/> <lineNo>10</lineNo> <percentageDue>50</percentageDue> - <rest>true</rest> + <rest>false</rest> <excludeTax>false</excludeTax> <formOfPayment xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> @@ -328166,7 +328165,7 @@ <paymentTerms id="E9849FDC670B41E4B5D4B5001CEF45D0"/> <lineNo>10</lineNo> <percentageDue>20</percentageDue> - <rest>true</rest> + <rest>false</rest> <excludeTax>false</excludeTax> <formOfPayment xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> @@ -328180,28 +328179,6 @@ <overduePaymentDayRule xsi:nil="true"/> <paymentMethod xsi:nil="true"/> </FinancialMgmtPaymentTermLine> - <FinancialMgmtPaymentTermLine id="BFC68F6A715443CCA080A30028B9C7F6"> - <id>BFC68F6A715443CCA080A30028B9C7F6</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="0"/> - <active>true</active> - <paymentTerms id="65E174ADC0A147A8B4008F47B24A2333"/> - <lineNo>20</lineNo> - <percentageDue>50</percentageDue> - <rest>true</rest> - <excludeTax>false</excludeTax> - <formOfPayment xsi:nil="true"/> - <fixedDueDate>false</fixedDueDate> - <overduePaymentDaysRule>60</overduePaymentDaysRule> - <lastDayCutoff xsi:nil="true"/> - <maturityDate1 xsi:nil="true"/> - <maturityDate2 xsi:nil="true"/> - <maturityDate3 xsi:nil="true"/> - <offsetMonthDue xsi:nil="true"/> - <nextBusinessDay>true</nextBusinessDay> - <overduePaymentDayRule xsi:nil="true"/> - <paymentMethod xsi:nil="true"/> - </FinancialMgmtPaymentTermLine> <FinancialMgmtPaymentTermLine id="C27D54C814F241F191F24FFFB49DD21D"> <id>C27D54C814F241F191F24FFFB49DD21D</id> <client id="FF8080812AFBCB14012AFBD3E373001F"/> @@ -328210,7 +328187,7 @@ <paymentTerms id="6D3B4000BE1E4E7EACFA36D97F6E35D5"/> <lineNo>10</lineNo> <percentageDue>20</percentageDue> - <rest>true</rest> + <rest>false</rest> <excludeTax>false</excludeTax> <formOfPayment xsi:nil="true"/> <fixedDueDate>false</fixedDueDate> @@ -328224,50 +328201,6 @@ <overduePaymentDayRule xsi:nil="true"/> <paymentMethod xsi:nil="true"/> </FinancialMgmtPaymentTermLine> - <FinancialMgmtPaymentTermLine id="CF715EA17F344E3B80A67404264353C4"> - <id>CF715EA17F344E3B80A67404264353C4</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="0"/> - <active>true</active> - <paymentTerms id="6D3B4000BE1E4E7EACFA36D97F6E35D5"/> - <lineNo>30</lineNo> - <percentageDue>40</percentageDue> - <rest>true</rest> - <excludeTax>false</excludeTax> - <formOfPayment xsi:nil="true"/> - <fixedDueDate>false</fixedDueDate> - <overduePaymentDaysRule>60</overduePaymentDaysRule> - <lastDayCutoff xsi:nil="true"/> - <maturityDate1 xsi:nil="true"/> - <maturityDate2 xsi:nil="true"/> - <maturityDate3 xsi:nil="true"/> - <offsetMonthDue xsi:nil="true"/> - <nextBusinessDay>true</nextBusinessDay> - <overduePaymentDayRule xsi:nil="true"/> - <paymentMethod xsi:nil="true"/> - </FinancialMgmtPaymentTermLine> - <FinancialMgmtPaymentTermLine id="EB75D7376CD5467E9AEC5C99E48920DF"> - <id>EB75D7376CD5467E9AEC5C99E48920DF</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="0"/> - <active>true</active> - <paymentTerms id="E9849FDC670B41E4B5D4B5001CEF45D0"/> - <lineNo>20</lineNo> - <percentageDue>80</percentageDue> - <rest>true</rest> - <excludeTax>false</excludeTax> - <formOfPayment xsi:nil="true"/> - <fixedDueDate>false</fixedDueDate> - <overduePaymentDaysRule>30</overduePaymentDaysRule> - <lastDayCutoff xsi:nil="true"/> - <maturityDate1 xsi:nil="true"/> - <maturityDate2 xsi:nil="true"/> - <maturityDate3 xsi:nil="true"/> - <offsetMonthDue xsi:nil="true"/> - <nextBusinessDay>true</nextBusinessDay> - <overduePaymentDayRule xsi:nil="true"/> - <paymentMethod xsi:nil="true"/> - </FinancialMgmtPaymentTermLine> <FinancialMgmtAmortization id="00010CA70FF0430399B6962C5B058A87"> <id>00010CA70FF0430399B6962C5B058A87</id> <client id="FF8080812AFBCB14012AFBD3E373001F"/> @@ -374020,8 +373953,8 @@ <processed>false</processed> <posted>N</posted> <printdetailed>false</printdetailed> + <printsummary>false</printsummary> <aPRMProcessReconciliation>P</aPRMProcessReconciliation> - <printsummary>false</printsummary> </FIN_Reconciliation> <FIN_Reconciliation id="8A64B71A2C360F9C012C36CA635A001C"> <id>8A64B71A2C360F9C012C36CA635A001C</id> @@ -374040,8 +373973,8 @@ <processed>false</processed> <posted>N</posted> <printdetailed>false</printdetailed> + <printsummary>false</printsummary> <aPRMProcessReconciliation>P</aPRMProcessReconciliation> - <printsummary>false</printsummary> </FIN_Reconciliation> <FinancialMgmtPaymentRunPayment id="8A64B71A2C351129012C35C40271001B"> <id>8A64B71A2C351129012C35C40271001B</id> diff -r 41a04622702b -r a94dffaa83dd src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Aug 30 10:50:49 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Aug 30 12:29:57 2011 +0200 @@ -155192,7 +155192,7 @@ <!--802404--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--802404--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--802404--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--802404--> <POSITION><![CDATA[13]]></POSITION> +<!--802404--> <POSITION><![CDATA[14]]></POSITION> <!--802404--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--802404--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--802404--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -155226,7 +155226,7 @@ <!--802405--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--802405--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--802405--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--802405--> <POSITION><![CDATA[14]]></POSITION> +<!--802405--> <POSITION><![CDATA[15]]></POSITION> <!--802405--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--802405--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--802405--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
