diff --git a/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5523120_sys_gh5265_AddNewJasperProcessAndPrintFormatForC_Order_MFGWarehouseReport.sql b/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5523120_sys_gh5265_AddNewJasperProcessAndPrintFormatForC_Order_MFGWarehouseReport.sql new file mode 100644 index 00000000000..f031ac50731 --- /dev/null +++ b/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5523120_sys_gh5265_AddNewJasperProcessAndPrintFormatForC_Order_MFGWarehouseReport.sql @@ -0,0 +1,16 @@ +-- 2019-06-03T12:21:04.111 +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_Process (AccessLevel,AD_Client_ID,AD_Org_ID,AD_Process_ID,AllowProcessReRun,Classname,CopyFromProcess,Created,CreatedBy,EntityType,IsActive,IsApplySecuritySettings,IsBetaFunctionality,IsDirectPrint,IsOneInstanceOnly,IsReport,IsServerProcess,IsTranslateExcelHeaders,IsUseBPartnerLanguage,JasperReport,LockWaitTimeout,Name,RefreshAllAfterExecution,ShowHelp,Type,Updated,UpdatedBy,Value) VALUES ('3',0,0,541142,'N','de.metas.report.jasper.client.process.JasperReportStarter','N',TO_TIMESTAMP('2019-06-03 12:21:03','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','N','N','N','N','Y','N','Y','Y','@PREFIX@de/metas/docs/sales/ordercheckup_combined/report.jasper',0,'Bestellkontrolle(both)','N','N','JasperReports',TO_TIMESTAMP('2019-06-03 12:21:03','YYYY-MM-DD HH24:MI:SS'),100,'C_Order_MFGWarehouse_Report_Combined') +; + +-- 2019-06-03T12:21:04.128 +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_Process_Trl (AD_Language,AD_Process_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language, t.AD_Process_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process t WHERE l.IsActive='Y'AND (l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N') AND t.AD_Process_ID=541142 AND NOT EXISTS (SELECT 1 FROM AD_Process_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_ID=t.AD_Process_ID) +; + +-- 2019-06-03T12:23:53.663 +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_PrintFormat (AD_Client_ID,AD_Org_ID,AD_PrintColor_ID,AD_PrintFont_ID,AD_Printformat_Group,AD_PrintFormat_ID,AD_PrintPaper_ID,AD_PrintTableFormat_ID,AD_Table_ID,CreateCopy,Created,CreatedBy,FooterMargin,HeaderMargin,IsActive,IsDefault,IsForm,IsStandardHeaderFooter,IsTableBased,JasperProcess_ID,Name,Updated,UpdatedBy) VALUES (0,0,100,540008,'SO',540097,102,100,540683,'N',TO_TIMESTAMP('2019-06-03 12:23:53','YYYY-MM-DD HH24:MI:SS'),100,0,0,'Y','N','N','Y','Y',541142,'C_Order_MFGWarehouse_Report_Combined',TO_TIMESTAMP('2019-06-03 12:23:53','YYYY-MM-DD HH24:MI:SS'),100) +; + +UPDATE C_Doc_Outbound_Config set AD_PrintFormat_ID = 540097 WHERE C_Doc_Outbound_Config_ID=540002; diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_combined/report.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_combined/report.jrxml new file mode 100644 index 00000000000..b6d3dc0c9e1 --- /dev/null +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_combined/report.jrxml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report.jrxml index 781a74d5783..af52644d1ea 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report.jrxml +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report.jrxml @@ -1,6 +1,5 @@ - - + @@ -63,7 +62,7 @@ LIMIT 1 - + @@ -191,14 +190,14 @@ LIMIT 1 - + - + @@ -211,7 +210,7 @@ LIMIT 1 - + diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_description.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_description.jrxml index 7bf3cf87b69..a8e0e8f6ccc 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_description.jrxml +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_description.jrxml @@ -1,6 +1,5 @@ - - + @@ -81,28 +80,28 @@ LIMIT 1 - + - + - + - + @@ -115,14 +114,14 @@ LIMIT 1 - + - + @@ -137,7 +136,7 @@ LIMIT 1 - + @@ -150,21 +149,21 @@ LIMIT 1 - + - + - + @@ -177,14 +176,14 @@ LIMIT 1 - + - + @@ -197,7 +196,7 @@ LIMIT 1 - + @@ -210,7 +209,7 @@ LIMIT 1 - + @@ -223,7 +222,7 @@ LIMIT 1 - + @@ -238,7 +237,7 @@ LIMIT 1 - + @@ -251,7 +250,7 @@ LIMIT 1 - + @@ -264,19 +263,22 @@ LIMIT 1 - + - + + + + @@ -291,14 +293,14 @@ LIMIT 1 - + - + diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details.jrxml index b9c5e035bc0..4eaa9013f46 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details.jrxml +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details.jrxml @@ -1,6 +1,5 @@ - - + @@ -120,7 +119,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -133,7 +132,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -146,7 +145,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -159,7 +158,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -174,7 +173,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -187,7 +186,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -200,7 +199,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -213,7 +212,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -226,7 +225,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -239,7 +238,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -252,7 +251,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -265,7 +264,7 @@ $F{uomsymbol}+$F{capacity}+$F{container}]]> - + @@ -286,77 +285,77 @@ $F{barcode} + - + - + - + - + - + - + - + - + - + - + - + @@ -375,7 +374,7 @@ $F{barcode} + - + @@ -388,7 +387,7 @@ $F{barcode} + - + @@ -403,7 +402,7 @@ $F{barcode} + - + @@ -416,7 +415,7 @@ $F{barcode} + - + @@ -429,7 +428,7 @@ $F{barcode} + - + @@ -442,7 +441,7 @@ $F{barcode} + - + @@ -455,7 +454,7 @@ $F{barcode} + - + @@ -468,7 +467,7 @@ $F{barcode} + - + @@ -481,7 +480,7 @@ $F{barcode} + - + @@ -494,7 +493,7 @@ $F{barcode} + - + @@ -507,7 +506,7 @@ $F{barcode} + - + @@ -520,7 +519,7 @@ $F{barcode} + - + diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details_hu.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details_hu.jrxml index d21bd29cf51..a519c530a72 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details_hu.jrxml +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_old/report_details_hu.jrxml @@ -1,6 +1,5 @@ - - + @@ -100,7 +99,7 @@ ORDER BY - + @@ -113,7 +112,7 @@ ORDER BY - + @@ -126,7 +125,7 @@ ORDER BY - + @@ -141,7 +140,7 @@ ORDER BY - + @@ -154,7 +153,7 @@ ORDER BY - + @@ -167,7 +166,7 @@ ORDER BY - + @@ -180,7 +179,7 @@ ORDER BY - + @@ -205,14 +204,14 @@ ORDER BY - + - + @@ -221,56 +220,56 @@ ORDER BY - + - + - + - + - + - + - + - + @@ -288,7 +287,7 @@ ORDER BY - + @@ -301,7 +300,7 @@ ORDER BY - + @@ -316,7 +315,7 @@ ORDER BY - + @@ -329,7 +328,7 @@ ORDER BY - + @@ -342,7 +341,7 @@ ORDER BY - + @@ -355,7 +354,7 @@ ORDER BY - + @@ -368,7 +367,7 @@ ORDER BY - + @@ -381,7 +380,7 @@ ORDER BY - + diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report.jrxml index 08903ba8a27..ac1f0e29bd1 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report.jrxml +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report.jrxml @@ -1,6 +1,5 @@ - - + @@ -49,7 +48,7 @@ - + @@ -141,14 +140,14 @@ - + - + diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report_container_details.jrxml b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report_container_details.jrxml index bc2d94ae472..e84ce248fb7 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report_container_details.jrxml +++ b/de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/ordercheckup_with_barcode/report_container_details.jrxml @@ -51,21 +51,21 @@ - + - + - + @@ -97,14 +97,14 @@ - + - +