Kurund Jalmi [Fri, 8 Aug 2014 15:25:51 +0000 (20:55 +0530)]
Merge pull request #54 from Parag18/VAT-572-Push
Hide Amount with tax field for new contribution, if invoicing is disable...
Parag Bhilkar [Fri, 8 Aug 2014 15:16:45 +0000 (20:46 +0530)]
Code Indented in proper format.
kurund [Fri, 8 Aug 2014 14:59:15 +0000 (20:29 +0530)]
Merge branch 'merge-forward' of github.com:dpradeep/civicrm-core into invoice-fixes
Conflicts:
CRM/Contribute/Form/Task/Invoice.php
kurund [Fri, 8 Aug 2014 14:43:44 +0000 (20:13 +0530)]
incorrect activity fixes
kurund [Fri, 8 Aug 2014 14:01:58 +0000 (19:31 +0530)]
form rule fixes and js cleanup
Parag Bhilkar [Fri, 8 Aug 2014 13:46:42 +0000 (19:16 +0530)]
Hide Amount with tax field for new contribution, if invoicing is disabled and Solved tax calculation js break on popup.
dpradeep [Fri, 8 Aug 2014 13:14:10 +0000 (18:44 +0530)]
Removed notice and added images for invoice pdf.
kurund [Fri, 8 Aug 2014 11:21:13 +0000 (16:51 +0530)]
notice fixes and indentation
kurund [Thu, 7 Aug 2014 18:06:05 +0000 (23:36 +0530)]
generated data fixes
Kurund Jalmi [Thu, 7 Aug 2014 17:53:09 +0000 (23:23 +0530)]
Merge pull request #52 from Parag18/VAT-572-Push
-- changed the version name
Kurund Jalmi [Thu, 7 Aug 2014 17:51:56 +0000 (23:21 +0530)]
Merge pull request #51 from Parag18/VAT-572-Push
-- added upgrade code message template
Parag Bhilkar [Thu, 7 Aug 2014 17:47:15 +0000 (23:17 +0530)]
-- changed the version name
Kurund Jalmi [Thu, 7 Aug 2014 17:45:35 +0000 (23:15 +0530)]
Merge pull request #50 from dpradeep/merge-forward
Minor Fixes after merge.
dpradeep [Thu, 7 Aug 2014 17:48:35 +0000 (23:18 +0530)]
Minor Fixes after merge.
Parag Bhilkar [Thu, 7 Aug 2014 17:39:25 +0000 (23:09 +0530)]
-- added upgrade code message template
dpradeep [Thu, 7 Aug 2014 16:30:00 +0000 (22:00 +0530)]
More Fixes after merge.
Kurund Jalmi [Thu, 7 Aug 2014 16:28:01 +0000 (21:58 +0530)]
Merge pull request #49 from dpradeep/merge-forward
More Fixes after merge.
dpradeep [Thu, 7 Aug 2014 14:08:52 +0000 (19:38 +0530)]
Fixed generated data
Kurund Jalmi [Thu, 7 Aug 2014 13:23:22 +0000 (18:53 +0530)]
Merge pull request #48 from dpradeep/merge-forward
merging civicrm core into master
dpradeep [Thu, 7 Aug 2014 12:59:53 +0000 (18:29 +0530)]
Merge remote branch 'canonical/master' into merge-forward
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/LineItem.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
css/civicrm.css
templates/CRM/Price/Page/LineItem.tpl
Monish Deb [Thu, 7 Aug 2014 10:52:40 +0000 (16:22 +0530)]
Merge pull request #3771 from monishdeb/CRM-15041
CRM-15041 fix - View Event Registration / Change Selections : Total Paid...
Pradeep Nayak [Thu, 7 Aug 2014 08:32:38 +0000 (14:02 +0530)]
Merge pull request #46 from Parag18/VAT-572-Push
VAT-572 Remove Print and Email Invoice button for Cancelled contribution...
Parag Bhilkar [Thu, 7 Aug 2014 08:09:05 +0000 (13:39 +0530)]
VAT-572 Check condition only for cancelled status.
Pradeep Nayak [Thu, 7 Aug 2014 07:31:15 +0000 (13:01 +0530)]
Merge pull request #47 from pratikshad/VAT-578-messagetemplate
Vat 578 code indentation and changes into tpl and php file
Parag Bhilkar [Thu, 7 Aug 2014 07:16:40 +0000 (12:46 +0530)]
VAT-572 Removed hard coded status id from view contribution page.
Pratiksha Dubey [Thu, 7 Aug 2014 06:59:41 +0000 (12:29 +0530)]
VAT-578 Code Indentation
Pradeep Nayak [Thu, 7 Aug 2014 06:56:52 +0000 (12:26 +0530)]
Merge pull request #45 from dpradeep/VAT-434-Push
VAT-434 Changes for accounting export for offline event with quick config.
Pratiksha Dubey [Thu, 7 Aug 2014 05:38:01 +0000 (11:08 +0530)]
VAT-578 Remove notices
Pratiksha Dubey [Thu, 7 Aug 2014 05:28:18 +0000 (10:58 +0530)]
VAT-578 Code indentation and new changes for tpl and php files
Parag Bhilkar [Thu, 7 Aug 2014 05:17:28 +0000 (10:47 +0530)]
VAT-572 Remove Print and Email Invoice button for Cancelled contribution status from view contribution and User Dashboard.
dpradeep [Thu, 7 Aug 2014 04:54:41 +0000 (10:24 +0530)]
VAT-434 Changes for accounting export for offline event with quick config
Pradeep Nayak [Wed, 6 Aug 2014 17:21:23 +0000 (22:51 +0530)]
Merge pull request #44 from Parag18/VAT-645
VAT-645 Added is_billing_required field for contribution.
Parag Bhilkar [Wed, 6 Aug 2014 17:14:31 +0000 (22:44 +0530)]
VAT-645 Added is_billing_required field for contribution.
Pradeep Nayak [Wed, 6 Aug 2014 17:03:39 +0000 (22:33 +0530)]
Merge pull request #43 from dpradeep/VAT-645
VAT-645 Display billing address fields on pay later option.
dpradeep [Wed, 6 Aug 2014 16:55:36 +0000 (22:25 +0530)]
VAT-645 Display billing address fields on pay later option.
Pradeep Nayak [Wed, 6 Aug 2014 16:24:53 +0000 (21:54 +0530)]
Merge branch 'VAT-417-Push' of github.com:Parag18/civicrm-core into Parag18-VAT-417-Push
Conflicts:
CRM/Contribute/Form/Task/Invoice.php
Pradeep Nayak [Wed, 6 Aug 2014 16:02:50 +0000 (21:32 +0530)]
Merge branch 'VAT-638' of github.com:Parag18/civicrm-core into Parag18-VAT-638
Conflicts:
CRM/Admin/Form/Preferences/Contribute.php
Pradeep Nayak [Wed, 6 Aug 2014 15:54:59 +0000 (21:24 +0530)]
Merge branch 'VAT-572' of github.com:Parag18/civicrm-core into Parag18-VAT-572
Conflicts:
CRM/Admin/Form/Preferences/Contribute.php
CRM/Price/BAO/PriceField.php
templates/CRM/Price/Form/PriceSet.tpl
Parag Bhilkar [Wed, 6 Aug 2014 15:34:33 +0000 (21:04 +0530)]
VAT-638 Code indented properly.
Pradeep Nayak [Wed, 6 Aug 2014 14:58:54 +0000 (20:28 +0530)]
Merge pull request #40 from pratikshad/VAT-578-source
VAT-578-source participant_source ,contribution_source and membership_so...
Pratiksha Dubey [Wed, 6 Aug 2014 14:57:21 +0000 (20:27 +0530)]
VAT-578-source remove extra spaces and code indentation
Pradeep Nayak [Wed, 6 Aug 2014 14:54:09 +0000 (20:24 +0530)]
Merge pull request #42 from dpradeep/VAT-434-Push
VAT-434 Accounting export / accounting entries corrected.
dpradeep [Wed, 6 Aug 2014 14:47:50 +0000 (20:17 +0530)]
VAT-434 Accounting export / accounting entries corrected.
Pradeep Nayak [Wed, 6 Aug 2014 14:35:21 +0000 (20:05 +0530)]
Merge pull request #38 from Parag18/VAT-637
VAT-637 Added tax rates for offline membership contribution on total amount.
Pradeep Nayak [Wed, 6 Aug 2014 14:20:01 +0000 (19:50 +0530)]
Merge pull request #41 from dpradeep/VAT-570-New
VAT-570 Added creditnote_id column for civicrm_contribution table.
dpradeep [Wed, 6 Aug 2014 14:05:21 +0000 (19:35 +0530)]
VAT-570 Added creditnote_id column for civicrm_contribution table.
Pratiksha Dubey [Wed, 6 Aug 2014 13:46:56 +0000 (19:16 +0530)]
VAT-578-source participant_source ,contribution_source and membership_source is added to display source into invoice.pdf
Pradeep Nayak [Wed, 6 Aug 2014 13:24:50 +0000 (18:54 +0530)]
Merge pull request #30 from dpradeep/VAT-569
VAT-569 Changes for Offline Contribution with tax amount
dpradeep [Wed, 6 Aug 2014 13:21:02 +0000 (18:51 +0530)]
VAT-569 Code indentation
dpradeep [Wed, 6 Aug 2014 13:11:25 +0000 (18:41 +0530)]
VAT-569 Code Indentation
Coleman Watts [Wed, 6 Aug 2014 12:57:08 +0000 (13:57 +0100)]
Open options-edit popup in a smaller dialog
Pradeep Nayak [Wed, 6 Aug 2014 12:52:34 +0000 (18:22 +0530)]
Merge pull request #29 from dpradeep/VAT-568
VAT-568 [Tax Term] use on contribution and event registration page.
dpradeep [Wed, 6 Aug 2014 12:54:59 +0000 (18:24 +0530)]
VAT-568 Code indentation
colemanw [Wed, 6 Aug 2014 12:52:01 +0000 (13:52 +0100)]
Merge pull request #3791 from colemanw/import
CRM-15028 - Fix participant import field labels
Coleman Watts [Wed, 6 Aug 2014 12:49:23 +0000 (13:49 +0100)]
CRM-15028 - Fix participant import field labels
Pradeep Nayak [Wed, 6 Aug 2014 12:36:17 +0000 (18:06 +0530)]
Merge pull request #34 from pratikshad/VAT-578
VAT-578 Invoice Pdf Layout
Pradeep Nayak [Wed, 6 Aug 2014 12:20:14 +0000 (17:50 +0530)]
Merge pull request #36 from pratikshad/VAT-499-newpush
Display sales tax amounts on event information page
Pratiksha Dubey [Wed, 6 Aug 2014 12:16:35 +0000 (17:46 +0530)]
VAT-499-newpush Added space in between parameters of function
colemanw [Wed, 6 Aug 2014 12:07:02 +0000 (13:07 +0100)]
Merge pull request #3790 from colemanw/export
CRM-15048 - Respect custom field text_length during export
Pradeep Nayak [Wed, 6 Aug 2014 12:06:29 +0000 (17:36 +0530)]
Merge pull request #35 from pratikshad/VAT-498-newpull
VAT-498 Automatically attach Invoice PDF to confirmation receipt based o...
Coleman Watts [Wed, 6 Aug 2014 11:59:25 +0000 (12:59 +0100)]
CRM-15048 - Respect custom field text_length during export
dpradeep [Wed, 6 Aug 2014 11:05:38 +0000 (16:35 +0530)]
VAT-568 Minor chnages to handled proper condition for text field.
Pratiksha Dubey [Wed, 6 Aug 2014 10:48:53 +0000 (16:18 +0530)]
VAT-498-newpull Added space in between parameters of function
colemanw [Wed, 6 Aug 2014 10:47:50 +0000 (11:47 +0100)]
Merge pull request #3789 from colemanw/menu
CRM-15076 - Fix drop-down menu height
Coleman Watts [Wed, 6 Aug 2014 10:45:41 +0000 (11:45 +0100)]
CRM-15076 - Fix drop-down menu height
Monish Deb [Wed, 6 Aug 2014 10:23:25 +0000 (15:53 +0530)]
Merge pull request #3788 from jitendrapurohit/Upgrade_fixes
Removed accidental adding of sample data to upgrade
Pratiksha Dubey [Wed, 6 Aug 2014 10:13:13 +0000 (15:43 +0530)]
VAT-498-newpull Added space between parameters of function
Jitendra Purohit [Wed, 6 Aug 2014 10:13:07 +0000 (15:43 +0530)]
Removed accidental adding of sample data to upgrade
Pradeep Nayak [Wed, 6 Aug 2014 09:49:57 +0000 (15:19 +0530)]
Merge pull request #26 from Parag18/VAT-416-New
VAT-416 Handled upgrade for New activity type and new option for Contact...
colemanw [Wed, 6 Aug 2014 09:46:20 +0000 (10:46 +0100)]
Merge pull request #3787 from colemanw/email
Change contact summary email links from 'mailto' to email activity popup
Coleman Watts [Wed, 6 Aug 2014 09:45:44 +0000 (10:45 +0100)]
Change contact summary email links from 'mailto' to email activity popup
Yashodha Chaku [Wed, 6 Aug 2014 08:33:34 +0000 (14:03 +0530)]
Merge pull request #3786 from jitendrapurohit/CRM-15063BillingFix
Billing Name saved as Participant Name Fix
Jitendra Purohit [Wed, 6 Aug 2014 05:54:33 +0000 (11:24 +0530)]
Billing Name saved as Participant Name Fix
Coleman Watts [Tue, 5 Aug 2014 20:52:55 +0000 (21:52 +0100)]
Email code cleanup
Coleman Watts [Tue, 5 Aug 2014 19:45:56 +0000 (20:45 +0100)]
Send email js fixes and cleanup
Kurund Jalmi [Tue, 5 Aug 2014 18:29:38 +0000 (23:59 +0530)]
Merge pull request #3765 from lcdservices/CRM-14912
CRM-14912 support import matching with external ID
Parag Bhilkar [Tue, 5 Aug 2014 12:35:04 +0000 (18:05 +0530)]
VAT-638 Checked and unchecked the Invoice/Credit Notes option when switch on invoicing and added help text for it. Remove email/print option from search contribution when invoicing is off.
Parag Bhilkar [Tue, 5 Aug 2014 10:00:49 +0000 (15:30 +0530)]
VAT-637 Added taxrates for offline membership contribution.
Yashodha Chaku [Tue, 5 Aug 2014 09:41:08 +0000 (15:11 +0530)]
Merge pull request #3782 from jitendrapurohit/CRM-Test-4.5beta5
CRM test Fix 4.5beta5 For ActivityTest
Jitendra Purohit [Tue, 5 Aug 2014 07:17:43 +0000 (12:47 +0530)]
CRM test Fix 4.5beta5
Kurund Jalmi [Mon, 4 Aug 2014 17:12:00 +0000 (22:42 +0530)]
Merge pull request #3776 from crusonweb/patch-3
Update Contribution.php
Kurund Jalmi [Mon, 4 Aug 2014 17:03:17 +0000 (22:33 +0530)]
Merge pull request #3779 from anttiviljami/master
Wrapped some unlocalised elements in ts-tags
kurund [Mon, 4 Aug 2014 17:01:05 +0000 (22:31 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32
Conflicts:
CRM/Utils/Type.php
Yashodha Chaku [Mon, 4 Aug 2014 13:40:36 +0000 (19:10 +0530)]
Merge pull request #3734 from wellebee/CRM-15036
CRM-15036 - force emailed social media image URLs to use HTTP.
colemanw [Mon, 4 Aug 2014 12:31:40 +0000 (13:31 +0100)]
Merge pull request #3780 from colemanw/sorting
Fix sort icons
Coleman Watts [Mon, 4 Aug 2014 11:06:10 +0000 (12:06 +0100)]
Removed unused datatable example styles
Coleman Watts [Mon, 4 Aug 2014 11:02:35 +0000 (12:02 +0100)]
Fix sort icons
colemanw [Mon, 4 Aug 2014 10:03:59 +0000 (11:03 +0100)]
Merge pull request #3778 from colemanw/apiActions
Improve lookup of api actions from function names
Coleman Watts [Mon, 4 Aug 2014 10:03:43 +0000 (11:03 +0100)]
Improve lookup of api actions from function names
Antti Kuosmanen [Mon, 4 Aug 2014 07:31:18 +0000 (10:31 +0300)]
Wrapped some unlocalised elements in ts-tags
colemanw [Sun, 3 Aug 2014 16:12:49 +0000 (17:12 +0100)]
Merge pull request #3777 from colemanw/psueodoConstant
Re-add case_type pseudoconstant to schema
Coleman Watts [Sun, 3 Aug 2014 15:50:38 +0000 (16:50 +0100)]
Change select option to use more standard pseudoconstant callback
Coleman Watts [Sun, 3 Aug 2014 15:49:27 +0000 (16:49 +0100)]
Increase pseudoconstant test coverage
Coleman Watts [Sun, 3 Aug 2014 15:48:45 +0000 (16:48 +0100)]
Remove useless tag from the old Preferences.xml
Coleman Watts [Sun, 3 Aug 2014 15:48:17 +0000 (16:48 +0100)]
Remove incorrect property from Grant.xml
Coleman Watts [Sat, 2 Aug 2014 16:59:39 +0000 (17:59 +0100)]
Re-add case_type pseudoconstant to schema
Kurund Jalmi [Fri, 1 Aug 2014 19:06:55 +0000 (00:36 +0530)]
Merge pull request #3774 from jitendrapurohit/CRM-15063additionalprofilefix
Additional profile select box fix in Manage Event Page
Dan Cruson [Fri, 1 Aug 2014 17:50:43 +0000 (13:50 -0400)]
Update Contribution.php
Fix regression that was causing Event Resets with Offline Contributions to be garbled. Detailed in CRM-15069
colemanw [Fri, 1 Aug 2014 14:49:49 +0000 (15:49 +0100)]
Merge pull request #3775 from colemanw/file
CRM-15068 - Add api support for custom file fields
Coleman Watts [Fri, 1 Aug 2014 14:49:08 +0000 (15:49 +0100)]
CRM-15068 - Add api support for custom file fields
projects / civicrm-core.git / log