svn commit: r1000657 - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r1000657 - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Author: jleroux
Date: Thu Sep 23 22:45:30 2010 New Revision: 1000657 URL: http://svn.apache.org/viewvc?rev=1000657&view=rev Log: Merges the trunk at r1000638 Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/jquery/applications/accounting/servicedef/secas_ledger.xml ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/jquery/applications/accounting/servicedef/services_ledger.xml ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingUiLabels.xml ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/specialpurpose/assetmaint/config/IsMgrUiLabels.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1000480 +/ofbiz/trunk:951708-1000653 Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -5674,7 +5674,7 @@ <property key="AccountingLookupAgreement"> <value xml:lang="de">Vereinbarung suchen</value> <value xml:lang="en">Lookup Agreement</value> - <value xml:lang="fr">Consulter l'accord commercial</value> + <value xml:lang="fr">Rechercher un ou des accords commerciaux</value> <value xml:lang="hi_IN">ठनà¥à¤¬à¤à¤§ लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca contratti</value> <value xml:lang="nl">Vind overeenkomst</value> @@ -5683,7 +5683,7 @@ <property key="AccountingLookupAgreementItem"> <value xml:lang="de">Vereinbarungsposition suchen</value> <value xml:lang="en">Lookup Agreement Item</value> - <value xml:lang="fr">Consulter la ligne d'accord commercial</value> + <value xml:lang="fr">Rechercher un ou des lignes d'accord commercial</value> <value xml:lang="hi_IN">ठनà¥à¤¬à¤à¤§ मद लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca righe contratti</value> <value xml:lang="nl">Vind onderdelen overeenkomst</value> @@ -10778,7 +10778,7 @@ <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ दिनाà¤à¤ सà¥</value> </property> <property key="FormFieldTitle_gatewayAvsResult"> - <value xml:lang="de">Schnittstelle AVS Ergebnis</value> + <value xml:lang="de">Schnittstelle AVS Ergebnis</value> <value xml:lang="en">Gateway Avs Result</value> <value xml:lang="es">Resultado Puerta Avs</value> <value xml:lang="fr">Réponse Avs du terminal de paiement</value> Modified: ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml Thu Sep 23 22:45:30 2010 @@ -45,6 +45,7 @@ under the License. <AcctgTransType acctgTransTypeId="SALES_INVOICE" description="Sales Invoice" hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/><!-- FIXME: replace with "SALES" --> <AcctgTransType acctgTransTypeId="PURCHASE_INVOICE" description="Purchase Invoice" hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/><!-- FIXME: replace with "SALES" --> + <AcctgTransType acctgTransTypeId="CUST_RTN_INVOICE" description="Customer Return" hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/><!-- FIXME: replace with "SALES" --> <AcctgTransType acctgTransTypeId="SALES_SHIPMENT" description="Sales Shipment" hasTable="N" parentTypeId="EXTERNAL_ACCTG_TRANS"/> <AcctgTransType acctgTransTypeId="SHIPMENT_RECEIPT" description="Shipment Receipt" hasTable="N" parentTypeId="EXTERNAL_ACCTG_TRANS"/> <AcctgTransType acctgTransTypeId="MANUFACTURING" description="Manufacturing" hasTable="N" parentTypeId=""/> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Thu Sep 23 22:45:30 2010 @@ -455,6 +455,7 @@ under the License. <simple-method method-name="setInvoiceStatus" short-description="Set The Invoice Status"> <entity-one entity-name="Invoice" value-field="invoice"/> <field-to-result field="invoice.statusId" result-name="oldStatusId"/> + <field-to-result field="invoice.invoiceTypeId" result-name="invoiceTypeId"/> <if-compare-field field="invoice.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false"> <field-map field-name="statusId" from-field="invoice.statusId"/> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Thu Sep 23 22:45:30 2010 @@ -579,6 +579,10 @@ under the License. <if-compare field="parameters.debitCreditFlag" operator="equals" value="D"/> </and> <and> + <if-compare field="parameters.acctgTransTypeId" operator="equals" value="CUST_RTN_INVOICE"/> + <if-compare field="parameters.debitCreditFlag" operator="equals" value="D"/> + </and> + <and> <if-compare field="parameters.acctgTransTypeId" operator="equals" value="SALES_INVOICE"/> <if-compare field="parameters.debitCreditFlag" operator="equals" value="C"/> </and> @@ -594,11 +598,16 @@ under the License. <set field="parameters.glAccountTypeId" value="UNINVOICED_SHIP_RCPT"/> <call-simple-method method-name="getGlAccountTypeDefaultInline"/> <set field="glAccountTypeDefault" from-field="lookedUpValue"/> - <else> + </if-compare> + <if-compare field="parameters.acctgTransTypeId" operator="equals" value="CUST_RTN_INVOICE"> + <set field="parameters.glAccountTypeId" value="SALES_RETURNS"/> + <call-simple-method method-name="getGlAccountTypeDefaultInline"/> + <set field="glAccountTypeDefault" from-field="lookedUpValue"/> + </if-compare> + <if-compare field="parameters.acctgTransTypeId" operator="equals" value="SALES_INVOICE"> <set field="parameters.glAccountTypeId" value="SALES_ACCOUNT"/> <call-simple-method method-name="getGlAccountTypeDefaultInline"/> <set field="glAccountTypeDefault" from-field="lookedUpValue"/> - </else> </if-compare> <if-not-empty field="glAccountTypeDefault.glAccountId"> <field-to-result field="glAccountTypeDefault.glAccountId" result-name="glAccountId"/> @@ -1877,6 +1886,130 @@ under the License. </if-compare> </simple-method> + <simple-method method-name="createAcctgTransForCustomerReturnInvoice" short-description="Create an accounting transaction for a Customer Return Invoice"> + <!-- retrieve ledger rounding properties --> + <call-simple-method method-name="getGlArithmeticSettingsInline"/> + + <entity-one entity-name="Invoice" value-field="invoice"/> + <get-related-one value-field="invoice" relation-name="InvoiceType" to-value-field="invoiceType"/> + <!-- Check invoiceTypeId. This service works only for CustomerReturns --> + <if-compare field="invoiceType.invoiceTypeId" operator="equals" value="CUST_RTN_INVOICE"> + <set field="totalAmountFromInvoice" type="BigDecimal" value="0"/> + <set field="transPartyRoleTypeId" value="BILL_TO_CUSTOMER"/> + <set field="acctgTransTypeId" value="CUST_RTN_INVOICE"/> + <entity-condition entity-name="InvoiceItem" list="invoiceItems" use-cache="true"> + <condition-list> + <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="PINV_SALES_TAX"/> + <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="PITM_SALES_TAX"/> + <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId"/> + </condition-list> + </entity-condition> + + <iterate list="invoiceItems" entry="invoiceItem"> + <set field="amountFromOrder" type="BigDecimal" value="0"/> + <set field="amountFromInvoice" type="BigDecimal" value="0"/> + <if-empty field="invoiceItem.quantity"> + <set field="invoiceItem.quantity" value="1"/> + </if-empty> + <!-- This InvoiceItem amount. --> + <calculate field="amountFromInvoice" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calcop operator="multiply"> + <calcop operator="get" field="invoiceItem.quantity"/> + <calcop operator="get" field="invoiceItem.amount"/> + </calcop> + </calculate> + <!-- Keep building Invoice Total for use in credit entry --> + <calculate field="totalAmountFromInvoice" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calcop operator="add"> + <calcop operator="get" field="totalAmountFromInvoice"/> + <calcop operator="get" field="amountFromInvoice"/> + </calcop> + </calculate> + <!-- Debit --> + <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/> + <set field="debitEntry.debitCreditFlag" value="D"/> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/> + <set field="debitEntry.partyId" from-field="invoice.partyIdFrom"/> + <set field="debitEntry.roleTypeId" from-field="transPartyRoleTypeId"/> + <set field="debitEntry.productId" from-field="invoiceItem.productId"/> + <set field="debitEntry.glAccountTypeId" from-field="invoiceItem.invoiceItemTypeId"/> + <set field="debitEntry.glAccountId" from-field="invoiceItem.overrideGlAccountId"/> + <set field="debitEntry.origAmount" from-field="amountFromInvoice"/> + <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/> + <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/> + </iterate> + <!-- debit entry for SALES_TAX--> + <call-class-method method-name="getInvoiceTaxAuthPartyAndGeos" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" + ret-field="taxAuthPartyAndGeos"> + <field field="invoice" type="org.ofbiz.entity.GenericValue"/> + </call-class-method> + <iterate-map key="taxAuthPartyId" value="taxAuthGeoIds" map="taxAuthPartyAndGeos"> + <iterate entry="taxAuthGeoId" list="taxAuthGeoIds"> + <clear-field field="debitEntry"/> + <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/> + <set field="debitEntry.debitCreditFlag" value="D"/> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyIdFrom"/> + <call-class-method method-name="getInvoiceTaxTotalForTaxAuthPartyAndGeo" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" + ret-field="taxAmount"> + <field field="invoice" type="GenericValue"/> + <field field="taxAuthPartyId" type="String"/> + <field field="taxAuthGeoId" type="String"/> + </call-class-method> + <set field="debitEntry.origAmount" from-field="taxAmount"/> + <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/> + <set field="debitEntry.partyId" from-field="taxAuthPartyId"/> + <set field="debitEntry.roleTypeId" value="TAX_AUTHORITY"/> + <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/> + </iterate> + </iterate-map> + <!-- Another entry for tax not attributed to a taxAuthPartyId --> + <clear-field field="debitEntry"/> + <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/> + <set field="debitEntry.debitCreditFlag" value="D"/> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyIdFrom"/> + <call-class-method method-name="getInvoiceUnattributedTaxTotal" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" + ret-field="taxAmount"> + <field field="invoice" type="GenericValue"/> + </call-class-method> + <set field="debitEntry.origAmount" from-field="taxAmount"/> + <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/> + <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/> + + <!-- Credit --> + <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/> + <set field="creditEntry.debitCreditFlag" value="C"/> + <set field="creditEntry.organizationPartyId" from-field="invoice.partyId"/> + <set field="creditEntry.glAccountTypeId" value="ACCOUNTS_PAYABLE"/> + <calculate field="totalAmountFromInvoice" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calcop operator="add"> + <calcop operator="get" field="totalAmountFromInvoice"/> + <calcop operator="get" field="invoiceTaxTotal"/> + </calcop> + </calculate> + <set field="creditEntry.origAmount" from-field="totalAmountFromInvoice"/> + <set field="creditEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/> + <set field="creditEntry.partyId" from-field="invoice.partyIdFrom"/> + <set field="creditEntry.roleTypeId" from-field="transPartyRoleTypeId"/> + <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/> + + <!-- Set header fields (AcctgTrans) --> + <set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/> + <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" from-field="acctgTransTypeId"/> + <set field="createAcctgTransAndEntriesInMap.invoiceId" from-field="invoice.invoiceId"/> + <set field="createAcctgTransAndEntriesInMap.partyId" from-field="invoice.partyIdFrom"/> + <set field="createAcctgTransAndEntriesInMap.roleTypeId" value="BILL_FROM_VENDOR"/> + <set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/> + <call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap"> + <result-to-field result-name="acctgTransId"/> + </call-service> + <field-to-result field="acctgTransId" result-name="acctgTransId"/> + <else> + <!-- This invoice is not a Customer Return. Return error --> + <add-error><fail-message message="Bad invoiceTypeId [${invoiceType.invoiceTypeId}]. Service createAcctgTransForCustomerReturnInvoice for type CUST_RTN_INVOICE."/></add-error> + </else> + </if-compare> + </simple-method> + <!-- Service for the automatic creation of accounting transaction for Purchase Invoice --> <simple-method method-name="createAcctgTransForPurchaseInvoice" short-description="Create an accounting transaction for a purchase invoice"> <!-- retrieve ledger rounding properties --> Modified: ofbiz/branches/jquery/applications/accounting/servicedef/secas_ledger.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/servicedef/secas_ledger.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/servicedef/secas_ledger.xml (original) +++ ofbiz/branches/jquery/applications/accounting/servicedef/secas_ledger.xml Thu Sep 23 22:45:30 2010 @@ -86,6 +86,7 @@ under the License. <!-- accounting transactions for Purchase (AP) and Sales Invoices (AR) --> <eca service="setInvoiceStatus" event="commit"> <condition field-name="invoiceId" operator="is-not-empty"/> + <condition field-name="invoiceTypeId" operator="not-equals" value="CUST_RTN_INVOICE"/> <condition field-name="statusId" operator="equals" value="INVOICE_READY"/> <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_READY"/> <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_PAID"/> @@ -94,6 +95,14 @@ under the License. </eca> <eca service="setInvoiceStatus" event="commit"> <condition field-name="invoiceId" operator="is-not-empty"/> + <condition field-name="invoiceTypeId" operator="equals" value="CUST_RTN_INVOICE"/> + <condition field-name="statusId" operator="equals" value="INVOICE_READY"/> + <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_READY"/> + <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_PAID"/> + <action service="createAcctgTransForCustomerReturnInvoice" mode="sync"/> + </eca> + <eca service="setInvoiceStatus" event="commit"> + <condition field-name="invoiceId" operator="is-not-empty"/> <condition field-name="statusId" operator="equals" value="INVOICE_CANCELLED"/> <action service="cancelInvoice" mode="sync"/> </eca> Modified: ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml (original) +++ ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml Thu Sep 23 22:45:30 2010 @@ -92,6 +92,7 @@ under the License. <attribute name="statusId" type="String" mode="IN" optional="false"/> <attribute name="statusDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="paidDate" type="Timestamp" mode="IN" optional="true"/> <!-- only relevant for changes to PAID --> + <attribute name="invoiceTypeId" type="String" mode="OUT" optional="true"/> <attribute name="oldStatusId" type="String" mode="OUT" optional="true"/> </service> <service name="copyInvoiceToTemplate" engine="simple" Modified: ofbiz/branches/jquery/applications/accounting/servicedef/services_ledger.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/servicedef/services_ledger.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/servicedef/services_ledger.xml (original) +++ ofbiz/branches/jquery/applications/accounting/servicedef/services_ledger.xml Thu Sep 23 22:45:30 2010 @@ -453,6 +453,14 @@ under the License. <attribute name="acctgTransId" type="String" mode="OUT" optional="true"/> </service> + <!-- An automatic GL Posting for Customer Return Invoice--> + <service name="createAcctgTransForCustomerReturnInvoice" engine="simple" auth="true" + location="component://accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createAcctgTransForCustomerReturnInvoice"> + <description>Create an accounting transaction for a Customer Return invoice</description> + <attribute name="invoiceId" type="String" mode="IN" optional="false"/> + <attribute name="acctgTransId" type="String" mode="OUT" optional="true"/> + </service> + <!-- An automatic GL Posting for Purchase Invoice--> <service name="createAcctgTransForPurchaseInvoice" engine="simple" auth="true" location="component://accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createAcctgTransForPurchaseInvoice"> Modified: ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -941,7 +941,7 @@ <value xml:lang="en">Messages</value> <value xml:lang="fr">Messages</value> <value xml:lang="it">Messaggi</value> - <value xml:lang="nl">Berichten</value> + <value xml:lang="nl">Berichten</value> <value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡</value> <value xml:lang="zh">æ¶æ¯</value> </property> Modified: ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -4074,7 +4074,7 @@ <value xml:lang="de">Arbeitsplansuche</value> <value xml:lang="en">Lookup Routing</value> <value xml:lang="es">Buscar ruta</value> - <value xml:lang="fr">Consulter la gamme</value> + <value xml:lang="fr">Rechercher un ou des gammes</value> <value xml:lang="it">Ricerca Ciclo</value> <value xml:lang="pt_BR">Buscar rota</value> <value xml:lang="ro">Cauta Ciclu</value> Modified: ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -1855,7 +1855,7 @@ <property key="PageTitleLookupCommEvent"> <value xml:lang="en">Lookup Communication Event</value> <value xml:lang="es">Buscar evento de comunicación</value> - <value xml:lang="fr">Consulter l'évènement de communication</value> + <value xml:lang="fr">Rechercher un ou des évènements de communication</value> <value xml:lang="it">Ricerca Evento Comunicazione</value> <value xml:lang="pt_BR">Buscar Evento de Comunicação</value> <value xml:lang="ro">Cauta Eveniment Comunicatie</value> @@ -1865,7 +1865,7 @@ <property key="PageTitleLookupContactList"> <value xml:lang="en">Lookup Contact List</value> <value xml:lang="es">Buscar lista de contactos</value> - <value xml:lang="fr">Consulter la liste de contact</value> + <value xml:lang="fr">Rechercher une ou des listes de contact</value> <value xml:lang="it">Ricerca Lista Contatti</value> <value xml:lang="pt_BR">Buscar Lista de Contatos</value> <value xml:lang="ro">Cauta Lista Contacte</value> @@ -1875,14 +1875,14 @@ <property key="PageTitleLookupSalesForecast"> <value xml:lang="de">Verkaufsprognosen anschauen</value> <value xml:lang="en">Lookup Sales Forecast</value> - <value xml:lang="fr">Consulter la prévision de ventes</value> + <value xml:lang="fr">Rechercher une ou des prévisions de ventes</value> <value xml:lang="it">Ricerca previsioni di vendita</value> <value xml:lang="pt_BR">Buscar previsões de venda</value> <value xml:lang="zh">æ¥æ¾éå®é¢æµ</value> </property> <property key="PageTitleLookupSegmentGroup"> <value xml:lang="en">Lookup Segment Group</value> - <value xml:lang="fr">Consulter le groupe de segment</value> + <value xml:lang="fr">Rechercher un ou des groupes de segment</value> <value xml:lang="it">Ricerca Gruppi Segmento</value> <value xml:lang="pt_BR">Buscar Grupo de segmento</value> <value xml:lang="ro">Cauta Grupuri Segment</value> @@ -1892,7 +1892,7 @@ <property key="PageTitleLookupTrackingCode"> <value xml:lang="en">Lookup Tracking Code</value> <value xml:lang="es">Buscar seguimiento</value> - <value xml:lang="fr">Consulter le code de suivi</value> + <value xml:lang="fr">Rechercher un ou des codes de suivi</value> <value xml:lang="it">Ricerca Codice Tracciatura</value> <value xml:lang="pt_BR">Buscar código de rastreio</value> <value xml:lang="ro">Cauta Cod Traseu</value> @@ -1902,7 +1902,7 @@ <property key="PageTitleLookupTrackingCodeType"> <value xml:lang="en">Lookup Tracking Code Type</value> <value xml:lang="es">Buscar tipo de seguimiento</value> - <value xml:lang="fr">Consulter le type de code de suivi</value> + <value xml:lang="fr">Rechercher un ou des types de code de suivi</value> <value xml:lang="it">Ricerca tipo tracciatura</value> <value xml:lang="pt_BR">Buscar por tipo de código de rastreio</value> <value xml:lang="ro">Cauta Tip Traseu</value> @@ -1913,7 +1913,7 @@ <value xml:lang="de">Besuche anschauen</value> <value xml:lang="en">Lookup Visit</value> <value xml:lang="es">Buscar visita</value> - <value xml:lang="fr">Consulter la visite</value> + <value xml:lang="fr">Rechercher une ou des visites</value> <value xml:lang="it">Ricerca Visita</value> <value xml:lang="pt_BR">Buscar visita</value> <value xml:lang="ro">Cauta Vizita</value> Modified: ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -11325,7 +11325,7 @@ <value xml:lang="de">Kundenanfrage suchen</value> <value xml:lang="en">Lookup Customer Request</value> <value xml:lang="es">Buscar requisito de cliente</value> - <value xml:lang="fr">Consulter la demande du client</value> + <value xml:lang="fr">Rechercher une ou des demandes client</value> <value xml:lang="it">Ricerca Richieste Clienti</value> <value xml:lang="nl">Lookup Customer Request</value> <value xml:lang="pt_BR">Buscar solicitações de clientes</value> @@ -11338,7 +11338,7 @@ <value xml:lang="de">Kundenanfrage Element suchen</value> <value xml:lang="en">Lookup Customer Request Item</value> <value xml:lang="es">Buscar Ãtem de requisito de cliente</value> - <value xml:lang="fr">Consulter la ligne de demande du client</value> + <value xml:lang="fr">Rechercher une ou des lignes de demande client</value> <value xml:lang="it">Ricerca Righe Richieste Clienti</value> <value xml:lang="nl">Lookup Customer Request Item</value> <value xml:lang="pt_BR">Buscar item de solicitação de cliente</value> @@ -11351,7 +11351,7 @@ <value xml:lang="de">Auftragskopf suchen</value> <value xml:lang="en">Lookup Order Header</value> <value xml:lang="es">Buscar cabecera de pedido</value> - <value xml:lang="fr">Consulter l'entête de commande</value> + <value xml:lang="fr">Rechercher un ou des entêtes de commande</value> <value xml:lang="it">Ricerca Testate Ordini</value> <value xml:lang="nl">Lookup Bestelling Header</value> <value xml:lang="pt_BR">Buscar cabeçalho de pedido</value> @@ -11364,7 +11364,7 @@ <value xml:lang="de">Auftragskopf und Versandinformationen suchen</value> <value xml:lang="en">Lookup Order Header and Ship Info</value> <value xml:lang="es">Buscar cabecera de pedido e información de envÃo</value> - <value xml:lang="fr">Consulter l'entête de commande et les infos d'expédition</value> + <value xml:lang="fr">Rechercher un ou des entêtes de commande et infos d'expédition</value> <value xml:lang="it">Ricerca Testate Ordini e Informazioni Spedizioni</value> <value xml:lang="nl">Lookup Bestelling Header and Ship Info</value> <value xml:lang="pt_BR">Buscar cabeçalho de pedido e informações de envio</value> @@ -11377,7 +11377,7 @@ <value xml:lang="de">Beschaffungsauftragskopf und Versandinformationen suchen</value> <value xml:lang="en">Lookup Purchase Order Header and Ship Info</value> <value xml:lang="es">Buscar cabecera de pedido de compra e información de envÃo</value> - <value xml:lang="fr">Consulter l'entête de la commande d'achat et les infos d'expédition</value> + <value xml:lang="fr">Rechercher un ou des entêtes commandes d'achat et infos d'expédition</value> <value xml:lang="it">Ricerca Testate Ordini Acquisto e Informazioni Spedizioni</value> <value xml:lang="nl">Lookup Purchase Bestelling Header and Ship Info</value> <value xml:lang="pt_BR">Buscar cabeçalho de pedido de venda e informação de envio</value> @@ -11390,7 +11390,7 @@ <value xml:lang="de">Offerte suchen</value> <value xml:lang="en">Lookup Quote</value> <value xml:lang="es">Buscar presupuesto</value> - <value xml:lang="fr">Consulter le devis</value> + <value xml:lang="fr">Rechercher un ou des devis</value> <value xml:lang="it">Ricerca Preventivi</value> <value xml:lang="nl">Lookup Quote</value> <value xml:lang="pt_BR">Buscar cotação</value> @@ -11403,7 +11403,7 @@ <value xml:lang="de">Offertelement suchen</value> <value xml:lang="en">Lookup Quote Item</value> <value xml:lang="es">Buscar Ãtem de presupuesto</value> - <value xml:lang="fr">Consulter la ligne de devis</value> + <value xml:lang="fr">Rechercher une ou des lignes de devis</value> <value xml:lang="it">Ricerca Righe Preventivi</value> <value xml:lang="nl">Lookup Quote Item</value> <value xml:lang="pt_BR">Buscar item de cotação</value> @@ -11416,7 +11416,7 @@ <value xml:lang="de">Bedarf suchen</value> <value xml:lang="en">Lookup Requirement</value> <value xml:lang="es">Buscar requisito</value> - <value xml:lang="fr">Consulter le besoin</value> + <value xml:lang="fr">Rechercher un ou des besoins</value> <value xml:lang="it">Ricerca Fabbisogni</value> <value xml:lang="nl">Lookup Requirement</value> <value xml:lang="pt_BR">Buscar requisito</value> @@ -11429,7 +11429,7 @@ <value xml:lang="de">Einkaufsliste suchen</value> <value xml:lang="en">Lookup Shopping List</value> <value xml:lang="es">Buscar lista de compra</value> - <value xml:lang="fr">Consulter la liste d'achat</value> + <value xml:lang="fr">Rechercher une ou des listes d'achat</value> <value xml:lang="it">Ricerca Liste di Acquisto</value> <value xml:lang="nl">Lookup Shopping List</value> <value xml:lang="pt_BR">Buscar lista de compras</value> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1000480 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1000653 Modified: ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -6430,7 +6430,7 @@ <value xml:lang="de">Kontaktmechanismus suchen</value> <value xml:lang="en">Lookup Contact Mech</value> <value xml:lang="es">Buscar mecanismo de contacto</value> - <value xml:lang="fr">Consulter les coordonnées</value> + <value xml:lang="fr">Rechercher une ou des coordonnées</value> <value xml:lang="hi_IN">सà¤à¤ªà¤°à¥à¤ याà¤à¤¤à¥à¤°à¤¿à¤ लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca Contatti</value> <value xml:lang="nl">Contactmech zoeken</value> @@ -6468,7 +6468,7 @@ <value xml:lang="de">Akteur und Benutzeranmeldung suchen</value> <value xml:lang="en">Lookup PartyAndUserLoginAndPerson</value> <value xml:lang="es">Buscar participante y conexion</value> - <value xml:lang="fr">Consulter l'acteur et son identifiant de connexion</value> + <value xml:lang="fr">Rechercher un ou des acteurs et identifiants de connexion</value> <value xml:lang="hi_IN">पारà¥à¤à¥/à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨/वà¥à¤¯à¤à¥à¤¤à¤¿ लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca soggetti utenti e persone</value> <value xml:lang="nl">Gebruikers zoeken</value> @@ -6496,7 +6496,7 @@ <value xml:lang="de">Akteur Klassifizierungsgruppe suchen</value> <value xml:lang="en">Lookup Party Classification Group</value> <value xml:lang="es">Buscar grupo de clasificación de participante</value> - <value xml:lang="fr">Consulter les groupe de classification de l'acteur</value> + <value xml:lang="fr">Rechercher un ou des groupes de classification de l'acteur</value> <value xml:lang="hi_IN">पारà¥à¤à¥ वरà¥à¤à¥à¤à¤°à¤£ समà¥à¤¹ लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca Gruppi Classificazione Soggetti</value> <value xml:lang="nl">Classificatiegroepen zoeken</value> @@ -6510,7 +6510,7 @@ <value xml:lang="de">Kommunikationsereignis suchen</value> <value xml:lang="en">Lookup Communication Event</value> <value xml:lang="es">Buscar evento de comunicación</value> - <value xml:lang="fr">Consulter l'évènement de communication</value> + <value xml:lang="fr">Rechercher un ou des évènements de communication</value> <value xml:lang="hi_IN">सà¤à¤à¤¾à¤° à¤à¤à¤¨à¤¾(Event) लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca Eventi Comunicazioni</value> <value xml:lang="nl">Communicatie-acties zoekent</value> @@ -6524,7 +6524,7 @@ <value xml:lang="de">Gruppe suchen</value> <value xml:lang="en">Lookup Group</value> <value xml:lang="es">Buscar grupo</value> - <value xml:lang="fr">Consulter le groupe</value> + <value xml:lang="fr">Rechercher un ou des groupes</value> <value xml:lang="hi_IN">समà¥à¤¹ लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca Gruppi</value> <value xml:lang="nl">Groep zoeken</value> @@ -6538,7 +6538,7 @@ <value xml:lang="de">Person suchen</value> <value xml:lang="en">Lookup Person</value> <value xml:lang="es">Buscar persona</value> - <value xml:lang="fr">Consulter la personne</value> + <value xml:lang="fr">Rechercher une ou des personnes</value> <value xml:lang="hi_IN">वà¥à¤¯à¤à¥à¤¤à¤¿(Person) लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca Persone</value> <value xml:lang="nl">Persoon zoeken</value> @@ -6552,7 +6552,7 @@ <value xml:lang="de">Benutzeranmeldung und Akteur suchen</value> <value xml:lang="en">Lookup UserLoginAndPartyDetails</value> <value xml:lang="es">Buscar conexión y detalles de participante</value> - <value xml:lang="fr">Consulter l'identifiant de connexion et les détails de l'acteur</value> + <value xml:lang="fr">Rechercher un ou des identifiants de connexion et détails de l'acteur</value> <value xml:lang="hi_IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨/पारà¥à¤à¥à¤µà¤¿à¤µà¤°à¤£ लà¥à¤à¤ प</value> <value xml:lang="it">Ricerca soggetti utenti e dettagli</value> <value xml:lang="nl">Logingegevens zoeken</value> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1000480 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1000653 Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -6175,7 +6175,7 @@ <value xml:lang="de">Einrichtung nachschlagen</value> <value xml:lang="en">Lookup Facility</value> <value xml:lang="es">Buscar almacén</value> - <value xml:lang="fr">Consulter le lieu de stockage</value> + <value xml:lang="fr">Rechercher un ou des lieux de stockage</value> <value xml:lang="it">Ricerca Stabilimento</value> <value xml:lang="ro">Cauta Compartiment</value> <value xml:lang="ru">ÐÑкаÑÑ Ð¾Ð±ÑекÑ</value> @@ -6186,7 +6186,7 @@ <value xml:lang="de">Produkt nachschlagen</value> <value xml:lang="en">Lookup Product</value> <value xml:lang="es">Buscar Producto</value> - <value xml:lang="fr">Consulter l'article</value> + <value xml:lang="fr">Rechercher un ou des articles</value> <value xml:lang="it">Ricerca prodotti</value> <value xml:lang="nl">Produkt zoeken</value> <value xml:lang="ro">Cauta Produse</value> @@ -6198,7 +6198,7 @@ <value xml:lang="de">Produktkategorie nachschlagen</value> <value xml:lang="en">Lookup Product Category</value> <value xml:lang="es">Buscar CategorÃa de productos</value> - <value xml:lang="fr">Consulter la catégorie d'article</value> + <value xml:lang="fr">Rechercher une ou des catégories d'article</value> <value xml:lang="it">Ricerca Categorie Prodotti</value> <value xml:lang="ro">Cauta Categorie Produse</value> <value xml:lang="ru">ÐÑкаÑÑ ÐºÐ°ÑегоÑÐ¸Ñ Ð¿ÑодÑкÑа</value> @@ -6209,7 +6209,7 @@ <value xml:lang="de">Produktmerkmal nachschlagen</value> <value xml:lang="en">Lookup Product Feature</value> <value xml:lang="es">Buscar CaracterÃsticas de Productos</value> - <value xml:lang="fr">Consulter les caractéristiques d'article</value> + <value xml:lang="fr">Rechercher une ou des caractéristiques d'article</value> <value xml:lang="it">Ricerca Caratteristiche Prodotti</value> <value xml:lang="ro">Cauta Caracteristici Produse</value> <value xml:lang="ru">ÐÑкаÑÑ Ð¾ÑобенноÑÑÑ Ð¿ÑодÑкÑа</value> @@ -6220,7 +6220,7 @@ <value xml:lang="de">Produkt und Preis nachschlagen</value> <value xml:lang="en">Lookup Product And Price</value> <value xml:lang="es">Buscar Producto y precio</value> - <value xml:lang="fr">Consulter les prix d'un article</value> + <value xml:lang="fr">Rechercher un ou des prix d'un article</value> <value xml:lang="it">Ricerca Prodotti e Prezzi</value> <value xml:lang="nl">Zoeken productprijs</value> <value xml:lang="ro">Cauta Produse si Preturi</value> @@ -6232,7 +6232,7 @@ <value xml:lang="de">Laden nachschlagen</value> <value xml:lang="en">Lookup Product Store</value> <value xml:lang="es">Buscar tienda de producto</value> - <value xml:lang="fr">Consulter le centre de profit</value> + <value xml:lang="fr">Rechercher un ou des centres de profit</value> <value xml:lang="it">Ricerca Negozi</value> <value xml:lang="nl">Zoeken winkel</value> <value xml:lang="ro">Cauta Magazine</value> @@ -6244,7 +6244,7 @@ <value xml:lang="de">Produktvariante nachschlagen</value> <value xml:lang="en">Lookup Variant Product</value> <value xml:lang="es">Buscar producto variante</value> - <value xml:lang="fr">Consulter la variante d'article</value> + <value xml:lang="fr">Rechercher une ou des variantes d'article</value> <value xml:lang="it">Ricerca Prodotti Varianti</value> <value xml:lang="ro">Cauta Variante Produse </value> <value xml:lang="ru">ÐÑкаÑÑ Ð²Ð°ÑÐ¸Ð°Ð½Ñ Ð¿ÑодÑкÑа</value> @@ -6255,7 +6255,7 @@ <value xml:lang="de">Virtuelles Produkt nachschlagen</value> <value xml:lang="en">Lookup Virtual Product</value> <value xml:lang="es">Buscar producto virtual</value> - <value xml:lang="fr">Consulter l'article virtuel</value> + <value xml:lang="fr">Rechercher un ou des articles virtuel</value> <value xml:lang="it">Ricerca Prodotti Virtuali</value> <value xml:lang="ro">Cauta Produse Virtuale</value> <value xml:lang="ru">ÐÑкаÑÑ Ð²Ð¸ÑÑÑалÑнÑй пÑодÑкÑ</value> @@ -6264,7 +6264,7 @@ </property> <property key="PageTitleLookupSupplierProduct"> <value xml:lang="en">Lookup Product for supplier:</value> - <value xml:lang="fr">Consulter un produit pour le fournisseur : </value> + <value xml:lang="fr">Rechercher un ou des produits pour le fournisseur : </value> <value xml:lang="it">Ricerca prodotto per fornitore:</value> <value xml:lang="zh">æ¥æ¾äº§åï¼ä¾è´§åæ¯</value> </property> @@ -8120,7 +8120,7 @@ <value xml:lang="de">Kataloge anzeigen</value> <value xml:lang="en">Browse Catalogs</value> <value xml:lang="es">Examinar Catálogos</value> - <value xml:lang="fr">Consulter les catalogues</value> + <value xml:lang="fr">Rechercher un ou des catalogues</value> <value xml:lang="it">Mostra Cataloghi</value> <value xml:lang="nl">Blader door catalogi</value> <value xml:lang="ro">Afiseaza Catalog</value> @@ -13143,7 +13143,7 @@ <value xml:lang="de">Lieferung(en) suchen</value> <value xml:lang="en">Lookup Shipment(s)</value> <value xml:lang="es">Buscar envÃo(s)</value> - <value xml:lang="fr">Consulter l'expédition(s)</value> + <value xml:lang="fr">Rechercher une ou des expéditions</value> <value xml:lang="it">Ricerca Spedizione(i)</value> <value xml:lang="ro">Cauta Expediere(i)</value> <value xml:lang="ru">ÐÑкаÑÑ Ð¿Ð¾ÑÑавкÑ(и)</value> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1000480 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1000653 Modified: ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -1214,7 +1214,7 @@ </property> <property key="PageTitleLookupTimesheet"> <value xml:lang="en">Lookup Timesheet by Name</value> - <value xml:lang="fr">Consulter les feuilles de présence par nom</value> + <value xml:lang="fr">Rechercher une ou des feuilles de présence par nom</value> <value xml:lang="it">Ricerca Timbrature per Nome</value> <value xml:lang="nl">Lookup Timesheet by Name</value> <value xml:lang="ro">Cauta Pontaj pe Nume</value> @@ -1223,7 +1223,7 @@ </property> <property key="PageTitleLookupWorkEffort"> <value xml:lang="en">Lookup WorkEffort by Name</value> - <value xml:lang="fr">Consulter les tâches par nom</value> + <value xml:lang="fr">Rechercher une ou des tâches par nom</value> <value xml:lang="it">Ricerca Impegno di Lavoro per Nome</value> <value xml:lang="nl">Zoek werk inspanningen op naam</value> <value xml:lang="ro">Cauta Sarcina de Lucru dupa Nume</value> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1000480 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1000653 Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/config/IsMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/config/IsMgrUiLabels.xml?rev=1000657&r1=1000656&r2=1000657&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/config/IsMgrUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/config/IsMgrUiLabels.xml Thu Sep 23 22:45:30 2010 @@ -99,7 +99,7 @@ </property> <property key="PageTitleLookupComputerHardware"> <value xml:lang="en">Lookup Computer Hardware</value> - <value xml:lang="fr">Consulter le matériel informatique</value> + <value xml:lang="fr">Rechercher du matériel informatique</value> <value xml:lang="it">Ricerca hardware per computer</value> <value xml:lang="zh">æ¥æ¾è®¡ç®æºç¡¬ä»¶</value> </property> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1000480 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1000653 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1000480 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1000653 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1000480 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1000653 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 23 22:45:30 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1000480 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1000653 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |