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
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
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
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...
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
Pratiksha Dubey [Wed, 6 Aug 2014 10:13:13 +0000 (15:43 +0530)]
VAT-498-newpull Added space between parameters of function
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...
Parag Bhilkar [Tue, 5 Aug 2014 10:00:49 +0000 (15:30 +0530)]
VAT-637 Added taxrates for offline membership contribution.
dpradeep [Mon, 28 Jul 2014 05:19:09 +0000 (10:49 +0530)]
VAT-568 Tax labels are changed as per tax label settings.
Pratiksha Dubey [Thu, 24 Jul 2014 12:33:01 +0000 (18:03 +0530)]
Display sales tax amounts on event information page
Pratiksha Dubey [Thu, 24 Jul 2014 12:07:31 +0000 (17:37 +0530)]
VAT-498 Automatically attach Invoice PDF to confirmation receipt based on the global setting
Pratiksha Dubey [Thu, 24 Jul 2014 07:14:55 +0000 (12:44 +0530)]
VAT-578 Modified message template for refunded contribution
Pratiksha Dubey [Tue, 15 Jul 2014 06:48:52 +0000 (12:18 +0530)]
VAT-578 Modified message template for contribution invoice
Pradeep Nayak [Thu, 10 Jul 2014 08:50:24 +0000 (14:20 +0530)]
Merge pull request #33 from Parag18/VAT-416-New-Push
VAT-416 Assign variables for contribution id and contact id.
Pratiksha Dubey [Mon, 7 Jul 2014 15:51:58 +0000 (21:21 +0530)]
VAT-578 Invoice Pdf Layout
Parag Bhilkar [Mon, 7 Jul 2014 15:09:06 +0000 (20:39 +0530)]
VAT-416 Assign variables for contribution id and contact id.
dpradeep [Fri, 4 Jul 2014 11:22:56 +0000 (16:52 +0530)]
VAT-569 Changes for Offline Contribution with tax amount
dpradeep [Fri, 4 Jul 2014 10:32:11 +0000 (16:02 +0530)]
VAT-568 [Tax Term] use on contribution and event registration page.
Parag Bhilkar [Thu, 3 Jul 2014 07:25:41 +0000 (12:55 +0530)]
VAT-416 Used CAST operator to get correct maximum value.
Pradeep Nayak [Thu, 3 Jul 2014 07:15:45 +0000 (12:45 +0530)]
Merge pull request #24 from pratikshad/VAT-500
Display amount including tax on Offline Contribution
pratikshad [Wed, 2 Jul 2014 11:16:36 +0000 (16:46 +0530)]
Optimization of code
Parag Bhilkar [Tue, 1 Jul 2014 15:03:44 +0000 (20:33 +0530)]
VAT-416 Handled upgrade for New activity type and new option for Contact Dashboard.
Pradeep Nayak [Tue, 1 Jul 2014 15:01:38 +0000 (20:31 +0530)]
Merge pull request #19 from Parag18/VAT-416-Push
VAT-416 Added display option for button on display preferences page.
Pradeep Nayak [Tue, 1 Jul 2014 11:19:00 +0000 (16:49 +0530)]
Merge pull request #17 from Parag18/VAT-414-Push
VAT-414 The system public pages should be updated to show the VAT/Tax br...
Pradeep Nayak [Tue, 1 Jul 2014 11:14:42 +0000 (16:44 +0530)]
Merge pull request #18 from Parag18/VAT-415-Push
VAT-415 The default receipts that the system sends out should be updated...
Pradeep Nayak [Tue, 1 Jul 2014 11:10:34 +0000 (16:40 +0530)]
Merge pull request #23 from pratikshad/VAT-499
Display sales tax amounts on event information page
Pradeep Nayak [Tue, 1 Jul 2014 11:08:32 +0000 (16:38 +0530)]
Merge pull request #25 from dpradeep/VAT-389-New
VAT-389 Resubmit the changes with some modifications.
dpradeep [Tue, 1 Jul 2014 11:09:27 +0000 (16:39 +0530)]
VAT-389 Resubmit the changes with some modifications.
Parag Bhilkar [Tue, 1 Jul 2014 10:41:06 +0000 (16:11 +0530)]
VAT-416 Remove extra used variables.
pratikshad [Tue, 1 Jul 2014 10:06:28 +0000 (15:36 +0530)]
Optimize code
pratikshad [Tue, 1 Jul 2014 09:50:25 +0000 (15:20 +0530)]
Modified assign of taxRates variable into one line code into Contribution.php and removed calculateTaxAmount jquery function into Contribution.tpl
Parag Bhilkar [Tue, 1 Jul 2014 07:57:26 +0000 (13:27 +0530)]
VAT-415 Added ts tag in Message Templates.
Parag Bhilkar [Tue, 1 Jul 2014 07:36:01 +0000 (13:06 +0530)]
VAT-414 Added ts tag in template files.
pratikshad [Fri, 27 Jun 2014 14:04:24 +0000 (19:34 +0530)]
Display amount including tax on Offline Contribution
pratikshad [Fri, 27 Jun 2014 13:59:55 +0000 (19:29 +0530)]
Display sales tax amounts on event information page
Parag Bhilkar [Fri, 27 Jun 2014 09:25:40 +0000 (14:55 +0530)]
VAT-414 Changes related to VAT/TAX breakdown
Parag Bhilkar [Thu, 26 Jun 2014 14:59:23 +0000 (20:29 +0530)]
VAT-416 Added display option for button on display preferences page. Populate the download option on click of Print Invoice button.
Parag Bhilkar [Thu, 26 Jun 2014 12:05:02 +0000 (17:35 +0530)]
VAT-415 The default receipts that the system sends out should be updated to show the VAT/Tax breakdown.
Parag Bhilkar [Thu, 26 Jun 2014 06:50:36 +0000 (12:20 +0530)]
VAT-414 The system public pages should be updated to show the VAT/Tax breakdown for all line items on each contribution record and in a price set.
Pradeep Nayak [Fri, 20 Jun 2014 08:34:31 +0000 (14:04 +0530)]
Merge pull request #13 from dpradeep/VAT-434
VAT-434 Batching contributions for Export
Pradeep Nayak [Fri, 20 Jun 2014 08:33:49 +0000 (14:03 +0530)]
Merge pull request #12 from dpradeep/VAT-365-New
VAT-365 Tax label changes and code optimization.
Pradeep Nayak [Fri, 20 Jun 2014 08:33:17 +0000 (14:03 +0530)]
Merge pull request #11 from dpradeep/VAT-88-New
VAT-88 Removed hardcode query during upgrade.
Pradeep Nayak [Fri, 20 Jun 2014 08:32:55 +0000 (14:02 +0530)]
Merge pull request #7 from rohankatkar/VAT_Issue_388
VAT-388 Added action for Print or Email Invoice. Created template for invoice.
dpradeep [Thu, 19 Jun 2014 12:42:05 +0000 (18:12 +0530)]
Added ts() for VAT (exempt).
Rohan Katkar [Thu, 19 Jun 2014 10:18:29 +0000 (15:48 +0530)]
Revert "Removing line used to get configuration array"
This reverts commit
eb12c6d02725226412951ae9c64366e3367a26ee.
Rohan Katkar [Thu, 19 Jun 2014 10:10:26 +0000 (15:40 +0530)]
Some minor changes for Invoice.php
Rohan Katkar [Thu, 19 Jun 2014 07:26:05 +0000 (12:56 +0530)]
Removing line used to get configuration array
Rohan Katkar [Fri, 6 Jun 2014 15:28:22 +0000 (20:58 +0530)]
VAT-388 Added message templates of contribution invoice receipt for handle upgrade
dpradeep [Fri, 6 Jun 2014 14:13:50 +0000 (19:43 +0530)]
VAT-434 Batching contributions for Export
dpradeep [Fri, 6 Jun 2014 13:58:13 +0000 (19:28 +0530)]
VAT-365 Tax label changes and code optimization.
dpradeep [Fri, 6 Jun 2014 13:41:06 +0000 (19:11 +0530)]
VAT-88 Removed hardcode query during upgrade.
Rohan Katkar [Fri, 6 Jun 2014 06:45:10 +0000 (12:15 +0530)]
VAT-388 some minor changes for code
Rohan Katkar [Thu, 5 Jun 2014 14:35:22 +0000 (20:05 +0530)]
Changed hard coded URL for image and changed variable to .
Rohan Katkar [Thu, 5 Jun 2014 13:25:44 +0000 (18:55 +0530)]
Removed same code from postprocess() function which is required for Invoice generation and PDF generation
Rohan Katkar [Tue, 27 May 2014 08:54:42 +0000 (14:24 +0530)]
VAT-388 Added new files for generation of invoice.
Rohan Katkar [Tue, 27 May 2014 08:24:49 +0000 (13:54 +0530)]
Changes for generation of Invoice
Kurund Jalmi [Thu, 22 May 2014 10:16:29 +0000 (15:46 +0530)]
Merge pull request #5 from rohankatkar/VAT-389
VAT-389 Added form for CiviContribute Component Settings
Kurund Jalmi [Thu, 22 May 2014 10:15:48 +0000 (15:45 +0530)]
Merge pull request #4 from rohankatkar/VAT-86-94-224-New
VAT-86-94-224 Added validation when 'Is Tax?' is checked. Checked for fi...
Kurund Jalmi [Thu, 22 May 2014 10:15:11 +0000 (15:45 +0530)]
Merge pull request #3 from dpradeep/VAT-366-New
VAT-366 Handle database entry(lineitem creation etc) of tax amounts
Kurund Jalmi [Thu, 22 May 2014 10:14:39 +0000 (15:44 +0530)]
Merge pull request #2 from dpradeep/VAT-365-New
VAT-365 Proposed Tax UI changes
Kurund Jalmi [Thu, 22 May 2014 10:10:57 +0000 (15:40 +0530)]
Merge pull request #1 from dpradeep/VAT-88-New
VAT-88 Associate the tax to be charged to the financial type + Add new c...
Rohan Katkar [Thu, 22 May 2014 07:46:58 +0000 (13:16 +0530)]
VAT-389 Added form for CiviContribute Component Settings
Rohan Katkar [Thu, 22 May 2014 06:54:45 +0000 (12:24 +0530)]
VAT-86-94-224 Added validation when 'Is Tax?' is checked. Checked for financial account to have 'Is Tax?' enabled. Add validation on edit for 'Is Tax?'.
dpradeep [Thu, 22 May 2014 04:39:10 +0000 (10:09 +0530)]
VAT-366 Handle database entry(lineitem creation etc) of tax amounts
dpradeep [Thu, 22 May 2014 04:30:06 +0000 (10:00 +0530)]
VAT-365 Proposed Tax UI changes
dpradeep [Thu, 22 May 2014 04:18:41 +0000 (09:48 +0530)]
VAT-88 Associate the tax to be charged to the financial type + Add new column tax_amount in contribution and lineitem table
Kurund Jalmi [Mon, 19 May 2014 05:37:20 +0000 (11:07 +0530)]
Merge pull request #3289 from kurund/CRM-14475
removed unused variables, case type test CRM-14475
Kurund Jalmi [Mon, 19 May 2014 05:36:57 +0000 (11:06 +0530)]
Merge pull request #3288 from kurund/CRM-14454
Crm 14454
Kurund Jalmi [Mon, 19 May 2014 05:29:18 +0000 (10:59 +0530)]
Merge pull request #3286 from kurund/CRM-14703
we should skip value changes of submit buttons, CRM-14703
Kurund Jalmi [Mon, 19 May 2014 05:26:38 +0000 (10:56 +0530)]
Merge pull request #3287 from kurund/CRM-14590
fixed the break in saving custom data of type participant role, due to s...
Kurund Jalmi [Mon, 19 May 2014 05:20:51 +0000 (22:20 -0700)]
Merge pull request #3112 from freeform/CRM-14568
CRM-14568 - Billing payment block is not being loaded in Chrome.
Eileen McNaughton [Mon, 19 May 2014 03:18:41 +0000 (15:18 +1200)]
Merge pull request #3285 from eileenmcnaughton/comments
autogenerate missing comments
Eileen McNaughton [Mon, 19 May 2014 03:18:27 +0000 (15:18 +1200)]
autogenerate missing comments
Eileen McNaughton [Mon, 19 May 2014 03:16:25 +0000 (15:16 +1200)]
Merge pull request #3284 from eileenmcnaughton/comments
some comment block fixes
Eileen McNaughton [Mon, 19 May 2014 02:56:50 +0000 (14:56 +1200)]
some comment block fixes
kurund [Sun, 18 May 2014 07:24:00 +0000 (12:54 +0530)]
removed unused variables, case type test CRM-14475
----------------------------------------
* CRM-14475:
https://issues.civicrm.org/jira/browse/CRM-14475
kurund [Sun, 18 May 2014 04:52:35 +0000 (10:22 +0530)]
notice fixes, CRM-14454
----------------------------------------
* CRM-14454:
https://issues.civicrm.org/jira/browse/CRM-14454
kurund [Sun, 18 May 2014 04:47:37 +0000 (10:17 +0530)]
fixed code indentation, CRM-14454
----------------------------------------
* CRM-14454:
https://issues.civicrm.org/jira/browse/CRM-14454
kurund [Sun, 18 May 2014 01:59:58 +0000 (20:59 -0500)]
fixed the break in saving custom data of type participant role, due to select2 changes CRM-14590
----------------------------------------
* CRM-14590:
https://issues.civicrm.org/jira/browse/CRM-14590
kurund [Sat, 17 May 2014 22:41:06 +0000 (17:41 -0500)]
we should skip value changes of submit buttons, CRM-14703
----------------------------------------
* CRM-14703:
https://issues.civicrm.org/jira/browse/CRM-14703
Dave Greenberg [Sat, 17 May 2014 01:02:23 +0000 (18:02 -0700)]
Merge pull request #3283 from davecivicrm/CRM-14700a
CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ...
Dave Greenberg [Sat, 17 May 2014 01:01:47 +0000 (18:01 -0700)]
CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ref to get the options.
----------------------------------------
* CRM-14700:
https://issues.civicrm.org/jira/browse/CRM-14700
Kurund Jalmi [Fri, 16 May 2014 22:04:48 +0000 (15:04 -0700)]
Merge pull request #2876 from mepps/participant-image-event-badge
Allows users to display a contact's profile picture on their name badge
Tim Otten [Fri, 16 May 2014 21:48:35 +0000 (14:48 -0700)]
Merge pull request #3248 from eileenmcnaughton/CRM-14684
CRM-14684 refactor function that identifies is a site supports back-offi...
Kurund Jalmi [Fri, 16 May 2014 21:43:38 +0000 (14:43 -0700)]
Merge pull request #3268 from eileenmcnaughton/CRM-14626
CRM-14626 fix event acl so that view event info & register for events ar...
Kurund Jalmi [Fri, 16 May 2014 20:48:18 +0000 (13:48 -0700)]
Merge pull request #3274 from jitendrapurohit/Webtest_4.5Fix
Web Test Fix 4.5alpha1
projects / civicrm-core.git / log