Skip to content

Commit 1700b72

Browse files
bsivalingambsivalingam
authored
Merge pull request #316 from intuit/mv-49-update
Added support for TaxRateRef field on JournalEntry - MV 49
2 parents 8ba8dd7 + 0ea023c commit 1700b72

File tree

8 files changed

+252
-2
lines changed

8 files changed

+252
-2
lines changed

‎src/Core/CoreConstants.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class CoreConstants
88
{
99
//Set the default minor version
10-
const DEFAULT_SDK_MINOR_VERSION = "47";
10+
const DEFAULT_SDK_MINOR_VERSION = "49";
1111
const DEFAULT_LOGGINGLOCATION = "/tmp/IdsLogs";
1212

1313
const PHP_CLASS_PREFIX = 'IPP';
@@ -298,7 +298,7 @@ class CoreConstants
298298
* The Request source header value.
299299
* @var string REQUESTSOURCEHEADER
300300
*/
301-
const USERAGENT = "V3PHPSDK5.3.6";
301+
const USERAGENT = "V3PHPSDK5.3.7";
302302

303303
public static function getType($string, $return=1)
304304
{

‎src/Data/IPPJournalEntryLineDetail.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,19 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
120120
* @var com\intuit\schema\finance\v3\IPPReferenceType
121121
*/
122122
public $TaxCodeRef;
123+
/**
124+
* @Definition
125+
Product: QBO
126+
Description: Sales/Purchase tax rate Id
127+
associated with the JournalEntry Line. For CA Companies.
128+
129+
* @xmlType element
130+
* @xmlNamespace http://schema.intuit.com/finance/v3
131+
* @xmlMinOccurs 0
132+
* @xmlName TaxRateRef
133+
* @var com\intuit\schema\finance\v3\IPPReferenceType
134+
*/
135+
public $TaxRateRef;
123136
/**
124137
* @Definition
125138
Product: QBO

‎src/Data/IPPPhysicalAddress.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,18 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
162162
* @var string
163163
*/
164164
public $CountryCode;
165+
/**
166+
* @Definition
167+
Product: QBO
168+
Description: County name.[br /]Max. length: 25 characters.
169+
170+
* @xmlType element
171+
* @xmlNamespace http://schema.intuit.com/finance/v3
172+
* @xmlMinOccurs 0
173+
* @xmlName County
174+
* @var string
175+
*/
176+
public $County;
165177
/**
166178
* @Definition
167179
Product: QBW

‎src/Data/IPPTimeActivity.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,18 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
279279
* @var com\intuit\schema\finance\v3\IPPIntuitAnyType
280280
*/
281281
public $TimeActivityEx;
282+
/**
283+
* @Definition True if the start, end hours are already with company/employee time zone offset.
284+
285+
Couple of TimeActivity API integrations are already submitting start, end hours with right company/employee time zone offsets. Such integrations will pass this attribute as true to avoid company time zone offsets by TimeActivity API.
286+
287+
* @xmlType element
288+
* @xmlNamespace http://schema.intuit.com/finance/v3
289+
* @xmlMinOccurs 0
290+
* @xmlName HoursInEmployeeTimeZone
291+
* @var boolean
292+
*/
293+
public $HoursInEmployeeTimeZone;
282294

283295

284296
} // end class IPPTimeActivity

‎src/Data/IPPTransaction.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,18 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
312312
* @var com\intuit\schema\finance\v3\IPPTag
313313
*/
314314
public $Tag;
315+
/**
316+
* @Definition
317+
                                    Product: QBO
318+
                                    Description: Details of the Approval Status for current transaction in QBO workflows.
319+
320+
* @xmlType element
321+
* @xmlNamespace http://schema.intuit.com/finance/v3
322+
* @xmlMinOccurs 0
323+
* @xmlName TxnApprovalInfo
324+
* @var com\intuit\schema\finance\v3\IPPTxnApprovalInfo
325+
*/
326+
public $TxnApprovalInfo;
315327

316328

317329
} // end class IPPTransaction

