svn commit: r418557 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Sun Jul 2 00:31:16 2006 New Revision: 418557 URL: http://svn.apache.org/viewvc?rev=418557&view=rev Log: Applied slightly modified patch from Chris Howe to split up the View Quote screen into reusable screenlets; also changed quote's artifacts license to ASL2.0. Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (with props) Removed: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteInfo.ftl Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CreateOrderQuote.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteReport.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml (original) +++ incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml Sun Jul 2 00:31:16 2006 @@ -1,28 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * $Id: ShoppingListScreens.xml 5462 2005-08-05 18:35:48Z jonesde $ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd"> @@ -79,12 +72,7 @@ <platform-specific> <html><html-template location="component://ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl"/></html> </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteInfo.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl"/></html> - </platform-specific> + <include-screen name="ViewQuoteTemplate" location="component://order/widget/ordermgr/QuoteScreens.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl Sun Jul 2 00:31:16 2006 @@ -1,28 +1,20 @@ <#-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <#if quote?exists> <form action="<@ofbizUrl>copyQuote</@ofbizUrl>" method="post" style="margin: 0;"> <input type="hidden" name="quoteId" value="${quoteId}"/> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CreateOrderQuote.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CreateOrderQuote.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CreateOrderQuote.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CreateOrderQuote.ftl Sun Jul 2 00:31:16 2006 @@ -1,28 +1,20 @@ <#-- - * Copyright (c) 2005-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <div> <a href="<@ofbizUrl>EditQuote</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrderQuote}</a> <#if quote?exists> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl Sun Jul 2 00:31:16 2006 @@ -1,28 +1,20 @@ <#-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <#list quoteCoefficients as quoteCoefficient> <div class="tabletext">${quoteCoefficient.coeffName}: ${quoteCoefficient.coeffValue}</div> </#list> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl Sun Jul 2 00:31:16 2006 @@ -1,28 +1,20 @@ <#-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <br/> <div class="tableheadtext">${uiLabelMap.CommonTotalCost}:</div> <div class="tabletext">${totalCost}</div> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Sun Jul 2 00:31:16 2006 @@ -1,26 +1,21 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2004 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteReport.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteReport.fo.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteReport.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteReport.fo.ftl Sun Jul 2 00:31:16 2006 @@ -1,26 +1,19 @@ <#-- - * Copyright (c) 2004 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. --> <?xml version="1.0" encoding="UTF-8" ?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl Sun Jul 2 00:31:16 2006 @@ -1,29 +1,20 @@ <#-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author David E. Jones ([hidden email]) - *@version $Rev$ - *@since 2.2 ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <#assign unselectedClassName = "tabButton"> <#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sun Jul 2 00:31:16 2006 @@ -1,28 +1,20 @@ <#-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <div class="screenlet"> <div class="screenlet-header"> <div style="float: right;"> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl Sun Jul 2 00:31:16 2006 @@ -1,28 +1,20 @@ <#-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *@author Jacopo Cappellato ([hidden email]) - *@version $Rev$ ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <#list quoteCoefficients as quoteCoefficient> <div class="tabletext">${quoteCoefficient.coeffName}: ${quoteCoefficient.coeffValue}</div> </#list> Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=418557&view=auto ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl Sun Jul 2 00:31:16 2006 @@ -0,0 +1,55 @@ +<#-- +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.CommonDate}</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1"> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderOrderQuoteIssueDate}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${(quote.issueDate.toString())?if_exists}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonValidFromDate}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${(quote.validFromDate.toString())?if_exists}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonValidThruDate}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${(quote.validThruDate.toString())?if_exists}</div> + </td> + </tr> + </table> + </div> +</div> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=418557&view=auto ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Sun Jul 2 00:31:16 2006 @@ -0,0 +1,102 @@ +<#-- +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead">${uiLabelMap.OrderOrderQuoteId} ${quote.quoteId} ${uiLabelMap.CommonInformation}</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1"> + <#-- quote header information --> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonType}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <#-- quote status information --> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonStatus}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${(statusItem.get("description", locale))?default(quote.statusId?if_exists)}</div> + </td> + </tr> + <#-- party --> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.PartyPartyId}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${quote.partyId?if_exists}</div> + </td> + </tr> + <#-- quote name --> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderOrderQuoteName}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${quote.quoteName?if_exists}</div> + </td> + </tr> + <#-- quote description --> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonDescription}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${quote.description?if_exists}</div> + </td> + </tr> + <#-- quote currency --> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonCurrency}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"><#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if></div> + </td> + </tr> + <#-- quote currency --> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.ProductProductStore}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"><#if store?exists>${store.storeName?default(quote.productStoreId?if_exists)}</#if></div> + </td> + </tr> + </table> + </div> +</div> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=418557&view=auto ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Sun Jul 2 00:31:16 2006 @@ -0,0 +1,41 @@ +<#-- +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.OrderOrderQuoteRoles}</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1"> + <#list quoteRoles as quoteRole> + <#assign roleType = quoteRole.getRelatedOne("RoleType")> + <#assign party = quoteRole.getRelatedOne("Party")> + <#assign rolePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quoteRole.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${roleType.get("description",locale)?if_exists}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${rolePartyNameResult.fullName?default("Name Not Found")}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + </#list> + </table> + </div> +</div> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=418557&r1=418556&r2=418557&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sun Jul 2 00:31:16 2006 @@ -1,27 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2004 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * ---> +$Id: $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd"> <screen name="CommonQuoteDecorator"> @@ -144,12 +138,7 @@ <platform-specific> <html><html-template location="component://order/webapp/ordermgr/quote/CreateOrderQuote.ftl"/></html> </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteInfo.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl"/></html> - </platform-specific> + <include-screen name="ViewQuoteTemplate"/> <platform-specific> <html><html-template location="component://order/webapp/ordermgr/quote/CopyQuote.ftl"/></html> </platform-specific> @@ -179,12 +168,7 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteInfo.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl"/></html> - </platform-specific> + <include-screen name="ViewQuoteTemplate"/> </widgets> </section> </screen> @@ -585,6 +569,75 @@ <include-form name="EditQuoteReportMail" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> </decorator-section> </decorator-screen> + </widgets> + </section> + </screen> + <screen name="ViewQuoteTemplate"> + <section> + <condition> + <not><if-empty field-name="quote"/></not> + </condition> + <widgets> + <label text="${note}" style="tabletext"/> + <include-screen name="ViewQuoteInfo"/> + <container style="leftclear"> + <include-screen name="ViewQuoteItemInfo"/> + </container> + </widgets> + <fail-widgets> + <label style="head3">${uiLabelMap.OrderErrorQuoteNotFound}</label> + </fail-widgets> + </section> + </screen> + <screen name="ViewQuoteInfo"> + <section> + <widgets> + <container style="lefthalf"> + <include-screen name="quoteInfo"/> + </container> + <container style="righthalf"> + <include-screen name="quoteDate"/> + <include-screen name="quoteRoles"/> + </container> + </widgets> + </section> + </screen> + <screen name="quoteInfo"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/quote/quoteInfo.ftl"/></html> + </platform-specific> + </widgets> + </section> + </screen> + <screen name="quoteDate"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/quote/quoteDate.ftl"/></html> + </platform-specific> + </widgets> + </section> + </screen> + <screen name="quoteRoles"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/quote/quoteRoles.ftl"/></html> + </platform-specific> + </widgets> + </section> + </screen> + <screen name="ViewQuoteItemInfo"> + <section> + <condition> + <not><if-empty field-name="quoteItems"/></not> + </condition> + <widgets> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl"/></html> + </platform-specific> </widgets> </section> </screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |