Author: sichen Date: Wed Nov 1 17:28:46 2006 New Revision: 470168 URL: http://svn.apache.org/viewvc?view=rev&rev=470168 Log: A new prorateTaxes on ProductStore to determine whether the order-level taxes should be charged to invoice in one lumpsum or prorated based on invoice values
Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml incubator/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=470168&r1=470167&r2=470168 ============================================================================== --- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Nov 1 17:28:46 2006 @@ -3032,6 +3032,7 @@ <field name="daysToCancelNonPay" type="numeric"></field> <field name="manualAuthIsCapture" type="indicator"></field> <field name="prorateShipping" type="indicator"></field> + <field name="prorateTaxes" type="indicator"></field> <field name="viewCartOnAdd" type="indicator"></field> <field name="autoSaveCart" type="indicator"></field> <field name="autoApproveReviews" type="indicator"></field> Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?view=diff&rev=470168&r1=470167&r2=470168 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ incubator/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Wed Nov 1 17:28:46 2006 @@ -51,6 +51,9 @@ <field name="prorateShipping" widget-style="selectBox"> <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> + <field name="prorateTaxes" widget-style="selectBox"> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> + </field> <field name="viewCartOnAdd" widget-style="selectBox"> <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field>