- Added parameter to disable the "common provider check"

  when creating an expense bundle

intranet-expenses.info

@@ -32,6 +32,9 @@
 	    <parameter datatype="number"  min_n_values="1"  max_n_values="1" name="EnabledInvoiceCannedNoteP"  default="0" description="Should we enabled canned notes on financial documents? Nice feature, but adds some extra complexity..."/>
 	    <parameter datatype="number"  min_n_values="1"  max_n_values="1" name="ShowInvoiceOurProjectNrFirstColumnP"  default="1" description="Show our &quot;Project Nr.&quot; field in the very first column of the invoice? This has now (V3.3) become the default."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ExpenseCurrencies"  description="The list of currencies to be used in Expense Management. Some customers want to limit the currencies here to simplify expense management. Example: 'EUR CHF USD' - this would limit the expense currencies to the subset of these three currencies and the system's active currencies. Default is empty to disable this feature."/>
+
+	    <parameter datatype="number" min_n_values="1" max_n_values="1" name="CheckExpenseBundleCommonProviderP"  default="0" description="Should the expense bundle creation screen check that all expense bundles are from the same 'provider' (=user)? Default is 1, assuming that each user will bundle and submit his expenses himself. However, in case of a central admin team, it might be useful to create bundles with travel items from multiple employees."/>
+
         </parameters>
 
     </version>

tcl/intranet-expenses-procs.tcl

@@ -112,7 +112,8 @@ ad_proc im_expense_bundle_item_sum {
     set common_customer_id 0
     set common_provider_id 0
     set common_currency ""
-    set default_currency [im_parameter -package_id [im_package_cost_id] "DefaultCurrency" "" "EUR"]
+    set default_currency [parameter::get_from_package_key -package_key "intranet-cost" -parameter "DefaultCurrency" -default "EUR"]
+    set check_common_provider_p [parameter::get_from_package_key -package_key "intranet-expenses" -parameter "CheckExpenseBundleCommonProviderP" -default "1"]
 
     set expense_sql "
 	select	c.*,
@@ -150,7 +151,7 @@ ad_proc im_expense_bundle_item_sum {
 	}
 
 	if {0 == $common_provider_id & $provider_id ne ""} { set common_provider_id $provider_id }
-	if {0 != $common_provider_id & $provider_id ne "" & $common_provider_id != $provider_id} {
+	if {$check_common_provider_p && 0 != $common_provider_id & $provider_id ne "" & $common_provider_id != $provider_id} {
 	    ad_return_complaint 1 [lang::message::lookup "" intranet-expenses.Muliple_projects "
 		You can't include expense items from several 'providers' (people reporting the expense) 
 		in one expense bundle.