Author: jleroux
Date: Fri Oct 18 17:34:27 2013 New Revision: 1533569 URL: http://svn.apache.org/r1533569 Log: "Applied fix from trunk for revision: 1494682" ------------------------------------------------------------------------ r1494682 | jleroux | 2013-06-19 18:32:04 +0200 (mer. 19 juin 2013) | 13 lignes A patch from Ankit for "The Invoice Item type dropdown have same description for different invoiceItemTypeId." https://issues.apache.org/jira/browse/OFBIZ-5225 The Invoice Item type dropdown have same description for different invoiceItemTypeId on Agreement Terms page in accounting. https://demo-trunk.ofbiz.apache.org/accounting/control/EditAgreementTerms?agreementId=10000 The description should be different that the invoiceItemType is for sales or purchase. Eg: Invoice Fee(Sales) Invoice Fee(Purchase) Something to differentiate between the same description. jleroux: while at it I also changed the French labels ------------------------------------------------------------------------ Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/applications/accounting/config/AccountingEntityLabels.xml ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1494682 Modified: ofbiz/branches/release11.04/applications/accounting/config/AccountingEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/config/AccountingEntityLabels.xml?rev=1533569&r1=1533568&r2=1533569&view=diff ============================================================================== --- ofbiz/branches/release11.04/applications/accounting/config/AccountingEntityLabels.xml (original) +++ ofbiz/branches/release11.04/applications/accounting/config/AccountingEntityLabels.xml Fri Oct 18 17:34:27 2013 @@ -2075,8 +2075,8 @@ <value xml:lang="zh_TW">é貨ç人工æåæç´°</value> </property> <property key="InvoiceItemType.description.FEE"> - <value xml:lang="en">Invoice Fee</value> - <value xml:lang="fr">Frais de facturation</value> + <value xml:lang="en">Invoice Fee (Sales)</value> + <value xml:lang="fr">Frais de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ शà¥à¤²à¥à¤</value> <value xml:lang="it">Fattura Onorario</value> <value xml:lang="pt">Taxa de fatura</value> @@ -2111,8 +2111,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°èª¿æ´</value> </property> <property key="InvoiceItemType.description.INV_ADD_FEATURE"> - <value xml:lang="en">Invoice Additional Feature</value> - <value xml:lang="fr">Facturation d'option supplémentaire</value> + <value xml:lang="en">Invoice Additional Feature (Sales)</value> + <value xml:lang="fr">Facturation d'option supplémentaire (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ ठतिरिà¤à¥à¤¤ सà¥à¤µà¤¿à¤§à¤¾</value> <value xml:lang="it">Fattura Caratteristica Addizionale</value> <value xml:lang="pt">Fatura de recursos adicionais</value> @@ -2123,8 +2123,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çéå ç¹å¾</value> </property> <property key="InvoiceItemType.description.INV_DISCOUNT_ADJ"> - <value xml:lang="en">Invoice Discount</value> - <value xml:lang="fr">Remise sur facture</value> + <value xml:lang="en">Invoice Discount (Sales)</value> + <value xml:lang="fr">Remise sur facture (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ डिसà¥à¤à¤¾à¤à¤à¤</value> <value xml:lang="it">Fattura Sconto</value> <value xml:lang="pt">Desconto de Fatura</value> @@ -2135,8 +2135,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ææ</value> </property> <property key="InvoiceItemType.description.INV_DPROD_ITEM"> - <value xml:lang="en">Invoice Digital Good Item</value> - <value xml:lang="fr">Facturation de service digital</value> + <value xml:lang="en">Invoice Digital Good Item (Sales)</value> + <value xml:lang="fr">Facturation de service digital (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ डिà¤à¤¿à¤à¤² सामà¤à¥à¤°à¥ मद</value> <value xml:lang="it">Fattura Riga Bene Digitale</value> <value xml:lang="pt">Nota Fiscal de item digital</value> @@ -2147,8 +2147,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çæ¸åç¢åæç´°</value> </property> <property key="InvoiceItemType.description.INV_FDPROD_ITEM"> - <value xml:lang="en">Invoice Finished/Digital Good Item</value> - <value xml:lang="fr">Facturation produit fini/ digital</value> + <value xml:lang="en">Invoice Finished/Digital Good Item (Sales)</value> + <value xml:lang="fr">Facturation produit fini/ digital (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ तà¥à¤¯à¤¾à¤°/डिà¤à¤¿à¤à¤² सामà¤à¥à¤°à¥ मद</value> <value xml:lang="it">Fattura Riga Bene Finito/Digitale</value> <value xml:lang="pt">Fatura do item de protduto final/digital</value> @@ -2159,8 +2159,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çå¶æå/æ¸åç¢åæç´°</value> </property> <property key="InvoiceItemType.description.INV_FPROD_ITEM"> - <value xml:lang="en">Invoice Finished Good Item</value> - <value xml:lang="fr">Facturation produit fini</value> + <value xml:lang="en">Invoice Finished Good Item (Sales)</value> + <value xml:lang="fr">Facturation produit fini (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¤à¤ªà¥à¤°à¥à¤£ सामà¤à¥à¤°à¥ मद</value> <value xml:lang="it">Fattura Riga Bene Finito</value> <value xml:lang="pt">Fatura de item de produto final</value> @@ -2179,8 +2179,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸ç婿¯è²»</value> </property> <property key="InvoiceItemType.description.INV_MISC_CHARGE"> - <value xml:lang="en">Invoice Miscellaneous Charges</value> - <value xml:lang="fr">Facturation charges diverses</value> + <value xml:lang="en">Invoice Miscellaneous Charges (Sales)</value> + <value xml:lang="fr">Facturation charges diverses (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ विविध पà¥à¤°à¤à¤¾à¤°</value> <value xml:lang="it">Fattura Commissioni Varie</value> <value xml:lang="pt">Encargos Diversos da fatura</value> @@ -2191,8 +2191,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çéè²»</value> </property> <property key="InvoiceItemType.description.INV_PROD_FEATR_ITEM"> - <value xml:lang="en">Invoice Product-Feature Item</value> - <value xml:lang="fr">Facturation d'option de produit</value> + <value xml:lang="en">Invoice Product-Feature Item (Sales)</value> + <value xml:lang="fr">Facturation d'option de produit (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ à¤à¤¤à¥à¤ªà¤¾à¤¦ फ़à¥à¤à¤° मद</value> <value xml:lang="it">Fattura Riga Prodotto-Caratteristica</value> <value xml:lang="pt">Fatura de itens por produto-caracterÃsticas</value> @@ -2203,8 +2203,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çç¢åç¹å¾æç´°</value> </property> <property key="InvoiceItemType.description.INV_PROD_ITEM"> - <value xml:lang="en">Invoice Product Item</value> - <value xml:lang="fr">Facturation de produit</value> + <value xml:lang="en">Invoice Product Item (Sales)</value> + <value xml:lang="fr">Facturation de produit (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ à¤à¤¤à¥à¤ªà¤¾à¤¦ मद</value> <value xml:lang="it">Fattura Riga Prodotto</value> <value xml:lang="pt">Fatura do Item de Produto</value> @@ -2215,8 +2215,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çç¢åæç´°</value> </property> <property key="InvoiceItemType.description.INV_PROMOTION_ADJ"> - <value xml:lang="en">Invoice Promotion</value> - <value xml:lang="fr">Remise promotionnelle sur facture</value> + <value xml:lang="en">Invoice Promotion (Sales)</value> + <value xml:lang="fr">Remise promotionnelle sur facture (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¤à¤µà¤°à¥à¤§à¤¨</value> <value xml:lang="it">Fattura Promozione</value> <value xml:lang="pt">Fatura de Promoção</value> @@ -2227,8 +2227,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çä¿é·</value> </property> <property key="InvoiceItemType.description.INV_SALES_TAX"> - <value xml:lang="en">Invoice Sales Tax</value> - <value xml:lang="fr">Taxes sur vente facturées</value> + <value xml:lang="en">Invoice Sales Tax (Sales)</value> + <value xml:lang="fr">Taxes sur vente facturées (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ बिà¤à¥à¤°à¥ à¤à¥à¤à¥à¤¸</value> <value xml:lang="it">Fattura Tasse Vendita</value> <value xml:lang="pt">Fatura de impostos de Vendas</value> @@ -2239,8 +2239,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸ççæ¥ç¨ </value> </property> <property key="InvoiceItemType.description.INV_SHIPPING_CHARGES"> - <value xml:lang="en">Invoice Shipping and Handling</value> - <value xml:lang="fr">Frais d'expédition facturés</value> + <value xml:lang="en">Invoice Shipping and Handling (Sales)</value> + <value xml:lang="fr">Frais d'expédition facturés (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ शिपिà¤à¤ à¤à¤° हà¥à¤à¤¡à¤²à¤¿à¤à¤</value> <value xml:lang="it">Fattura Spese di Spedizione e Imballaggio</value> <value xml:lang="pt">Fatura de Envio e manuseio</value> @@ -2251,8 +2251,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çè£éè²»</value> </property> <property key="InvoiceItemType.description.INV_SPROD_ITEM"> - <value xml:lang="en">Invoice Service Product Item</value> - <value xml:lang="fr">Facturation de service/ produit</value> + <value xml:lang="en">Invoice Service Product Item (Sales)</value> + <value xml:lang="fr">Facturation de service/ produit (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¥à¤µà¤¾ à¤à¤¤à¥à¤ªà¤¾à¤¦ मद</value> <value xml:lang="it">Fattura Riga Prodotto Servizio</value> <value xml:lang="pt">Fatura de Item de serviço produto</value> @@ -2263,8 +2263,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çæåç¢åæç´°</value> </property> <property key="InvoiceItemType.description.INV_SURCHARGE_ADJ"> - <value xml:lang="en">Invoice Surcharge</value> - <value xml:lang="fr">Facturation de surcoût</value> + <value xml:lang="en">Invoice Surcharge (Sales)</value> + <value xml:lang="fr">Facturation de surcoût (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ ठधिà¤à¤¾à¤°</value> <value xml:lang="it">Fattura Supplementare</value> <value xml:lang="pt">Sobretaxa da Fatura</value> @@ -2275,8 +2275,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çéå è²»</value> </property> <property key="InvoiceItemType.description.INV_TE_ITEM"> - <value xml:lang="en">Invoice Time-Entry Item</value> - <value xml:lang="fr">Facturation de prestation horaire</value> + <value xml:lang="en">Invoice Time-Entry Item (Sales)</value> + <value xml:lang="fr">Facturation de prestation horaire (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ समय-पà¥à¤°à¤µà¥à¤¶ मद</value> <value xml:lang="it">Fattura Riga Voce-Tempo</value> <value xml:lang="pt">Fatura de item por registro-tempo</value> @@ -2287,8 +2287,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çé ç´æç´°</value> </property> <property key="InvoiceItemType.description.INV_WARRANTY_ADJ"> - <value xml:lang="en">Invoice Warranty</value> - <value xml:lang="fr">Facturation de garantie</value> + <value xml:lang="en">Invoice Warranty (Sales)</value> + <value xml:lang="fr">Facturation de garantie (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ वारà¤à¤à¥</value> <value xml:lang="it">Fattura Garanzia</value> <value xml:lang="pt">Fatura de Garantia</value> @@ -2299,8 +2299,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çä¿è¨¼æ¢æ¬¾</value> </property> <property key="InvoiceItemType.description.INV_WE_ITEM"> - <value xml:lang="en">Invoice Work-Effort Item</value> - <value xml:lang="fr">Facturation de prestation</value> + <value xml:lang="en">Invoice Work-Effort Item (Sales)</value> + <value xml:lang="fr">Facturation de prestation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ à¤à¤¾à¤°à¥à¤¯-पà¥à¤°à¤¯à¤¾à¤¸ मद</value> <value xml:lang="it">Fattura Riga Impegno di Lavoro</value> <value xml:lang="pt">Fatura de Item de esforço de trabalho,</value> @@ -2311,8 +2311,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ç人工æåæç´°</value> </property> <property key="InvoiceItemType.description.ITM_ADD_FEATURE"> - <value xml:lang="en">Invoice Item Additional Feature</value> - <value xml:lang="fr">Facturation d'options additionnelles</value> + <value xml:lang="en">Invoice Item Additional Feature (Sales)</value> + <value xml:lang="fr">Facturation d'options additionnelles (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद ठतिरिà¤à¥à¤¤ फ़à¥à¤à¤°</value> <value xml:lang="it">Invoice Riga Caratteristica Addizionale</value> <value xml:lang="pt">Fatura de itens com recursos adicionais</value> @@ -2323,8 +2323,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çéå ç¹å¾</value> </property> <property key="InvoiceItemType.description.ITM_DISCOUNT_ADJ"> - <value xml:lang="en">Invoice Item Discount</value> - <value xml:lang="fr">Remise sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Discount (Sales)</value> + <value xml:lang="fr">Remise sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद डिसà¥à¤à¤¾à¤à¤à¤</value> <value xml:lang="it">Fattura Riga Sconto</value> <value xml:lang="pt">Fatura de Desconto de Item</value> @@ -2335,8 +2335,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çææ</value> </property> <property key="InvoiceItemType.description.ITM_FEE"> - <value xml:lang="en">Invoice Item Fee</value> - <value xml:lang="fr">Frais sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Fee (Sales)</value> + <value xml:lang="fr">Frais sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद शà¥à¤²à¥à¤</value> <value xml:lang="it">Fattura Riga Onorario</value> <value xml:lang="pt">Fatura de Taxa sobre Item</value> @@ -2347,8 +2347,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çè²»ç¨</value> </property> <property key="InvoiceItemType.description.ITM_MISC_CHARGE"> - <value xml:lang="en">Invoice Item Miscellaneous Charges</value> - <value xml:lang="fr">Frais divers sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Miscellaneous Charges (Sales)</value> + <value xml:lang="fr">Frais divers sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद विविध वà¥à¤¯à¤¯</value> <value xml:lang="it">Fattura Riga Commissioni Varie</value> <value xml:lang="pt">Item de Fatura de Encargos Diversos</value> @@ -2359,8 +2359,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çéè²»</value> </property> <property key="InvoiceItemType.description.ITM_PROMOTION_ADJ"> - <value xml:lang="en">Invoice Item Promotion</value> - <value xml:lang="fr">Promotion sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Promotion (Sales)</value> + <value xml:lang="fr">Promotion sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद सà¤à¤µà¤°à¥à¤§à¤¨</value> <value xml:lang="it">Fattura Riga Promozione</value> <value xml:lang="pt">Item de Fatura de promoção</value> @@ -2371,8 +2371,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çä¿é·</value> </property> <property key="InvoiceItemType.description.ITM_REPLACE_ADJ"> - <value xml:lang="en">Invoice Item Replacement</value> - <value xml:lang="fr">Echange sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Replacement (Sales)</value> + <value xml:lang="fr">Echange sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद पà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¨</value> <value xml:lang="it">Fattura Riga Sostituzione</value> <value xml:lang="pt">Substituição de Item de fatura</value> @@ -2383,8 +2383,8 @@ <value xml:lang="zh_TW">æè²¨ç¼ç¥¨æç´°</value> </property> <property key="InvoiceItemType.description.ITM_SALES_TAX"> - <value xml:lang="en">Invoice Item Sales Tax</value> - <value xml:lang="fr">Ligne de TVA</value> + <value xml:lang="en">Invoice Item Sales Tax (Sales)</value> + <value xml:lang="fr">Ligne de TVA (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद बिà¤à¥à¤°à¥ à¤à¥à¤à¥à¤¸</value> <value xml:lang="it">Fattura Riga Tasse Vendita</value> <value xml:lang="pt">Item de fatura de impostos de venda</value> @@ -2395,8 +2395,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°ççæ¥ç¨ </value> </property> <property key="InvoiceItemType.description.ITM_SHIPPING_CHARGES"> - <value xml:lang="en">Invoice Item Shipping and Handling</value> - <value xml:lang="fr">Frais d'expédition sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Shipping and Handling (Sales)</value> + <value xml:lang="fr">Frais d'expédition sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद शिपिà¤à¤ à¤à¤° हà¥à¤à¤¡à¤²à¤¿à¤à¤</value> <value xml:lang="it">Fattura Riga Spese di Spedizione e Imballaggio</value> <value xml:lang="pt">Item de fatura de envio e manuseio</value> @@ -2407,8 +2407,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çè£éè²»</value> </property> <property key="InvoiceItemType.description.ITM_SURCHARGE_ADJ"> - <value xml:lang="en">Invoice Item Surcharge</value> - <value xml:lang="fr">Surcoût sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Surcharge (Sales)</value> + <value xml:lang="fr">Surcoût sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद ठधिà¤à¤¾à¤°</value> <value xml:lang="it">Fattura Riga Supplementare</value> <value xml:lang="pt">Item de Fatura de Sobretaxa</value> @@ -2419,8 +2419,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çéå è²»</value> </property> <property key="InvoiceItemType.description.ITM_WARRANTY_ADJ"> - <value xml:lang="en">Invoice Item Warranty</value> - <value xml:lang="fr">Garantie sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Warranty (Sales)</value> + <value xml:lang="fr">Garantie sur ligne de facturation (ventes)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद वारà¤à¤à¥</value> <value xml:lang="it">Fattura Riga Garanzia</value> <value xml:lang="pt">Item de Fatura de Garantia</value> @@ -2705,8 +2705,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°èª¿æ´</value> </property> <property key="InvoiceItemType.description.PINV_ADD_FEATURE"> - <value xml:lang="en">Invoice Additional Feature</value> - <value xml:lang="fr">Facturation d'option supplémentaire</value> + <value xml:lang="en">Invoice Additional Feature (Purchase)</value> + <value xml:lang="fr">Facturation d'option supplémentaire (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ ठतिरिà¤à¥à¤¤ फ़à¥à¤à¤°</value> <value xml:lang="it">Fattura Caratteristica Addizionale</value> <value xml:lang="pt">Recurso adicional de fatura</value> @@ -2717,8 +2717,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çéå ç¹å¾</value> </property> <property key="InvoiceItemType.description.PINV_DISCOUNT_ADJ"> - <value xml:lang="en">Invoice Discount</value> - <value xml:lang="fr">Remise sur facture</value> + <value xml:lang="en">Invoice Discount (Purchase)</value> + <value xml:lang="fr">Remise sur facture (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ डिसà¥à¤à¤¾à¤à¤à¤</value> <value xml:lang="it">Fattura Sconto</value> <value xml:lang="pt">Desconto sobre Fatura</value> @@ -2729,8 +2729,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ææ£</value> </property> <property key="InvoiceItemType.description.PINV_DPROD_ITEM"> - <value xml:lang="en">Invoice Digital Good Item</value> - <value xml:lang="fr">Facturation de service digital</value> + <value xml:lang="en">Invoice Digital Good Item (Purchase)</value> + <value xml:lang="fr">Facturation de service digital (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ डिà¤à¤¿à¤à¤² सामà¤à¥à¤°à¥ मद</value> <value xml:lang="it">Fattura Riga Bene Digitale</value> <value xml:lang="pt">Fatura de item de Bem eletrônico</value> @@ -2741,8 +2741,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çæ¸åç¢åæç´°</value> </property> <property key="InvoiceItemType.description.PINV_FDPROD_ITEM"> - <value xml:lang="en">Invoice Finished/Digital Good Item</value> - <value xml:lang="fr">Facturation de service digital</value> + <value xml:lang="en">Invoice Finished/Digital Good Item (Purchase)</value> + <value xml:lang="fr">Facturation de service digital (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ तà¥à¤¯à¤¾à¤°/डिà¤à¤¿à¤à¤² सामà¤à¥à¤°à¥ मद</value> <value xml:lang="it">Fattura Riga Bene Finito/Digitale</value> <value xml:lang="pt">Item da fatura de produto final/digital</value> @@ -2753,8 +2753,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çå¶æå/æ¸åç¢åæç´°</value> </property> <property key="InvoiceItemType.description.PINV_FPROD_ITEM"> - <value xml:lang="en">Invoice Finished Good Item</value> - <value xml:lang="fr">Facturation produit fini</value> + <value xml:lang="en">Invoice Finished Good Item (Purchase)</value> + <value xml:lang="fr">Facturation produit fini (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¤à¤ªà¥à¤°à¥à¤£ सामà¤à¥à¤°à¥ मद</value> <value xml:lang="it">Fattura Riga Bene Finito</value> <value xml:lang="pt">Item de Fatura de bens acabados</value> @@ -2789,8 +2789,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ç庫åç¢åæç´°</value> </property> <property key="InvoiceItemType.description.PINV_MISC_CHARGE"> - <value xml:lang="en">Invoice Miscellaneous Charges</value> - <value xml:lang="fr">Facturation de charges diverses</value> + <value xml:lang="en">Invoice Miscellaneous Charges (Purchase)</value> + <value xml:lang="fr">Facturation de charges diverses (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ विविध पà¥à¤°à¤à¤¾à¤°</value> <value xml:lang="it">Fattura Commissioni Varie</value> <value xml:lang="pt">Encargos Diversos da fatura</value> @@ -2801,8 +2801,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çéè²»</value> </property> <property key="InvoiceItemType.description.PINV_PROD_FEATR_ITEM"> - <value xml:lang="en">Invoice Product-Feature Item</value> - <value xml:lang="fr">Facturation d'option de produit</value> + <value xml:lang="en">Invoice Product-Feature Item (Purchase)</value> + <value xml:lang="fr">Facturation d'option de produit (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ à¤à¤¤à¥à¤ªà¤¾à¤¦ फ़à¥à¤à¤° मद</value> <value xml:lang="it">Fattura Riga Prodotto-Caratteristica</value> <value xml:lang="pt">Item de Fatura de recursos do produto</value> @@ -2813,8 +2813,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çç¢åç¹å¾æç´°</value> </property> <property key="InvoiceItemType.description.PINV_PROD_ITEM"> - <value xml:lang="en">Invoice Product Item</value> - <value xml:lang="fr">Facturation de produit</value> + <value xml:lang="en">Invoice Product Item (Purchase)</value> + <value xml:lang="fr">Facturation de produit (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ à¤à¤¤à¥à¤ªà¤¾à¤¦ मद</value> <value xml:lang="it">Fattura Riga Prodotto</value> <value xml:lang="pt">Item de Fatura de Produto</value> @@ -2825,8 +2825,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çç¢åæç´°</value> </property> <property key="InvoiceItemType.description.PINV_PROMOTION_ADJ"> - <value xml:lang="en">Invoice Promotion</value> - <value xml:lang="fr">Promotion sur ligne de facturation</value> + <value xml:lang="en">Invoice Promotion (Purchase)</value> + <value xml:lang="fr">Promotion sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¤à¤µà¤°à¥à¤§à¤¨</value> <value xml:lang="it">Fattura Promozione</value> <value xml:lang="pt">Fatura de Promoção</value> @@ -2837,8 +2837,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¿é·</value> </property> <property key="InvoiceItemType.description.PINV_SALES_TAX"> - <value xml:lang="en">Invoice Sales Tax</value> - <value xml:lang="fr">Taxes sur vente facturées</value> + <value xml:lang="en">Invoice Sales Tax (Purchase)</value> + <value xml:lang="fr">Taxes sur vente facturées (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ बिà¤à¥à¤°à¥ à¤à¥à¤à¥à¤¸</value> <value xml:lang="it">Fattura Tasse Vendita</value> <value xml:lang="pt">Fatura impostos de Vendas</value> @@ -2849,8 +2849,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸ççæ¥ç¨ </value> </property> <property key="InvoiceItemType.description.PINV_SHIP_CHARGES"> - <value xml:lang="en">Invoice Shipping and Handling</value> - <value xml:lang="fr">Frais d'expédition facturés</value> + <value xml:lang="en">Invoice Shipping and Handling (Purchase)</value> + <value xml:lang="fr">Frais d'expédition facturés (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ शिपिà¤à¤ à¤à¤° हà¥à¤à¤¡à¤²à¤¿à¤à¤</value> <value xml:lang="it">Fattura Spese di Spedizione e Imballaggio</value> <value xml:lang="pt">Fatura de Envio e Manuseio</value> @@ -2861,8 +2861,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çè£éè²»</value> </property> <property key="InvoiceItemType.description.PINV_SPROD_ITEM"> - <value xml:lang="en">Invoice Service Product Item</value> - <value xml:lang="fr">Facturation de service/ produit</value> + <value xml:lang="en">Invoice Service Product Item (Purchase)</value> + <value xml:lang="fr">Facturation de service/ produit (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¥à¤µà¤¾ à¤à¤¤à¥à¤ªà¤¾à¤¦ मद</value> <value xml:lang="it">Fattura Riga Prodotto Servizio</value> <value xml:lang="pt">Item de Fatura de Produto de serviço</value> @@ -2885,8 +2885,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çä½å¼æèç¢åæç´°</value> </property> <property key="InvoiceItemType.description.PINV_SURCHARGE_ADJ"> - <value xml:lang="en">Invoice Surcharge</value> - <value xml:lang="fr">Facturation de surcoût</value> + <value xml:lang="en">Invoice Surcharge (Purchase)</value> + <value xml:lang="fr">Facturation de surcoût (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ ठधिà¤à¤¾à¤°</value> <value xml:lang="it">Fattura Supplementare</value> <value xml:lang="pt">Fatura de Sobretaxa</value> @@ -2897,8 +2897,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çéå è²»</value> </property> <property key="InvoiceItemType.description.PINV_TE_ITEM"> - <value xml:lang="en">Invoice Time-Entry Item</value> - <value xml:lang="fr">Facturation de prestation horaire</value> + <value xml:lang="en">Invoice Time-Entry Item (Purchase)</value> + <value xml:lang="fr">Facturation de prestation horaire (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ समय-पà¥à¤°à¤µà¥à¤¶ मद</value> <value xml:lang="it">Fattura Riga Voce-Tempo</value> <value xml:lang="pt">Item de fatura de registro-data</value> @@ -2909,8 +2909,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨çé ç´æç´°</value> </property> <property key="InvoiceItemType.description.PINV_WARRANTY_ADJ"> - <value xml:lang="en">Invoice Warranty</value> - <value xml:lang="fr">Facturation de garantie</value> + <value xml:lang="en">Invoice Warranty (Purchase)</value> + <value xml:lang="fr">Facturation de garantie (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ वारà¤à¤à¥</value> <value xml:lang="it">Fattura Garanzia</value> <value xml:lang="pt">Fatura de Garantia</value> @@ -2921,8 +2921,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ä¸çä¿è¨¼æ¢æ¬¾</value> </property> <property key="InvoiceItemType.description.PINV_WE_ITEM"> - <value xml:lang="en">Invoice Work-Effort Item</value> - <value xml:lang="fr">Facturation de prestation</value> + <value xml:lang="en">Invoice Work-Effort Item (Purchase)</value> + <value xml:lang="fr">Facturation de prestation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ à¤à¤¾à¤°à¥à¤¯-पà¥à¤°à¤¯à¤¾à¤¸ मद</value> <value xml:lang="it">Fattura Riga Impegno di Lavoro</value> <value xml:lang="pt">Item de Fatura de esforço de trabalho,</value> @@ -2933,8 +2933,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨ç人工æåæç´°</value> </property> <property key="InvoiceItemType.description.PITM_ADD_FEATURE"> - <value xml:lang="en">Invoice Item Additional Feature</value> - <value xml:lang="fr">Facturation d'options additionnelles</value> + <value xml:lang="en">Invoice Item Additional Feature (Purchase)</value> + <value xml:lang="fr">Facturation d'options additionnelles (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद ठतिरिà¤à¥à¤¤ फ़à¥à¤à¤°</value> <value xml:lang="it">Fattura Riga Caratteristica Addizionale</value> <value xml:lang="pt">CaracterÃstica adicional do item de fatura</value> @@ -2945,8 +2945,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çéå ç¹å¾</value> </property> <property key="InvoiceItemType.description.PITM_DISCOUNT_ADJ"> - <value xml:lang="en">Invoice Item Discount</value> - <value xml:lang="fr">Remise sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Discount (Purchase)</value> + <value xml:lang="fr">Remise sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद डिसà¥à¤à¤¾à¤à¤à¤</value> <value xml:lang="it">Fattura Riga Sconto</value> <value xml:lang="pt">Desconto sobre o Item da Fatura</value> @@ -2957,8 +2957,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çææ</value> </property> <property key="InvoiceItemType.description.PITM_FEE"> - <value xml:lang="en">Invoice Item Fee</value> - <value xml:lang="fr">Frais sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Fee (Purchase)</value> + <value xml:lang="fr">Frais sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद शà¥à¤²à¥à¤</value> <value xml:lang="it">Fattura Riga Onorario</value> <value xml:lang="pt">Taxa sobre o Item da Fatura</value> @@ -2969,8 +2969,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çè²»ç¨</value> </property> <property key="InvoiceItemType.description.PITM_MISC_CHARGE"> - <value xml:lang="en">Invoice Item Miscellaneous Charges</value> - <value xml:lang="fr">Frais divers sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Miscellaneous Charges (Purchase)</value> + <value xml:lang="fr">Frais divers sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद विविध वà¥à¤¯à¤¯</value> <value xml:lang="it">Fattura Riga Commissioni Varie</value> <value xml:lang="pt">Encargos Diversos sobre o item da fatura</value> @@ -2981,8 +2981,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çéè²»</value> </property> <property key="InvoiceItemType.description.PITM_PROMOTION_ADJ"> - <value xml:lang="en">Invoice Item Promotion</value> - <value xml:lang="fr">Remise promotionnelle sur facture</value> + <value xml:lang="en">Invoice Item Promotion (Purchase)</value> + <value xml:lang="fr">Remise promotionnelle sur facture (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद सà¤à¤µà¤°à¥à¤§à¤¨</value> <value xml:lang="it">Fattura Riga Promozione</value> <value xml:lang="pt">Promoção do item da fatura</value> @@ -2993,8 +2993,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çä¿é·</value> </property> <property key="InvoiceItemType.description.PITM_REPLACE_ADJ"> - <value xml:lang="en">Invoice Item Replacement</value> - <value xml:lang="fr">Echange sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Replacement (Purchase)</value> + <value xml:lang="fr">Echange sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद पà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¨</value> <value xml:lang="it">Fattura Riga Sostituzione</value> <value xml:lang="pt">Substituição do Item da Fatura</value> @@ -3005,8 +3005,8 @@ <value xml:lang="zh_TW">æè²¨ç¼ç¥¨æç´°</value> </property> <property key="InvoiceItemType.description.PITM_SALES_TAX"> - <value xml:lang="en">Invoice Item Sales Tax</value> - <value xml:lang="fr">ligne de TVA</value> + <value xml:lang="en">Invoice Item Sales Tax (Purchase)</value> + <value xml:lang="fr">ligne de TVA (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद बिà¤à¥à¤°à¥ à¤à¥à¤à¥à¤¸</value> <value xml:lang="it">Fattura Riga Tasse Vendita</value> <value xml:lang="pt">Imposto de venda do item da fatura</value> @@ -3017,8 +3017,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°ççæ¥ç¨ </value> </property> <property key="InvoiceItemType.description.PITM_SHIP_CHARGES"> - <value xml:lang="en">Invoice Item Shipping and Handling</value> - <value xml:lang="fr">Frais d'expédition facturés</value> + <value xml:lang="en">Invoice Item Shipping and Handling (Purchase)</value> + <value xml:lang="fr">Frais d'expédition facturés (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद शिपिà¤à¤ à¤à¤° हà¥à¤à¤¡à¤²à¤¿à¤à¤</value> <value xml:lang="it">Fattura Riga Spese di Spedizione e Imballaggio</value> <value xml:lang="pt">Envio e manuseio do Item da fatura</value> @@ -3029,8 +3029,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çè£éè²»</value> </property> <property key="InvoiceItemType.description.PITM_SURCHARGE_ADJ"> - <value xml:lang="en">Invoice Item Surcharge</value> - <value xml:lang="fr">Surcoût sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Surcharge (Purchase)</value> + <value xml:lang="fr">Surcoût sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद ठधिà¤à¤¾à¤°</value> <value xml:lang="it">Fattura Riga Supplementare</value> <value xml:lang="pt">Sobretaxa sobre o Item da fatura</value> @@ -3041,8 +3041,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çéå è²»</value> </property> <property key="InvoiceItemType.description.PITM_WARRANTY_ADJ"> - <value xml:lang="en">Invoice Item Warranty</value> - <value xml:lang="fr">Garantie sur ligne de facturation</value> + <value xml:lang="en">Invoice Item Warranty (Purchase)</value> + <value xml:lang="fr">Garantie sur ligne de facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद वारà¤à¤à¥</value> <value xml:lang="it">Fattura Riga Garanzia</value> <value xml:lang="pt">Garantia do Item da fatura</value> @@ -3053,8 +3053,8 @@ <value xml:lang="zh_TW">ç¼ç¥¨æç´°çä¿è¨¼æ¢æ¬¾</value> </property> <property key="InvoiceItemType.description.P_FEE"> - <value xml:lang="en">Invoice Fee</value> - <value xml:lang="fr">Frais sur facturation</value> + <value xml:lang="en">Invoice Fee (Purchase)</value> + <value xml:lang="fr">Frais sur facturation (achat)</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ शà¥à¤²à¥à¤</value> <value xml:lang="it">Fattura Onorario</value> <value xml:lang="pt">Taxa da Fatura</value> Modified: ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml?rev=1533569&r1=1533568&r2=1533569&view=diff ============================================================================== --- ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/release11.04/applications/accounting/data/AccountingTypeData.xml Fri Oct 18 17:34:27 2013 @@ -398,73 +398,73 @@ under the License. <InvoiceItemType description="Supplier Return Adjustment" hasTable="N" invoiceItemTypeId="SRETURN_ADJ" parentTypeId="INVOICE_ADJ"/> <!-- invoice item types for sales (AR) invoices --> - <InvoiceItemType description="Invoice Promotion" hasTable="N" invoiceItemTypeId="INV_PROMOTION_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Discount" hasTable="N" invoiceItemTypeId="INV_DISCOUNT_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Fee" hasTable="N" invoiceItemTypeId="FEE" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Miscellaneous Charges" hasTable="N" invoiceItemTypeId="INV_MISC_CHARGE" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Sales Tax" hasTable="N" invoiceItemTypeId="INV_SALES_TAX" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Shipping and Handling" hasTable="N" invoiceItemTypeId="INV_SHIPPING_CHARGES" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Surcharge" hasTable="N" invoiceItemTypeId="INV_SURCHARGE_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Additional Feature" hasTable="N" invoiceItemTypeId="INV_ADD_FEATURE" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Warranty" hasTable="N" invoiceItemTypeId="INV_WARRANTY_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Promotion(Sales)" hasTable="N" invoiceItemTypeId="INV_PROMOTION_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Discount(Sales)" hasTable="N" invoiceItemTypeId="INV_DISCOUNT_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Fee(Sales)" hasTable="N" invoiceItemTypeId="FEE" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Miscellaneous Charges(Sales)" hasTable="N" invoiceItemTypeId="INV_MISC_CHARGE" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Sales Tax(Sales)" hasTable="N" invoiceItemTypeId="INV_SALES_TAX" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Shipping and Handling(Sales)" hasTable="N" invoiceItemTypeId="INV_SHIPPING_CHARGES" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Surcharge(Sales)" hasTable="N" invoiceItemTypeId="INV_SURCHARGE_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Additional Feature(Sales)" hasTable="N" invoiceItemTypeId="INV_ADD_FEATURE" parentTypeId="SINVOICE_HEAD_ADJ"/> + <InvoiceItemType description="Invoice Warranty(Sales)" hasTable="N" invoiceItemTypeId="INV_WARRANTY_ADJ" parentTypeId="SINVOICE_HEAD_ADJ"/> <InvoiceItemType description="Invoice Interest Charge" hasTable="N" invoiceItemTypeId="INV_INTRST_CHRG" parentTypeId="SINVOICE_HEAD_ADJ"/> - <InvoiceItemType description="Invoice Item Promotion" hasTable="N" invoiceItemTypeId="ITM_PROMOTION_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Replacement" hasTable="N" invoiceItemTypeId="ITM_REPLACE_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Discount" hasTable="N" invoiceItemTypeId="ITM_DISCOUNT_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Fee" hasTable="N" invoiceItemTypeId="ITM_FEE" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Miscellaneous Charges" hasTable="N" invoiceItemTypeId="ITM_MISC_CHARGE" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Sales Tax" hasTable="N" invoiceItemTypeId="ITM_SALES_TAX" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Shipping and Handling" hasTable="N" invoiceItemTypeId="ITM_SHIPPING_CHARGES" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Surcharge" hasTable="N" invoiceItemTypeId="ITM_SURCHARGE_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Additional Feature" hasTable="N" invoiceItemTypeId="ITM_ADD_FEATURE" parentTypeId="SINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Warranty" hasTable="N" invoiceItemTypeId="ITM_WARRANTY_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> - - <InvoiceItemType description="Invoice Product Item" hasTable="N" invoiceItemTypeId="INV_PROD_ITEM" parentTypeId=""/> - <InvoiceItemType description="Invoice Finished Good Item" hasTable="N" invoiceItemTypeId="INV_FPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Digital Good Item" hasTable="N" invoiceItemTypeId="INV_DPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Finished/Digital Good Item" hasTable="N" invoiceItemTypeId="INV_FDPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Product-Feature Item" hasTable="N" invoiceItemTypeId="INV_PROD_FEATR_ITEM" parentTypeId="INV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Service Product Item" hasTable="N" invoiceItemTypeId="INV_SPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Item Promotion(Sales)" hasTable="N" invoiceItemTypeId="ITM_PROMOTION_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Replacement(Sales)" hasTable="N" invoiceItemTypeId="ITM_REPLACE_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Discount(Sales)" hasTable="N" invoiceItemTypeId="ITM_DISCOUNT_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Fee(Sales)" hasTable="N" invoiceItemTypeId="ITM_FEE" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Miscellaneous Charges(Sales)" hasTable="N" invoiceItemTypeId="ITM_MISC_CHARGE" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Sales Tax(Sales)" hasTable="N" invoiceItemTypeId="ITM_SALES_TAX" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Shipping and Handling(Sales)" hasTable="N" invoiceItemTypeId="ITM_SHIPPING_CHARGES" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Surcharge(Sales)" hasTable="N" invoiceItemTypeId="ITM_SURCHARGE_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Additional Feature(Sales)" hasTable="N" invoiceItemTypeId="ITM_ADD_FEATURE" parentTypeId="SINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Warranty(Sales)" hasTable="N" invoiceItemTypeId="ITM_WARRANTY_ADJ" parentTypeId="SINVOICE_ITM_ADJ"/> + + <InvoiceItemType description="Invoice Product Item(Sales)" hasTable="N" invoiceItemTypeId="INV_PROD_ITEM" parentTypeId=""/> + <InvoiceItemType description="Invoice Finished Good Item(Sales)" hasTable="N" invoiceItemTypeId="INV_FPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Digital Good Item(Sales)" hasTable="N" invoiceItemTypeId="INV_DPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Finished/Digital Good Item(Sales)" hasTable="N" invoiceItemTypeId="INV_FDPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Product-Feature Item(Sales)" hasTable="N" invoiceItemTypeId="INV_PROD_FEATR_ITEM" parentTypeId="INV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Service Product Item(Sales)" hasTable="N" invoiceItemTypeId="INV_SPROD_ITEM" parentTypeId="INV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Work-Effort Item" hasTable="N" invoiceItemTypeId="INV_WE_ITEM" parentTypeId=""/> - <InvoiceItemType description="Invoice Time-Entry Item" hasTable="N" invoiceItemTypeId="INV_TE_ITEM" parentTypeId=""/> + <InvoiceItemType description="Invoice Work-Effort Item(Sales)" hasTable="N" invoiceItemTypeId="INV_WE_ITEM" parentTypeId=""/> + <InvoiceItemType description="Invoice Time-Entry Item(Sales)" hasTable="N" invoiceItemTypeId="INV_TE_ITEM" parentTypeId=""/> <!-- invoice item types for purchase (AP) invoices --> - <InvoiceItemType description="Invoice Promotion" hasTable="N" invoiceItemTypeId="PINV_PROMOTION_ADJ" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Discount" hasTable="N" invoiceItemTypeId="PINV_DISCOUNT_ADJ" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Fee" hasTable="N" invoiceItemTypeId="P_FEE" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Miscellaneous Charges" hasTable="N" invoiceItemTypeId="PINV_MISC_CHARGE" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Sales Tax" hasTable="N" invoiceItemTypeId="PINV_SALES_TAX" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Shipping and Handling" hasTable="N" invoiceItemTypeId="PINV_SHIP_CHARGES" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Surcharge" hasTable="N" invoiceItemTypeId="PINV_SURCHARGE_ADJ" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Additional Feature" hasTable="N" invoiceItemTypeId="PINV_ADD_FEATURE" parentTypeId="PINVOICE_ADJ"/> - <InvoiceItemType description="Invoice Warranty" hasTable="N" invoiceItemTypeId="PINV_WARRANTY_ADJ" parentTypeId="PINVOICE_ADJ"/> - - <InvoiceItemType description="Invoice Item Promotion" hasTable="N" invoiceItemTypeId="PITM_PROMOTION_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Replacement" hasTable="N" invoiceItemTypeId="PITM_REPLACE_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Discount" hasTable="N" invoiceItemTypeId="PITM_DISCOUNT_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Fee" hasTable="N" invoiceItemTypeId="PITM_FEE" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Miscellaneous Charges" hasTable="N" invoiceItemTypeId="PITM_MISC_CHARGE" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Sales Tax" hasTable="N" invoiceItemTypeId="PITM_SALES_TAX" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Shipping and Handling" hasTable="N" invoiceItemTypeId="PITM_SHIP_CHARGES" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Surcharge" hasTable="N" invoiceItemTypeId="PITM_SURCHARGE_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Additional Feature" hasTable="N" invoiceItemTypeId="PITM_ADD_FEATURE" parentTypeId="PINVOICE_ITM_ADJ"/> - <InvoiceItemType description="Invoice Item Warranty" hasTable="N" invoiceItemTypeId="PITM_WARRANTY_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> - - <InvoiceItemType description="Invoice Product Item" hasTable="N" invoiceItemTypeId="PINV_PROD_ITEM" parentTypeId=""/> - <InvoiceItemType description="Invoice Finished Good Item" hasTable="N" invoiceItemTypeId="PINV_FPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Digital Good Item" hasTable="N" invoiceItemTypeId="PINV_DPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Finished/Digital Good Item" hasTable="N" invoiceItemTypeId="PINV_FDPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Product-Feature Item" hasTable="N" invoiceItemTypeId="PINV_PROD_FEATR_ITEM" parentTypeId="PINV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Service Product Item" hasTable="N" invoiceItemTypeId="PINV_SPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Promotion(Purchase)" hasTable="N" invoiceItemTypeId="PINV_PROMOTION_ADJ" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Discount(Purchase)" hasTable="N" invoiceItemTypeId="PINV_DISCOUNT_ADJ" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Fee(Purchase)" hasTable="N" invoiceItemTypeId="P_FEE" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Miscellaneous Charges(Purchase)" hasTable="N" invoiceItemTypeId="PINV_MISC_CHARGE" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Sales Tax(Purchase)" hasTable="N" invoiceItemTypeId="PINV_SALES_TAX" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Shipping and Handling(Purchase)" hasTable="N" invoiceItemTypeId="PINV_SHIP_CHARGES" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Surcharge(Purchase)" hasTable="N" invoiceItemTypeId="PINV_SURCHARGE_ADJ" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Additional Feature(Purchase)" hasTable="N" invoiceItemTypeId="PINV_ADD_FEATURE" parentTypeId="PINVOICE_ADJ"/> + <InvoiceItemType description="Invoice Warranty(Purchase)" hasTable="N" invoiceItemTypeId="PINV_WARRANTY_ADJ" parentTypeId="PINVOICE_ADJ"/> + + <InvoiceItemType description="Invoice Item Promotion(Purchase)" hasTable="N" invoiceItemTypeId="PITM_PROMOTION_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Replacement(Purchase)" hasTable="N" invoiceItemTypeId="PITM_REPLACE_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Discount(Purchase)" hasTable="N" invoiceItemTypeId="PITM_DISCOUNT_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Fee(Purchase)" hasTable="N" invoiceItemTypeId="PITM_FEE" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Miscellaneous Charges(Purchase)" hasTable="N" invoiceItemTypeId="PITM_MISC_CHARGE" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Sales Tax(Purchase)" hasTable="N" invoiceItemTypeId="PITM_SALES_TAX" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Shipping and Handling(Purchase)" hasTable="N" invoiceItemTypeId="PITM_SHIP_CHARGES" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Surcharge(Purchase)" hasTable="N" invoiceItemTypeId="PITM_SURCHARGE_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Additional Feature(Purchase)" hasTable="N" invoiceItemTypeId="PITM_ADD_FEATURE" parentTypeId="PINVOICE_ITM_ADJ"/> + <InvoiceItemType description="Invoice Item Warranty(Purchase)" hasTable="N" invoiceItemTypeId="PITM_WARRANTY_ADJ" parentTypeId="PINVOICE_ITM_ADJ"/> + + <InvoiceItemType description="Invoice Product Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_PROD_ITEM" parentTypeId=""/> + <InvoiceItemType description="Invoice Finished Good Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_FPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Digital Good Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_DPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Finished/Digital Good Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_FDPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Product-Feature Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_PROD_FEATR_ITEM" parentTypeId="PINV_PROD_ITEM"/> + <InvoiceItemType description="Invoice Service Product Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_SPROD_ITEM" parentTypeId="PINV_PROD_ITEM"/> <InvoiceItemType description="Invoice Inventory Product Item" hasTable="N" invoiceItemTypeId="PINV_INVPRD_ITEM" parentTypeId="PINV_PROD_ITEM"/> <InvoiceItemType description="Invoice Supplies (to Expense) Product Item" hasTable="N" invoiceItemTypeId="PINV_SUPLPRD_ITEM" parentTypeId="PINV_PROD_ITEM"/> <InvoiceItemType description="Invoice Fixed Asset Product Item" hasTable="N" invoiceItemTypeId="PINV_FXASTPRD_ITEM" parentTypeId="PINV_PROD_ITEM"/> - <InvoiceItemType description="Invoice Work-Effort Item" hasTable="N" invoiceItemTypeId="PINV_WE_ITEM" parentTypeId=""/> - <InvoiceItemType description="Invoice Time-Entry Item" hasTable="N" invoiceItemTypeId="PINV_TE_ITEM" parentTypeId=""/> + <InvoiceItemType description="Invoice Work-Effort Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_WE_ITEM" parentTypeId=""/> + <InvoiceItemType description="Invoice Time-Entry Item(Purchase)" hasTable="N" invoiceItemTypeId="PINV_TE_ITEM" parentTypeId=""/> <!-- invoice items for customer returns --> <InvoiceItemType description="Return Product Item" hasTable="N" invoiceItemTypeId="CRT_PROD_ITEM" parentTypeId=""/> |
Free forum by Nabble | Edit this page |