‎src/Data/IPPTxnApprovalInfo.php

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?php
2+
namespace QuickBooksOnline\API\Data;
3+
4+
/**
5+
* @xmlNamespace http://schema.intuit.com/finance/v3
6+
* @xmlType
7+
* @xmlName IPPTxnApprovalInfo
8+
* @var IPPTxnApprovalInfo
9+
* @xmlDefinition Details of approval status for the specific transaction.
10+
*/
11+
class IPPTxnApprovalInfo
12+
{
13+
14+
/**
15+
* Initializes this object, optionally with pre-defined property values
16+
*
17+
* Initializes this object and it's property members, using the dictionary
18+
* of key/value pairs passed as an optional argument.
19+
*
20+
* @param dictionary $keyValInitializers key/value pairs to be populated into object's properties
21+
* @param boolean $verbose specifies whether object should echo warnings
22+
*/
23+
public function __construct($keyValInitializers=array(), $verbose=FALSE)
24+
{
25+
foreach($keyValInitializers as $initPropName => $initPropVal)
26+
{
27+
if (property_exists('IPPTxnApprovalInfo',$initPropName) || property_exists('QuickBooksOnline\API\Data\IPPTxnApprovalInfo',$initPropName))
28+
{
29+
$this->{$initPropName} = $initPropVal;
30+
}
31+
else
32+
{
33+
if ($verbose)
34+
echo "Property does not exist ($initPropName) in class (".get_class($this).")";
35+
}
36+
}
37+
}
38+
39+
40+
/**
41+
* @Definition
42+
                        Product: QBO
43+
                        Description: Overall Approval Status, collective of all user approvals.
44+
InputType: QBO: ReadOnly
45+
46+
* @xmlType element
47+
* @xmlNamespace http://schema.intuit.com/finance/v3
48+
* @xmlMinOccurs 0
49+
* @xmlName ApprovalStatus
50+
* @var string
51+
*/
52+
public $ApprovalStatus;
53+
/**
54+
* @Definition
55+
Product: QBO
56+
Description:ApprovalStatusDetail represents the detailed approval statuses of a transaction. For a given ApprovalStatus, ApprovalStatusDetail can have one of the many values described below.
57+
Following are the approval status and their possible detailed approval statuses:
58+
Approval Status - APPROVED
59+
Approval Status Detail - APPROVED,AUTO_APPROVED,FORCE_APPROVED,WORKFLOW_AUTO_APPROVED
60+
61+
Approval Status - REJECTED
62+
Approval Status Detail - REJECTED,WORKFLOW_AUTO_REJECTED
63+
64+
Approval Status - REQUIRES_APPROVAL
65+
Approval Status Detail - REQUIRES_APPROVAL,CANNOT_DETERMINE
66+
67+
Approval Status - PENDING_APPROVAL
68+
Approval Status Detail - PENDING_APPROVAL
69+
70+
Approval Status - IN_PROGRESS
71+
Approval Status Detail - IN_PROGRESS
72+
InputType: QBO: ReadOnly
73+
74+
* @xmlType element
75+
* @xmlNamespace http://schema.intuit.com/finance/v3
76+
* @xmlMinOccurs 0
77+
* @xmlName ApprovalStatusDetail
78+
* @var string
79+
*/
80+
public $ApprovalStatusDetail;
81+
/**
82+
* @Definition
83+
                        Product: QBO
84+
                        Description: User-id of the user last updating the approval status.
85+
InputType: QBO: ReadOnly
86+
87+
* @xmlType element
88+
* @xmlNamespace http://schema.intuit.com/finance/v3
89+
* @xmlMinOccurs 0
90+
* @xmlName LastChangedByUser
91+
* @var string
92+
*/
93+
public $LastChangedByUser;
94+
/**
95+
* @Definition
96+
                        Product: QBO
97+
                        Description: Date when the approval status was last updated.
98+
InputType: QBO: ReadOnly
99+
100+
* @xmlType element
101+
* @xmlNamespace http://schema.intuit.com/finance/v3
102+
* @xmlMinOccurs 0
103+
* @xmlName LastChangedDate
104+
* @var string
105+
*/
106+
public $LastChangedDate;
107+
108+
109+
} // end class IPPTxnApprovalInfo

‎src/XSD/Finance.xsd

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3876,6 +3876,64 @@
38763876
</xs:element>
38773877
</xs:sequence>
38783878
</xs:complexType>
3879+
<xs:complexType name="TxnApprovalInfo">
3880+
<xs:annotation>
3881+
<xs:documentation>Details of approval status for the specific transaction.</xs:documentation>
3882+
</xs:annotation>
3883+
<xs:sequence>
3884+
<xs:element name="ApprovalStatus" type="xs:string" minOccurs="0">
3885+
<xs:annotation>
3886+
<xs:documentation>
3887+
                        Product: QBO
3888+
                        Description: Overall Approval Status, collective of all user approvals.
