svn commit: r1754402 - in /ofbiz/trunk: ./ applications/accounting/config
Locked
svn commit: r1754402 - in /ofbiz/trunk: ./ applications/accounting/config
 
|
Author: jleroux
Date: Thu Jul 28 12:27:20 2016 New Revision: 1754402 URL: http://svn.apache.org/viewvc?rev=1754402&view=rev Log: This removes the pos component. Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else. I have voluntarily left 2 or 3 moot points I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read. I have to check if we should keep or not this code snippet <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals --> <entity-count entity-name="InventoryItem" count-field="iiCount"> <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/> </entity-count> I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change // if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change) // continue; // } Removed: ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/both.properties ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/pos.properties ofbiz/trunk/specialpurpose/pos/ ofbiz/trunk/tools/startofbizBoth.bat ofbiz/trunk/tools/startofbizPos.bat Modified: ofbiz/trunk/OPTIONAL_LIBRARIES (contents, props changed) ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml ofbiz/trunk/applications/order/data/OrderTypeData.xml ofbiz/trunk/applications/product/config/ProductEntityLabels.xml ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml ofbiz/trunk/applications/product/servicedef/services_facility.xml ofbiz/trunk/framework/base/config/ofbiz-containers.xml ofbiz/trunk/framework/common/config/CommonEntityLabels.xml ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml ofbiz/trunk/framework/service/ofbiz-component.xml ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java ofbiz/trunk/specialpurpose/LICENSE ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizHead.ftl ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl ofbiz/trunk/specialpurpose/component-load.xml Modified: ofbiz/trunk/OPTIONAL_LIBRARIES URL: http://svn.apache.org/viewvc/ofbiz/trunk/OPTIONAL_LIBRARIES?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/OPTIONAL_LIBRARIES (original) +++ ofbiz/trunk/OPTIONAL_LIBRARIES Thu Jul 28 12:27:20 2016 @@ -37,24 +37,6 @@ on the old Undersun SVN server in the sp and rename the ZIP file that comes with it as jimi-xxx.jar, then copy it into the same directory as fop.jar, which at this time is ${ofbiz.home}/framework/webapp/lib/ --=- POS _______________________________________________________________________________________________________________________________________________________ - --GTK Swing (LGPL): - http://sourceforge.net/projects/gtkswing/ - TO DEPLOY: base/config/pos-containers.xml:org.gtk.java.swing.plaf.gtk.GtkLookAndFeel for look and feel --JavaPOS hardware drivers - TO DEPLOY: specialpurpose/pos/lib/ - - Epson Printer TM-T88III (Proprietay licence) needs jpos18-controls.jar (version specific) - https://www.epson-pos.com/cgi-bin/sdssm/main/td_login.jsp - epsonJposService180.jar - epsonJposServiceCommon.jar - - Star (Proprietay licence) - http://www.star-micronics.co.jp/service/s_print/starjavapos_win32-linux-macosx_yyyymmdd.zip.htm - starjavapos.jar - - -=- Office (Word, etc) File Handling __________________________________________________________________________________________________________________________ -OpenOffice UNO (LGPL) Propchange: ofbiz/trunk/OPTIONAL_LIBRARIES ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/OPTIONAL_LIBRARIES ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Thu Jul 28 12:27:20 2016 @@ -5287,36 +5287,6 @@ <value xml:lang="zh">å·¥èµæ¯ç¥¨</value> <value xml:lang="zh-TW">å·¥è³æ¯ç¥¨</value> </property> - <property key="PaymentType.description.POS_PAID_IN"> - <value xml:lang="de">Kasseneinzahlung</value> - <value xml:lang="en">POS Paid In</value> - <value xml:lang="fr">Reçu en caisse</value> - <value xml:lang="hi-IN">Pos à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¤¿à¤¯à¤¾</value> - <value xml:lang="it">Pagamento POS Ingresso</value> - <value xml:lang="ja">POSæå ¥</value> - <value xml:lang="nl">PoS - In</value> - <value xml:lang="pt">POS Pago em</value> - <value xml:lang="ru">ÐÑ Ð¾Ð´. оплаÑа POS</value> - <value xml:lang="th">à¸à¸³à¸£à¸° ภà¸à¸¸à¸à¸à¸²à¸¢</value> - <value xml:lang="vi">Thanh toán Và o (của POS)</value> - <value xml:lang="zh">æ款æºæ¶æ¬¾</value> - <value xml:lang="zh-TW">æ款æ©æ¶æ¬¾</value> - </property> - <property key="PaymentType.description.POS_PAID_OUT"> - <value xml:lang="de">Kassenauszahlung</value> - <value xml:lang="en">POS Paid Out</value> - <value xml:lang="fr">Sortie de caisse</value> - <value xml:lang="hi-IN">Pos बाहर à¤à¥ शà¥à¤²à¥à¤à¤¿à¤¤</value> - <value xml:lang="it">Pagamento POS Uscita</value> - <value xml:lang="ja">POSæåº</value> - <value xml:lang="nl">PoS - Uit</value> - <value xml:lang="pt">POS pago</value> - <value xml:lang="ru">ÐÑÑ Ð¾Ð´. оплаÑа POS</value> - <value xml:lang="th">à¸à¸³à¸£à¸°à¸à¸à¸à¸à¸¸à¸à¸à¸²à¸¢</value> - <value xml:lang="vi">Thanh toán Ra (của POS)</value> - <value xml:lang="zh">æ款æºé款</value> - <value xml:lang="zh-TW">æ款æ©é款</value> - </property> <property key="PaymentType.description.RECEIPT"> <value xml:lang="ar">ÙصÙ</value> <value xml:lang="de">Quittung</value> Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Thu Jul 28 12:27:20 2016 @@ -719,10 +719,6 @@ under the License. <PaymentType description="Interest Receipt" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="INTEREST_RECEIPT"/> <PaymentType description="Gift Certificate Deposit" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="GC_DEPOSIT"/> - <!-- payment types for POS PAID IN/OUT --> - <PaymentType description="POS Paid Out" hasTable="N" parentTypeId="DISBURSEMENT" paymentTypeId="POS_PAID_OUT"/> - <PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="POS_PAID_IN"/> - <!-- Payment Group Type --> <PaymentGroupType paymentGroupTypeId="CHECK_RUN" parentTypeId="" hasTable="N" description="Check Run"/> <PaymentGroupType paymentGroupTypeId="BATCH_PAYMENT" parentTypeId="" hasTable="N" description="Batch of Payments"/> Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml (original) +++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml Thu Jul 28 12:27:20 2016 @@ -27,7 +27,6 @@ License. <listitem><para>Customer Deposit</para></listitem> <listitem><para>Customer Payment</para></listitem> <listitem><para>Interest In</para></listitem> - <listitem><para>POS In (POS = Point of Sale)</para></listitem> </itemizedlist> <para>Examples of outgoing payment types are as follows:</para> <itemizedlist> @@ -47,7 +46,7 @@ License. <listitem><para> Select the 'Payment Type Id' from the drop down box (NOTE: This is currently limited to the following: Customer Deposit, Customer - Payment, Interest In, POS Paid In and Gift Certificate Deposit) + Payment, Interest In and Gift Certificate Deposit) </para></listitem> <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem> <listitem><para>Enter or use the lookup to find the 'From Party Id'</para></listitem> Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Thu Jul 28 12:27:20 2016 @@ -532,9 +532,9 @@ public class InvoiceServices { // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced, // so skip this adjustment - if (adj.get("amount") == null) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, item(s) here) and a cash amount higher than total (hence issuing change) - continue; - } +// if (adj.get("amount") == null) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, item(s) here) and a cash amount higher than total (hence issuing change) +// continue; +// } if (adjAlreadyInvoicedAmount.abs().compareTo(adj.getBigDecimal("amount").setScale(invoiceTypeDecimals, ROUNDING).abs()) > 0) { continue; } @@ -663,14 +663,14 @@ public class InvoiceServices { } catch (GenericServiceException e) { Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, - "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale)); + "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale)); } // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced, // so skip this adjustment - if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change) - continue; - } +// if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change) +// continue; +// } if (adjAlreadyInvoicedAmount.abs().compareTo(adj.getBigDecimal("amount").setScale(invoiceTypeDecimals, ROUNDING).abs()) > 0) { continue; } Modified: ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml (original) +++ ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml Thu Jul 28 12:27:20 2016 @@ -259,8 +259,7 @@ under the License. <EntityGroupEntry entityGroupId="6920" entityOrPackage="org.apache.ofbiz.content.website" applEnumId="ESIA_INCLUDE"/> <EntityGroup entityGroupId="6930" entityGroupName="Technical: Login and Security"/> <EntityGroupEntry entityGroupId="6930" entityOrPackage="org.apache.ofbiz.security" applEnumId="ESIA_INCLUDE"/> - <EntityGroup entityGroupId="6990" entityGroupName="Technical: POS, OAGIS, Other"/> - <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.pos.terminal" applEnumId="ESIA_INCLUDE"/> + <EntityGroup entityGroupId="6990" entityGroupName="Technical: OAGIS, Other"/> <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.specialpurpose.oagis" applEnumId="ESIA_INCLUDE"/> <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.catalina.session" applEnumId="ESIA_INCLUDE"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original) +++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Thu Jul 28 12:27:20 2016 @@ -75,7 +75,6 @@ under the License. <EnumerationType description="Order Sales Channel" enumTypeId="ORDER_SALES_CHANNEL" hasTable="N" parentTypeId=""/> <Enumeration description="Web Channel" enumCode="WEB_CHANNEL" enumId="WEB_SALES_CHANNEL" sequenceId="01" enumTypeId="ORDER_SALES_CHANNEL"/> - <Enumeration description="POS Channel" enumCode="POS_CHANNEL" enumId="POS_SALES_CHANNEL" sequenceId="02" enumTypeId="ORDER_SALES_CHANNEL"/> <Enumeration description="Fax Channel" enumCode="FAX_CHANNEL" enumId="FAX_SALES_CHANNEL" sequenceId="03" enumTypeId="ORDER_SALES_CHANNEL"/> <Enumeration description="Phone Channel" enumCode="PHONE_CHANNEL" enumId="PHONE_SALES_CHANNEL" sequenceId="04" enumTypeId="ORDER_SALES_CHANNEL"/> <Enumeration description="E-Mail Channel" enumCode="EMAIL_CHANNEL" enumId="EMAIL_SALES_CHANNEL" sequenceId="05" enumTypeId="ORDER_SALES_CHANNEL"/> Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Thu Jul 28 12:27:20 2016 @@ -4299,11 +4299,11 @@ <value xml:lang="zh-TW">å¦ææ¯,åä¸æç¼éä»»ä½æ°å»ºçè¨å®,ä¹ä¸æå°ä¿¡ç¨å¡æ¶è²»ç.</value> </property> <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> - <value xml:lang="de">Wenn eingeschaltet, werden Bestellungen sofort durch systemgenerierte Prozesse ausgeführt (z.B. für POS Käufe). Wenn ausgeschaltet, werden sie für eine manuelle Prüfung zurückgehalten.</value> - <value xml:lang="en">If Yes, the order will be immediately fulfilled through system-generated processes in ofbiz (e.g. for POS sales). If no, it will be held for manual review.</value> - <value xml:lang="fr">Si Oui, toutes les commandes seront automatiquement remplies par le système (e.g. Les ventes du POS). Si Non, les commandes seront retenues à des fins de traitement manuel.</value> + <value xml:lang="de">Wenn eingeschaltet, werden Bestellungen sofort durch systemgenerierte Prozesse ausgeführt. Wenn ausgeschaltet, werden sie für eine manuelle Prüfung zurückgehalten.</value> + <value xml:lang="en">If Yes, the order will be immediately fulfilled through system-generated processes in ofbiz. If no, it will be held for manual review.</value> + <value xml:lang="fr">Si Oui, toutes les commandes seront automatiquement remplies par le système. Si Non, les commandes seront retenues à des fins de traitement manuel.</value> <value xml:lang="ja">ã¯ãã®å ´åãofbizã§ã¯ã·ã¹ãã ã«çæãããããã»ã¹ã§æ³¨æãããå®è¡ããã¾ãããããã®å ´åã¯ãæåã§ç¢ºèªãããã¾ã§ä¿çããã¾ãã</value> - <value xml:lang="vi">Nếu có, Äặt hà ng sẽ Äược tá»± Äá»ng Äiá»n Äầy Äủ ngay láºp tức thông qua há» thá»ng xá» lý của Ofbiz (và dụ nhÆ° há» thá»ng bán hà ng POS). Nếu không, nó sẽ dẫn Äến phần xem xét thủ công</value> + <value xml:lang="vi">Nếu có, Äặt hà ng sẽ Äược tá»± Äá»ng Äiá»n Äầy Äủ ngay láºp tức thông qua há» thá»ng xá» lý của Ofbiz. Nếu không, nó sẽ dẫn Äến phần xem xét thủ công</value> <value xml:lang="zh">å¦ææ¯ï¼åä¼å¨OFBizä¸éè¿ç³»ç»çæè¿ç¨ç«å³æ§è¡ï¼å¦POSéå®ï¼ãå¦æå¦ï¼åä¼çå¾ äººå·¥æ£æ¥ã</value> <value xml:lang="zh-TW">å¦ææ¯,åæå¨OFBizä¸éé系統ç¢çéç¨ç«å³è²¬ä»»å±¥è¡(å¦POSé·å®).å¦æå¦,åæçå¾ äººå·¥æª¢æ¥.</value> </property> Modified: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product%20Stores.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml (original) +++ ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml Thu Jul 28 12:27:20 2016 @@ -67,7 +67,7 @@ Stores tab (with a store selected) bring </section> <section> <title> Why use stores?</title> - <para>The 'Stores' tab in the catalog manager as used to define all the properties of a working store, is a group of products sold together under the same policies. Stores greatly improve the flexibility of Apache OFBiz applications. It is possible for a company to set up multiple stores, each with its warehouses, fulfillment policies, currencies, languages, promotions, and look-and-feel. These stores can be web-based b2b or consumer ecommerce stores or for internal order entry and POS applications. They could even be in different countries with different shipping and taxation rules. + <para>The 'Stores' tab in the catalog manager as used to define all the properties of a working store, is a group of products sold together under the same policies. Stores greatly improve the flexibility of Apache OFBiz applications. It is possible for a company to set up multiple stores, each with its warehouses, fulfillment policies, currencies, languages, promotions, and look-and-feel. These stores can be web-based b2b or consumer ecommerce stores or for internal order entry. They could even be in different countries with different shipping and taxation rules. </para> </section> <section> Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Thu Jul 28 12:27:20 2016 @@ -480,7 +480,7 @@ under the License. <service name="issueImmediatelyFulfilledOrder" engine="simple" location="component://product/minilang/product/inventory/InventoryIssueServices.xml" invoke="issueImmediatelyFulfilledOrder" auth="false"> <description> - Issues the Inventory for an Order that was Immediately Fulfilled, like in a POS environment. + Issues the Inventory for an Order that was Immediately Fulfilled. Note that this skips the normal inventory reservation process, and the shipment process (no shipment is created). </description> <attribute name="orderId" type="String" mode="IN" optional="false"/> Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original) +++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Thu Jul 28 12:27:20 2016 @@ -22,7 +22,7 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> <!-- load the ofbiz component container (always first) --> - <container name="component-container" loaders="main,rmi,pos,load-data" class="org.apache.ofbiz.base.container.ComponentContainer"/> + <container name="component-container" loaders="main,rmi,load-data" class="org.apache.ofbiz.base.container.ComponentContainer"/> <container name="component-container-test" loaders="test" class="org.apache.ofbiz.base.container.ComponentContainer"/> Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Thu Jul 28 12:27:20 2016 @@ -1637,22 +1637,6 @@ <value xml:lang="zh">çµè¯æ¸ é</value> <value xml:lang="zh-TW">é»è©±éè·¯</value> </property> - <property key="Enumeration.description.POS_SALES_CHANNEL"> - <value xml:lang="de">Verkaufskanal: POS</value> - <value xml:lang="en">POS Channel</value> - <value xml:lang="es">Punto de venta</value> - <value xml:lang="fr">Canal de vente : Point de Vente</value> - <value xml:lang="it">Canale POS</value> - <value xml:lang="ja">POSãã£ãã«</value> - <value xml:lang="pt">Canal POS</value> - <value xml:lang="pt-BR">Canal de ponto de venda</value> - <value xml:lang="ro">Canal POS</value> - <value xml:lang="ru">РозниÑнÑе пÑодажи</value> - <value xml:lang="th">à¸à¹à¸à¸à¸à¸²à¸à¸à¸¸à¸à¸à¸²à¸£à¸à¸²à¸¢</value> - <value xml:lang="vi">Kênh POS</value> - <value xml:lang="zh">POSæ¸ é</value> - <value xml:lang="zh-TW">POSéè·¯</value> - </property> <property key="Enumeration.description.POTT_CFR"> <value xml:lang="ar">اÙتÙÙÙØ© ÙاÙÙÙÙ</value> <value xml:lang="de">Kosten und Fracht</value> Modified: ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml (original) +++ ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml Thu Jul 28 12:27:20 2016 @@ -212,17 +212,6 @@ <value xml:lang="zh">ä¼å管çç»ï¼å ·æå ¨é¨ä¼åæéã</value> <value xml:lang="zh-TW">åé«ç®¡ç群çµ,å ·æå ¨é¨åé«æ¬é.</value> </property> - <property key="SecurityGroup.description.POSCLERK"> - <value xml:lang="en">POS Clerk</value> - <value xml:lang="es">Cajero</value> - <value xml:lang="fr">Employé POS</value> - <value xml:lang="it">Impiegato POS</value> - <value xml:lang="ja">POSäºå</value> - <value xml:lang="ru">СлÑжаÑий POS</value> - <value xml:lang="th">à¸à¸à¸±à¸à¸à¸²à¸ à¸.à¸à¸¸à¸à¸à¸²à¸¢</value> - <value xml:lang="zh">æåæºæä½å</value> - <value xml:lang="zh-TW">POSæ©æä½å¡</value> - </property> <property key="SecurityGroup.description.PROJECTADMIN"> <value xml:lang="en">Project Admin group, has update access to own projects.</value> <value xml:lang="it">Gruppo permesso amministrazione progetti, ha accesso in aggiornamento come proprietario progetti.</value> Modified: ofbiz/trunk/framework/service/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/framework/service/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/service/ofbiz-component.xml Thu Jul 28 12:27:20 2016 @@ -44,7 +44,7 @@ under the License. <keystore name="rmitrust" type="jks" password="changeit" is-truststore="true" is-certstore="false" loader="main" location="config/rmitrust.jks"/> - <container name="service-container" loaders="main,rmi,pos,load-data,test" class="org.apache.ofbiz.service.ServiceContainer"> + <container name="service-container" loaders="main,rmi,load-data,test" class="org.apache.ofbiz.service.ServiceContainer"> <property name="dispatcher-factory" value="org.apache.ofbiz.service.GenericDispatcherFactory"/> </container> Modified: ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java (original) +++ ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java Thu Jul 28 12:27:20 2016 @@ -172,15 +172,9 @@ public final class Config { ){ fileName = "start"; } else if(ofbizCommands.stream().anyMatch( - option -> option.getName() == StartupCommandUtil.StartupOption.BOTH.getName())) { - fileName = "both"; - } else if(ofbizCommands.stream().anyMatch( option -> option.getName() == StartupCommandUtil.StartupOption.LOAD_DATA.getName())) { fileName = "load-data"; } else if(ofbizCommands.stream().anyMatch( - option -> option.getName() == StartupCommandUtil.StartupOption.POS.getName())) { - fileName = "pos"; - } else if(ofbizCommands.stream().anyMatch( option -> option.getName() == StartupCommandUtil.StartupOption.TEST.getName())) { fileName = "test"; } else if(ofbizCommands.stream().anyMatch( Modified: ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java (original) +++ ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java Thu Jul 28 12:27:20 2016 @@ -52,7 +52,7 @@ final class StartupCommandUtil { * Make sure of defining the same set of values in: * * - The StartupOptions in the StartupOption enum - * - The commons-cli options (e.g. BOTH, HELP, etc ...) + * - The commons-cli options (e.g. HELP, START, etc ...) * - The getOfbizStartupOptions method * * Keeping these items in sync means that OFBiz behaves correctly @@ -61,11 +61,9 @@ final class StartupCommandUtil { */ public enum StartupOption { - BOTH("both"), HELP("help"), LOAD_DATA("load-data"), PORTOFFSET("portoffset"), - POS("pos"), SHUTDOWN("shutdown"), START("start"), STATUS("status"), @@ -81,11 +79,6 @@ final class StartupCommandUtil { } } - private static final Option BOTH = Option.builder("b") - .longOpt(StartupOption.BOTH.getName()) - .desc("Runs simultaneously both the POS (Point of Sales) application and OFBiz server") - .hasArg(false) - .build(); private static final Option HELP = Option.builder("?") .longOpt(StartupOption.HELP.getName()) .desc("Prints this help screen to the user") @@ -118,11 +111,6 @@ final class StartupCommandUtil { .argName("offset") .optionalArg(false) .build(); - private static final Option POS = Option.builder("p") - .longOpt(StartupOption.POS.getName()) - .desc("Runs the POS (Point of Sales) application") - .hasArg(false) - .build(); private static final Option SHUTDOWN = Option.builder("d") .longOpt(StartupOption.SHUTDOWN.getName()) .desc("Shutdown OFBiz") @@ -249,10 +237,8 @@ final class StartupCommandUtil { private static final Options getOfbizStartupOptions() { OptionGroup ofbizCommandOptions = new OptionGroup(); - ofbizCommandOptions.addOption(BOTH); ofbizCommandOptions.addOption(HELP); ofbizCommandOptions.addOption(LOAD_DATA); - ofbizCommandOptions.addOption(POS); ofbizCommandOptions.addOption(SHUTDOWN); ofbizCommandOptions.addOption(START); ofbizCommandOptions.addOption(STATUS); Modified: ofbiz/trunk/specialpurpose/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/LICENSE?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/LICENSE (original) +++ ofbiz/trunk/specialpurpose/LICENSE Thu Jul 28 12:27:20 2016 @@ -261,7 +261,6 @@ specialpurpose/solr/webapp/solr/WEB-INF/ The following libraries distributed with Apache OFBiz are licensed under the BSD License: specialpurpose/ldap/lib/cas-server-core-3.3.jar -specialpurpose/pos/lib/looks-2.0.2.jar specialpurpose/solr/webapp/solr/WEB-INF/lib/antlr-runtime-3.5.jar specialpurpose/solr/webapp/solr/WEB-INF/lib/asm-4.1.jar specialpurpose/solr/webapp/solr/WEB-INF/lib/asm-commons-4.1.jar @@ -322,9 +321,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE The following libraries distributed with Apache OFBiz are licensed under the Mozilla Public License Version 1.1: specialpurpose/cmssite/template/docbook/extensions/saxon65.jar -specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar -specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar - ========================================================================= MOZILLA PUBLIC LICENSE Version 1.1 @@ -798,227 +794,6 @@ EXHIBIT A -Mozilla Public License. ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the -Common Public License: -specialpurpose/pos/lib/jcl.jar -specialpurpose/pos/lib/jpos18-controls.jar - -========================================================================= -Common Public License Version 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - - i) changes to the Program, and - - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from a -Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to -the Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and such -derivative works, in source code and object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed -Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. -This patent license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the -Licensed Patents. The patent license shall not apply to any other combinations -which include the Contribution. No hardware per se is licensed hereunder. - - c) Recipient understands that although each Contributor grants the licenses -to its Contributions set forth herein, no assurances are provided by any -Contributor that the Program does not infringe the patent or other intellectual -property rights of any other entity. Each Contributor disclaims any liability to -Recipient for claims brought by any other entity based on infringement of -intellectual property rights or otherwise. As a condition to exercising the -rights and licenses granted hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. -For example, if a third party patent license is required to allow Recipient to -distribute the Program, it is Recipient's responsibility to acquire that license -before distributing the Program. - - d) Each Contributor represents that to its knowledge it has sufficient -copyright rights in its Contribution, if any, to grant the copyright license set -forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its -own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - - b) its license agreement: - - i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title and -non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - - ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - - iii) states that any provisions which differ from this Agreement are offered -by that Contributor alone and not by any other party; and - - iv) states that source code for the Program is available from such -Contributor, and informs licensees how to obtain it in a reasonable manner on or -through a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - - b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the -Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to -control, and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may participate in -any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its exercise of -rights under this Agreement, including but not limited to the risks and costs of -program errors, compliance with applicable laws, damage to or loss of data, -programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such Recipient -under this Agreement shall terminate as of the date such litigation is filed. In -addition, if Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted under -Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue and -survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to serve -as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the Agreement -under which it was received. In addition, after a new version of the Agreement -is published, Contributor may elect to distribute the Program (including its -Contributions) under the new version. Except as expressly stated in Sections -2(a) and 2(b) above, Recipient receives no rights or licenses to the -intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. - -========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the MIT/X License: specialpurpose/cmssite/template/docbook/webhelp/* specialpurpose/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizHead.ftl?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizHead.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizHead.ftl Thu Jul 28 12:27:20 2016 @@ -34,9 +34,9 @@ under the License. <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>OFBiz, The Apache OFBiz Project - Open Source E-Business / E-Commerce, ERP, CRM, POS</title> + <title>OFBiz, The Apache OFBiz Project - Open Source E-Business / E-Commerce, ERP, CRM</title> <link rel="stylesheet" href="/ofbiz/images/ofbws.css" type="text/css"/> - <meta name="keywords" content="Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory"/> + <meta name="keywords" content="Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="/ofbiz/images/ofbiz.ico"/> </head> Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl Thu Jul 28 12:27:20 2016 @@ -73,7 +73,6 @@ under the License. <li>general work effort management (events, tasks, projects, requests, etc)</li> <li>content management (for product content, web sites, general content, blogging, forums, etc)</li> - <li>a maturing Point Of Sales (POS) module using <b><a href="http://www.xoetrope.com/xui" target="_blank">XUI</a></b> as rich client interface</li> <li>and much more all in an open source package!</li> </ul> Modified: ofbiz/trunk/specialpurpose/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1754402&r1=1754401&r2=1754402&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/component-load.xml (original) +++ ofbiz/trunk/specialpurpose/component-load.xml Thu Jul 28 12:27:20 2016 @@ -23,7 +23,6 @@ under the License. <load-component component-location="lucene"/> <load-component component-location="solr"/> <load-component component-location="ecommerce"/> - <load-component component-location="pos"/> <load-component component-location="hhfacility"/> <load-component component-location="assetmaint"/> <load-component component-location="cmssite"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |