Author: jleroux
Date: Mon Aug 4 07:44:08 2014
New Revision: 1615494
URL: http://svn.apache.org/r1615494
Log:
Keeps in sync with OFBiz trunk HEAD
Added:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/ecj-4.4.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/ecj-4.4.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-catalina.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-catalina.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-jasper.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-jasper.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
- copied unchanged from r1615493,
ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/ecj-P20140317-1600.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-catalina.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-jasper.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/rc.ofbiz.for.debian
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1614242-1615493
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Aug
4 07:44:08 2014
@@ -100,16 +100,16 @@
<classpathentry kind="lib"
path="framework/base/lib/scripting/jython-nooro.jar"/>
<classpathentry kind="lib"
path="specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar"/>
<classpathentry kind="lib"
path="specialpurpose/birt/lib/viewservlets.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/ecj-P20140317-1600.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-catalina.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-jasper.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-catalina.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-jasper.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar"/>
<classpathentry kind="lib"
path="framework/entity/lib/commons-dbcp2-2.0.1.jar"/>
<classpathentry kind="lib"
path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/>
<classpathentry kind="lib"
path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Aug 4
07:44:08 2014
@@ -75,15 +75,15 @@ framework/base/lib/scripting/jansi-1.2.1
framework/base/lib/xmlrpc-client-3.1.2.jar
framework/base/lib/xmlrpc-common-3.1.2.jar
framework/base/lib/xmlrpc-server-3.1.2.jar
-framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
-framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
-framework/catalina/lib/tomcat-7.0.54-catalina.jar
-framework/catalina/lib/tomcat-7.0.54-jasper.jar
-framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
-framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
-framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
-framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
-framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
+framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.55-catalina.jar
+framework/catalina/lib/tomcat-7.0.55-jasper.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
+framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
+framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
framework/entity/lib/commons-dbcp2-2.0.1.jar
framework/entity/lib/jdbc/derby-10.10.1.1.jar
framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
@@ -2188,7 +2188,7 @@ of California, with venue lying in Santa
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
Eclipse Public License - v 1.0:
-framework/catalina/lib/ecj-P20140317-1600.jar
+framework/catalina/lib/ecj-4.4.jar
=========================================================================
Eclipse Public License - v 1.0
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml
Mon Aug 4 07:44:08 2014
@@ -1567,7 +1567,7 @@
<value xml:lang="de">Kundenrechnungsart zu Ertragskonto
zuweisen</value>
<value xml:lang="en">Assign Sales Invoice type to Revenue GL Account
Number</value>
<value xml:lang="es">Asignar tipo de factura de venta a ingresos
número de cuenta de LM de ingresos</value>
- <value xml:lang="fr">Allouer un type de facture de vente au compte
comptable no.</value>
+ <value xml:lang="fr">Allouer un type de facture de vente au compte
comptable n°</value>
<value xml:lang="hi_IN">राà¤à¤¸à¥à¤µ सामानà¥à¤¯
बहॠà¤à¤¾à¤¤à¤¾ निरà¥à¤ªà¤¿à¤¤ à¤à¤°à¤¨à¥ à¤à¥ लिà¤
बिà¤à¥à¤°à¥ à¤à¤¾à¤²à¤¾à¤¨ पà¥à¤°à¤à¤¾à¤° सà¤à¤à¥à¤¯à¤¾</value>
<value xml:lang="it">Assegna Tipo Fattura Vendita al Numero Conto
Profitti Gl</value>
<value xml:lang="ja">åå
¥GLåå®ã«è²©å£²è«æ±ç¨®é¡ãå²å½</value>
@@ -3978,7 +3978,7 @@
<value xml:lang="de">Kunden-Nr.</value>
<value xml:lang="en">Cust.Nr</value>
<value xml:lang="es">Nr Cliente</value>
- <value xml:lang="fr">No. de Client</value>
+ <value xml:lang="fr">N° de Client</value>
<value xml:lang="hi_IN">à¤à¥à¤°à¤¾à¤¹à¤ à¤à¥à¤¡</value>
<value xml:lang="it">Cod.Cliente</value>
<value xml:lang="ja">顧客No</value>
@@ -7185,7 +7185,7 @@
<value xml:lang="ar">رÙÙ
اÙÙاتÙرة</value>
<value xml:lang="en">Inv.Nr</value>
<value xml:lang="es">Nr.Fact</value>
- <value xml:lang="fr">Fact. no.</value>
+ <value xml:lang="fr">Fact. n°</value>
<value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ सà¤à¤à¥à¤¯à¤¾</value>
<value xml:lang="it">Nr.Fattura</value>
<value xml:lang="ja">è«æ±No</value>
@@ -8306,7 +8306,7 @@
<property key="AccountingItemNr">
<value xml:lang="en">ItemNr</value>
<value xml:lang="es">NrElemento</value>
- <value xml:lang="fr">Item no.</value>
+ <value xml:lang="fr">Item n°</value>
<value xml:lang="hi_IN">मद सà¤à¤à¥à¤¯à¤¾</value>
<value xml:lang="it">Nr.Riga</value>
<value xml:lang="ja">ã¢ã¤ãã No</value>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
Mon Aug 4 07:44:08 2014
@@ -515,7 +515,10 @@ public class InvoiceWorker {
List<GenericValue> acctgTransEntries =
invoice.getRelated("AcctgTrans", null, null, false);
if (UtilValidate.isNotEmpty(acctgTransEntries)) {
GenericValue acctgTransEntry =
(acctgTransEntries.get(0)).getRelated("AcctgTransEntry", null, null,
false).get(0);
- conversionRate =
acctgTransEntry.getBigDecimal("amount").divide(acctgTransEntry.getBigDecimal("origAmount"),
new MathContext(100)).setScale(decimals,rounding);
+ BigDecimal origAmount =
acctgTransEntry.getBigDecimal("origAmount");
+ if (origAmount.compareTo(ZERO) == 1) {
+ conversionRate =
acctgTransEntry.getBigDecimal("amount").divide(acctgTransEntry.getBigDecimal("origAmount"),
new MathContext(100)).setScale(decimals,rounding);
+ }
}
// check if a payment is applied and use the currency conversion
from there
if (UtilValidate.isEmpty(conversionRate)) {
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
Mon Aug 4 07:44:08 2014
@@ -56,8 +56,8 @@ if (invoice) {
if (billingAddress) {
context.billingAddress = billingAddress;
}
- billingParty = InvoiceWorker.getBillToParty(invoice);
- context.billingParty = billingParty;
+ billToParty = InvoiceWorker.getBillToParty(invoice);
+ context.billToParty = billToParty;
sendingParty = InvoiceWorker.getSendFromParty(invoice);
context.sendingParty = sendingParty;
@@ -77,10 +77,15 @@ if (invoice) {
// also create a map with tax grand total amount by VAT tax: it is
also required in invoices by UE
taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false);
if (taxRate && "VAT_TAX".equals(taxRate.taxAuthorityRateTypeId)) {
- taxInfos =
EntityUtil.filterByDate(delegator.findByAnd("PartyTaxAuthInfo", [partyId :
billingParty.partyId, taxAuthGeoId : taxRate.taxAuthGeoId, taxAuthPartyId :
taxRate.taxAuthPartyId], null, false), invoice.invoiceDate);
+ taxInfos =
EntityUtil.filterByDate(delegator.findByAnd("PartyTaxAuthInfo", [partyId :
billToParty.partyId, taxAuthGeoId : taxRate.taxAuthGeoId, taxAuthPartyId :
taxRate.taxAuthPartyId], null, false), invoice.invoiceDate);
taxInfo = EntityUtil.getFirst(taxInfos);
if (taxInfo) {
- context.billingPartyTaxId = taxInfo.partyTaxId;
+ context.billToPartyTaxId = taxInfo.partyTaxId;
+ }
+ taxInfos =
EntityUtil.filterByDate(delegator.findByAnd("PartyTaxAuthInfo", [partyId :
sendingParty.partyId, taxAuthGeoId : taxRate.taxAuthGeoId, taxAuthPartyId :
taxRate.taxAuthPartyId], null, false), invoice.invoiceDate);
+ taxInfo = EntityUtil.getFirst(taxInfos);
+ if (taxInfo) {
+ context.sendingPartyTaxId = taxInfo.partyTaxId;
}
vatTaxesByTypeAmount =
vatTaxesByType[taxRate.taxAuthorityRateSeqId];
if (!vatTaxesByTypeAmount) {
@@ -102,9 +107,9 @@ if (invoice) {
//*________________this snippet was added for adding Tax ID in
invoice header if needed _________________
sendingTaxInfos = sendingParty.getRelated("PartyTaxAuthInfo",
null, null, false);
- billingTaxInfos = billingParty.getRelated("PartyTaxAuthInfo",
null, null, false);
+ billingTaxInfos = billToParty.getRelated("PartyTaxAuthInfo",
null, null, false);
sendingPartyTaxId = null;
- billingPartyTaxId = null;
+ billToPartyTaxId = null;
if (billingAddress) {
sendingTaxInfos.eachWithIndex { sendingTaxInfo, i ->
@@ -114,15 +119,15 @@ if (invoice) {
}
billingTaxInfos.eachWithIndex { billingTaxInfo, i ->
if
(billingTaxInfo.taxAuthGeoId.equals(billingAddress.countryGeoId)) {
- billingPartyTaxId =
billingTaxInfos[i-1].partyTaxId;
+ billToPartyTaxId = billingTaxInfos[i-1].partyTaxId;
}
}
}
if (sendingPartyTaxId) {
context.sendingPartyTaxId = sendingPartyTaxId;
}
- if (billingPartyTaxId && !context.billingPartyTaxId) {
- context.billingPartyTaxId = billingPartyTaxId;
+ if (billToPartyTaxId && !context.billToPartyTaxId) {
+ context.billToPartyTaxId = billToPartyTaxId;
}
//________________this snippet was added for adding Tax ID in
invoice header if needed _________________*/
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy
Mon Aug 4 07:44:08 2014
@@ -65,16 +65,16 @@ invoiceIds.each { invoiceId ->
if (billingAddress) {
invoicesMap.billingAddress = billingAddress;
}
- billingParty = InvoiceWorker.getBillToParty(invoice);
- invoicesMap.billingParty = billingParty;
+ billToParty = InvoiceWorker.getBillToParty(invoice);
+ invoicesMap.billToParty = billToParty;
sendingParty = InvoiceWorker.getSendFromParty(invoice);
invoicesMap.sendingParty = sendingParty;
// This snippet was added for adding Tax ID in invoice header if
needed
sendingTaxInfos = sendingParty.getRelated("PartyTaxAuthInfo", null,
null, false);
- billingTaxInfos = billingParty.getRelated("PartyTaxAuthInfo", null,
null, false);
+ billingTaxInfos = billToParty.getRelated("PartyTaxAuthInfo", null,
null, false);
sendingPartyTaxId = null;
- billingPartyTaxId = null;
+ billToPartyTaxId = null;
if (billingAddress) {
sendingTaxInfos.eachWithIndex { sendingTaxInfo, i ->
@@ -84,15 +84,15 @@ invoiceIds.each { invoiceId ->
}
billingTaxInfos.eachWithIndex { billingTaxInfo, i ->
if
(billingTaxInfo.taxAuthGeoId.equals(billingAddress.countryGeoId)) {
- billingPartyTaxId = billingTaxInfos[i-1].partyTaxId;
+ billToPartyTaxId = billingTaxInfos[i-1].partyTaxId;
}
}
}
if (sendingPartyTaxId) {
invoicesMap.sendingPartyTaxId = sendingPartyTaxId;
}
- if (billingPartyTaxId) {
- invoicesMap.billingPartyTaxId = billingPartyTaxId;
+ if (billToPartyTaxId) {
+ invoicesMap.billToPartyTaxId = billToPartyTaxId;
}
terms = invoice.getRelated("InvoiceTerm", null, null, false);
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
Mon Aug 4 07:44:08 2014
@@ -30,9 +30,9 @@ under the License.
<#if invoiceDetailList?has_content>
<#list invoiceDetailList as invoiceDetail>
<#assign invoice = invoiceDetail.invoice />
- <#if invoiceDetail.billingParty?has_content>
- <#assign billingParty = invoiceDetail.billingParty />
- <#assign partyName = delegator.findOne("PartyNameView", {"partyId" :
billingParty.partyId}, true)>
+ <#if invoiceDetail.billToParty?has_content>
+ <#assign billToParty = invoiceDetail.billToParty />
+ <#assign partyName = delegator.findOne("PartyNameView", {"partyId" :
billToParty.partyId}, true)>
</#if>
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
@@ -70,10 +70,10 @@ under the License.
</fo:block>
</fo:table-cell>
</fo:table-row>
- <#if invoiceDetail.billingPartyTaxId?has_content>
+ <#if invoiceDetail.billToPartyTaxId?has_content>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block>
${invoiceDetail.billingPartyTaxId}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>
${invoiceDetail.billToPartyTaxId}</fo:block></fo:table-cell>
</fo:table-row>
</#if>
<fo:table-row>
@@ -95,7 +95,7 @@ under the License.
</fo:table>
</fo:block>
- <#if billingParty?has_content>
+ <#if billToParty?has_content>
<fo:block>
<fo:table width="100%" table-layout="fixed"
space-after="0.3in">
<fo:table-column column-width="3.5in"/>
@@ -105,8 +105,8 @@ under the License.
<fo:block>${uiLabelMap.CommonTo}: </fo:block>
<#if invoiceDetail.billingAddress?has_content>
<#assign billingAddress =
invoiceDetail.billingAddress />
- <#assign billingPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId,
"compareDate", invoice.invoiceDate, "userLogin", userLogin))/>
-
<fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing
Name Not Found")}</fo:block>
+ <#assign billToPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId,
"compareDate", invoice.invoiceDate, "userLogin", userLogin))/>
+
<fo:block>${billToPartyNameResult.fullName?default(billingAddress.toName)?default("Billing
Name Not Found")}</fo:block>
<#if billingAddress.attnName?exists>
<fo:block>${billingAddress.attnName}</fo:block>
</#if>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
Mon Aug 4 07:44:08 2014
@@ -22,22 +22,30 @@ under the License.
<fo:table-body>
<fo:table-row >
<fo:table-cell>
- <fo:block>${uiLabelMap.CommonTo}: </fo:block>
- <#if billingAddress?has_content>
- <#assign billingPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId,
"compareDate", invoice.invoiceDate, "userLogin", userLogin))/>
-
<fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing
Name Not Found")}</fo:block>
- <#if billingAddress.attnName?exists>
- <fo:block>${billingAddress.attnName}</fo:block>
- </#if>
- <fo:block>${billingAddress.address1?if_exists}</fo:block>
- <#if billingAddress.address2?exists>
- <fo:block>${billingAddress.address2}</fo:block>
- </#if>
- <fo:block>${billingAddress.city?if_exists}
${billingAddress.stateProvinceGeoId?if_exists}
${billingAddress.postalCode?if_exists}</fo:block>
- <#else>
-
<fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId}</fo:block>
- </#if>
- </fo:table-cell>
+ <fo:block>_______________________________</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
+ <fo:table-cell>
+ <fo:block>${uiLabelMap.CommonTo}: </fo:block>
+ <#if billingAddress?has_content>
+ <#assign billToPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId,
"compareDate", invoice.invoiceDate, "userLogin", userLogin))/>
+
<fo:block>${billToPartyNameResult.fullName?default(billingAddress.toName)?default("Billing
Name Not Found")}</fo:block>
+ <#if billingAddress.attnName?exists>
+ <fo:block>${billingAddress.attnName}</fo:block>
+ </#if>
+ <fo:block>${billingAddress.address1?if_exists}</fo:block>
+ <#if billingAddress.address2?exists>
+ <fo:block>${billingAddress.address2}</fo:block>
+ </#if>
+ <fo:block>${billingAddress.city?if_exists}
${billingAddress.stateProvinceGeoId?if_exists}
${billingAddress.postalCode?if_exists}</fo:block>
+ <#if billToPartyTaxId?has_content>
+ <fo:block>${uiLabelMap.PartyTaxId}:
${billToPartyTaxId}</fo:block>
+ </#if>
+ <#else>
+
<fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billToParty.partyId}</fo:block>
+ </#if>
+ </fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
Mon Aug 4 07:44:08 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#escape x as x?xml>
<fo:table table-layout="fixed" width="100%">
-<fo:table-column column-width="1in"/>
+<fo:table-column column-width="1.5in"/>
<fo:table-column column-width="2.5in"/>
<fo:table-body>
<fo:table-row>
@@ -34,16 +34,9 @@ under the License.
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block><#if
billingParty?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block><#if
billToParty?has_content>${billToParty.partyId}</#if></fo:block></fo:table-cell>
</fo:table-row>
-<#if billingPartyTaxId?has_content>
- <fo:table-row>
-
<fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block> ${billingPartyTaxId}</fo:block></fo:table-cell>
- </fo:table-row>
-</#if>
-
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell>
<fo:table-cell><fo:block><#if
invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml
Mon Aug 4 07:44:08 2014
@@ -36,7 +36,7 @@
<ContentAssoc mapKey="MANUFACTURING_main" contentId="HELP_MFG"
contentIdTo="MFG_Main" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12
01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="MFG_ProdRuns" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
-
objectInfo="applications/manufacturing/data/helpdata/Help_MFG_findProductionRun.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+
objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="MFG_ProdRuns" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="MFG_ProdRuns" contentTypeId="DOCUMENT"
contentName="Production Runs" templateDataResourceId="HELP_TEMPL"
dataResourceId="MFG_ProdRuns" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml
Mon Aug 4 07:44:08 2014
@@ -23,62 +23,68 @@
xmlns:xi="http://www.w3.org/2001/XInclude";
xsi:schemaLocation="http://docbook.org/ns/docbook
../../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook";>
- <title>Manufacturing: Edit production run</title>
+ <title>Manufacturing: Edit Production Run</title>
<para>
- This screen displays the production run. Through this screen you can:
+ This screen displays the details of a Production Run. Through this screen
you can:
</para>
<itemizedlist>
- <listitem><para>Edit the base details of the production
run</para></listitem>
- <listitem><para>Create tasks - Click 'Taksks'</para></listitem>
- <listitem><para>Add materials - Click 'Materials'</para></listitem>
- <listitem><para>Associate equipment - Click
'Equipment'</para></listitem>
- <listitem><para>View associated (dependent) productie runs - click
'Assocs'</para></listitem>
- <listitem><para>View associated content - Click
'Content'</para></listitem>
- <listitem><para>View actual cost of the production run - Click 'Actual
Costs'</para></listitem>
+ <listitem><para>Edit the basic details of the Production
Run</para></listitem>
+ <listitem><para>Create tasks that will be performed as part of the
Production Run by clicking 'Tasks'</para></listitem>
+ <listitem><para>Add materials that the Production Run will use to make
the manufactured product by clicking 'Materials'</para></listitem>
+ <listitem><para>Associate equipment that will be used as part of
Production by clicking 'Equipment'</para></listitem>
+ <listitem><para>View any associated (or dependent) Production Runs by
clicking 'Assocs'</para></listitem>
+ <listitem><para>View any associated content by clicking
'Content'</para></listitem>
+ <listitem><para>View the actual cost of the Production Run by click
'Actual Costs'</para></listitem>
</itemizedlist>
<section>
- <title>Base details production run</title>
+ <title>Basic Production Run Details</title>
<para>
- This section displays the base details of the production run. Additionally
you can edit the details.
+ This section displays the basic details of the Production Run. This
includes information about the
+ Facility where the Production Run will take place, the quantity of product
to be produced and the proposed start and
+ completion date.</para>
+ <para>The majority of these fields are editable, the exception being the
"Calculated completion date".
</para>
- <para>In this section following action can be performed:</para>
+ <para>This section also allows you to change the Production Run status as
follows:</para>
<itemizedlist>
- <listitem><para>Cancel - to cancel the production
run.</para></listitem>
- <listitem><para>Quick close - to close the production
run</para></listitem>
- <listitem><para>Quick complete - to mark the production run as
'complete'</para></listitem>
- <listitem><para>Confirm - to confirm the production
run</para></listitem>
- <listitem><para>Schedule -to schedule the production run in the
calendar</para></listitem>
- <listitem><para>Print - to create a pdf file of the production
run</para></listitem>
+ <listitem><para>"Cancel" - To cancel the Production
Run.</para></listitem>
+ <listitem><para>"Quick Close" - To close the Production
Run</para></listitem>
+ <listitem><para>"Quick complete" - To mark the Production Run as
'complete'</para></listitem>
+ <listitem><para>"Confirm" - To confirm the Production
Run</para></listitem>
+ <listitem><para>"Schedule" -To schedule the Production Run in the
calendar</para></listitem>
+ <listitem><para>"Print" - To create a pdf file of the Production
Run</para></listitem>
</itemizedlist>
</section>
<section>
- <title>Order items</title>
+ <title>Order Items</title>
<para>
- This section displays an overview of associated order items.
+ This section displays an overview of associated order items if the
Production Run will be used
+ to fulfill an order.
</para>
</section>
<section>
<title>Tasks</title>
<para>
- This section displays an overview of associated tasks
+ This section displays an overview of associated tasks that will be
performed as part of the Production Run.
+ These are also called "Routing Tasks"
</para>
</section>
<section>
<title>Materials</title>
<para>
- this section displays an overview of the required materials
+ This section displays an overview of the required materials that will
be used during the Production Run. This
+ information is taken from the Bill of Materials.
</para>
</section>
<section>
- <title>Equipment</title>
+ <title>Equipment/Production Run Fixed Assets</title>
<para>
- This section displays the required equimpent to be used in the
productionn run.
+ This section displays the required equipment or machinery to be used
in the Production Pun.
</para>
</section>
<section>
<title>Notes</title>
<para>
- this sections displays an overview of associated notes.
+ This section displays an overview of any associated Production Run
notes.
</para>
</section>
</section>
\ No newline at end of file
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml
Mon Aug 4 07:44:08 2014
@@ -23,8 +23,12 @@
xmlns:xi="http://www.w3.org/2001/XInclude";
xsi:schemaLocation="http://docbook.org/ns/docbook
../../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook";>
- <title>Manufacturing: Create and edit Routing</title>
+ <title>Manufacturing: Create and Edit Routing</title>
<para>
- In this screen you can create new a new routing and edit an existing
routing.
+ <para>In this screen you can :</para>
+ <itemizedlist>
+ <listitem><para>Create new a new Routing or;</para></listitem>
+ <listitem><para>Edit an existing Routing.</para></listitem>
+ </itemizedlist>
</para>
</section>
\ No newline at end of file
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml
Mon Aug 4 07:44:08 2014
@@ -23,11 +23,15 @@
xmlns:xi="http://www.w3.org/2001/XInclude";
xsi:schemaLocation="http://docbook.org/ns/docbook
../../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook";>
- <title>Manufacturing: Create and edit routing associated
product-link</title>
+ <title>Manufacturing: Create and Edit Routing associated
product-link</title>
<para>
- In this screen can you create a link to a product for the route.
- You can also edit a existing product link.
+ In this screen can you create a link to a product for the routing.</para>
+ <para>The product specified here will be linked to this routing. This
means that when a Production Run
+ is created for this product, it will automatically use this routing by
default.</para>
+ <para>
+ You can also edit an existing product link.</para>
+ <para>
An overview of the associated products is displayed in the lower section
of the screen.
</para>
</section>
\ No newline at end of file
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml
Mon Aug 4 07:44:08 2014
@@ -25,6 +25,15 @@
xmlns="http://docbook.org/ns/docbook";>
<title>Manufacturing: Create and edit route task</title>
<para>
- In this screen you can create a new routing task and modify an existing
routing task.
+ A "Routing Task" is an individual step or activity that is used in the
manufacturing or assembling process of a
+ product.</para>
+ <para>Examples include:</para>
+ <itemizedlist>
+ <listitem><para>Weighing out Raw Materials</para></listitem>
+ <listitem><para>Assembling a Product</para></listitem>
+ <listitem><para>Machining or Processing Materials</para></listitem>
+ </itemizedlist>
+ <para>
+ In this screen you can create a new routing task and modify an
existing Routing Task.
</para>
</section>
\ No newline at end of file
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main.xml
Mon Aug 4 07:44:08 2014
@@ -25,6 +25,32 @@
xmlns="http://docbook.org/ns/docbook";>
<title>Manufacturing: Main</title>
<para>
- This is the start screen of the application.
+ The default screen is the JobShop menu.</para>
+ <para>The JobShop is used to manage and track all the manufacturing or
assembling work.
+ The work (or job) carried out in the JobShop is called a Production
Run. Production Runs
+ can also be called Work Orders.
</para>
+ <para>Production Runs are the work list of the manufacturing
department and include details of:</para>
+ <itemizedlist>
+ <listitem>
+ <para>the product to be manufactured</para></listitem>
+ <listitem
+ ><para>the raw materials or sub assemblies to use</para></listitem>
+ <listitem><para>the steps needed to make the finished
product</para></listitem>
+ </itemizedlist>
+ <title>How do I create a new Production Run?</title>
+ <para>Productions Runs can be created manually or automatically. To
create one manually:</para>
+ <orderedlist>
+ <listitem><para>Click the "Create a Production Run"
button</para></listitem>
+
+ </orderedlist>
+ <title>How do I locate an existing Production Run?</title>
+ <para>To locate an existing Production Run</para>
+ <orderedlist>
+ <listitem><para>Click "Find"</para></listitem>
+ <listitem><para>A list of any existing Production Runs will be
displayed</para></listitem>
+ <listitem><para>Click the Production Run Id to view the Production Run
details</para></listitem>
+ </orderedlist>
+ <title>How do I delete a Production Run?</title>
+ <para>Production Runs cannot be deleted but they can be cancelled
instead.</para>
</section>
\ No newline at end of file
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml
Mon Aug 4 07:44:08 2014
@@ -11838,8 +11838,9 @@
<property key="PartyTaxId">
<value xml:lang="de">Steuer ID</value>
<value xml:lang="en">Tax ID</value>
+ <value xml:lang="en_IN">TIN</value>
<value xml:lang="es">Código de Impuesto</value>
- <value xml:lang="fr">TVA</value>
+ <value xml:lang="fr">Id. de TVA</value>
<value xml:lang="hi_IN">à¤à¤°(tax) à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">ID Tasse</value>
<value xml:lang="ja">ç¨åID</value>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyForms.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyForms.xml
Mon Aug 4 07:44:08 2014
@@ -840,8 +840,10 @@ under the License.
<field name="partyIdTo"
entry-name="parameters.partyId"><display/></field>
<field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}">
<drop-down allow-empty="false" no-current-selected-key="_NA_">
- <entity-options entity-name="RoleType"
key-field-name="roleTypeId" description="${description}">
+ <entity-options entity-name="RoleTypeAndParty"
key-field-name="roleTypeId" description="${description}">
+ <entity-constraint name="partyId" value="${partyId}"/>
<entity-order-by field-name="description"/>
+ <entity-order-by field-name="roleTypeId"/>
</entity-options>
</drop-down>
</field>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
Mon Aug 4 07:44:08 2014
@@ -198,4 +198,8 @@ under the License.
<PaymentMethod paymentMethodId="FRENCHCUSTOMER"
paymentMethodTypeId="CREDIT_CARD" partyId="FrenchCustomer" fromDate="2009-01-09
00:00:00.000"/>
<CreditCard paymentMethodId="FRENCHCUSTOMER" cardType="Visa"
cardNumber="4111111111111111" expireDate="02/2020" companyNameOnCard=""
titleOnCard="" firstNameOnCard="FRENCH" middleNameOnCard=""
lastNameOnCard="CUSTOMER" suffixOnCard="" contactMechId="FRENCHCUSTOMER"/>
+
+ <PartyTaxAuthInfo partyId="FrenchCustomer" taxAuthGeoId="FRA"
taxAuthPartyId="FRA_TA" fromDate="2001-05-13 00:00:00.000"
partyTaxId="FR-12345678901" isExempt="N"/>
+ <!--PartyTaxAuthInfo partyId="Company" taxAuthGeoId="FRA"
taxAuthPartyId="FRA_TA" fromDate="2014-01-01 00:00:00.000"
partyTaxId="FR-12345678901" isExempt="N"/-->
+
</entity-engine-xml>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
Mon Aug 4 07:44:08 2014
@@ -581,6 +581,7 @@ under the License.
<ProductPrice productId="GZ-1000" productPricePurposeId="PURCHASE"
productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD"
productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="15.99"
createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin"
lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<ProductPrice productId="GZ-1000" productPricePurposeId="PURCHASE"
productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_"
fromDate="2001-05-13 12:00:00.0" price="15.0" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
+ <ProductPrice productId="GZ-1000" productPricePurposeId="PURCHASE"
productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR"
productStoreGroupId="_NA_" fromDate="2014-01-01 00:00:00.0" price="10.000"
priceWithTax="10.000" priceWithoutTax="8.333" taxAmount="1.667"
taxAuthGeoId="FRA" taxAuthPartyId="FRA_TA" taxInPrice="Y"
taxPercentage="20.000000"/>
<ProductPrice productId="GZ-1001" productPricePurposeId="PURCHASE"
productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD"
productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="25.99"
createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin"
lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<ProductPrice productId="GZ-1001" productPricePurposeId="PURCHASE"
productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_"
fromDate="2001-05-13 12:00:00.0" price="25.99" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
<ProductPrice productId="GZ-1004" productPricePurposeId="PURCHASE"
productPriceTypeId="AVERAGE_COST" currencyUomId="USD"
productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="29.99"
createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin"
lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/rc.ofbiz.for.debian
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/rc.ofbiz.for.debian?rev=1615494&r1=1615493&r2=1615494&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/rc.ofbiz.for.debian
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/rc.ofbiz.for.debian
Mon Aug 4 07:44:08 2014
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#####################################################################
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -23,6 +23,15 @@
#
# chkconfig: - 80 10
# description: OFBiz server
+### BEGIN INIT INFO
+# Provides: OFBiz ERP software
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Apache-OFBiz
+# Description: OFBiz ERP Software
+### END INIT INFO
# Paths - Edit for your locations
JAVA_BINARY=/usr/java/j2sdk1.4.2/bin/java
