Update the Jackrabbit branch with the current trunk version to keep the branch up to date
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/jackrabbit20100709@1231507 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/accounting/config/AccountingUiLabels.xml b/applications/accounting/config/AccountingUiLabels.xml
index aec31f6..f9901c0 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -296,6 +296,7 @@
<value xml:lang="fr">Ajouter une période de temps</value>
<value xml:lang="hi_IN">स्वनिर्धारित समय अवधि जोड़ें</value>
<value xml:lang="it">Aggiungi Periodi di Tempo Personalizzati</value>
+ <value xml:lang="nl">Aangepaste periode toevoegen</value>
<value xml:lang="pt">Adicionar período personalizado</value>
<value xml:lang="th">เพิ่มการกำหนดระยะเวลา</value>
<value xml:lang="zh">添加定制时间段</value>
@@ -303,6 +304,7 @@
</property>
<property key="AccountingAddFinAccountReconciliations">
<value xml:lang="en">Add Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
+ <value xml:lang="nl">Toevoegen afstemmingen voor Financiele rekening : ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="pt">Adicionar Reconciliação de Conta Financeira para Conta Financeira: ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="zh">为财务账目 ${finAccount.finAccountName} [${finAccountId}] 添加财务账目对账</value>
</property>
@@ -325,7 +327,7 @@
<value xml:lang="fr">Ajouter une identification d'immobilisation</value>
<value xml:lang="hi_IN">अचल संपत्ति की पहचान जोड़ें</value>
<value xml:lang="it">Nuova identificazione cespite</value>
- <value xml:lang="nl">Voeg vaste activa-identificatie toe</value>
+ <value xml:lang="nl">Vaste activa-id toevoegen</value>
<value xml:lang="pt">Adicionar Identificação de Ativos Fixos</value>
<value xml:lang="ro">Actualizeaza Identitate Mijloc Fix</value>
<value xml:lang="ru">Редактирование идентификаторов ОС</value>
@@ -339,6 +341,7 @@
<value xml:lang="fr">Ajouter une commande de maintenance d'immobilisation</value>
<value xml:lang="hi_IN">अचल संपत्ति रखरखाव के आदेश जोड़ें</value>
<value xml:lang="it">Nuovo ordine di manutenzione cespite</value>
+ <value xml:lang="nl">Opdracht voor onderhoud op vaste activa toevoegen</value>
<value xml:lang="pt">Adicionar Pedido de Manutenção de Ativos Fixos</value>
<value xml:lang="th">แก้ไขรายการบำรุงรักษาทรัพย์สินไม่หมุนเวียน</value>
<value xml:lang="zh">添加固定资产维修保养订单</value>
@@ -365,7 +368,7 @@
<value xml:lang="fr">Ajouter une mesure de la maintenance d'immobilisation</value>
<value xml:lang="hi_IN">अचल संपत्ति मापक रीडिंग जोड़ें</value>
<value xml:lang="it">Nuova misura contatori cespite</value>
- <value xml:lang="nl">Voeg meterwaarde vaste activa toe</value>
+ <value xml:lang="nl">Meterwaarde vaste activa toevoegen</value>
<value xml:lang="pt">Adicionar leitura de medidor de Ativos Fixos</value>
<value xml:lang="th">Add Fixed Asset Maintenance Meter</value>
<value xml:lang="zh">添加固定资产仪表读数</value>
@@ -377,6 +380,7 @@
<value xml:lang="fr">Ajouter une tâche d'un acteur à une immobilisation</value>
<value xml:lang="hi_IN">अचल संपत्ति में नियत कार्य करने के लिए पार्टी जोड़ें</value>
<value xml:lang="it">Nuova assegnazione cespite a soggetto</value>
+ <value xml:lang="nl">Taaktoewijzing Vaste Activa toevoegen</value>
<value xml:lang="pt">Adicionar Atribuição de Ativos Fixos ao participante</value>
<value xml:lang="th">แก้ไขกลุ่มทรัพย์สินไม่หมุนเวียน</value>
<value xml:lang="zh">添加会员固定资产分配</value>
@@ -389,6 +393,7 @@
<value xml:lang="fr">Ajouter l'enregistrement d'immobilisation</value>
<value xml:lang="hi_IN">अचल संपत्ति के लिए पंजीयन जोड़ें</value>
<value xml:lang="it">Nuova registrazione cespite</value>
+ <value xml:lang="nl">Registratie ID voor Vaste Activa toevoegen</value>
<value xml:lang="pt">Adicionar Registro de de Ativo Fixo</value>
<value xml:lang="ro">Actualizeaza Inregistrare Mijloc Fix</value>
<value xml:lang="ru">Изменить регистраций ОС</value>
@@ -440,7 +445,7 @@
<value xml:lang="hi_IN">नया EFT ख़ाता</value>
<value xml:lang="it">Aggiungi nuovo conto EFT</value>
<value xml:lang="ja">Add New EFT Account</value>
- <value xml:lang="nl">Voeg een nieuwe bankrekening toe</value>
+ <value xml:lang="nl">Nieuwe bankrekening toevoegen</value>
<value xml:lang="pt">Adicionar Nova Conta EFT</value>
<value xml:lang="pt_PT">Adicionar Nova Conta EFT</value>
<value xml:lang="ro">Adauga Nou Cont EFT</value>
@@ -458,7 +463,7 @@
<value xml:lang="hi_IN">नया उपहार ख़ाता</value>
<value xml:lang="it">Aggiungi nuova carta omaggio</value>
<value xml:lang="ja">ギフトカードの追加</value>
- <value xml:lang="nl">Voeg een nieuwe tegoedbon toe</value>
+ <value xml:lang="nl">Tegoedbon toevoegen</value>
<value xml:lang="pt">Adicionar Novo Cartão de presente</value>
<value xml:lang="ro">Adauga Noua Carte Omagiu</value>
<value xml:lang="ru">Добавить новую дисконтную карту</value>
@@ -481,6 +486,7 @@
<property key="AccountingAddPaymentGroupMember">
<value xml:lang="en">Add Payment Group Member</value>
<value xml:lang="hi_IN">भुगतान समूह सदस्य जोड़ें</value>
+ <value xml:lang="nl">Payment Group Member toevoegen</value>
<value xml:lang="pt">Adicionar Membro do Grupo de Pagamento</value>
<value xml:lang="zh">添加支付组成员</value>
<value xml:lang="zh_TW">增加支付群組成員</value>
@@ -488,6 +494,7 @@
<property key="AccountingAddTax">
<value xml:lang="en">Add Tax</value>
<value xml:lang="fr">Ajouter les taxes</value>
+ <value xml:lang="nl">Belastingen toevoegen</value>
<value xml:lang="zh">添加税项</value>
</property>
<property key="AccountingAddTaxAuthorityGlAccount">
@@ -638,6 +645,7 @@
<value xml:lang="fr">Point de l'accord commercial (articles) pour rapport</value>
<value xml:lang="hi_IN">अनुबंध वस्तु उत्पाद के लिए ब्यौरेवार विवरण</value>
<value xml:lang="it">Prodotti riga contratto per i report</value>
+ <value xml:lang="nl">Overeenkomst items producten voor rapport</value>
<value xml:lang="pt">Itens do acordo para o Relatório</value>
<value xml:lang="zh">用于报表的合同条款产品</value>
<value xml:lang="zh_TW">用于報表的合同條款產品</value>
@@ -663,6 +671,7 @@
<value xml:lang="fr">Point de l'accord commercial (articles/fournisseur) pour rapport</value>
<value xml:lang="hi_IN">अनुबंध वस्तु प्रदायक के लिए ब्यौरेवार विवरण</value>
<value xml:lang="it">Prodotti fornitore riga contratto per i report</value>
+ <value xml:lang="nl">Overeenkomst item leverancier producten voor rapport</value>
<value xml:lang="pt">Fornecedores dos itens do acordo para relatório</value>
<value xml:lang="zh">用于报表的合同条款供货商产品</value>
<value xml:lang="zh_TW">用于報表的合同條款供貨商產品</value>
@@ -707,7 +716,7 @@
<value xml:lang="fr">Points d'accord commercial</value>
<value xml:lang="hi_IN">अनुबंध मदें</value>
<value xml:lang="it">Righe Contratto</value>
- <value xml:lang="nl">Overeenkomst Items</value>
+ <value xml:lang="nl">Overeenkomst items</value>
<value xml:lang="pt">Itens do acordo</value>
<value xml:lang="ro">Linii Contract</value>
<value xml:lang="ru">Элементы договора</value>
@@ -991,6 +1000,7 @@
<value xml:lang="fr">Modifier le vendeur</value>
<value xml:lang="hi_IN">विक्रेता को संपादित करें</value>
<value xml:lang="it">Aggiorna fornitore</value>
+ <value xml:lang="nl">Leverancier wijzigen</value>
<value xml:lang="pt">Editar fornecedor</value>
<value xml:lang="zh">编辑供应商</value>
<value xml:lang="zh_TW">編輯供應商</value>
@@ -1031,6 +1041,7 @@
<property key="AccountingApPaymentGroupMenu">
<value xml:lang="en">AP Payment Groups</value>
<value xml:lang="fr">Groupes de paiement AP</value>
+ <value xml:lang="nl">AP Betalingsgroepen</value>
<value xml:lang="pt">Grupos de pagamento de contas a pagar</value>
<value xml:lang="zh">应付支付组</value>
<value xml:lang="zh_TW">應付支付群組</value>
@@ -1218,6 +1229,7 @@
<value xml:lang="fr">Page d'accueil de la comptabilité client</value>
<value xml:lang="hi_IN">मुख्य पृष्ठ प्राप्य खाता</value>
<value xml:lang="it">Pagina principale conto creditori</value>
+ <value xml:lang="nl">Hoofdpagina Debiteuren</value>
<value xml:lang="pt">Página principal do contas a receber</value>
<value xml:lang="zh">应收账户首页</value>
<value xml:lang="zh_TW">應收賬戶首頁</value>
@@ -1269,6 +1281,7 @@
<property key="AccountingArPaymentGroupMenu">
<value xml:lang="en">AR Payment Groups</value>
<value xml:lang="fr">Groupes de paiement</value>
+ <value xml:lang="nl">AP Betalingsgroepen</value>
<value xml:lang="pt">Grupos de Pagamento do Contas a receber</value>
<value xml:lang="zh">应收支付组</value>
<value xml:lang="zh_TW">應收支付群組</value>
@@ -4332,6 +4345,7 @@
<property key="AccountingFindArInvoices">
<value xml:lang="en">Find AR Invoices</value>
<value xml:lang="hi_IN">लेखा प्राप्य चालान खोजें</value>
+ <value xml:lang="nl">Crediteuren facturen vinden</value>
<value xml:lang="pt">Encontrar Faturas do contas a receber</value>
<value xml:lang="zh">查找应收发票</value>
<value xml:lang="zh_TW">找尋應收發票</value>
@@ -4339,6 +4353,7 @@
<property key="AccountingFindArPaymentGroups">
<value xml:lang="en">Find AR Payment Groups</value>
<value xml:lang="fr">Recherche de groupes de paiement</value>
+ <value xml:lang="nl">AR Betalingsgroepen vinden</value>
<value xml:lang="pt">Buscar os grupos de pagamento do contas a receber</value>
<value xml:lang="zh">查找应收支付组</value>
<value xml:lang="zh_TW">找尋應收支付群組</value>
@@ -4346,6 +4361,7 @@
<property key="AccountingFindArPayments">
<value xml:lang="en">Find AR Payments</value>
<value xml:lang="hi_IN">लेखा प्राप्य भुगतान खोजें</value>
+ <value xml:lang="nl">Crediteuren betalingen vinden</value>
<value xml:lang="pt">Encontrar Pagamentos do contas a receber</value>
<value xml:lang="zh">查找应收支付</value>
<value xml:lang="zh_TW">找尋應收支付</value>
@@ -4358,6 +4374,7 @@
</property>
<property key="AccountingFindFinAccountReconciliations">
<value xml:lang="en">Find Financial Account Reconciliations</value>
+ <value xml:lang="nl">Afstemmingen financiele rekeningen vinden</value>
<value xml:lang="pt">Encontrar reconciliações de Conta Financeira</value>
<value xml:lang="zh">查找财务账目对账</value>
</property>
@@ -4397,6 +4414,7 @@
<value xml:lang="en">Find Payment Group</value>
<value xml:lang="fr">Recherche de groupes de paiement</value>
<value xml:lang="hi_IN">भुगतान समूह खोजें</value>
+ <value xml:lang="nl">Betalingsgroep vinden</value>
<value xml:lang="pt">Encontrar Grupo de pagamento</value>
<value xml:lang="zh">查找支付组</value>
<value xml:lang="zh_TW">找尋支付群組</value>
@@ -4405,6 +4423,7 @@
<value xml:lang="en">Find Purchase Invoices</value>
<value xml:lang="fr">Recherche de factures d'achat</value>
<value xml:lang="hi_IN">खरीद चालान खोजें</value>
+ <value xml:lang="nl">Inkoopfactuur vinden</value>
<value xml:lang="pt">Encontrar faturas de compra</value>
<value xml:lang="zh">查找采购发票</value>
<value xml:lang="zh_TW">找尋採購發票</value>
@@ -4437,6 +4456,7 @@
<value xml:lang="en">Find Sales Invoices For Commission Run</value>
<value xml:lang="hi_IN">दलाली भुगतान के लिए बिक्री चालान खोजें</value>
<value xml:lang="it">Ricerca fatture di vendita per commissione</value>
+ <value xml:lang="nl">Verkoopfactuur voor commissierun vinden</value>
<value xml:lang="pt">Encontrar faturas de venda por Comissão</value>
<value xml:lang="zh">为佣金计算查找销售发票</value>
</property>
@@ -4459,6 +4479,7 @@
<property key="AccountingFirstNameOnCardMissing">
<value xml:lang="de">Vorname des Karteninhabers fehlt</value>
<value xml:lang="en">First Name on Card is missing</value>
+ <value xml:lang="nl">Voornaam van de kaarthouder ontbreekt</value>
<value xml:lang="pt">Primeiro nome no cartão está faltando</value>
<value xml:lang="zh">缺少卡上姓名的第一组字母</value>
<value xml:lang="zh_TW">沒有卡片上的名字</value>
@@ -5750,6 +5771,9 @@
<value xml:lang="pt">Reconciliação de contabilidade para: ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="zh">总账对账：${finAccount.finAccountName} [${finAccountId}]</value>
</property>
+ <property key="AccountingGlMappings">
+ <value xml:lang="en">GL Mappings</value>
+ </property>
<property key="AccountingGlobalGLSettings">
<value xml:lang="de">Hauptbuch-Einstellungen, global</value>
<value xml:lang="en">Global GL Settings</value>
@@ -5764,6 +5788,7 @@
</property>
<property key="AccountingGrossMargin">
<value xml:lang="en">Gross Margin</value>
+ <value xml:lang="nl">Bruto marge</value>
<value xml:lang="pt">Margem Bruta</value>
<value xml:lang="zh">毛利</value>
</property>
@@ -5851,6 +5876,7 @@
</property>
<property key="AccountingIncomeFromOperations">
<value xml:lang="en">Income From Operations</value>
+ <value xml:lang="nl">Operationele inkomsten</value>
<value xml:lang="pt">Resultado Operacional</value>
<value xml:lang="zh">营运收入</value>
</property>
@@ -8239,6 +8265,7 @@
</property>
<property key="AccountingOperatingExpenses">
<value xml:lang="en">Operating Expenses</value>
+ <value xml:lang="nl">Operationele kosten</value>
<value xml:lang="pt">Despesas Operacionais</value>
<value xml:lang="zh">营业费用</value>
</property>
@@ -8335,6 +8362,7 @@
<value xml:lang="fr">Réf. d'org.</value>
<value xml:lang="hi_IN">संगठन पार्टी क्रमांक</value>
<value xml:lang="it">Organizzazione</value>
+ <value xml:lang="nl">Organisatie ID</value>
<value xml:lang="pt">ID de organização participante</value>
<value xml:lang="th">รหัสองค์กรกลุ่มผู้ใช้</value>
<value xml:lang="zh">组织会员标识</value>
@@ -8642,6 +8670,7 @@
<property key="AccountingPastDueInvoices">
<value xml:lang="en">Past Due Invoices</value>
<value xml:lang="fr">Factures en attente de règlement</value>
+ <value xml:lang="nl">Vervallen facturen</value>
<value xml:lang="pt">Faturas passdas em débito</value>
<value xml:lang="zh">过期发票</value>
</property>
@@ -10481,6 +10510,7 @@
<value xml:lang="en">Purchase Invoices</value>
<value xml:lang="fr">Factures d'achat</value>
<value xml:lang="hi_IN">खरीद चालान</value>
+ <value xml:lang="nl">Inkoopfacturen</value>
<value xml:lang="pt">Faturas de Compra</value>
<value xml:lang="zh">采购发票</value>
</property>
@@ -10520,6 +10550,7 @@
<value xml:lang="fr">Taux</value>
<value xml:lang="hi_IN">मूल्य</value>
<value xml:lang="it">Tassi</value>
+ <value xml:lang="nl">Tarieven</value>
<value xml:lang="pt">Tarifas</value>
<value xml:lang="zh">税率</value>
<value xml:lang="zh_TW">稅率</value>
@@ -10557,6 +10588,7 @@
<value xml:lang="de">Kontenabstimmung</value>
<value xml:lang="en">Reconciliation</value>
<value xml:lang="hi_IN">मिलाप</value>
+ <value xml:lang="nl">Afstemming</value>
<value xml:lang="pt">Reconciliação</value>
<value xml:lang="zh">对账</value>
<value xml:lang="zh_TW">調節</value>
@@ -10772,6 +10804,7 @@
<property key="AccountingSagePayPaymentError">
<value xml:lang="en">Problem at SagePay</value>
<value xml:lang="it">Problemi di SagePay</value>
+ <value xml:lang="nl">Probleem bij SagePay</value>
<value xml:lang="zh">SagePay出错</value>
</property>
<property key="AccountingSagePayPaymentInvalidInformationPassed">
@@ -10792,6 +10825,7 @@
<property key="AccountingSagePayPaymentRefunded">
<value xml:lang="en">Payment Refunded</value>
<value xml:lang="it">Pagamento rimborsato</value>
+ <value xml:lang="nl">Betaling teruggewezen</value>
<value xml:lang="zh">支付已退</value>
</property>
<property key="AccountingSagePayPaymentReleaseRequestMalformed">
@@ -10903,6 +10937,7 @@
<value xml:lang="de">Vertreter</value>
<value xml:lang="en">Sales Agents</value>
<value xml:lang="hi_IN">विक्रय दलाल</value>
+ <value xml:lang="nl">Vertegenwoordiger</value>
<value xml:lang="pt">Agentes de Vendas</value>
<value xml:lang="zh">销售代理</value>
<value xml:lang="zh_TW">銷售代理</value>
@@ -10926,6 +10961,7 @@
<value xml:lang="de">Verkaufsrechnungen</value>
<value xml:lang="en">Sales Invoices</value>
<value xml:lang="hi_IN">विक्रय चालान </value>
+ <value xml:lang="nl">Verkoopfacturen</value>
<value xml:lang="pt">Faturas</value>
<value xml:lang="zh">销售发票</value>
<value xml:lang="zh_TW">銷售發票</value>
@@ -10948,23 +10984,27 @@
<property key="AccountingSecurityPayNotProperlyConfigurated">
<value xml:lang="en">ERROR: Getting SecurePay property configuration</value>
<value xml:lang="it">ERRORE: Ricavando la configurazione di SecurePay</value>
+ <value xml:lang="nl">ERROR: ophalen SecurePay configuratie</value>
<value xml:lang="zh">错误：获取SecurePay属性设置时</value>
</property>
<property key="AccountingSecurityPayPaymentWasNotSent">
<value xml:lang="en">Payment was not sent to server.</value>
<value xml:lang="it">Pagamento non è stato inviato al server.</value>
+ <value xml:lang="nl">Betaling is niet naar de server verzonden</value>
<value xml:lang="zh">支付没有发送到服务器。</value>
</property>
<property key="AccountingSelectAction">
<value xml:lang="en">Select Action</value>
<value xml:lang="fr">Choisir une action</value>
<value xml:lang="hi_IN">कार्य चुनें</value>
+ <value xml:lang="nl">Actie selecteren</value>
<value xml:lang="pt">Selecionar Ação</value>
<value xml:lang="zh">选择操作</value>
</property>
<property key="AccountingSelectPartiesForCommissionInvoice">
<value xml:lang="en">Select The Parties For Commission Invoice</value>
<value xml:lang="hi_IN">दलाली चालान के लिए पार्टियों चुनें</value>
+ <value xml:lang="nl">Partijen voor commisiefactuur selecteren</value>
<value xml:lang="pt">Selecionar participantes para fatura de Comissão</value>
<value xml:lang="zh">为佣金发票选择会员</value>
</property>
@@ -11438,6 +11478,7 @@
<property key="AccountingTaxCannotCalculate">
<value xml:lang="en">Cannot calculate tax, no shipping or.......</value>
<value xml:lang="it">Non è possibile calcolare le tasse, nessuna spedizione o.......</value>
+ <value xml:lang="nl">Belasting kan niet berekend worden, geen transport of .....</value>
<value xml:lang="pt">Não é possível calcular o imposto, não envio ou .......</value>
<value xml:lang="zh">无法算税，没有运输或......</value>
</property>
@@ -11477,6 +11518,7 @@
<property key="AccountingTermAmount">
<value xml:lang="en">Term Amount</value>
<value xml:lang="hi_IN">शर्त राशी</value>
+ <value xml:lang="nl">Conditie bedrag</value>
<value xml:lang="pt">Quantia do prazo</value>
<value xml:lang="zh">期金额</value>
</property>
@@ -11512,6 +11554,7 @@
<property key="AccountingTheBalanceOfLastYear">
<value xml:lang="en">The balance of last year</value>
<value xml:lang="hi_IN">पिछले वर्ष का शेष</value>
+ <value xml:lang="nl">Saldo vorig jaar</value>
<value xml:lang="pt">O saldo do ano passado</value>
<value xml:lang="zh">上年余额</value>
</property>
@@ -11626,47 +11669,55 @@
<property key="AccountingTotalCashBalance">
<value xml:lang="en">Total Cash Balance</value>
<value xml:lang="hi_IN">कुल नकदी शेष</value>
+ <value xml:lang="nl">Totaal saldo cash</value>
<value xml:lang="pt">Saldo Total em caixa</value>
<value xml:lang="zh">现金余额合计</value>
</property>
<property key="AccountingTotalClosingCashBalance">
<value xml:lang="en">Total Closing Cash Balance</value>
<value xml:lang="hi_IN">कुल बंद नकदी शेष</value>
+ <value xml:lang="nl">Totaal eindbalans cash</value>
<value xml:lang="pt">Saldo Total de Caixa de Encerramento</value>
<value xml:lang="zh">期末现金余额</value>
</property>
<property key="AccountingTotalCommissionAmount">
<value xml:lang="en">Total Commission Amount</value>
<value xml:lang="hi_IN">कुल दलाली राशी</value>
+ <value xml:lang="nl">Totaal bedrag commissies</value>
<value xml:lang="pt">Quantia Total da Comissão</value>
<value xml:lang="zh">佣金合计</value>
</property>
<property key="AccountingTotalCostCenterAmount">
<value xml:lang="en">Cost center amount percentage saved successfully</value>
+ <value xml:lang="nl">Percentage kostenplaats succesvol opgeslagen</value>
<value xml:lang="pt">Porcentagem da Quantia central de custo salva com sucesso</value>
<value xml:lang="zh">成功保存了费用中心金额百分比</value>
</property>
<property key="AccountingTotalCredit_Disbursement">
<value xml:lang="en">Total Credit(Disbursement)</value>
<value xml:lang="hi_IN">कुल जमा</value>
+ <value xml:lang="nl">Totaal Credit (betalingen)</value>
<value xml:lang="pt">Crédito Total (Desembolso)</value>
<value xml:lang="zh">贷方合计（支出）</value>
</property>
<property key="AccountingTotalCurrentAssetBalance">
<value xml:lang="en">Total Current Asset Balance</value>
<value xml:lang="hi_IN">कुल चालू सम्पत्ति राशी</value>
+ <value xml:lang="nl">Totaal vlottende activa</value>
<value xml:lang="pt">Total do Balanço Patrimonial atual</value>
<value xml:lang="zh">流动资产余额合计</value>
</property>
<property key="AccountingTotalDebit_Receipts">
<value xml:lang="en">Total Debit(Receipts)</value>
<value xml:lang="hi_IN">कुल नामे</value>
+ <value xml:lang="nl">Totaal Debet (ontvangsten)</value>
<value xml:lang="pt">Débito Total (Recibos)</value>
<value xml:lang="zh">借方合计（收入）</value>
</property>
<property key="AccountingTotalEndingCashBalance">
<value xml:lang="en">Total Ending Cash Balance</value>
<value xml:lang="hi_IN">कुल अंतिम नकदी शेष</value>
+ <value xml:lang="nl">Totaal eindbalans cash</value>
<value xml:lang="pt">Saldo Total Final de Caixa</value>
<value xml:lang="zh">期末现金余额合计</value>
</property>
@@ -11699,48 +11750,56 @@
<property key="AccountingTotalNetSales">
<value xml:lang="en">Total Net Sales</value>
<value xml:lang="hi_IN">कुल शुद्ध विक्रय</value>
+ <value xml:lang="nl">Totaal netto verkopen</value>
<value xml:lang="pt">Total das vendas líquidas</value>
<value xml:lang="zh">净销售合计</value>
</property>
<property key="AccountingTotalNumberOfOrders">
<value xml:lang="en">Total Number of Orders</value>
<value xml:lang="hi_IN">कुल आदेशों की संख्या</value>
+ <value xml:lang="nl">Totaal aantal orders</value>
<value xml:lang="pt">Número total de pedidos</value>
<value xml:lang="zh">订单数量合计</value>
</property>
<property key="AccountingTotalOfTheCurrentMonth">
<value xml:lang="en">Total of the current month</value>
<value xml:lang="hi_IN">चालू माह के कुल</value>
+ <value xml:lang="nl">Totaal van huidige maand</value>
<value xml:lang="pt">Total do mês atual</value>
<value xml:lang="zh">当月合计</value>
</property>
<property key="AccountingTotalOfYearToDate">
<value xml:lang="en">Total of Year To Date</value>
<value xml:lang="hi_IN">वर्ष से दिनांक का कुल</value>
+ <value xml:lang="nl">Totaal van jaar tot nu</value>
<value xml:lang="pt">Total do Ano até o momento</value>
<value xml:lang="zh">当年合计</value>
</property>
<property key="AccountingTotalOpeningCashBalance">
<value xml:lang="en">Total Opening Cash Balance</value>
<value xml:lang="hi_IN">कुल अथ नकदी शेष</value>
+ <value xml:lang="nl">Totaal openingsbalans cash</value>
<value xml:lang="pt">Saldo de Abertura de Caixa Total</value>
<value xml:lang="zh">期初现金余额合计</value>
</property>
<property key="AccountingTotalOperationalCashBalance">
<value xml:lang="en">Total Operational Cash Balance</value>
<value xml:lang="hi_IN">कुल क्रियाशील नकदी</value>
+ <value xml:lang="nl">Totaal operationele balans cash</value>
<value xml:lang="pt">Saldo de Caixa Operacional Total</value>
<value xml:lang="zh">现金余额合计</value>
</property>
<property key="AccountingTotalPeriodCashBalance">
<value xml:lang="en">Total Period Cash Balance</value>
<value xml:lang="hi_IN">कुल अवधि नकदी शेष</value>
+ <value xml:lang="nl">Totaal periode balans cash</value>
<value xml:lang="pt">Saldo Total do período em caixa</value>
<value xml:lang="zh">时间段现金余额合计</value>
</property>
<property key="AccountingTotalQuantityOnHand">
<value xml:lang="en">Total Quantity On Hand</value>
<value xml:lang="hi_IN">कुल मात्रा हाथ पर</value>
+ <value xml:lang="nl">Totaal hoeveelheden onder handen</value>
<value xml:lang="pt">Total das quantidades disponíveis</value>
<value xml:lang="zh">现存数量合计</value>
</property>
@@ -11757,6 +11816,7 @@
<property key="AccountingTransactionIsAlreadyReconciled">
<value xml:lang="en">Transaction Is already Reconciled</value>
<value xml:lang="hi_IN">गतिविधि पहले से ही समझौता है</value>
+ <value xml:lang="nl">Transactie is al afgestemd</value>
<value xml:lang="pt">Transação já foi reconciliada</value>
<value xml:lang="zh">交易已经对过账了</value>
</property>
@@ -11774,6 +11834,7 @@
<property key="AccountingTransactionTotalsReport">
<value xml:lang="en">Transaction Totals Report</value>
<value xml:lang="hi_IN">गतिविधि योग ब्यौरेवार विवरण</value>
+ <value xml:lang="nl">Rapport transatie-totalen</value>
<value xml:lang="pt">Relatório de Transações totais</value>
<value xml:lang="zh">交易总额报告</value>
</property>
@@ -14706,6 +14767,9 @@
<value xml:lang="pt">Nova categoria de Conta Razão</value>
<value xml:lang="zh">新建总账账户分类</value>
</property>
+ <property key="FormFieldTitle_NextDepreciationAmount">
+ <value xml:lang="en">Next depreciation amount</value>
+ </property>
<property key="FormFieldTitle_notApplied">
<value xml:lang="en">Not Applied</value>
<value xml:lang="fr">Non alloué</value>
@@ -15828,6 +15892,7 @@
<value xml:lang="en">Source Id</value>
<value xml:lang="hi_IN">स्रोत क्रमांक(SourceId)</value>
<value xml:lang="it">Id sorgente</value>
+ <value xml:lang="nl">Bron ID</value>
<value xml:lang="pt">Id da fonte</value>
<value xml:lang="zh">来源标识</value>
<value xml:lang="zh_TW">來源編號</value>
@@ -16023,7 +16088,7 @@
<value xml:lang="fr">Valeur du texte</value>
<value xml:lang="hi_IN">पाठ्य मान</value>
<value xml:lang="it">Testo Valore</value>
- <value xml:lang="nl">Text Value</value>
+ <value xml:lang="nl">Textwaarde</value>
<value xml:lang="pt">Valor do Texto</value>
<value xml:lang="ru">Текстовое значение</value>
<value xml:lang="th">ค่าตัวอักษร</value>
@@ -16043,6 +16108,7 @@
<value xml:lang="en">Thru Due Date</value>
<value xml:lang="fr">Jusqu'à la date d'échéance</value>
<value xml:lang="hi_IN">अन्तिम दिनांक तक</value>
+ <value xml:lang="nl">Tot vervaldatum</value>
<value xml:lang="pt">Data de Vencimento do débito</value>
<value xml:lang="zh">截止日期终于</value>
</property>
@@ -16050,6 +16116,7 @@
<value xml:lang="en">Thru Invoice Date</value>
<value xml:lang="fr">Jusqu'à la date de facture</value>
<value xml:lang="hi_IN">चालान दिनांक तक</value>
+ <value xml:lang="nl">Tot factuurdatum</value>
<value xml:lang="pt">Data de vencimento da fatura</value>
<value xml:lang="zh">发票截止日期</value>
</property>
@@ -16077,6 +16144,7 @@
<value xml:lang="fr">Réf de feuille d'activité d'un acteur</value>
<value xml:lang="hi_IN">Timesheet पार्टी क्रमांक</value>
<value xml:lang="it">Soggetto Timbratura</value>
+ <value xml:lang="nl">Party ID Urenstaat</value>
<value xml:lang="pt">ID do participante da folha de horas trabalhadas</value>
<value xml:lang="zh">工时表会员标识</value>
<value xml:lang="zh_TW">工時表成員ID</value>
@@ -16129,6 +16197,7 @@
<value xml:lang="fr">Total alloué</value>
<value xml:lang="hi_IN">कुल एप्लाइड चालान</value>
<value xml:lang="it">Totale fattura applicato</value>
+ <value xml:lang="nl">Totaal rekening toegepast</value>
<value xml:lang="pt">Total da fatura Aplicada</value>
<value xml:lang="zh">全部已开发票</value>
<value xml:lang="zh_TW">全部已開發票</value>
@@ -16138,6 +16207,7 @@
<value xml:lang="fr">Montant total</value>
<value xml:lang="hi_IN">कुल राशि</value>
<value xml:lang="it">Importo Totale</value>
+ <value xml:lang="nl">Totaal bedrag</value>
<value xml:lang="pt">Quantia Total</value>
<value xml:lang="zh">金额合计</value>
<value xml:lang="zh_TW">金額合計</value>
@@ -16145,6 +16215,7 @@
<property key="FormFieldTitle_totalOfCurrentFiscalPeriod">
<value xml:lang="en">Total of Current Fiscal Period</value>
<value xml:lang="hi_IN">चालू वित्त वर्ष अवधि का कुल</value>
+ <value xml:lang="nl">Totaal van huidige fiscale period</value>
<value xml:lang="pt">Total do período fiscal atual</value>
<value xml:lang="zh">本财年合计</value>
</property>
@@ -16423,6 +16494,9 @@
<value xml:lang="pt">Pagamentos de Depósito e Criar lote</value>
<value xml:lang="zh">存款支付并创建批量处理</value>
</property>
+ <property key="PageTitleFixedAssetDepreciationHistory">
+ <value xml:lang="en">Deprecation history</value>
+ </property>
<property key="PageTitleEditAgreement">
<value xml:lang="de">Vereinbarung ändern</value>
<value xml:lang="en">Edit Agreement</value>
diff --git a/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign b/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
index 769b1ed..a970fce 100644
--- a/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
+++ b/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<list-property name="userProperties">
diff --git a/applications/accounting/webapp/ar/invoice/ListInvoices.ftl b/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
index ac1d949..49ce28a 100644
--- a/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
+++ b/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
@@ -181,7 +181,6 @@
<td><@ofbizCurrency amount=invoicePaymentInfo.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td>
<td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td>
<td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td>
- mlml
<td align="right"><input type="checkbox" id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}" onclick="javascript:getInvoiceRunningTotal();"/></td>
</tr>
<#-- toggle the row color -->
diff --git a/applications/accounting/widget/FixedAssetForms.xml b/applications/accounting/widget/FixedAssetForms.xml
index 7940fcd..3e40e96 100644
--- a/applications/accounting/widget/FixedAssetForms.xml
+++ b/applications/accounting/widget/FixedAssetForms.xml
@@ -731,7 +731,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="GlobalFixedAssetTypeGlAccounts" type="list"
+ <form name="GlobalFixedAssetTypeGlAccounts" type="list" list-name="globalFixedAssetTypeGlAccounts"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FixedAssetTypeGlAccount" list="globalFixedAssetTypeGlAccounts">
@@ -751,7 +751,7 @@
<field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
<field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
</form>
- <form name="FixedAssetTypeGlAccounts" type="list"
+ <form name="FixedAssetTypeGlAccounts" type="list" list-name="fixedAssetTypeGlAccounts"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FixedAssetTypeGlAccount" list="fixedAssetTypeGlAccounts">
diff --git a/applications/accounting/widget/FixedAssetScreens.xml b/applications/accounting/widget/FixedAssetScreens.xml
index 3a333e7..5647716 100644
--- a/applications/accounting/widget/FixedAssetScreens.xml
+++ b/applications/accounting/widget/FixedAssetScreens.xml
@@ -529,12 +529,12 @@
<section>
<widgets>
<screenlet title="${uiLabelMap.PageTitleFixedAssetDepreciationHistory}">
- <label style="h3">${uiLabelMap.FixedAssetPurchaseCost}: ${fixedAsset.purchaseCost}</label>
- <label style="h3">${uiLabelMap.FixedAssetDepreciation}: ${depreciation}</label>
- <label style="h3">${uiLabelMap.FixedAssetSalvageValue}: ${fixedAsset.salvageValue}</label>
- <label style="h3">${uiLabelMap.FixedAssetDateAcquired}: ${fixedAsset.dateAcquired}</label>
- <label style="h3">${uiLabelMap.FixedAssetExpectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label>
- <label style="h3">${uiLabelMap.FixedAssetNextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label>
+ <label style="h3">${uiLabelMap.FormFieldTitle_purchaseCost}: ${fixedAsset.purchaseCost}</label>
+ <label style="h3">${uiLabelMap.FormFieldTitle_depreciation}: ${depreciation}</label>
+ <label style="h3">${uiLabelMap.FormFieldTitle_salvageValue}: ${fixedAsset.salvageValue}</label>
+ <label style="h3">${uiLabelMap.FormFieldTitle_dateAcquired}: ${fixedAsset.dateAcquired}</label>
+ <label style="h3">${uiLabelMap.FormFieldTitle_expectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label>
+ <label style="h3">${uiLabelMap.FormFieldTitle_NextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label>
<section>
<condition>
<and>
@@ -577,7 +577,7 @@
<include-form name="AddFixedAssetDepMethod" location="component://accounting/widget/FixedAssetForms.xml"/>
<include-form name="ListFixedAssetDepMethods" location="component://accounting/widget/FixedAssetForms.xml"/>
</screenlet>
- <screenlet title="GL Mappings">
+ <screenlet title="${uiLabelMap.AccountingGlMappings}">
<include-form name="AddFixedAssetTypeGlAccount" location="component://accounting/widget/FixedAssetForms.xml"/>
<label style="h3">${uiLabelMap.PageTitleFixedAssetMappings}</label>
<include-form name="FixedAssetTypeGlAccounts" location="component://accounting/widget/FixedAssetForms.xml"/>
diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
index fbdcc67..28e983d 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -1192,7 +1192,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FixedAssetTypeGlAccounts" type="list"
+ <form name="FixedAssetTypeGlAccounts" type="list" list-name="fixedAssetTypeGlAccounts"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FixedAssetTypeGlAccount" list="fixedAssetTypeGlAccounts">
diff --git a/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml b/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml
index daf7116..1f5e480 100644
--- a/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml
+++ b/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml
@@ -38,7 +38,7 @@
<response name="success" type="view" value="showMessage"/>
</request-map>
- <!-- party requests -->
+ <!-- party requests -->
<request-map uri="updatePartyGroup">
<security https="true" auth="true"/>
<event type="service" path="" invoke="updatePartyGroup"/>
diff --git a/applications/commonext/widget/ofbizsetup/CommonScreens.xml b/applications/commonext/widget/ofbizsetup/CommonScreens.xml
index 733cdab..61908ef 100644
--- a/applications/commonext/widget/ofbizsetup/CommonScreens.xml
+++ b/applications/commonext/widget/ofbizsetup/CommonScreens.xml
@@ -52,11 +52,11 @@
</screen>
<screen name="CommonPartyDecorator">
- <section>
- <widgets>
+ <section>
+ <widgets>
<include-screen name="CommonSetupDecorator"/>
- </widgets>
- </section>
+ </widgets>
+ </section>
</screen>
<screen name="CommonSetupDecorator">
diff --git a/applications/content/data/DemoBlogEntryData.xml b/applications/content/data/DemoBlogEntryData.xml
index 1fe6172..724c877 100644
--- a/applications/content/data/DemoBlogEntryData.xml
+++ b/applications/content/data/DemoBlogEntryData.xml
@@ -18,7 +18,7 @@
under the License.
-->
<entity-engine-xml>
- <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" isPublic="Y" createdByUserLogin="admin" createdDate="2004-01-16 01:24:06.522" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406" lastModifiedByUserLogin="admin" lastModifiedDate="2010-09-26 13:13:32.482" lastUpdatedStamp="2010-09-26 13:13:32.483" lastUpdatedTxStamp="2010-09-26 13:13:32.429" mimeTypeId="application/octet-stream" statusId="CTNT_PUBLISHED"/>
+ <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" isPublic="Y" createdByUserLogin="admin" createdDate="2004-01-16 01:24:06.522" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406" lastModifiedByUserLogin="admin" lastModifiedDate="2010-09-26 13:13:32.482" lastUpdatedStamp="2010-09-26 13:13:32.483" lastUpdatedTxStamp="2010-09-26 13:13:32.429" mimeTypeId="application/octet-stream" statusId="CTNT_PUBLISHED"/>
<DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" mimeTypeId="image/jpeg" objectInfo="specialpurpose/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.843" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.843" createdTxStamp="2007-01-23 16:46:21.406"/>
<DataResource dataResourceId="BLG10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:46:22.984" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.671" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.671" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.984" createdTxStamp="2007-01-23 16:46:21.406"/>
<DataResource dataResourceId="BLG10003" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:47:49.343" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:47:49.343" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:47:49.343" lastUpdatedTxStamp="2007-01-23 16:47:49.328" createdStamp="2007-01-23 16:47:49.343" createdTxStamp="2007-01-23 16:47:49.328"/>
diff --git a/applications/content/src/org/ofbiz/content/content/ContentSearch.java b/applications/content/src/org/ofbiz/content/content/ContentSearch.java
index e094f23..467f9ba 100644
--- a/applications/content/src/org/ofbiz/content/content/ContentSearch.java
+++ b/applications/content/src/org/ofbiz/content/content/ContentSearch.java
@@ -460,7 +460,7 @@
// ======================================================================
@SuppressWarnings("serial")
- public static abstract class ContentSearchConstraint implements java.io.Serializable {
+ public static abstract class ContentSearchConstraint implements java.io.Serializable {
public ContentSearchConstraint() { }
public abstract void addConstraint(ContentSearchContext contentSearchContext);
@@ -470,7 +470,7 @@
@SuppressWarnings("serial")
- public static class ContentAssocConstraint extends ContentSearchConstraint {
+ public static class ContentAssocConstraint extends ContentSearchConstraint {
public static final String constraintName = "ContentAssoc";
protected String contentId;
protected String contentAssocTypeId;
diff --git a/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java b/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java
index c6327ce..8a8e8f1 100644
--- a/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java
+++ b/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java
@@ -43,7 +43,7 @@
public static final String module = ContentSearchSession.class.getName();
@SuppressWarnings("serial")
- public static class ContentSearchOptions implements java.io.Serializable {
+ public static class ContentSearchOptions implements java.io.Serializable {
protected List<ContentSearchConstraint> constraintList = null;
protected ResultSortOrder resultSortOrder = null;
protected Integer viewIndex = null;
diff --git a/applications/content/webapp/content/WEB-INF/controller.xml b/applications/content/webapp/content/WEB-INF/controller.xml
index a30e237..9c95010 100644
--- a/applications/content/webapp/content/WEB-INF/controller.xml
+++ b/applications/content/webapp/content/WEB-INF/controller.xml
@@ -745,7 +745,7 @@
<response name="success" type="view" value="EditDataResourceRole"/>
<response name="error" type="view" value="EditDataResourceRole"/>
</request-map>
-
+
<!-- ================ DataResourceProductFeature Requests ================= -->
<request-map uri="EditDataResourceProductFeatures">
<security auth="true" https="true"/>
diff --git a/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl b/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
deleted file mode 100644
index e69de29..0000000
--- a/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
+++ /dev/null
diff --git a/applications/order/config/OrderEntityLabels.xml b/applications/order/config/OrderEntityLabels.xml
index 7d69f96..3398268 100644
--- a/applications/order/config/OrderEntityLabels.xml
+++ b/applications/order/config/OrderEntityLabels.xml
@@ -463,7 +463,7 @@
<value xml:lang="es">Pedido de Venta</value>
<value xml:lang="fr">Ventes</value>
<value xml:lang="it">Ordine di vendita</value>
- <value xml:lang="nl">Verkoopbestelling</value>
+ <value xml:lang="nl">Verkoopbestelling</value>
<value xml:lang="pt_BR">Pedido de vendas</value>
<value xml:lang="ro">Vanzare</value>
<value xml:lang="ru">Продажи</value>
diff --git a/applications/party/config/PartyEntityLabels.xml b/applications/party/config/PartyEntityLabels.xml
index ae2cb99..53a21ef 100644
--- a/applications/party/config/PartyEntityLabels.xml
+++ b/applications/party/config/PartyEntityLabels.xml
@@ -1273,7 +1273,7 @@
<value xml:lang="fr">Contact</value>
<value xml:lang="hi_IN">संपर्क</value>
<value xml:lang="it">Contatto</value>
- <value xml:lang="nl">Contact</value>
+ <value xml:lang="nl">Contact</value>
<value xml:lang="pt_BR">Contato</value>
<value xml:lang="ro">Contact</value>
<value xml:lang="ru">Контакт</value>
@@ -2114,7 +2114,7 @@
<value xml:lang="fr">Contact</value>
<value xml:lang="hi_IN">संपर्क</value>
<value xml:lang="it">Contatto</value>
- <value xml:lang="nl">Contact</value>
+ <value xml:lang="nl">Contact</value>
<value xml:lang="pt_BR">Contato</value>
<value xml:lang="ro">Contat</value>
<value xml:lang="ru">Контакт</value>
diff --git a/applications/party/data/PartyDemoData.xml b/applications/party/data/PartyDemoData.xml
index 5b7ceb8..72703cc 100644
--- a/applications/party/data/PartyDemoData.xml
+++ b/applications/party/data/PartyDemoData.xml
@@ -48,9 +48,9 @@
<!-- new registration notification -->
<EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
- <!-- make admin an employee of Company -->
+ <!-- make admin an employee of Company -->
<PartyRole partyId="admin" roleTypeId="CONTACT"/>
<PartyRole partyId="Company" roleTypeId="ACCOUNT"/>
<PartyRelationship partyIdFrom="Company" roleTypeIdFrom="ACCOUNT" partyIdTo="admin" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00.000" partyRelationshipTypeId="EMPLOYMENT"/>
-
+
</entity-engine-xml>
diff --git a/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml b/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
index e4bb63e..c2cf6f3 100644
--- a/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
+++ b/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
@@ -318,29 +318,23 @@
<simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address">
<set field="input.filterByDate" value="Y"/>
<set field="input.inputFields.infoString" from-field="parameters.address"/>
- <if-empty field="parameters.caseInsensitive">
- <call-bsh><![CDATA[
- String caseInsensitiveEmail = org.ofbiz.base.util.UtilProperties.getPropertyValue("general.properties", "mail.address.caseInsensitive", "N");
- parameters.put("caseInsensitive", caseInsensitiveEmail);
- ]]></call-bsh>
+ <set field="caseInsensitive" from-field="parameters.caseInsensitive"/>
+ <if-empty field="caseInsensitive">
+ <property-to-field resource="general.properties" property="mail.address.caseInsensitive" field="caseInsensitive" default="N"/>
</if-empty>
- <set field="input.inputFields.infoString_ic" from-field="parameters.caseInsensitive"/>
- <log level="info" message="findPartyFromEmailAddress with case insensitive search: ${parameters.caseInsensitive}"/>
-
+ <set field="input.inputFields.infoString_ic" from-field="caseInsensitive"/>
<if-empty field="parameters.fromDate">
<set field="input.filterByDate" value="Y"/>
<else>
<set field="input.filterByDateValue" from-field="parameters.fromDate"/>
</else>
</if-empty>
-
<!-- try primary email address -->
<set field="input.inputFields.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
<set field="input.entityName" value="PartyContactDetailByPurpose"/>
<call-service service-name="performFindItem" in-map-name="input">
<results-to-map map-name="results"/>
</call-service>
-
<!-- any other email address -->
<if-empty field="results.item">
<set field="input.entityName" value="PartyAndContactMech"/>
@@ -349,12 +343,10 @@
<results-to-map map-name="results"/>
</call-service>
</if-empty>
-
<if-not-empty field="results.item">
<field-to-result field="results.item.partyId" result-name="partyId"/>
<field-to-result field="results.item.contactMechId" result-name="contactMechId"/>
</if-not-empty>
-
</simple-method>
<simple-method method-name="findPartyFromTelephone" short-description="Find partyId from the telephone number">
diff --git a/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy b/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy
index ffcdefb..99a0e87 100644
--- a/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy
+++ b/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.ofbiz.entity.*;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.base.util.*;
diff --git a/applications/product/config/ImageProperties.xml b/applications/product/config/ImageProperties.xml
index 5b2038d..025bf5f 100644
--- a/applications/product/config/ImageProperties.xml
+++ b/applications/product/config/ImageProperties.xml
@@ -47,7 +47,7 @@
<dimension name="height" value="112"/>
<dimension name="width" value="150"/>
</size>
- <size name="320x240">
+ <size name="320x240">
<dimension name="height" value="240"/>
<dimension name="width" value="320"/>
</size>
diff --git a/applications/product/entitydef/entitymodel.xml b/applications/product/entitydef/entitymodel.xml
index 14c84dc..3ec2389 100644
--- a/applications/product/entitydef/entitymodel.xml
+++ b/applications/product/entitydef/entitymodel.xml
@@ -1045,11 +1045,16 @@
<view-entity entity-name="FacilityAndContactMech" package-name="org.ofbiz.product.facility" title="Facility and Contact Mech View Entity">
<member-entity entity-alias="FA" entity-name="Facility"/>
<member-entity entity-alias="CM" entity-name="FacilityContactMech"/>
+ <member-entity entity-alias="MC" entity-name="ContactMech"/>
<alias-all entity-alias="FA"/>
<alias-all entity-alias="CM"/>
+ <alias-all entity-alias="MC"/>
<view-link entity-alias="FA" rel-entity-alias="CM">
<key-map field-name="facilityId"/>
</view-link>
+ <view-link entity-alias="CM" rel-entity-alias="MC">
+ <key-map field-name="contactMechId"/>
+ </view-link>
</view-entity>
<entity entity-name="FacilityAttribute" package-name="org.ofbiz.product.facility" title="Facility Attribute Entity">
<field name="facilityId" type="id-ne"></field>
diff --git a/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java b/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java
index b505e1b..0329307 100644
--- a/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java
+++ b/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java
@@ -189,7 +189,7 @@
urlBuilder.append(CATALOG_URL_MOUNT_POINT);
if (UtilValidate.isNotEmpty(currentCategoryId)) {
- crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId);
+ crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId);
for (String trailCategoryId: crumb) {
if ("TOP".equals(trailCategoryId)) continue;
urlBuilder.append("/");
diff --git a/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java b/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
index 0dae7b6..9659577 100644
--- a/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
+++ b/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
@@ -307,6 +307,21 @@
this.issueItemsToShipment(shipmentId, locale);
this.updateProduct();
+ // Set PicklistItem to Complete
+ List<GenericValue> picklistItems = this.getDelegator().findByAnd("PicklistItem", UtilMisc.toMap("orderId", orderId));
+ for (GenericValue item : picklistItems) {
+ Map<String, Object> setPicklistItemToCompleteCtx = FastMap.newInstance();
+ setPicklistItemToCompleteCtx.put("picklistBinId", item.get("picklistBinId"));
+ setPicklistItemToCompleteCtx.put("orderId", orderId);
+ setPicklistItemToCompleteCtx.put("orderItemSeqId", item.get("orderItemSeqId"));
+ setPicklistItemToCompleteCtx.put("shipGroupSeqId", item.get("shipGroupSeqId"));
+ setPicklistItemToCompleteCtx.put("inventoryItemId", item.get("inventoryItemId"));
+ setPicklistItemToCompleteCtx.put("quantity", item.get("quantity"));
+ setPicklistItemToCompleteCtx.put("itemStatusId", "PICKITEM_COMPLETED");
+ setPicklistItemToCompleteCtx.put("userLogin", this.getUserLogin());
+ this.getDispatcher().runSync("setPicklistItemToComplete", setPicklistItemToCompleteCtx);
+ }
+
// Update the shipment status to Picked, this will trigger createInvoicesFromShipment and finally a invoice will be created
Map<String, Object> updateShipmentCtx = FastMap.newInstance();
updateShipmentCtx.put("shipmentId", shipmentId);
diff --git a/applications/product/testdef/data/IssuanceTestData.xml b/applications/product/testdef/data/IssuanceTestData.xml
index 2e9e060..715f8fc 100644
--- a/applications/product/testdef/data/IssuanceTestData.xml
+++ b/applications/product/testdef/data/IssuanceTestData.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entity-engine-xml>
diff --git a/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy b/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy
index 7efa39f..04f597b 100644
--- a/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy
+++ b/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
productCategoryId = parameters.productCategoryId;
if (productCategoryId) {
productCategoryContents = delegator.findByAnd("ProductCategoryContent", ["productCategoryId" : productCategoryId]);
diff --git a/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy b/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy
index 1254b16..7366f06 100644
--- a/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy
+++ b/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
productId = parameters.productId;
if (productId) {
productContents = delegator.findByAnd("ProductContent", ["productId" : productId]);
diff --git a/applications/product/webapp/catalog/WEB-INF/controller.xml b/applications/product/webapp/catalog/WEB-INF/controller.xml
index fb75588..ac915c1 100644
--- a/applications/product/webapp/catalog/WEB-INF/controller.xml
+++ b/applications/product/webapp/catalog/WEB-INF/controller.xml
@@ -3173,7 +3173,7 @@
<view-map name="EditProductStoreFinAccountSettings" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/>
<view-map name="EditProductStoreVendorPayments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/>
<view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
- <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/StoreScreens.xml#ProductStoreFacilities" type="screen"/>
+ <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/>
<view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/>
<view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/>
<view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/>
diff --git a/applications/product/webapp/catalog/category/EditCategory.ftl b/applications/product/webapp/catalog/category/EditCategory.ftl
index 2d4c8c4..742aaf4 100644
--- a/applications/product/webapp/catalog/category/EditCategory.ftl
+++ b/applications/product/webapp/catalog/category/EditCategory.ftl
@@ -96,15 +96,15 @@
<td> </td>
<td width="74%">
<select name="productCategoryTypeId" size="1">
- <#assign selectedKey = "">
- <#list productCategoryTypes as productCategoryTypeData>
- <#if requestParameters.productCategoryTypeId?has_content>
- <#assign selectedKey = requestParameters.productCategoryTypeId>
- <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)>
- <#assign selectedKey = productCategory.productCategoryTypeId>
- </#if>
- <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
- </#list>
+ <#assign selectedKey = "">
+ <#list productCategoryTypes as productCategoryTypeData>
+ <#if requestParameters.productCategoryTypeId?has_content>
+ <#assign selectedKey = requestParameters.productCategoryTypeId>
+ <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)>
+ <#assign selectedKey = productCategory.productCategoryTypeId>
+ </#if>
+ <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
+ </#list>
</select>
</td>
</tr>
diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
index 6d0b57f..5705bc3 100644
--- a/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
+++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
@@ -77,6 +77,14 @@
}
}
+if (orderId && !picklistBinId) {
+ picklistBin = EntityUtil.getFirst(delegator.findByAnd("PicklistBin", [primaryOrderId : orderId]));
+ if (picklistBin) {
+ picklistBinId = picklistBin.picklistBinId;
+ verifyPickSession.setPicklistBinId(picklistBinId);
+ }
+}
+
context.orderId = orderId;
context.shipGroupSeqId = shipGroupSeqId;
context.picklistBinId = picklistBinId;
diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml
index a97651b..c09f6d9 100644
--- a/applications/product/widget/catalog/CommonScreens.xml
+++ b/applications/product/widget/catalog/CommonScreens.xml
@@ -156,7 +156,7 @@
<if-compare operator="not-equals" value="EditProductStore" field="tabButtonItem"/>
</condition>
<widgets>
- <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
</widgets>
</section>
</fail-widgets>
@@ -398,4 +398,36 @@
</widgets>
</section>
</screen>
+
+ <screen name="ProductStoreFacilities">
+ <section>
+ <actions>
+ <set field="productStoreId" from-field="parameters.productStoreId"/>
+ <entity-one entity-name="ProductStore" value-field="productStore"/>
+ <set field="tabButtonItem" value="EditProductStoreFacilities"/>
+ <set field="labelTitleProperty" value="ProductFacility"/>
+ <set field="headerItem" value="store"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="left-column">
+ <include-screen name="leftbar"/>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition><not><if-empty field="productStore"/></not></condition>
+ <widgets>
+ <container>
+ <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label>
+ </container>
+ <include-portal-page id="ProductStoreFacility"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
diff --git a/applications/product/widget/catalog/FeatureForms.xml b/applications/product/widget/catalog/FeatureForms.xml
index bbed8a0..cbeafbe 100644
--- a/applications/product/widget/catalog/FeatureForms.xml
+++ b/applications/product/widget/catalog/FeatureForms.xml
@@ -315,7 +315,7 @@
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
- <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field>
+ <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field>
</form>
<form name="CreateProductFeature" type="single" target="CreateFeatureCategory">
diff --git a/applications/product/widget/catalog/StoreScreens.xml b/applications/product/widget/catalog/StoreScreens.xml
index 070a686..cd08dbf 100644
--- a/applications/product/widget/catalog/StoreScreens.xml
+++ b/applications/product/widget/catalog/StoreScreens.xml
@@ -554,48 +554,20 @@
</screen>
<!-- Assoc with product -->
- <screen name="ProductStoreFacilities">
+ <screen name="ListProductStoreFacility">
<section>
<actions>
<set field="titleProperty" value="ProductStoreFacilityAssocList"/>
- <set field="headerItem" value="store"/>
<set field="tabButtonItem" value="EditProductStoreFacilities"/>
<set field="productStoreId" from-field="parameters.productStoreId"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-portal-page id="ProductStoreFacility"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="ListProductStoreFacility">
- <section>
- <widgets>
- <screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}" navigation-menu-name="ProductStoreFacility">
- <include-menu name="ProductStoreFacility" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <container id="PrdStoreFacilityMgmtArea">
- <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-screen name="ListProductStoreFacilityFormOnly"/>
- </decorator-section>
- </decorator-screen>
- </container>
- </screenlet>
- </widgets>
- </section>
- </screen>
- <screen name="ListProductStoreFacilityFormOnly">
- <section>
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="portalPageId" value="ProductStoreFacility"/>
</actions>
<widgets>
<container id="ProductStoreFacilityEditArea"/>
- <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/>
+ <screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}" navigation-menu-name="ProductStoreFacility">
+ <include-menu name="ProductStoreFacility" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
diff --git a/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml b/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
index 0f0f60d..cb1c4ac 100644
--- a/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
+++ b/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
@@ -1662,6 +1662,7 @@
<condition-list combine="and">
<condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/>
<condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/>
+ <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
<condition-expr field-name="partyId" from-field="assignedParty.partyId"/>
</condition-list>
</entity-condition>
@@ -1675,15 +1676,20 @@
<condition-list combine="and">
<condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/>
<condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/>
+ <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
<condition-expr field-name="fixedAssetId" from-field="assignedFixedAsset.fixedAssetId"/>
</condition-list>
</entity-condition>
<list-to-list list="resultList" to-list="workEfforts"/>
</iterate>
- <entity-and list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true">
- <field-map field-name="workEffortIdFrom" from-field="workEffortId"/>
- </entity-and>
+ <entity-condition list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true">
+ <condition-list combine="and">
+ <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/>
+ <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
+ </condition-list>
+ </entity-condition>
<list-to-list list="resultList" to-list="workEfforts"/>
+ <set field="workEfforts" from-field="groovy:org.ofbiz.workeffort.workeffort.WorkEffortWorker.removeDuplicateWorkEfforts(workEfforts);" type="List"/>
<field-to-result field="workEfforts"/>
</simple-method>
diff --git a/applications/workeffort/servicedef/services.xml b/applications/workeffort/servicedef/services.xml
index 7c44e29..2d4cd85 100644
--- a/applications/workeffort/servicedef/services.xml
+++ b/applications/workeffort/servicedef/services.xml
@@ -766,6 +766,7 @@
<description>Get iCalendar Work Efforts</description>
<!-- No permission checking - the servlet handles that -->
<attribute type="String" mode="IN" name="workEffortId" optional="false"/>
+ <attribute type="String" mode="IN" name="workEffortTypeId" optional="true"/>
<attribute type="List" mode="OUT" name="workEfforts"/>
</service>
<service name="getPartyICalUrl" engine="simple" auth="false"
diff --git a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
index e031b7b..f455efe 100644
--- a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
+++ b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
@@ -69,7 +69,7 @@
if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1"))) {
List<GenericValue> workEffortNotes = delegator.findByAnd("WorkEffortNoteAndData", UtilMisc.toMap("workEffortId", workEffortId));
- for (GenericValue workEffortNote : workEffortNotes) {
+ for (GenericValue workEffortNote : workEffortNotes) {
addWeightedKeywordSourceString(workEffortNote, "noteInfo", strings);
}
}
diff --git a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
index 0401b77..d2abb79 100644
--- a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
+++ b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
@@ -483,7 +483,7 @@
// ======================================================================
@SuppressWarnings("serial")
- public static abstract class WorkEffortSearchConstraint implements java.io.Serializable {
+ public static abstract class WorkEffortSearchConstraint implements java.io.Serializable {
public WorkEffortSearchConstraint() { }
public abstract void addConstraint(WorkEffortSearchContext workEffortSearchContext);
@@ -493,7 +493,7 @@
@SuppressWarnings("serial")
- public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint {
+ public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint {
public static final String constraintName = "WorkEffortAssoc";
protected String workEffortId;
protected String workEffortAssocTypeId;
@@ -809,7 +809,7 @@
}
@SuppressWarnings("serial")
- public static class ProductSetConstraint extends WorkEffortSearchConstraint {
+ public static class ProductSetConstraint extends WorkEffortSearchConstraint {
public static final String constraintName = "ProductSet";
protected Set<String> productIdSet;
diff --git a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
index 971a2cd..a521066 100644
--- a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
+++ b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
@@ -43,7 +43,7 @@
public static final String module = WorkEffortSearchSession.class.getName();
@SuppressWarnings("serial")
- public static class WorkEffortSearchOptions implements java.io.Serializable {
+ public static class WorkEffortSearchOptions implements java.io.Serializable {
protected List<WorkEffortSearchConstraint> constraintList = null;
protected ResultSortOrder resultSortOrder = null;
protected Integer viewIndex = null;
diff --git a/build.xml b/build.xml
index bec6f8d..3fd0b28 100644
--- a/build.xml
+++ b/build.xml
@@ -936,7 +936,7 @@
<taskdef resource="tasks.properties">
<classpath>
<fileset dir="framework/base/lib">
- <include name="cobertura-1.9.3.jar" />
+ <include name="cobertura-1.9.4.1.jar" />
<include name="log4j-1.2.15.jar" />
<include name="scripting/asm*.jar" />
</fileset>
@@ -964,7 +964,7 @@
<taskdef resource="tasks.properties">
<classpath>
<fileset dir="framework/base/lib">
- <include name="cobertura-1.9.3.jar" />
+ <include name="cobertura-1.9.4.1.jar" />
<include name="log4j-1.2.15.jar" />
<include name="scripting/asm*.jar" />
</fileset>
diff --git a/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java b/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java
index de63380..f44357c 100644
--- a/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java
+++ b/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java
@@ -25,17 +25,16 @@
import java.util.Collection;
import java.util.Collections;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.ClassVisitor;
-
import net.sourceforge.cobertura.coveragedata.CoverageDataFileHandler;
import net.sourceforge.cobertura.coveragedata.ProjectData;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
import org.ofbiz.base.start.Instrumenter;
public final class CoberturaInstrumenter implements Instrumenter {
- private static final Constructor INSTRUMENTER_CONSTRUCTOR;
+ private static final Constructor<?> INSTRUMENTER_CONSTRUCTOR;
private static final Method IS_INSTRUMENTED_METHOD;
static {
try {
@@ -77,14 +76,18 @@
}
public byte[] instrumentClass(byte[] bytes) throws IOException {
- ClassReader cr = new ClassReader(bytes);
- ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS/* | ClassWriter.COMPUTE_FRAMES*/);
- try {
- ClassVisitor ci = (ClassVisitor) INSTRUMENTER_CONSTRUCTOR.newInstance(projectData != null ? projectData : ProjectData.getGlobalProjectData(), cw, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
- cr.accept(ci, 0);
- if (((Boolean) IS_INSTRUMENTED_METHOD.invoke(ci)).booleanValue()) return cw.toByteArray();
- } catch (Throwable t) {
- throw (IOException) new IOException(t.getMessage()).initCause(t);
+ if (forInstrumenting) {
+ ClassReader cr = new ClassReader(bytes);
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS/* | ClassWriter.COMPUTE_FRAMES*/);
+ try {
+ ClassVisitor ci = (ClassVisitor) INSTRUMENTER_CONSTRUCTOR.newInstance(projectData, cw, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+ cr.accept(ci, 0);
+ if (((Boolean) IS_INSTRUMENTED_METHOD.invoke(ci)).booleanValue()) {
+ return cw.toByteArray();
+ }
+ } catch (Throwable t) {
+ throw (IOException) new IOException(t.getMessage()).initCause(t);
+ }
}
return bytes;
}
diff --git a/framework/base/src/org/ofbiz/base/container/ComponentContainer.java b/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
index 4776b0f..409d13e 100644
--- a/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
+++ b/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
@@ -136,7 +136,10 @@
// set the new classloader/classpath on the current thread
if (updateClasspath) {
- classPath.instrument(instrumenterFile, instrumenterClassName);
+ if (UtilValidate.isNotEmpty(instrumenterFile) && UtilValidate.isNotEmpty(instrumenterClassName)) {
+ classPath.instrument(instrumenterFile, instrumenterClassName);
+ }
+
System.setProperty("java.class.path", classPath.toString());
System.setProperty("java.library.path", libraryPath.toString());
ClassLoader cl = classPath.getClassLoader();
diff --git a/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java b/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
index 86c2496..7fdc92c 100644
--- a/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
+++ b/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
@@ -65,7 +65,7 @@
*/
@SuppressWarnings("serial")
public class UtilCache<K, V> implements Serializable, EvictionListener<Object, CacheLine<V>> {
-
+
public static final String module = UtilCache.class.getName();
/** A static Map to keep track of all of the UtilCache instances. */
@@ -190,11 +190,11 @@
public static String getPropertyParam(ResourceBundle res, String[] propNames, String parameter) {
try {
for (String propName: propNames) {
- if(res.containsKey(propName+ '.' + parameter)) {
- try {
- return res.getString(propName + '.' + parameter);
- } catch (MissingResourceException e) {}
- }
+ if(res.containsKey(propName+ '.' + parameter)) {
+ try {
+ return res.getString(propName + '.' + parameter);
+ } catch (MissingResourceException e) {}
+ }
}
// don't need this, just return null
//if (value == null) {
@@ -1032,8 +1032,8 @@
return (UtilCache<K, V>) UtilCache.utilCacheTable.get(cacheName);
}
- @Override
- public void onEviction(Object key, CacheLine<V> value) {
- ExecutionPool.removePulse(value);
- }
+ @Override
+ public void onEviction(Object key, CacheLine<V> value) {
+ ExecutionPool.removePulse(value);
+ }
}
diff --git a/framework/common/src/org/ofbiz/common/UrlServletHelper.java b/framework/common/src/org/ofbiz/common/UrlServletHelper.java
index b0e9fe7..8ae3778 100644
--- a/framework/common/src/org/ofbiz/common/UrlServletHelper.java
+++ b/framework/common/src/org/ofbiz/common/UrlServletHelper.java
@@ -55,7 +55,6 @@
// get tenant delegator by domain name
String serverName = request.getServerName();
try {
-
// if tenant was specified, replace delegator with the new per-tenant delegator and set tenantId to session attribute
delegator = getDelegator(servletContext);
List<GenericValue> tenants = delegator.findList("Tenant", EntityCondition.makeCondition("domainName", serverName), null, UtilMisc.toList("-createdStamp"), null, false);
diff --git a/framework/common/webcommon/includes/listVisualThemes.ftl b/framework/common/webcommon/includes/listVisualThemes.ftl
index 50dbd58..269bf59 100644
--- a/framework/common/webcommon/includes/listVisualThemes.ftl
+++ b/framework/common/webcommon/includes/listVisualThemes.ftl
@@ -34,11 +34,11 @@
'hideOnContentClick': true
});
$("a.group").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic',
- 'speedIn' : 600,
- 'speedOut' : 200,
- 'overlayShow' : false
+ 'transitionIn' : 'elastic',
+ 'transitionOut' : 'elastic',
+ 'speedIn' : 600,
+ 'speedOut' : 200,
+ 'overlayShow' : false
});
});
</script>
diff --git a/framework/common/widget/CommonScreens.xml b/framework/common/widget/CommonScreens.xml
index 767a596..30d1417 100644
--- a/framework/common/widget/CommonScreens.xml
+++ b/framework/common/widget/CommonScreens.xml
@@ -543,7 +543,7 @@
<widgets>
<decorator-screen name="LookupDecorator">
<decorator-section name="body">
- <label>${uiLabelMap.CommonSessionTimeoutPleaseLogIn}</label>
+ <link target="checkLogin" text="${uiLabelMap.CommonSessionTimeoutPleaseLogIn}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/framework/common/widget/PortalPageScreens.xml b/framework/common/widget/PortalPageScreens.xml
index a24d8e5..17a7a08 100644
--- a/framework/common/widget/PortalPageScreens.xml
+++ b/framework/common/widget/PortalPageScreens.xml
@@ -101,9 +101,9 @@
<decorator-section name="body">
<screenlet id="PortalPagesList" title="${uiLabelMap.CommonPortalPagesForApplication}: ${parameters.parentPortalPageId}" collapsible="true">
<container style="button-bar">
- <link target="NewPortalPage" text="${uiLabelMap.CommonNewPortalPage}" style="buttontext create">
- <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
- </link>
+ <link target="NewPortalPage" text="${uiLabelMap.CommonNewPortalPage}" style="buttontext create">
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </link>
</container>
<include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/>
</screenlet>
diff --git a/framework/documents/DataFiles.xml b/framework/documents/DataFiles.xml
index b4a3bdb..8b90139 100644
--- a/framework/documents/DataFiles.xml
+++ b/framework/documents/DataFiles.xml
@@ -46,9 +46,9 @@
<title>How to use the "Work With Data Files" screen in the Webtools application</title>_Prerequisites_: a definition file (containing the fields' definition of the data file) and a data file (containing the data you want to parse/import) should be available in the OFBiz server.Steps:
- <step performance="required">
+ <step performance="required">
<para>
- connect to the Webtools application
+ connect to the Webtools application
</para>
</step>
<step performance="required">
@@ -98,9 +98,9 @@
</section>
<section>The field.name attribute must contain the name of the entity field in which the records will be imported
- (for example<programlisting><![CDATA[:<field name="productId" type="String">
- </field>
- ]]></programlisting>
+ (for example<programlisting><![CDATA[:<field name="productId" type="String">
+ </field>
+ ]]></programlisting>
</section>
<section>
<title>Examples</title>
@@ -136,52 +136,52 @@
</record>
</data-file>
</data-files>
- ]]></programlisting>
+ ]]></programlisting>
</example>
- The types listed in this sample are simple String's but the usual types are available such as Date, Long etc
+ The types listed in this sample are simple String's but the usual types are available such as Date, Long etc
</section>
<section>
<example>
<title>Another example reading fixed record little endian binary files</title>
<programlisting><![CDATA[
- <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768">
- <record name="stockdataitem" limit="many">
- <field name="barcode" type="NullTerminatedString" length="12" position="0">
- </field>
- <field name="prodCode" type="NullTerminatedString" length="12" position="68">
- </field>
- <field name="price" type="LEInteger" length="4" position="80">
- </field>
- <field name="name" type="NullTerminatedString" length="30" position="16">
- </field>
- </record>
- </data-file>
- </data-files>
- ]]></programlisting>
+ <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768">
+ <record name="stockdataitem" limit="many">
+ <field name="barcode" type="NullTerminatedString" length="12" position="0">
+ </field>
+ <field name="prodCode" type="NullTerminatedString" length="12" position="68">
+ </field>
+ <field name="price" type="LEInteger" length="4" position="80">
+ </field>
+ <field name="name" type="NullTerminatedString" length="30" position="16">
+ </field>
+ </record>
+ </data-file>
+ </data-files>
+ ]]></programlisting>
</example>
<procedure>
<title>In the interface enter something like:</title>
- <step performance="required">
+ <step performance="required">
<para>
- Definition Filename or URL: posschema.xml
+ Definition Filename or URL: posschema.xml
</para>
</step>
<step performance="required">
<para>
- Data File Definition Name: posreport
+ Data File Definition Name: posreport
</para>
</step>
<step performance="required">
<para>
- Data Filename or URL: posreport.csv
+ Data Filename or URL: posreport.csv
</para>
</step>
-
+
</procedure>
</section>
</section>
@@ -190,51 +190,50 @@
<title>Sample xml definition file for importing select columns posschema.xml:</title>
<programlisting><![CDATA[
- <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <data-file name="posreport" separator-style="fixed-length" type-code="text">
- <record name="tillentry" limit="many">
- <field name="tillCode" type="String" length="16" position="0">
- </field>
- <field name="name" type="String" length="32" position="17">
- </field>
- <field name="prodCode" type="String" length="12" position="63">
- </field>
- <field name="quantity" type="String" length="8" position="76">
- </field>
- <field name="totalPrice" type="String" length="8" position="85">
- </field>
- </record>
- </data-file>
- </data-files>
- ]]></programlisting>
+ <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <data-file name="posreport" separator-style="fixed-length" type-code="text">
+ <record name="tillentry" limit="many">
+ <field name="tillCode" type="String" length="16" position="0">
+ </field>
+ <field name="name" type="String" length="32" position="17">
+ </field>
+ <field name="prodCode" type="String" length="12" position="63">
+ </field>
+ <field name="quantity" type="String" length="8" position="76">
+ </field>
+ <field name="totalPrice" type="String" length="8" position="85">
+ </field>
+ </record>
+ </data-file>
+ </data-files>
+ ]]></programlisting>
</example>
-
- In the interface enter something like:* Definition Filename or URL: posschema.xml* Data File Definition Name: posreport* Data Filename or URL: posreport.csvThe types listed in this sample are simple String's but the usual types are available such as Date, Long etc.
+
+ In the interface enter something like:* Definition Filename or URL: posschema.xml* Data File Definition Name: posreport* Data Filename or URL: posreport.csvThe types listed in this sample are simple String's but the usual types are available such as Date, Long etc.
</section>
<section>
<example>
<title> Another example reading fixed record little endian binary files</title>
<programlisting><![CDATA[
- <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768">
- <record name="stockdataitem" limit="many">
- <field name="barcode" type="NullTerminatedString" length="12" position="0">
- </field>
- <field name="prodCode" type="NullTerminatedString" length="12" position="68">
- </field>
- <field name="price" type="LEInteger" length="4" position="80">
- </field>
- <field name="name" type="NullTerminatedString" length="30" position="16">
- </field>
- </record>
- </data-file>
- </data-files>
- ]]></programlisting>
+ <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768">
+ <record name="stockdataitem" limit="many">
+ <field name="barcode" type="NullTerminatedString" length="12" position="0">
+ </field>
+ <field name="prodCode" type="NullTerminatedString" length="12" position="68">
+ </field>
+ <field name="price" type="LEInteger" length="4" position="80">
+ </field>
+ <field name="name" type="NullTerminatedString" length="30" position="16">
+ </field>
+ </record>
+ </data-file>
+ </data-files>
+ ]]></programlisting>
</example>
</section>
</section>
</chapter>
-
diff --git a/framework/example/widget/example/ExampleForms.xml b/framework/example/widget/example/ExampleForms.xml
index d2be91a..5c7b955 100644
--- a/framework/example/widget/example/ExampleForms.xml
+++ b/framework/example/widget/example/ExampleForms.xml
@@ -104,7 +104,7 @@
<field use-when="example!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="example==null @and exampleId==null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><ignored/></field>
<field use-when="example==null @and exampleId!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleId}]" also-hidden="false"/></field>
- <field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId">
+ <field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId" widget-style="required">
<drop-down allow-empty="false">
<!-- this is a neat feature, but not good for the type because the user would have to know the possible types in order to enter at least the first letter, so leaving it out by default; just uncomment to enable: <auto-complete/> -->
<entity-options entity-name="ExampleType" description="${description}">
@@ -112,18 +112,19 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}">
+ <field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" widget-style="required">
<drop-down allow-empty="false">
<entity-options entity-name="ExampleStatusItem" description="${description}"/>
</drop-down>
</field>
- <field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}">
+ <field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}" widget-style="required">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId" env-name="example.statusId"/>
</entity-options>
</drop-down>
</field>
+ <field name="exampleName" required-field="true" widget-style="required"></field>
<field name="description" title="${uiLabelMap.CommonDescription}"/>
<field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/>
<field name="anotherText">
diff --git a/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java b/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java
index e5c51f8..e889388 100644
--- a/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java
+++ b/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java
@@ -71,7 +71,7 @@
e.printStackTrace();
return srcPaths;
} catch (ClassNotFoundException e) {
- e.printStackTrace();
+ System.err.println("InstrumenterWorker.instrument - Code instrumentation has been disabled, unable to find instrumenter class " + instrumenterClassName);
return srcPaths;
}
ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors());
diff --git a/framework/start/src/org/ofbiz/base/start/Start.java b/framework/start/src/org/ofbiz/base/start/Start.java
index 465c4b7..4711624 100644
--- a/framework/start/src/org/ofbiz/base/start/Start.java
+++ b/framework/start/src/org/ofbiz/base/start/Start.java
@@ -236,10 +236,10 @@
}
private String sendSocketCommand(String command) throws IOException, ConnectException {
- String response = "OFBiz is Down";
-
- try {
- Socket socket = new Socket(config.adminAddress, config.adminPort);
+ String response = "OFBiz is Down";
+
+ try {
+ Socket socket = new Socket(config.adminAddress, config.adminPort);
// send the command
PrintWriter writer = new PrintWriter(socket.getOutputStream(), true);
diff --git a/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java b/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
index e0877bf..6f0a673 100644
--- a/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
+++ b/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
@@ -265,12 +265,12 @@
appendWhitespace(writer);
}
if (modelMenu.renderedMenuItemCount(context) > 0) {
- writer.append("<ul>");
- appendWhitespace(writer);
- writer.append("<li>");
- appendWhitespace(writer);
- writer.append(" <ul>");
- appendWhitespace(writer);
+ writer.append("<ul>");
+ appendWhitespace(writer);
+ writer.append("<li>");
+ appendWhitespace(writer);
+ writer.append(" <ul>");
+ appendWhitespace(writer);
}
}
@@ -278,19 +278,19 @@
* @see org.ofbiz.widget.menu.MenuStringRenderer#renderMenuClose(java.io.Writer, java.util.Map, org.ofbiz.widget.menu.ModelMenu)
*/
public void renderMenuClose(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException {
- // TODO: div can't be directly inside an UL
+ // TODO: div can't be directly inside an UL
String fillStyle = modelMenu.getFillStyle();
if (UtilValidate.isNotEmpty(fillStyle)) {
writer.append("<div class=\"").append(fillStyle).append("\"> </div>");
}
//String menuContainerStyle = modelMenu.getMenuContainerStyle(context);
if (modelMenu.renderedMenuItemCount(context) > 0) {
- writer.append(" </ul>");
- appendWhitespace(writer);
- writer.append("</li>");
- appendWhitespace(writer);
- writer.append("</ul>");
- appendWhitespace(writer);
+ writer.append(" </ul>");
+ appendWhitespace(writer);
+ writer.append("</li>");
+ appendWhitespace(writer);
+ writer.append("</ul>");
+ appendWhitespace(writer);
}
writer.append(" <br class=\"clear\"/>");
appendWhitespace(writer);
@@ -599,7 +599,3 @@
writer.append("/>");
}
}
-
-
-
-
diff --git a/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java b/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
index 37312dc..06cb925 100644
--- a/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
+++ b/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
@@ -324,10 +324,10 @@
public int renderedMenuItemCount(Map<String, Object> context)
{
- int count = 0;
+ int count = 0;
for (ModelMenuItem item : this.menuItemList) {
if (item.shouldBeRendered(context))
- count++;
+ count++;
}
return count;
}
diff --git a/ivy.xml b/ivy.xml
index 1151d5f..8101032 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -25,12 +25,12 @@
<description homepage="http://ofbiz.apache.org/"/>
</info>
<configurations>
- <conf name="cobertura" description="downloads cobertura 1.9.3 (GPL2.0) http://cobertura.sourceforge.net/"/>
+ <conf name="cobertura" description="downloads cobertura 1.9.4.1 (GPL2.0) http://cobertura.sourceforge.net/"/>
<conf name="postgres" description="downloads the postgres JDBC driver"/>
<conf name="sonar-ant-task" description="downloads the ant sonar task (need sonar>=2.6)"/>
</configurations>
<dependencies>
- <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.3" conf="cobertura->default"/>
+ <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.4.1" conf="cobertura->default"/>
<dependency org="postgresql" name="postgresql" rev="9.0-801.jdbc4" conf="postgres->default"/>
<dependency org="org.codehaus.sonar-plugins" name="sonar-ant-task" rev="1.0" conf="sonar-ant-task->default"/>
diff --git a/specialpurpose/scrum/build.xml b/specialpurpose/scrum/build.xml
index fdda4bb..9e63250 100644
--- a/specialpurpose/scrum/build.xml
+++ b/specialpurpose/scrum/build.xml
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project name="OFBiz - scrum Component" default="jar" basedir=".">
<import file="../../common.xml"/>
diff --git a/specialpurpose/scrum/config/scrumUiLabels.xml b/specialpurpose/scrum/config/scrumUiLabels.xml
index 89278f3..84e8b35 100644
--- a/specialpurpose/scrum/config/scrumUiLabels.xml
+++ b/specialpurpose/scrum/config/scrumUiLabels.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<property key="PageTitleAddProductTimeToNewInvoice">
<value xml:lang="en">Add all reported/approved task time to a new invoice</value>
diff --git a/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml b/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml
index 5306ba6..a9a334b 100644
--- a/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml
+++ b/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml
@@ -23,101 +23,101 @@
xmlns="http://docbook.org/ns/docbook">
<title>Welcome to the SCRUM Component help system</title>
<section>
- <title>Introduction</title>
+ <title>Introduction</title>
<para>
- The purpose of this component is to have a web based and ERP integrated access and recording for all information
- related to your Scrum project development. The Scrum development methodology itself is described in any of the following documents:
- <orderedlist>
+ The purpose of this component is to have a web based and ERP integrated access and recording for all information
+ related to your Scrum project development. The Scrum development methodology itself is described in any of the following documents:
+ <orderedlist>
<listitem><para><link xl:href="http://www.scrum.org/scrumguides/">Scrum guide</link> (various languages)</para></listitem>
- <listitem><para><link xl:href="http://www.scrumalliance.org/pages/what_is_scrum">Scrum in 30 seconds.</link></para></listitem>
- <listitem><para><link xl:href="http://www.softhouse.se/Uploades/Scrum_eng_webb.pdf">Scrum in 5 minutes</link></para></listitem>
- </orderedlist>
+ <listitem><para><link xl:href="http://www.scrumalliance.org/pages/what_is_scrum">Scrum in 30 seconds.</link></para></listitem>
+ <listitem><para><link xl:href="http://www.softhouse.se/Uploades/Scrum_eng_webb.pdf">Scrum in 5 minutes</link></para></listitem>
+ </orderedlist>
</para>
<para>
- Below follows a list how the system should be used and at what time you have to update the information within the Scrum component.
+ Below follows a list how the system should be used and at what time you have to update the information within the Scrum component.
</para>
</section>
<section>
- <title>Create the available Scrum members</title>
+ <title>Create the available Scrum members</title>
<para>
- Any activity in any of the Scrum actions need people who are members of the project. So create the people which will be involved in the "Members Tab".
- You need to enter an existing person and company (partyGroup). Persons and companies (PartyGroup) need to be added in the party component first before they can be used in the Scrum component.
- </para>
- </section>
+ Any activity in any of the Scrum actions need people who are members of the project. So create the people which will be involved in the "Members Tab".
+ You need to enter an existing person and company (partyGroup). Persons and companies (PartyGroup) need to be added in the party component first before they can be used in the Scrum component.
+ </para>
+ </section>
<section>
- <title>Create the product Backlog.</title>
+ <title>Create the product Backlog.</title>
<para>
- Before anything can start a product backlog is required which will need a product to be created first.
- So create a product assign the it to a product owner which was created in the Scrum member section.
- Then go to the backlog and create the backlog items.
- </para>
- </section>
- <section>
- <title>Create the project</title>
- <para>
- Now that we have a project backlog it is time to hold a project meeting. In this project meeting discuss the goals of the project,
- the organization and the product backlog items and the estimated hours to complete each item.
- </para>
- <para>
- Now create the project in the system and assign the members to the project with their roles. Attach the minutes of the meeting to the project.
- </para>
- </section>
- <section>
- <title>Create the first sprint</title>
- <para>
- Now that there is a project we can look at creating the (first) sprint.
- Have a Sprint meeting, define what should be implemented in the (first) sprint and how it should be implemented
- </para>
- <para>
- Create now the (first) sprint in the system and enter also the number of backlog items which will be included in this sprint. Attach the minutes of the meeting to the project.
- </para>
- </section>
- <section>
- <title>Create tasks on the sprint backlog items</title>
- <para>
- In order to be able to enter actual hours it is required to create at least a single task on every sprint backlog item.
- </para>
- </section>
- <section>
- <title>Update daily the actual and planned hours</title>
- <para>
- Before going to the daily sprint meeting make sure the planned (backlog item) and actuals (tasks) are updated.
- </para>
- </section>
- <section>
- <title>Daily sprint meeting</title>
- <para>
- Have a daily sprint meeting where the three famous questions are answered and enter the answers in the system related to this sprint.
- </para>
- </section>
- <section>
- <title>Sprint burndown chart</title>
- <para>
- Keep an eye on the burndown chart if you are still on track. If not discuss with the product owner if backlog items have to be added or removed.
- </para>
- </section>
- <section>
- <title>Sprint Demonstration and Evaluation meeting</title>
- <para>
- At the end of a sprint demonstrate the system to the product owner and interested parties. The product owner will incorporate comments into the current backlog list.
- The team and Scrum master will evaluate the sprint so lessons can be learned for the next sprint.
- </para>
- <para>
- Determine also which tasks were not completed and return them to the product backlog to be included in a next sprint.
- </para>
- </section>
- <para>
- The sprint will be repeated until the project is complete.
- </para>
- <section>
- <title>Security</title>
- <para>
- In the Scrum component there are security roles to access in the Scrum component.
- </para>
- <para>1. Product Owner can create product, project, and assign member in project.</para>
- <para>2. Scrum Master can do anything on the project.</para>
- <para>3. Scrum admin can do anything on Scrum component</para>
- <para>4. Scrum team can assign task to yourself and view project.</para>
- </section>
+ Before anything can start a product backlog is required which will need a product to be created first.
+ So create a product assign the it to a product owner which was created in the Scrum member section.
+ Then go to the backlog and create the backlog items.
+ </para>
+ </section>
+ <section>
+ <title>Create the project</title>
+ <para>
+ Now that we have a project backlog it is time to hold a project meeting. In this project meeting discuss the goals of the project,
+ the organization and the product backlog items and the estimated hours to complete each item.
+ </para>
+ <para>
+ Now create the project in the system and assign the members to the project with their roles. Attach the minutes of the meeting to the project.
+ </para>
+ </section>
+ <section>
+ <title>Create the first sprint</title>
+ <para>
+ Now that there is a project we can look at creating the (first) sprint.
+ Have a Sprint meeting, define what should be implemented in the (first) sprint and how it should be implemented
+ </para>
+ <para>
+ Create now the (first) sprint in the system and enter also the number of backlog items which will be included in this sprint. Attach the minutes of the meeting to the project.
+ </para>
+ </section>
+ <section>
+ <title>Create tasks on the sprint backlog items</title>
+ <para>
+ In order to be able to enter actual hours it is required to create at least a single task on every sprint backlog item.
+ </para>
+ </section>
+ <section>
+ <title>Update daily the actual and planned hours</title>
+ <para>
+ Before going to the daily sprint meeting make sure the planned (backlog item) and actuals (tasks) are updated.
+ </para>
+ </section>
+ <section>
+ <title>Daily sprint meeting</title>
+ <para>
+ Have a daily sprint meeting where the three famous questions are answered and enter the answers in the system related to this sprint.
+ </para>
+ </section>
+ <section>
+ <title>Sprint burndown chart</title>
+ <para>
+ Keep an eye on the burndown chart if you are still on track. If not discuss with the product owner if backlog items have to be added or removed.
+ </para>
+ </section>
+ <section>
+ <title>Sprint Demonstration and Evaluation meeting</title>
+ <para>
+ At the end of a sprint demonstrate the system to the product owner and interested parties. The product owner will incorporate comments into the current backlog list.
+ The team and Scrum master will evaluate the sprint so lessons can be learned for the next sprint.
+ </para>
+ <para>
+ Determine also which tasks were not completed and return them to the product backlog to be included in a next sprint.
+ </para>
+ </section>
+ <para>
+ The sprint will be repeated until the project is complete.
+ </para>
+ <section>
+ <title>Security</title>
+ <para>
+ In the Scrum component there are security roles to access in the Scrum component.
+ </para>
+ <para>1. Product Owner can create product, project, and assign member in project.</para>
+ <para>2. Scrum Master can do anything on the project.</para>
+ <para>3. Scrum admin can do anything on Scrum component</para>
+ <para>4. Scrum team can assign task to yourself and view project.</para>
+ </section>
</section>
\ No newline at end of file
diff --git a/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml b/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml
index a109019..f879fa5 100644
--- a/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml
+++ b/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml
@@ -20,13 +20,13 @@
<title>Update Sprint.</title>
<para>This use for updating the Sprint.</para>
<orderedlist>
- <listitem><para>Product Name</para></listitem>
- <listitem><para>Sprint Name</para></listitem>
- <listitem><para>Sprint Goal</para></listitem>
- <listitem><para>Status</para></listitem>
- <listitem><para>Start Date</para></listitem>
- <listitem><para>End date</para></listitem>
- <listitem><para>Planed Hours</para></listitem>
- <listitem><para>Sprint Length Weeks</para></listitem>
+ <listitem><para>Product Name</para></listitem>
+ <listitem><para>Sprint Name</para></listitem>
+ <listitem><para>Sprint Goal</para></listitem>
+ <listitem><para>Status</para></listitem>
+ <listitem><para>Start Date</para></listitem>
+ <listitem><para>End date</para></listitem>
+ <listitem><para>Planed Hours</para></listitem>
+ <listitem><para>Sprint Length Weeks</para></listitem>
</orderedlist>
</section>
\ No newline at end of file
diff --git a/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml b/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml
index 19e1fea..5c5a095 100644
--- a/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml
+++ b/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml
@@ -20,7 +20,7 @@
<title>Update Sprint backlog.</title>
<para>This part use to update Sprint backlog such as planed hours, ....</para>
<orderedlist>
- <listitem><para>Enter Planed Hours field (Integer or floating point).</para></listitem>
- <listitem><para>Click the update button to update the Sprint Backlog.</para></listitem>
+ <listitem><para>Enter Planed Hours field (Integer or floating point).</para></listitem>
+ <listitem><para>Click the update button to update the Sprint Backlog.</para></listitem>
</orderedlist>
</section>
\ No newline at end of file
diff --git a/specialpurpose/scrum/data/hookscripts/commit.py b/specialpurpose/scrum/data/hookscripts/commit.py
index a17b321..77fcb5d 100644
--- a/specialpurpose/scrum/data/hookscripts/commit.py
+++ b/specialpurpose/scrum/data/hookscripts/commit.py
@@ -1,4 +1,25 @@
#!/usr/bin/python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
from xml.dom.minidom import Document
import httplib,sys,os,subprocess
import ConfigParser
diff --git a/specialpurpose/scrum/data/hookscripts/post-commit b/specialpurpose/scrum/data/hookscripts/post-commit
index 1201822..b81ca15 100644
--- a/specialpurpose/scrum/data/hookscripts/post-commit
+++ b/specialpurpose/scrum/data/hookscripts/post-commit
@@ -1,4 +1,22 @@
#!/bin/sh
+#####################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################
# POST-COMMIT HOOK
#
diff --git a/specialpurpose/scrum/data/hookscripts/pre-commit b/specialpurpose/scrum/data/hookscripts/pre-commit
index f8d5984..d10086b 100644
--- a/specialpurpose/scrum/data/hookscripts/pre-commit
+++ b/specialpurpose/scrum/data/hookscripts/pre-commit
@@ -1,4 +1,22 @@
#!/bin/sh
+#####################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################
# PRE-COMMIT HOOK
#
diff --git a/specialpurpose/scrum/data/scrumDemoData.xml b/specialpurpose/scrum/data/scrumDemoData.xml
index 9c8357d..89eb2d0 100644
--- a/specialpurpose/scrum/data/scrumDemoData.xml
+++ b/specialpurpose/scrum/data/scrumDemoData.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entity-engine-xml>
<Party partyId="admin" partyTypeId="PERSON"/>
diff --git a/specialpurpose/scrum/data/scrumHelpData.xml b/specialpurpose/scrum/data/scrumHelpData.xml
index 256d09a..fea895d 100644
--- a/specialpurpose/scrum/data/scrumHelpData.xml
+++ b/specialpurpose/scrum/data/scrumHelpData.xml
@@ -23,7 +23,7 @@
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="SCRUM Help system root" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_SCRUM" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL"
- dataResourceId="HELP_SCRUM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Scrum" mimeTypeId="text/html"/>
+ dataResourceId="HELP_SCRUM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Scrum" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SCRUM" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" mapKey="SCRUM_Sprints"/>
<!-- === Project === -->
<DataResource dataResourceId="HELP_SCRUM_PROJECT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
diff --git a/specialpurpose/scrum/data/scrumSecurityData.xml b/specialpurpose/scrum/data/scrumSecurityData.xml
index aab6c83..f08068d 100644
--- a/specialpurpose/scrum/data/scrumSecurityData.xml
+++ b/specialpurpose/scrum/data/scrumSecurityData.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entity-engine-xml>
<!-- Scrum Component -->
<SecurityPermission description="View operations in the SCRUM Component." permissionId="SCRUM_VIEW"/>
diff --git a/specialpurpose/scrum/data/scrumTypeData.xml b/specialpurpose/scrum/data/scrumTypeData.xml
index 1f51a4f..2c6fa87 100644
--- a/specialpurpose/scrum/data/scrumTypeData.xml
+++ b/specialpurpose/scrum/data/scrumTypeData.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entity-engine-xml>
<RoleType roleTypeId="SCRUM_MEMBER" hasTable="N" description="Scrum Member"/>
<RoleType roleTypeId="PRODUCT_OWNER" parentTypeId="SCRUM_MEMBER" hasTable="N" description="Product Owner"/>
diff --git a/specialpurpose/scrum/entitydef/entitymodel.xml b/specialpurpose/scrum/entitydef/entitymodel.xml
index 7cb1b25..ed0b503 100644
--- a/specialpurpose/scrum/entitydef/entitymodel.xml
+++ b/specialpurpose/scrum/entitydef/entitymodel.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
diff --git a/specialpurpose/scrum/ofbiz-component.xml b/specialpurpose/scrum/ofbiz-component.xml
index 2456348..659f5a7 100644
--- a/specialpurpose/scrum/ofbiz-component.xml
+++ b/specialpurpose/scrum/ofbiz-component.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<ofbiz-component name="scrum"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
@@ -46,5 +64,3 @@
base-permission=""
mount-point="/scrumdemo" />
</ofbiz-component>
-
-
diff --git a/specialpurpose/scrum/servicedef/permissionServices.xml b/specialpurpose/scrum/servicedef/permissionServices.xml
index 931db68..b014f21 100644
--- a/specialpurpose/scrum/servicedef/permissionServices.xml
+++ b/specialpurpose/scrum/servicedef/permissionServices.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
<description>scrum Services</description>
diff --git a/specialpurpose/scrum/servicedef/services.xml b/specialpurpose/scrum/servicedef/services.xml
index 3cdcd3f..2cbc129 100644
--- a/specialpurpose/scrum/servicedef/services.xml
+++ b/specialpurpose/scrum/servicedef/services.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
<description>scrum Services</description>
diff --git a/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java b/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
index d511853..4713a01 100644
--- a/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
+++ b/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
package org.ofbiz.scrum;
import java.io.BufferedReader;
diff --git a/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl b/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl
index c6980bc..b47b651 100644
--- a/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl
+++ b/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl
@@ -1,4 +1,21 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/specialpurpose/scrum/templates/ClosedSprintNotification.ftl b/specialpurpose/scrum/templates/ClosedSprintNotification.ftl
index 227111a..b6fc869 100644
--- a/specialpurpose/scrum/templates/ClosedSprintNotification.ftl
+++ b/specialpurpose/scrum/templates/ClosedSprintNotification.ftl
@@ -1,4 +1,21 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/specialpurpose/scrum/testdef/scrumTests.xml b/specialpurpose/scrum/testdef/scrumTests.xml
index 164fae3..0a3802e 100644
--- a/specialpurpose/scrum/testdef/scrumTests.xml
+++ b/specialpurpose/scrum/testdef/scrumTests.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<test-suite suite-name="scrumtests"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
diff --git a/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml b/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml
index 189da58..db28f6c 100644
--- a/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml
+++ b/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml" />
diff --git a/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml b/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
index 601e064..efe5fcc 100644
--- a/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
+++ b/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
@@ -1,105 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app>
- <display-name>Open For Business - scrum Component</display-name>
- <description>scrum Component of the Open For Business Project
- </description>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
- <context-param>
- <param-name>localDispatcherName</param-name>
- <param-value>scrum</param-value>
- <description>A unique name used to identify/recognize the local
- dispatcher for the Service Engine</description>
- </context-param>
- <context-param>
- <param-name>entityDelegatorName</param-name>
- <param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in
- entityengine.xml</description>
- </context-param>
- <context-param>
- <param-name>mainDecoratorLocation</param-name>
- <param-value>component://scrum/widget/demotest/DemotestScreen.xml
- </param-value>
- <description>The location of the main-decorator screen to use for this
- webapp; referred to as a context variable in screen def XML files.
- </description>
- </context-param>
- <context-param>
- <param-name>widgetVerbose</param-name>
- <param-value>false</param-value>
- <description>Enable widget boundary comments. See
- org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled().
- </description>
- </context-param>
- <context-param>
- <param-name>compressHTML</param-name>
- <param-value>false</param-value>
- <description>Remove unnecessary whitespace from HTML output.
- </description>
- </context-param>
+http://www.apache.org/licenses/LICENSE-2.0
- <filter>
- <filter-name>ContextFilter</filter-name>
- <display-name>ContextFilter</display-name>
- <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
- <init-param>
- <param-name>disableContextSecurity</param-name>
- <param-value>N</param-value>
- </init-param>
- <init-param>
- <param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css
- </param-value>
- </init-param>
- <init-param>
- <param-name>errorCode</param-name>
- <param-value>403</param-value>
- </init-param>
- <init-param>
- <param-name>redirectPath</param-name>
- <param-value>/control/main</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>ContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+ <web-app>
+ <display-name>Open For Business - scrum Component</display-name>
+ <description>scrum Component of the Open For Business Project
+ </description>
- <listener>
- <listener-class>org.ofbiz.webapp.control.ControlEventListener
- </listener-class>
- </listener>
- <listener>
- <listener-class>org.ofbiz.webapp.control.LoginEventListener
- </listener-class>
- </listener>
- <!--
- NOTE: not all app servers support mounting implementations of the
- HttpSessionActivationListener interface
- -->
- <!--
- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener>
- -->
+ <context-param>
+ <param-name>localDispatcherName</param-name>
+ <param-value>scrum</param-value>
+ <description>A unique name used to identify/recognize the local
+ dispatcher for the Service Engine</description>
+ </context-param>
+ <context-param>
+ <param-name>entityDelegatorName</param-name>
+ <param-value>default</param-value>
+ <description>The Name of the Entity Delegator to use, defined in
+ entityengine.xml</description>
+ </context-param>
+ <context-param>
+ <param-name>mainDecoratorLocation</param-name>
+ <param-value>component://scrum/widget/demotest/DemotestScreen.xml
+ </param-value>
+ <description>The location of the main-decorator screen to use for this
+ webapp; referred to as a context variable in screen def XML files.
+ </description>
+ </context-param>
+ <context-param>
+ <param-name>widgetVerbose</param-name>
+ <param-value>false</param-value>
+ <description>Enable widget boundary comments. See
+ org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled().
+ </description>
+ </context-param>
+ <context-param>
+ <param-name>compressHTML</param-name>
+ <param-value>false</param-value>
+ <description>Remove unnecessary whitespace from HTML output.
+ </description>
+ </context-param>
- <servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
- <description>Main Control Servlet</description>
- <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ControlServlet</servlet-name>
- <url-pattern>/control/*</url-pattern>
- </servlet-mapping>
+ <filter>
+ <filter-name>ContextFilter</filter-name>
+ <display-name>ContextFilter</display-name>
+ <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
+ <init-param>
+ <param-name>disableContextSecurity</param-name>
+ <param-value>N</param-value>
+ </init-param>
+ <init-param>
+ <param-name>allowedPaths</param-name>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>errorCode</param-name>
+ <param-value>403</param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirectPath</param-name>
+ <param-value>/control/main</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ContextFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <session-config>
- <session-timeout>60</session-timeout><!-- in minutes -->
- </session-config>
+ <listener>
+ <listener-class>org.ofbiz.webapp.control.ControlEventListener
+ </listener-class>
+ </listener>
+ <listener>
+ <listener-class>org.ofbiz.webapp.control.LoginEventListener
+ </listener-class>
+ </listener>
+ <!--
+ NOTE: not all app servers support mounting implementations of the
+ HttpSessionActivationListener interface
+ -->
+ <!--
+ <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener>
+ -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- </welcome-file-list>
-</web-app>
\ No newline at end of file
+ <servlet>
+ <servlet-name>ControlServlet</servlet-name>
+ <display-name>ControlServlet</display-name>
+ <description>Main Control Servlet</description>
+ <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ControlServlet</servlet-name>
+ <url-pattern>/control/*</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ </welcome-file-list>
+ </web-app>
\ No newline at end of file
diff --git a/specialpurpose/scrum/webapp/demotest/error/error.jsp b/specialpurpose/scrum/webapp/demotest/error/error.jsp
index 212fbcf..8bca433 100644
--- a/specialpurpose/scrum/webapp/demotest/error/error.jsp
+++ b/specialpurpose/scrum/webapp/demotest/error/error.jsp
@@ -1,3 +1,21 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
<%@ page import="org.ofbiz.base.util.*" %>
<html>
<head>
diff --git a/specialpurpose/scrum/webapp/demotest/index.jsp b/specialpurpose/scrum/webapp/demotest/index.jsp
index 598a073..ee2b80a 100644
--- a/specialpurpose/scrum/webapp/demotest/index.jsp
+++ b/specialpurpose/scrum/webapp/demotest/index.jsp
@@ -1 +1,19 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
<%response.sendRedirect("control/main");%>
\ No newline at end of file
diff --git a/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml b/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
index 3b6ec58..fb08f41 100644
--- a/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
+++ b/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<!-- The controller elements that are common to all OFBiz components
diff --git a/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml b/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
index a6b837b..dd9986a 100644
--- a/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
+++ b/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<web-app>
<display-name>Open For Business - scrum Component</display-name>
<description>scrum Component of the Open For Business Project</description>
diff --git a/specialpurpose/scrum/webapp/scrum/error/error.jsp b/specialpurpose/scrum/webapp/scrum/error/error.jsp
index 212fbcf..8bca433 100644
--- a/specialpurpose/scrum/webapp/scrum/error/error.jsp
+++ b/specialpurpose/scrum/webapp/scrum/error/error.jsp
@@ -1,3 +1,21 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
<%@ page import="org.ofbiz.base.util.*" %>
<html>
<head>
diff --git a/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl b/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl
index 30249e5..d5ab6bb 100644
--- a/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl
+++ b/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl
@@ -1,4 +1,21 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<div id="params_birtReport" style='display:none'>
<INPUT type="HIDDEN" name="productId" value="${product.productId}"/>
</div>
diff --git a/specialpurpose/scrum/webapp/scrum/index.jsp b/specialpurpose/scrum/webapp/scrum/index.jsp
index 598a073..ee2b80a 100644
--- a/specialpurpose/scrum/webapp/scrum/index.jsp
+++ b/specialpurpose/scrum/webapp/scrum/index.jsp
@@ -1 +1,19 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
<%response.sendRedirect("control/main");%>
\ No newline at end of file
diff --git a/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
index a3a6509..713c9e7 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
index f482456..7481147 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign
index f318a3e..f6d5d88 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
index c173826..b625e9a 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
index d093de6..ffc2f79 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
index 654ce2b..f0021e8 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
index e0a2b3c..c24eb78 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign b/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
index 1f3f52c..47f7689 100644
--- a/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
+++ b/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
diff --git a/specialpurpose/scrum/widget/CommonScreens.xml b/specialpurpose/scrum/widget/CommonScreens.xml
index fbe7c23..b1cd0d7 100644
--- a/specialpurpose/scrum/widget/CommonScreens.xml
+++ b/specialpurpose/scrum/widget/CommonScreens.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
diff --git a/specialpurpose/scrum/widget/CommunicationEventForms.xml b/specialpurpose/scrum/widget/CommunicationEventForms.xml
index 529420e..e453285 100644
--- a/specialpurpose/scrum/widget/CommunicationEventForms.xml
+++ b/specialpurpose/scrum/widget/CommunicationEventForms.xml
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditEmail" type="single" target="${target}" default-map-name="communicationEvent" id="updateEmailForProductBacklog">
diff --git a/specialpurpose/scrum/widget/EmailTemplates.xml b/specialpurpose/scrum/widget/EmailTemplates.xml
index 27f3f02..21b2850 100644
--- a/specialpurpose/scrum/widget/EmailTemplates.xml
+++ b/specialpurpose/scrum/widget/EmailTemplates.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
diff --git a/specialpurpose/scrum/widget/OpenTestForms.xml b/specialpurpose/scrum/widget/OpenTestForms.xml
index 79567a6..f4b79d7 100644
--- a/specialpurpose/scrum/widget/OpenTestForms.xml
+++ b/specialpurpose/scrum/widget/OpenTestForms.xml
@@ -32,11 +32,11 @@
</entity-and>
<set field="partyId" from-field="partyAssignViewList[0].partyId"/>
</row-actions>
- <field name="workEffortId" title="${uiLabelMap.ScrumTaskName}">
- <hyperlink target="editDefaultTask" description="${workEffortName}">
- <parameter param-name="workEffortId"/>
- <parameter param-name="productId"/>
- </hyperlink></field>
+ <field name="workEffortId" title="${uiLabelMap.ScrumTaskName}">
+ <hyperlink target="editDefaultTask" description="${workEffortName}">
+ <parameter param-name="workEffortId"/>
+ <parameter param-name="productId"/>
+ </hyperlink></field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
<field name="createdDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display/></field>
<field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
@@ -63,8 +63,8 @@
</actions>
<alt-target use-when="workEffortId!=null" target="updateDefaultTask"/>
<field name="workEffortId"><hidden/></field>
- <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><text default-value="${workEffortName}"/></field>
- <field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field>
+ <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><text default-value="${workEffortName}"/></field>
+ <field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
<drop-down >
<entity-options entity-name="WorkEffortType" description="${description}">
@@ -74,8 +74,8 @@
</field>
<field name="workEffortPurposeTypeId"><hidden value="SCRUM_DEFAULT_TASK"/></field>
<field name="plannedHours" title="${uiLabelMap.ScrumInitialPlannedHours}"><text size="3"/></field>
- <field name="currentStatusId"><hidden value="STS_CREATED"/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
+ <field name="currentStatusId"><hidden value="STS_CREATED"/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
<field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
<drop-down allow-empty="true">
<entity-options description="${lastName} ${firstName} ${middleName}" entity-name="ScrumMemberUserLoginAndSecurityGroup" key-field-name="partyId" >
@@ -85,23 +85,23 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="workEffortId==null"><submit/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="workEffortId==null"><submit/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="workEffortId!=null"><submit/></field>
</form>
<form name="listCompletedTask" type="list" target="" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortAndPartyAssign">
- <field-map field-name="currentStatusId" value="STS_COMPLETED"/>
- </entity-and>
+ <entity-and entity-name="WorkEffortAndPartyAssign">
+ <field-map field-name="currentStatusId" value="STS_COMPLETED"/>
+ </entity-and>
</actions>
<row-actions>
<entity-one entity-name="PartyNameView" value-field="party"/>
</row-actions>
<field name="workEffortId" title="Task Name">
- <hyperlink target="taskView" description="${workEffortName}">
- <parameter param-name="taskId" from-field="workEffortId"/>
- </hyperlink>
+ <hyperlink target="taskView" description="${workEffortName}">
+ <parameter param-name="taskId" from-field="workEffortId"/>
+ </hyperlink>
</field>
<field name="description"><display/></field>
<field name="partyId">
@@ -140,7 +140,7 @@
<parameter param-name="productId" from-field="parameters.productId"/>
</hyperlink>
</field>
- <field name="custRequestTypeId"><display></display> </field>
+ <field name="custRequestTypeId"><display></display> </field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}">
<display description="${custRequestType}"/>
</field>
@@ -150,29 +150,29 @@
</field>
</form>
<form name="editTask" type="upload" target="createTestTask">
- <actions>
- <entity-and entity-name="WorkEffortPartyAssignView" list="membersPartyId">
- <field-map field-name="workEffortId" from-field="sprintId"/>
- </entity-and>
- <entity-one entity-name="WorkEffort" value-field="sprint">
- <field-map field-name="workEffortId" from-field="sprintId"/>
- </entity-one>
- <set field="projectId" from-field="sprint.workEffortParentId"/>
- <set field="partyId" from-field="workEffortPartyAssignment.partyId"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <entity-one entity-name="WorkEffort" value-field="project">
- <field-map field-name="workEffortId" from-field="projectId"/>
- </entity-one>
- <entity-and entity-name="CustRequestItem" list="CustRequest">
- <field-map field-name="custRequestId" from-field="custRequestId"/>
- </entity-and>
+ <actions>
+ <entity-and entity-name="WorkEffortPartyAssignView" list="membersPartyId">
+ <field-map field-name="workEffortId" from-field="sprintId"/>
+ </entity-and>
+ <entity-one entity-name="WorkEffort" value-field="sprint">
+ <field-map field-name="workEffortId" from-field="sprintId"/>
+ </entity-one>
+ <set field="projectId" from-field="sprint.workEffortParentId"/>
+ <set field="partyId" from-field="workEffortPartyAssignment.partyId"/>
+ <set field="custRequestId" from-field="parameters.custRequestId"/>
+ <entity-one entity-name="WorkEffort" value-field="project">
+ <field-map field-name="workEffortId" from-field="projectId"/>
+ </entity-one>
+ <entity-and entity-name="CustRequestItem" list="CustRequest">
+ <field-map field-name="custRequestId" from-field="custRequestId"/>
+ </entity-and>
<entity-condition entity-name="ScrumMemberUserLoginAndSecurityGroup" list="ScrumMember">
<condition-list combine="and">
<condition-expr field-name="partyStatusId" operator="not-equals" value="PARTY_DISABLED"/>
<condition-expr field-name="groupId" operator="equals" value="SCRUM_TEAM"/>
</condition-list>
</entity-condition>
- </actions>
+ </actions>
<field name="sprintStatusId"><hidden value="${parameters.sprintStatusId}"/></field>
<field name="projectName" title="${uiLabelMap.ScrumProjectName}" use-when="projectId!=null">
<display description="${project.workEffortName} [${projectId}]"/>
@@ -181,25 +181,25 @@
<field name="sprintName" title="${uiLabelMap.ScrumSprintName}" use-when="sprintId!=null">
<display description="${sprint.workEffortName} [${sprintId}]"/>
</field>
- <field name="custRequestId" title="${uiLabelMap.ScrumBacklogItem}">
- <display-entity entity-name="CustRequest" description="${description}">
- <sub-hyperlink target="EditProdBacklog"></sub-hyperlink>
- </display-entity>
- </field>
- <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field>
- <field name="workEffortTypeId"><hidden value="SCRUM_TASK_ERROR"/></field>
- <field name="currentStatusId"><hidden value="STS_CREATED"/></field>
- <field name="roleTypeId"><hidden value="SCRUM_TEAM"/></field>
- <field name="statusId"><hidden value="SCAS_ASSIGNED"/></field>
- <field name="priority"><hidden value="1"/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><textarea rows="6"/></field>
- <field name="uploadedFile"><file/></field>
- <field name="contentTypeId"><hidden value="DOCUMENT"/></field>
+ <field name="custRequestId" title="${uiLabelMap.ScrumBacklogItem}">
+ <display-entity entity-name="CustRequest" description="${description}">
+ <sub-hyperlink target="EditProdBacklog"></sub-hyperlink>
+ </display-entity>
+ </field>
+ <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field>
+ <field name="workEffortTypeId"><hidden value="SCRUM_TASK_ERROR"/></field>
+ <field name="currentStatusId"><hidden value="STS_CREATED"/></field>
+ <field name="roleTypeId"><hidden value="SCRUM_TEAM"/></field>
+ <field name="statusId"><hidden value="SCAS_ASSIGNED"/></field>
+ <field name="priority"><hidden value="1"/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><textarea rows="6"/></field>
+ <field name="uploadedFile"><file/></field>
+ <field name="contentTypeId"><hidden value="DOCUMENT"/></field>
<field name="resourceStatusId"><hidden value="CTNT_PUBLISHED"/></field>
<field name="workEffortContentTypeId"><hidden value="CREATED_MEDIA"/></field>
<field name="mimeTypeId"><hidden value="application/octet-stream"/></field>
<field name="sprintId"><hidden value="${parameters.sprintId}"/></field>
- <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" use-when="sprintId!=null">
+ <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" use-when="sprintId!=null">
<drop-down >
<list-options key-name="partyId" list-name="membersPartyId" description="${lastName} ${firstName} ${middleName}"/>
</drop-down>
diff --git a/specialpurpose/scrum/widget/OpenTestScreens.xml b/specialpurpose/scrum/widget/OpenTestScreens.xml
index 1e2c196..be4b535 100644
--- a/specialpurpose/scrum/widget/OpenTestScreens.xml
+++ b/specialpurpose/scrum/widget/OpenTestScreens.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
diff --git a/specialpurpose/scrum/widget/TimeSheetForms.xml b/specialpurpose/scrum/widget/TimeSheetForms.xml
index b270aa1..47711d5 100644
--- a/specialpurpose/scrum/widget/TimeSheetForms.xml
+++ b/specialpurpose/scrum/widget/TimeSheetForms.xml
@@ -23,24 +23,24 @@
<form name="FindTimeSheet" target="FindTimeSheet" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-condition entity-name="PartyRoleDetailAndPartyDetail" distinct="true" list="parties">
- <condition-list combine="or">
- <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_TEAM"/>
- <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_MASTER"/>
- </condition-list>
- <select-field field-name="firstName"/>
- <select-field field-name="middleName"/>
- <select-field field-name="lastName"/>
- <select-field field-name="partyId"/>
- <order-by field-name="lastName"/>
- </entity-condition>
+ <entity-condition entity-name="PartyRoleDetailAndPartyDetail" distinct="true" list="parties">
+ <condition-list combine="or">
+ <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_TEAM"/>
+ <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_MASTER"/>
+ </condition-list>
+ <select-field field-name="firstName"/>
+ <select-field field-name="middleName"/>
+ <select-field field-name="lastName"/>
+ <select-field field-name="partyId"/>
+ <order-by field-name="lastName"/>
+ </entity-condition>
</actions>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="timesheetId"><text-find ignore-case="true"/></field>
<field name="comments"><text-find ignore-case="true"/></field>
<field name="partyId" title="${uiLabelMap.PartyParty}">
<drop-down allow-empty="true">
- <list-options key-name="partyId" list-name="parties" description="${lastName} ${firstName} ${middleName}"/>
+ <list-options key-name="partyId" list-name="parties" description="${lastName} ${firstName} ${middleName}"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
diff --git a/specialpurpose/scrum/widget/demotest/DemotestScreen.xml b/specialpurpose/scrum/widget/demotest/DemotestScreen.xml
index a31a56c..a0658a9 100644
--- a/specialpurpose/scrum/widget/demotest/DemotestScreen.xml
+++ b/specialpurpose/scrum/widget/demotest/DemotestScreen.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
diff --git a/specialpurpose/scrum/widget/scrumForms.xml b/specialpurpose/scrum/widget/scrumForms.xml
index a5539b7..6b8284a 100644
--- a/specialpurpose/scrum/widget/scrumForms.xml
+++ b/specialpurpose/scrum/widget/scrumForms.xml
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="sprintList" type="list" use-row-submit="true" list-name="listIt" target="DeleteSprint" paginate-target="SprintList" separate-columns="true"
diff --git a/specialpurpose/scrum/widget/scrumMenus.xml b/specialpurpose/scrum/widget/scrumMenus.xml
index cb3bb10..5af26b8 100644
--- a/specialpurpose/scrum/widget/scrumMenus.xml
+++ b/specialpurpose/scrum/widget/scrumMenus.xml
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="ScrumAppBar" title="${uiLabelMap.ScrumApplication}"
default-menu-item-name="products" id="app-navigation" type="simple"
diff --git a/specialpurpose/scrum/widget/scrumScreens.xml b/specialpurpose/scrum/widget/scrumScreens.xml
index f257e09..2df2936 100644
--- a/specialpurpose/scrum/widget/scrumScreens.xml
+++ b/specialpurpose/scrum/widget/scrumScreens.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
