details: https://code.openbravo.com/erp/devel/pi/rev/e103ba0ec245 changeset: 16076:e103ba0ec245 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Apr 13 11:24:20 2012 +0200 summary: Fixed issue 20209. Templates will be found by looking at the natural tree of the organization
details: https://code.openbravo.com/erp/devel/pi/rev/45d8b90d0a7d changeset: 16077:45d8b90d0a7d user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Apr 13 11:48:31 2012 +0200 summary: Added new demo data diffstat: referencedata/sampledata/F_B_International_Group.xml | 1221525 +++++++-- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 489 + src-test/org/openbravo/test/base/BaseTest.java | 26 +- src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java | 15 +- src-test/org/openbravo/test/dal/DalQueryTest.java | 2 +- src-test/org/openbravo/test/dal/DalTest.java | 68 +- src-test/org/openbravo/test/dal/IssuesTest.java | 4 + src-test/org/openbravo/test/dal/test_13281.xml | 4 +- src-test/org/openbravo/test/model/OneToManyTest.java | 10 +- src-test/org/openbravo/test/preference/PreferenceTest.java | 10 +- src-test/org/openbravo/test/security/AccessLevelTest.java | 4 +- src-test/org/openbravo/test/security/AllowedOrganizationsTest.java | 2 +- src-test/org/openbravo/test/security/WritableReadableOrganizationClientTest.java | 2 +- src-test/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java | 2 +- src-test/org/openbravo/test/xml/EntityXMLImportTestReference.java | 16 + src-test/org/openbravo/test/xml/EntityXMLImportTestWarning.java | 4 + src/org/openbravo/erpCommon/utility/reporting/EmailDefinition_data.xsql | 18 +- src/org/openbravo/erpCommon/utility/reporting/Template_data.xsql | 25 +- 18 files changed, 863849 insertions(+), 358377 deletions(-) diffs (truncated from 1243597 to 300 lines): diff -r 5dd00d376163 -r 45d8b90d0a7d referencedata/sampledata/F_B_International_Group.xml --- a/referencedata/sampledata/F_B_International_Group.xml Fri Apr 13 10:54:41 2012 +0200 +++ b/referencedata/sampledata/F_B_International_Group.xml Fri Apr 13 11:48:31 2012 +0200 @@ -1,416 +1,2429 @@ <?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"/> + <FinancialMgmtMatchingAlgorithm id="03266D6AD5B949F8B6231E158CE5D9A2"> + <id>03266D6AD5B949F8B6231E158CE5D9A2</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="0"/> + <active>true</active> + <name>Advanced Matching Algorithm</name> + <description>The Advanced Matching Algorithm adds the possibility to match a bank statement line with a "payment" if the financial account transaction is not found; or with an "invoice payment plan line" if a payment is not found; or with an "order payment plan line" if an invoice payment plan lines is not found; and finally to generate a credit for a Business Partner in case there are no transaction to match found. "Advanced Matching Algorithm" also creates the corresponding financial accounts transactions while matching and finally it adds unmatching at any time. </description> + <javaClassName>org.openbravo.module.invoicematchingalgorithm.algorithm.InvoiceMatchingAlgorithm</javaClassName> + </FinancialMgmtMatchingAlgorithm> + <FinancialMgmtMatchingAlgorithm id="B98D193328B84DB89E50164A3ADD2B82"> + <id>B98D193328B84DB89E50164A3ADD2B82</id> + <client id="23C59575B9CF467C9620760EB255B389"/> <organization id="0"/> <active>true</active> <name>Standard</name> <description xsi:nil="true"/> <javaClassName>org.openbravo.advpaymentmngt.algorithm.StandardMatchingAlgorithm</javaClassName> </FinancialMgmtMatchingAlgorithm> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082C10019"> - <id>8A64B71A2B68AAA5012B7D0082C10019</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/> - <amount>0.02</amount> + <FIN_Payment_Detail id="00A9F3805820483F9B32929836462D16"> + <id>00A9F3805820483F9B32929836462D16</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="B843C30461EA4501935CB1D125C9C25A"/> + <finPayment id="C33F00F7C52A4CA0B82A9F419526EFFF"/> + <amount>2714.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082C8001A"> - <id>8A64B71A2B68AAA5012B7D0082C8001A</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/> - <amount>85.79</amount> + <FIN_Payment_Detail id="051915B2B3D64FE0AD66C97B30C3B931"> + <id>051915B2B3D64FE0AD66C97B30C3B931</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="B843C30461EA4501935CB1D125C9C25A"/> + <finPayment id="100730E380AA4B4EB5B8909806A600A5"/> + <amount>4720.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082CA001B"> - <id>8A64B71A2B68AAA5012B7D0082CA001B</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/> - <amount>164.92</amount> + <FIN_Payment_Detail id="0597069904A546858D060BA4A4E5F951"> + <id>0597069904A546858D060BA4A4E5F951</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="F523A75348C74EC49F4476E3BDD26233"/> + <amount>2392.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082CC001C"> - <id>8A64B71A2B68AAA5012B7D0082CC001C</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/> - <amount>191.12</amount> + <FIN_Payment_Detail id="07CE794F98024DC9B46D8B725875F074"> + <id>07CE794F98024DC9B46D8B725875F074</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="B843C30461EA4501935CB1D125C9C25A"/> + <finPayment id="7847898C64A24634A0211DF9F0F5623D"/> + <amount>4720.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082EF001D"> - <id>8A64B71A2B68AAA5012B7D0082EF001D</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/> - <amount>168.22</amount> + <FIN_Payment_Detail id="0853EA8DB54641DB84F85726ECA5E17F"> + <id>0853EA8DB54641DB84F85726ECA5E17F</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="9EE50FB51F7843C28E3E04F7E98D5CAD"/> + <amount>159654.70</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0843720021"> - <id>8A64B71A2B68AAA5012B7D0843720021</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="16248F4ADAE448F482815CB91E1B6AE7"/> - <amount>3</amount> - <refund>false</refund> - <active>true</active> - <writeoffAmount>0</writeoffAmount> - <gLItem xsi:nil="true"/> - <isprepayment>false</isprepayment> - </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D08C3D90022"> - <id>8A64B71A2B68AAA5012B7D08C3D90022</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="C40A8A65B0FB4522A40830387B93E5CB"/> - <amount>3.31</amount> + <FIN_Payment_Detail id="096C56D3E38F4E9F92085EC8437D5E21"> + <id>096C56D3E38F4E9F92085EC8437D5E21</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="9089C31F423C4E2D925F87C79EBD0EC0"/> + <amount>10400.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D1849160027"> - <id>8A64B71A2B68AAA5012B7D1849160027</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="378AF0EAE1A2479EAAA33436645E9433"/> - <finPayment id="8A64B71A2B68AAA5012B7D1849130026"/> - <amount>1383.20</amount> + <FIN_Payment_Detail id="097A9819A20D4CE5A90A49AD66766030"> + <id>097A9819A20D4CE5A90A49AD66766030</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="E96C3C5BE7BA4E1DAA7A84C971F7975A"/> + <amount>50513.56</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B80D4A863003A"> - <id>8A64B71A2B68AAA5012B80D4A863003A</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="FAE31E5467274E86BC7CDF5FBF1788C2"/> - <amount>75.03</amount> - <refund>false</refund> - <active>true</active> - <writeoffAmount>0</writeoffAmount> - <gLItem xsi:nil="true"/> - <isprepayment>false</isprepayment> - </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B80D530B5003B"> - <id>8A64B71A2B68AAA5012B80D530B5003B</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="90A1F59849E84AFABD04814B3D15A691"/> - <finPayment id="4CBE98FC1EF44556B499DB99EDA26C1B"/> - <amount>50.00</amount> + <FIN_Payment_Detail id="09E8D8F2BE0A45E588EA77D204F70F69"> + <id>09E8D8F2BE0A45E588EA77D204F70F69</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="DC206C91AA6A4897B44DA897936E0EC3"/> + <finPayment id="EADA9BE1B4E745F19D053D2EFAE1E03A"/> + <amount>300015.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B68AAA5012B80DAE368003D"> - <id>8A64B71A2B68AAA5012B80DAE368003D</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="378AF0EAE1A2479EAAA33436645E9433"/> - <finPayment id="A9310A008E744E50929ADE299B724D1E"/> - <amount>628.79</amount> + <FIN_Payment_Detail id="0A4194FC2F5A42B695276DBE3858A47B"> + <id>0A4194FC2F5A42B695276DBE3858A47B</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="2A39322167534B47AEBB6482B46E4A86"/> + <amount>10400.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B81497F012B81D5B48C0017"> - <id>8A64B71A2B81497F012B81D5B48C0017</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/> - <finPayment id="4A5808566ECC40DEAF4A5C05D225D81E"/> - <amount>202.68</amount> - <refund>false</refund> - <active>true</active> - <writeoffAmount>0</writeoffAmount> - <gLItem xsi:nil="true"/> - <isprepayment>false</isprepayment> - </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B81497F012B81D64FDD0018"> - <id>8A64B71A2B81497F012B81D64FDD0018</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/> - <finPayment id="53CC001E6036491080266E38A54D73DF"/> - <amount>300.00</amount> + <FIN_Payment_Detail id="0B9987FFBD4747BD9E0827C1E904E475"> + <id>0B9987FFBD4747BD9E0827C1E904E475</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="4895AE00B6644092858A8AD23C6BAA99"/> + <amount>100429.14</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B81497F012B82367D37001D"> - <id>8A64B71A2B81497F012B82367D37001D</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/> - <finPayment id="22F7D21FB4104C089194547F00D0626B"/> - <amount>262.55</amount> + <FIN_Payment_Detail id="0BF3E38AD0D84E44BF3EB5440E43B072"> + <id>0BF3E38AD0D84E44BF3EB5440E43B072</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="E443A31992CB4635AFCAEABE7183CE85"/> + <finPayment id="27AE15BB409C45D9ABF10F0150D247EC"/> + <amount>308387.76</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B81497F012B82367D47001E"> - <id>8A64B71A2B81497F012B82367D47001E</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/> - <finPayment id="22F7D21FB4104C089194547F00D0626B"/> - <amount>177.00</amount> + <FIN_Payment_Detail id="0C2FD1C961C14D81A4608C8BF301E8EA"> + <id>0C2FD1C961C14D81A4608C8BF301E8EA</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="E443A31992CB4635AFCAEABE7183CE85"/> + <finPayment id="A49FFF38CF704B61BD5A93C60EAFF4CF"/> + <amount>322789.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2B81497F012B82367D49001F"> - <id>8A64B71A2B81497F012B82367D49001F</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> - <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/> - <finPayment id="22F7D21FB4104C089194547F00D0626B"/> - <amount>110.63</amount> + <FIN_Payment_Detail id="0C34CDAAB5A64253A3CCC4F7AB35E783"> + <id>0C34CDAAB5A64253A3CCC4F7AB35E783</id> + <client id="23C59575B9CF467C9620760EB255B389"/> + <organization id="2E60544D37534C0B89E765FE29BC0B43"/> + <finPayment id="375F163EFECD407DB9F08A8F7647C136"/> + <amount>4587.00</amount> <refund>false</refund> <active>true</active> <writeoffAmount>0.00</writeoffAmount> <gLItem xsi:nil="true"/> <isprepayment>false</isprepayment> </FIN_Payment_Detail> - <FIN_Payment_Detail id="8A64B71A2C351129012C35C401FF0019"> - <id>8A64B71A2C351129012C35C401FF0019</id> - <client id="FF8080812AFBCB14012AFBD3E373001F"/> ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
