Created
November 10, 2009 17:50
-
-
Save kevinold/231092 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#How the branch looks now. The 3 merges at the top came in via 'git merge SHA1' | |
* 9223da2 - (8557_currency) Merge commit '7d7b2df' into 8557_currency (2 minutes ago) | |
|\ | |
| * 7d7b2df - reference date_field passed rather than hard coded (17 hours ago) | |
* | b9a9776 - Merge commit 'f3796b2' into 8557_currency (2 minutes ago) | |
|\ \ | |
| |/ | |
| * f3796b2 - json query and parsing performed; need to pass date and set mods to the ex structure (18 hours | |
* | 1bd336b - Merge commit 'fee72a0' into 8557_currency (3 minutes ago) | |
|\ \ | |
| |/ | |
| * fee72a0 - add date flag to Currency lookup (18 hours ago) | |
* | 3e40749 - (master) sync CVS (20 minutes ago) | |
|/ | |
* afe295e - TO CVS: WIP - alter switch for modifiable exhange rate; honor new switch options (20 hours ago) | |
* 838f607 - sync CVS (20 hours ago) | |
* 10c3207 - sync CVS (6 days ago) | |
* fb1fb5b - sync CVS (6 days ago) | |
# See how the merge's don't show the diff | |
www@localhost [8557_currency]$ git log -p | |
commit 9223da2ece52bdd76739b91471f9bbd30edc7b0a | |
Merge: b9a9776 7d7b2df | |
Author: Kevin Old <kevin@kevinold.com> | |
Date: Tue Nov 10 11:40:17 2009 -0600 | |
Merge commit '7d7b2df' into 8557_currency | |
commit b9a97765b4fe37c59e68a949b094dd94b1715078 | |
Merge: 1bd336b f3796b2 | |
Author: Kevin Old <kevin@kevinold.com> | |
Date: Tue Nov 10 11:39:54 2009 -0600 | |
Merge commit 'f3796b2' into 8557_currency | |
commit 1bd336bf545637622706f75474492a4a1e4fe082 | |
Merge: 3e40749 fee72a0 | |
Author: Kevin Old <kevin@kevinold.com> | |
Date: Tue Nov 10 11:39:43 2009 -0600 | |
Merge commit 'fee72a0' into 8557_currency | |
commit 3e40749c96bf08a81e4f5860f7e075736ce9b957 | |
Author: Kevin Old <kevin@kevinold.com> | |
Date: Tue Nov 10 11:22:35 2009 -0600 | |
sync CVS | |
diff --git a/CannedReport.pm b/CannedReport.pm | |
index 2b76219..3dd633e 100644 | |
--- a/CannedReport.pm | |
+++ b/CannedReport.pm | |
@@ -10093,8 +10093,7 @@ sub pending_recognition_run { | |
$pg->make_url(-url_text => "Go to the next $tm->{project}", -token => ['_orig_project'], -transl | |
my $url = $pg->js_confirm_url( | |
-url => $pg->make_url(-action => 'pending_recognition_bulk_run'), | |
- -message => "Are you sure you want to create all the $tm->{revenuerecognitiontransactions}?" | |
- ); | |
+ -message => $pg->translate("Are you sure you want to create all the $tm->{revenuerecognitiontran | |
$pg->add_hint("$url to create " | |
. libMisc::plural_phrase($total_trans, 'revenuerecognitiontransaction', -capitalize => 0, -car | |
. ' for ' | |
diff --git a/Grid.pm b/Grid.pm | |
index 4e4da3c..a3e514d 100644 | |
--- a/Grid.pm | |
+++ b/Grid.pm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment