[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[768] trunk/mmex/src

[<oma...@us...>]

Revision: 768
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=768&view=rev
Author:   omalleypat
Date:     2009-11-13 15:28:43 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
Merge changes to mmtransaction

svn merge -x -w -x --ignore-eol-style -r 407:HEAD ^/tags/releases/0.9.5.1/include/mmtransaction.h ./src/mmtransaction.h
svn merge -x -w -x --ignore-eol-style -r 407:HEAD ^/tags/releases/0.9.5.1/src/mmtransaction.cpp ./src/mmtransaction.cpp

Changes to sql syntax in trunk causing conflict were kept.
This change added to trunk from branch:
-   pCopyTransaction->status_ =    pBankTransaction->status_;
+   pCopyTransaction->status_ =    (useOriginalDate ? wxChar('D') : pBankTransaction->status_);

Modified Paths:
--------------
    trunk/mmex/src/mmtransaction.cpp

Property Changed:
----------------
    trunk/mmex/src/mmtransaction.cpp
    trunk/mmex/src/mmtransaction.h

Modified: trunk/mmex/src/mmtransaction.cpp
===================================================================
--- trunk/mmex/src/mmtransaction.cpp	2009-11-13 15:17:42 UTC (rev 767)
+++ trunk/mmex/src/mmtransaction.cpp	2009-11-13 15:28:43 UTC (rev 768)
@@ -497,7 +497,7 @@
    pCopyTransaction->payeeID_=    pBankTransaction->payeeID_;
    pCopyTransaction->transType_=    pBankTransaction->transType_;
    pCopyTransaction->amt_ =   pBankTransaction->amt_;
-   pCopyTransaction->status_ =    pBankTransaction->status_;
+   pCopyTransaction->status_ =    (useOriginalDate ? wxChar('D') : pBankTransaction->status_);
    pCopyTransaction->transNum_=   pBankTransaction->transNum_;
    pCopyTransaction->notes_=   pBankTransaction->notes_;
    pCopyTransaction->categID_  =   pBankTransaction->categID_;


Property changes on: trunk/mmex/src/mmtransaction.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/0.9.5/mmex/src/mmtransaction.cpp:408-735
/tags/releases/0.9.5.1/src/mmtransaction.cpp:736-767


Property changes on: trunk/mmex/src/mmtransaction.h
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/0.9.5/mmex/include/mmtransaction.h:408-735
/branches/0.9.5/mmex/src/mmtransaction.h:566
/tags/releases/0.9.5.1/include/mmtransaction.h:736-767


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.