toolhound-ruby 1.0.26 → 1.0.27
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/toolhound-ruby/rental_charge.rb +5 -3
- data/lib/toolhound-ruby/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f36db35250ce656b1d1e50f95b567fbdf90e7c4d
|
|
4
|
+
data.tar.gz: 8cf00d9f9e6013bb243fadd72da55095730262c8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3912c54ab6ffc8bd31d101b0f82f644fdc7ceb0ebc3fe55206d0b39caaa47f7aac3e9d3551c7f06dff2a38c61e94a9817f4a4c47695b0ee2d5f58590c2c1675f
|
|
7
|
+
data.tar.gz: c0d82328373adc80faf5d06acb7527cffafae3164b2806bd99bb426d9ba322a0842cde700ce0ea40c492fbeaf3f2b1647f70f440e8db09003a165e59ccd3dafc
|
|
@@ -57,6 +57,8 @@ module Toolhound
|
|
|
57
57
|
joins << "LEFT OUTER JOIN tblRentalItem ON tblRentalItem.intRentalItemID = tblRentalCharge.intRentalItemID"
|
|
58
58
|
joins << "LEFT OUTER JOIN tblRentalDetail ON tblRentalDetail.intRentalDetailID = tblRentalItem.intRentalDetailID"
|
|
59
59
|
joins << "LEFT OUTER JOIN tblRental ON tblRental.intRentalID = tblRentalDetail.intRentalID"
|
|
60
|
+
joins << "LEFT OUTER JOIN tblTransaction ON tblTransaction.intRentalID = tblRental.intRentalID"
|
|
61
|
+
|
|
60
62
|
joins << "INNER JOIN tblInventoryID ON tblInventoryID.intInventoryIdID = tblRentalCharge.intInventoryIDID"
|
|
61
63
|
joins << "INNER JOIN tblInventory ON tblInventoryID.intInventoryID = tblInventory.intInventoryID"
|
|
62
64
|
joins << "INNER JOIN tblInventoryText ON tblInventory.intInventoryID = tblInventoryText.intInventoryID"
|
|
@@ -66,7 +68,6 @@ module Toolhound
|
|
|
66
68
|
) as taxQuery ON taxQuery.intLocationID = tblLocation.intLocationID"
|
|
67
69
|
joins << "LEFT OUTER JOIN tblTax ON tblTax.intLocationID = taxQuery.intLocationID AND tblTax.dteCreatedDate = taxQuery.max_date"
|
|
68
70
|
joins << "LEFT OUTER JOIN tblTaxText ON tblTaxText.intTaxID = tblTax.intTaxID AND tblTaxText.varLocaleID = '#{locale}'"
|
|
69
|
-
|
|
70
71
|
wheres = [
|
|
71
72
|
{"inventory.bol_deleted" => 0},
|
|
72
73
|
{"inventory.bol_is_active" => 1},
|
|
@@ -81,7 +82,7 @@ module Toolhound
|
|
|
81
82
|
rental_charge: [
|
|
82
83
|
:int_rental_charge_id, :int_entity_id, :int_qty, :dec_total, :var_type, :int_inventory_id_id,
|
|
83
84
|
:dec_days, :dec_daily, :dec_weeks, :dec_weekly, :dec_months, :dec_monthly,
|
|
84
|
-
{var_work_order: :var_work_order_no},
|
|
85
|
+
# {var_work_order: :var_work_order_no},
|
|
85
86
|
:dte_start_date, :dte_end_date
|
|
86
87
|
],
|
|
87
88
|
inventory_id: [{var_inventory_id: :inventory_id_no}, :int_inventory_id],
|
|
@@ -90,9 +91,10 @@ module Toolhound
|
|
|
90
91
|
:var_part_no, :var_description, {var_user_field1: :gl_revenue}, {var_user_field2: :gl_cogs_code},
|
|
91
92
|
{var_user_field3: :phase_code}
|
|
92
93
|
],
|
|
94
|
+
transaction: [{var_work_order: :var_work_order_no}, :var_transaction_no],
|
|
93
95
|
tax: [{dec_tax1_rate: :tax_rate}],
|
|
94
96
|
tax_text: [{var_tax1_description: :tax_label}],
|
|
95
|
-
rental:
|
|
97
|
+
rental: [:var_rental_number]
|
|
96
98
|
}
|
|
97
99
|
|
|
98
100
|
build_and_query(selects: selects, where: wheres, joins: joins, order: "tblInventoryText.varPartNo")
|