svn commit: r1614280 - in /ofbiz/trunk/applications/manufacturing/data: ./ helpdata/
Author: sharan Date: Tue Jul 29 08:03:53 2014 New Revision: 1614280 URL: http://svn.apache.org/r1614280 Log: Applied OFBIZ-5684 (OFBIZ-2219) updates to manufacturing help screens Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_EN.xml ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_main.xml Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_EN.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_EN.xml?rev=1614280r1=1614279r2=1614280view=diff == --- ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_EN.xml (original) +++ ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_EN.xml Tue Jul 29 08:03:53 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/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml?rev=1614280r1=1614279r2=1614280view=diff == --- ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml (original) +++ ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml Tue Jul 29 08:03:53 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; -titleManufacturing: Edit production run/title +titleManufacturing: 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 -listitemparaEdit the base details of the production run/para/listitem -listitemparaCreate tasks - Click 'Taksks'/para/listitem -listitemparaAdd materials - Click 'Materials'/para/listitem -listitemparaAssociate equipment - Click 'Equipment'/para/listitem -listitemparaView associated (dependent) productie runs - click 'Assocs'/para/listitem -listitemparaView associated content - Click 'Content'/para/listitem -listitemparaView actual cost of the production run - Click 'Actual Costs'/para/listitem +listitemparaEdit the basic details of the Production Run/para/listitem +listitemparaCreate tasks that will be performed as part of the Production Run by clicking 'Tasks'/para/listitem +listitemparaAdd materials that the Production Run will use to make the manufactured product by clicking 'Materials'/para/listitem +listitemparaAssociate equipment that will be used as part of Production by clicking 'Equipment'/para/listitem +listitemparaView any associated (or dependent) Production Runs by clicking 'Assocs'/para/listitem +listitemparaView any associated content by clicking 'Content'/para/listitem +listitemparaView the actual cost of the Production Run by click 'Actual Costs'/para/listitem /itemizedlist section -titleBase details production run/title +titleBasic 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 +paraThe majority of these fields are editable, the exception being
svn commit: r1614355 - /ofbiz/trunk/tools/rc.ofbiz.for.debian
Author: jleroux Date: Tue Jul 29 14:03:38 2014 New Revision: 1614355 URL: http://svn.apache.org/r1614355 Log: A patch from Julien Nicolas for modification on daemon script for debian https://issues.apache.org/jira/browse/OFBIZ-5693 The file rc.ofbiz.for.debian generate some error because of the bash type contained in the first line. !/bin/sh should be !/bin/bash To add it in the startup process, it must contained a specific header : ### BEGIN INIT INFO # Provides: Apache-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: Apache-OFBiz ERP Software ### END INIT INFO Modified: ofbiz/trunk/tools/rc.ofbiz.for.debian Modified: ofbiz/trunk/tools/rc.ofbiz.for.debian URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/rc.ofbiz.for.debian?rev=1614355r1=1614354r2=1614355view=diff == --- ofbiz/trunk/tools/rc.ofbiz.for.debian (original) +++ ofbiz/trunk/tools/rc.ofbiz.for.debian Tue Jul 29 14:03:38 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
svn commit: r1614356 - in /ofbiz/branches/release13.07: ./ tools/rc.ofbiz.for.debian
Author: jleroux Date: Tue Jul 29 14:04:50 2014 New Revision: 1614356 URL: http://svn.apache.org/r1614356 Log: Applied fix from trunk for revision: 1614355 r1614355 | jleroux | 2014-07-29 16:03:38 +0200 (mar. 29 juil. 2014) | 16 lignes A patch from Julien Nicolas for modification on daemon script for debian https://issues.apache.org/jira/browse/OFBIZ-5693 The file rc.ofbiz.for.debian generate some error because of the bash type contained in the first line. !/bin/sh should be !/bin/bash To add it in the startup process, it must contained a specific header : ### BEGIN INIT INFO # Provides: Apache-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: Apache-OFBiz ERP Software ### END INIT INFO Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/tools/rc.ofbiz.for.debian Propchange: ofbiz/branches/release13.07/ -- Merged /ofbiz/trunk:r1614355 Modified: ofbiz/branches/release13.07/tools/rc.ofbiz.for.debian URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/tools/rc.ofbiz.for.debian?rev=1614356r1=1614355r2=1614356view=diff == --- ofbiz/branches/release13.07/tools/rc.ofbiz.for.debian (original) +++ ofbiz/branches/release13.07/tools/rc.ofbiz.for.debian Tue Jul 29 14:04:50 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
svn commit: r1614357 - in /ofbiz/branches/release12.04: ./ tools/rc.ofbiz.for.debian
Author: jleroux Date: Tue Jul 29 14:04:52 2014 New Revision: 1614357 URL: http://svn.apache.org/r1614357 Log: Applied fix from trunk for revision: 1614355 r1614355 | jleroux | 2014-07-29 16:03:38 +0200 (mar. 29 juil. 2014) | 16 lignes A patch from Julien Nicolas for modification on daemon script for debian https://issues.apache.org/jira/browse/OFBIZ-5693 The file rc.ofbiz.for.debian generate some error because of the bash type contained in the first line. !/bin/sh should be !/bin/bash To add it in the startup process, it must contained a specific header : ### BEGIN INIT INFO # Provides: Apache-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: Apache-OFBiz ERP Software ### END INIT INFO Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/tools/rc.ofbiz.for.debian Propchange: ofbiz/branches/release12.04/ -- Merged /ofbiz/trunk:r1614355 Modified: ofbiz/branches/release12.04/tools/rc.ofbiz.for.debian URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/tools/rc.ofbiz.for.debian?rev=1614357r1=1614356r2=1614357view=diff == --- ofbiz/branches/release12.04/tools/rc.ofbiz.for.debian (original) +++ ofbiz/branches/release12.04/tools/rc.ofbiz.for.debian Tue Jul 29 14:04:52 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
svn commit: r1614366 - /ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
Author: jleroux
Date: Tue Jul 29 14:37:48 2014
New Revision: 1614366
URL: http://svn.apache.org/r1614366
Log:
A patch from Pierre Smits for AddOtherPartyRelationship allows user to select
roles the selected party doesn't have
https://issues.apache.org/jira/browse/OFBIZ-5694
When a relationship must be set for a party to another party, the role selector
for the party shows all roles available in the data set.
This, however, must be limitied to the roles the party has.
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1614366r1=1614365r2=1614366view=diff
==
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Tue Jul 29
14:37:48 2014
@@ -840,8 +840,10 @@ under the License.
field name=partyIdTo
entry-name=parameters.partyIddisplay//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
svn commit: r1614367 - in /ofbiz/branches/release13.07: ./ applications/party/widget/partymgr/PartyForms.xml
Author: jleroux
Date: Tue Jul 29 14:38:43 2014
New Revision: 1614367
URL: http://svn.apache.org/r1614367
Log:
Applied fix from trunk for revision: 1614366
r1614366 | jleroux | 2014-07-29 16:37:48 +0200 (mar. 29 juil. 2014) | 4 lignes
A patch from Pierre Smits for AddOtherPartyRelationship allows user to select
roles the selected party doesn't have
https://issues.apache.org/jira/browse/OFBIZ-5694
When a relationship must be set for a party to another party, the role selector
for the party shows all roles available in the data set.
This, however, must be limitied to the roles the party has.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyForms.xml
Propchange: ofbiz/branches/release13.07/
--
Merged /ofbiz/trunk:r1614366
Modified:
ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyForms.xml?rev=1614367r1=1614366r2=1614367view=diff
==
---
ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyForms.xml
(original)
+++
ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyForms.xml
Tue Jul 29 14:38:43 2014
@@ -840,8 +840,10 @@ under the License.
field name=partyIdTo
entry-name=parameters.partyIddisplay//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
svn commit: r1614368 - in /ofbiz/branches/release12.04: ./ applications/party/widget/partymgr/PartyForms.xml
Author: jleroux
Date: Tue Jul 29 14:38:45 2014
New Revision: 1614368
URL: http://svn.apache.org/r1614368
Log:
Applied fix from trunk for revision: 1614366
r1614366 | jleroux | 2014-07-29 16:37:48 +0200 (mar. 29 juil. 2014) | 4 lignes
A patch from Pierre Smits for AddOtherPartyRelationship allows user to select
roles the selected party doesn't have
https://issues.apache.org/jira/browse/OFBIZ-5694
When a relationship must be set for a party to another party, the role selector
for the party shows all roles available in the data set.
This, however, must be limitied to the roles the party has.
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml
Propchange: ofbiz/branches/release12.04/
--
Merged /ofbiz/trunk:r1614366
Modified:
ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml?rev=1614368r1=1614367r2=1614368view=diff
==
---
ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml
(original)
+++
ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml
Tue Jul 29 14:38:45 2014
@@ -835,8 +835,10 @@ under the License.
field name=partyIdTo
entry-name=parameters.partyIddisplay//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
svn commit: r1614369 - in /ofbiz/branches/release11.04: ./ applications/party/widget/partymgr/PartyForms.xml
Author: jleroux
Date: Tue Jul 29 14:38:48 2014
New Revision: 1614369
URL: http://svn.apache.org/r1614369
Log:
Applied fix from trunk for revision: 1614366
r1614366 | jleroux | 2014-07-29 16:37:48 +0200 (mar. 29 juil. 2014) | 4 lignes
A patch from Pierre Smits for AddOtherPartyRelationship allows user to select
roles the selected party doesn't have
https://issues.apache.org/jira/browse/OFBIZ-5694
When a relationship must be set for a party to another party, the role selector
for the party shows all roles available in the data set.
This, however, must be limitied to the roles the party has.
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/party/widget/partymgr/PartyForms.xml
Propchange: ofbiz/branches/release11.04/
--
Merged /ofbiz/trunk:r1614366
Modified:
ofbiz/branches/release11.04/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/party/widget/partymgr/PartyForms.xml?rev=1614369r1=1614368r2=1614369view=diff
==
---
ofbiz/branches/release11.04/applications/party/widget/partymgr/PartyForms.xml
(original)
+++
ofbiz/branches/release11.04/applications/party/widget/partymgr/PartyForms.xml
Tue Jul 29 14:38:48 2014
@@ -812,8 +812,10 @@ under the License.
field name=partyIdTo
entry-name=parameters.partyIddisplay//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
svn commit: r1614428 - /ofbiz/trunk/applications/party/config/PartyUiLabels.xml
Author: jleroux Date: Tue Jul 29 17:29:09 2014 New Revision: 1614428 URL: http://svn.apache.org/r1614428 Log: Better label Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1614428r1=1614427r2=1614428view=diff == --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Jul 29 17:29:09 2014 @@ -11839,7 +11839,7 @@ value xml:lang=deSteuer ID/value value xml:lang=enTax ID/value value xml:lang=esCódigo de Impuesto/value -value xml:lang=frTVA/value +value xml:lang=frN° de TVA intracommunautaire/value value xml:lang=hi_INà¤à¤°(tax) à¤à¥à¤°à¤®à¤¾à¤à¤/value value xml:lang=itID Tasse/value value xml:lang=jaç¨åID/value