3889+
InputType: QBO: ReadOnly
3890+
</xs:documentation>
3891+
</xs:annotation>
3892+
</xs:element>
3893+
<xs:element name="ApprovalStatusDetail" type="xs:string" minOccurs="0">
3894+
<xs:annotation>
3895+
<xs:documentation>
3896+
Product: QBO
3897+
Description:ApprovalStatusDetail represents the detailed approval statuses of a transaction. For a given ApprovalStatus, ApprovalStatusDetail can have one of the many values described below.
3898+
Following are the approval status and their possible detailed approval statuses:
3899+
Approval Status - APPROVED
3900+
Approval Status Detail - APPROVED,AUTO_APPROVED,FORCE_APPROVED,WORKFLOW_AUTO_APPROVED
3901+
3902+
Approval Status - REJECTED
3903+
Approval Status Detail - REJECTED,WORKFLOW_AUTO_REJECTED
3904+
3905+
Approval Status - REQUIRES_APPROVAL
3906+
Approval Status Detail - REQUIRES_APPROVAL,CANNOT_DETERMINE
3907+
3908+
Approval Status - PENDING_APPROVAL
3909+
Approval Status Detail - PENDING_APPROVAL
3910+
3911+
Approval Status - IN_PROGRESS
3912+
Approval Status Detail - IN_PROGRESS
3913+
InputType: QBO: ReadOnly
3914+
</xs:documentation>
3915+
</xs:annotation>
3916+
</xs:element>
3917+
<xs:element name="LastChangedByUser" type="xs:string" minOccurs="0">
3918+
<xs:annotation>
3919+
<xs:documentation>
3920+
                        Product: QBO
3921+
                        Description: User-id of the user last updating the approval status.
3922+
InputType: QBO: ReadOnly
3923+
</xs:documentation>
3924+
</xs:annotation>
3925+
</xs:element>
3926+
<xs:element name="LastChangedDate" type="xs:dateTime" minOccurs="0">
3927+
<xs:annotation>
3928+
<xs:documentation>
3929+
                        Product: QBO
3930+
                        Description: Date when the approval status was last updated.
3931+
InputType: QBO: ReadOnly
3932+
</xs:documentation>
3933+
</xs:annotation>
3934+
</xs:element>
3935+
</xs:sequence>
3936+
</xs:complexType>
38793937
<xs:group name="TxnLineReferenceGroup">
38803938
<xs:annotation>
38813939
<xs:documentation>A reference to the transaction and one of its
@@ -4794,6 +4852,14 @@
47944852
</xs:documentation>
47954853
</xs:annotation>
47964854
</xs:element>
4855+
<xs:element name="TxnApprovalInfo" type="TxnApprovalInfo" minOccurs="0">
4856+
<xs:annotation>
4857+
<xs:documentation>
4858+
                                    Product: QBO
4859+
                                    Description: Details of the Approval Status for current transaction in QBO workflows.
4860+
</xs:documentation>
4861+
</xs:annotation>
4862+
</xs:element>
47974863
</xs:sequence>
47984864
</xs:extension>
47994865
</xs:complexContent>
@@ -7741,6 +7807,16 @@
77417807
</xs:documentation>
77427808
</xs:annotation>
77437809
</xs:element>
7810+
<xs:element name="TaxRateRef" type="ReferenceType"
7811+
minOccurs="0">
7812+
<xs:annotation>
7813+
<xs:documentation>
7814+
Product: QBO
7815+
Description: Sales/Purchase tax rate Id
7816+
associated with the JournalEntry Line. For CA Companies.
7817+
</xs:documentation>
7818+
</xs:annotation>
7819+
</xs:element>
77447820
<xs:element name="TaxApplicableOn" type="TaxApplicableOnEnum"
77457821
minOccurs="0">
77467822
<xs:annotation>
@@ -11526,6 +11602,14 @@
1152611602
TimeActivity.</xs:documentation>
1152711603
</xs:annotation>
1152811604
</xs:element>
11605+
<xs:element name="HoursInEmployeeTimeZone" type="xs:boolean" minOccurs="0">
11606+
<xs:annotation>
11607+
<xs:documentation>True if the start, end hours are already with company/employee time zone offset.
11608+
11609+
Couple of TimeActivity API integrations are already submitting start, end hours with right company/employee time zone offsets. Such integrations will pass this attribute as true to avoid company time zone offsets by TimeActivity API.
11610+
</xs:documentation>
11611+
</xs:annotation>
11612+
</xs:element>
1152911613
</xs:sequence>
1153011614
</xs:extension>
1153111615
</xs:complexContent>

‎src/XSD/IntuitBaseTypes.xsd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,14 @@
673673
</xs:documentation>
674674
</xs:annotation>
675675
</xs:element>
676+
<xs:element name="County" type="xs:string" minOccurs="0">
677+
<xs:annotation>
678+
<xs:documentation xml:lang="en">
679+
Product: QBO
680+
Description: County name.[br /]Max. length: 25 characters.
681+
</xs:documentation>
682+
</xs:annotation>
683+
</xs:element>
676684
<xs:element name="CountrySubDivisionCode" type="xs:string" minOccurs="0">
677685
<xs:annotation>
678686
<xs:documentation xml:lang="en">

0 commit comments

Comments
 (0)