Skip to content

Commit c690a10

Browse files
gymadgymad
committed
Merge pull request salesagility#1256 from salesagility/campaignwizard
7.6 RC
2 parents 346d243 + d74b16a commit c690a10

31 files changed

+636
-331
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##SuiteCRM 7.6 beta 2
1+
##SuiteCRM 7.6 RC
22

33
[![Build Status](https://travis-ci.org/salesagility/SuiteCRM.svg?branch=develop)](https://travis-ci.org/salesagility/SuiteCRM)
44

‎include/language/en_us.lang.php

+1
Original file line numberDiff line numberDiff line change
@@ -1652,6 +1652,7 @@
16521652
'LBL_CONTACT_LIST' => 'Contact List',
16531653
'LBL_CONTACT' => 'Contact',
16541654
'LBL_CONTACTS' => 'Contacts',
1655+
'LBL_CONTRACT' => 'Contract',
16551656
'LBL_CONTRACTS' => 'Contracts',
16561657
'LBL_COUNTRY' => 'Country:',
16571658
'LBL_CREATE_BUTTON_LABEL' => 'Create',

‎install/performSetup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ function createFTSLogicHook($filePath = 'application/Ext/LogicHooks/logichooks.e
592592
installLog('handleOverride');
593593
// add local settings to config overrides
594594
if(!empty($_SESSION['default_date_format'])) $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
595-
if(!empty($_SESSION['default_time_format'])) $sugar_config['default_date_format'] = $_SESSION['default_time_format'];
595+
if(!empty($_SESSION['default_time_format'])) $sugar_config['default_time_format'] = $_SESSION['default_time_format'];
596596
if(!empty($_SESSION['default_language'])) $sugar_config['default_language'] = $_SESSION['default_language'];
597597
if(!empty($_SESSION['default_locale_name_format'])) $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
598598
//$configurator->handleOverride();

‎jssource/src_files/modules/Campaigns/wizard.js

+22-4
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,35 @@ function navigate(direction, noValidation){
165165
back_button_div.style.display = '';
166166
save_button_div.style.display = '';
167167
next_button_div.style.display = 'none';
168-
finish_button.style.display = 'none';
169-
168+
if(finish_button) {
169+
finish_button.style.display = 'none';
170+
}
171+
if(typeof campaignBudget != 'undefined' && campaignBudget) {
172+
finish_button.style.display = '';
173+
}
170174
}else{
171175
if(current_step.value<2){
172176
back_button_div.style.display = 'none';
173177
}else{
174178
back_button_div.style.display = '';
175179
}
176180
var next_button = document.getElementById('wiz_next_button');
177-
next_button_div.style.display = '';
178-
save_button_div.style.display = 'none';
181+
182+
if(typeof campaignBudget != 'undefined' && campaignBudget) {
183+
var targetListStep = 3;
184+
}
185+
else {
186+
var targetListStep = 2;
187+
}
188+
if (current_step.value == targetListStep) {
189+
next_button_div.style.display = 'none';
190+
save_button_div.style.display = '';
191+
$('#wiz_submit_button').removeAttr('disabled');
192+
}
193+
else {
194+
next_button_div.style.display = '';
195+
save_button_div.style.display = 'none';
196+
}
179197
next_button.focus();
180198
}
181199

‎modules/AOS_Contracts/language/en_us.lang.php

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
'LBL_PDF_NAME' => 'Contract',
102102
'LBL_EMAIL_NAME' => 'Contract for',
103103
'LBL_NO_TEMPLATE' => 'ERROR\nNo templates found. If you have not created an Contract template, go to the PDF templates module and create one',
104+
'LBL_TOTAL_CONTRACT_VALUE_USDOLLAR' => 'Contract Value (Default Currency)',
104105
'LBL_SUBTOTAL_AMOUNT_USDOLLAR' => 'Subtotal (Default Currency)',
105106
'LBL_DISCOUNT_AMOUNT_USDOLLAR' => 'Discount (Default Currency)',
106107
'LBL_TAX_AMOUNT_USDOLLAR' => 'Tax (Default Currency)',

‎modules/AOS_Contracts/vardefs.php

+123-64
Original file line numberDiff line numberDiff line change
@@ -400,70 +400,6 @@
400400
'reportable' => true,
401401
'size' => '20',
402402
),
403-
404-
'tasks' =>
405-
array(
406-
'name' => 'tasks',
407-
'type' => 'link',
408-
'relationship' => 'aos_contracts_tasks',
409-
'module' => 'Tasks',
410-
'bean_name' => 'Task',
411-
'source' => 'non-db',
412-
),
413-
'notes' =>
414-
array(
415-
'name' => 'notes',
416-
'type' => 'link',
417-
'relationship' => 'aos_contracts_notes',
418-
'module' => 'Notes',
419-
'bean_name' => 'Note',
420-
'source' => 'non-db',
421-
),
422-
'meetings' =>
423-
array(
424-
'name' => 'meetings',
425-
'type' => 'link',
426-
'relationship' => 'aos_contracts_meetings',
427-
'module' => 'Meetings',
428-
'bean_name' => 'Meeting',
429-
'source' => 'non-db',
430-
),
431-
'calls' =>
432-
array(
433-
'name' => 'calls',
434-
'type' => 'link',
435-
'relationship' => 'aos_contracts_calls',
436-
'module' => 'Calls',
437-
'bean_name' => 'Call',
438-
'source' => 'non-db',
439-
),
440-
441-
'emails' =>
442-
array(
443-
'name' => 'emails',
444-
'type' => 'link',
445-
'relationship' => 'emails_aos_contracts_rel', /* reldef in emails */
446-
'module' => 'Emails',
447-
'bean_name' => 'Email',
448-
'source' => 'non-db',
449-
'studio' => array("formula" => false),
450-
),
451-
'aos_quotes_aos_contracts' =>
452-
array(
453-
'name' => 'aos_quotes_aos_contracts',
454-
'type' => 'link',
455-
'relationship' => 'aos_quotes_aos_contracts',
456-
'source' => 'non-db',
457-
'module' => 'AOS_Quotes',
458-
),
459-
"documents" =>
460-
array(
461-
'name' => 'documents',
462-
'type' => 'link',
463-
'relationship' => 'aos_contracts_documents',
464-
'source' => 'non-db',
465-
'module' => 'Documents',
466-
),
467403
'line_items' =>
468404
array(
469405
'required' => false,
@@ -743,6 +679,85 @@
743679
),
744680
'len' => '26,6',
745681
),
682+
683+
'accounts' =>
684+
array(
685+
'name' => 'accounts',
686+
'type' => 'link',
687+
'relationship' => 'account_aos_contracts',
688+
'module' => 'Accounts',
689+
'bean_name' => 'Account',
690+
'source' => 'non-db',
691+
),
692+
'contacts' =>
693+
array(
694+
'name' => 'contacts',
695+
'type' => 'link',
696+
'relationship' => 'contact_aos_contracts',
697+
'module' => 'Contacts',
698+
'bean_name' => 'Contact',
699+
'source' => 'non-db',
700+
),
701+
'tasks' =>
702+
array(
703+
'name' => 'tasks',
704+
'type' => 'link',
705+
'relationship' => 'aos_contracts_tasks',
706+
'module' => 'Tasks',
707+
'bean_name' => 'Task',
708+
'source' => 'non-db',
709+
),
710+
'notes' =>
711+
array(
712+
'name' => 'notes',
713+
'type' => 'link',
714+
'relationship' => 'aos_contracts_notes',
715+
'module' => 'Notes',
716+
'bean_name' => 'Note',
717+
'source' => 'non-db',
718+
),
719+
'meetings' =>
720+
array(
721+
'name' => 'meetings',
722+
'type' => 'link',
723+
'relationship' => 'aos_contracts_meetings',
724+
'module' => 'Meetings',
725+
'bean_name' => 'Meeting',
726+
'source' => 'non-db',
727+
),
728+
'calls' =>
729+
array(
730+
'name' => 'calls',
731+
'type' => 'link',
732+
'relationship' => 'aos_contracts_calls',
733+
'module' => 'Calls',
734+
'bean_name' => 'Call',
735+
'source' => 'non-db',
736+
),
737+
'emails' =>
738+
array(
739+
'name' => 'emails',
740+
'type' => 'link',
741+
'relationship' => 'emails_aos_contracts_rel',/* reldef in emails */
742+
'source' => 'non-db',
743+
'vname' => 'LBL_EMAILS',
744+
),
745+
'aos_quotes_aos_contracts' =>
746+
array(
747+
'name' => 'aos_quotes_aos_contracts',
748+
'type' => 'link',
749+
'relationship' => 'aos_quotes_aos_contracts',
750+
'source' => 'non-db',
751+
'module' => 'AOS_Quotes',
752+
),
753+
"documents" =>
754+
array(
755+
'name' => 'documents',
756+
'type' => 'link',
757+
'relationship' => 'aos_contracts_documents',
758+
'source' => 'non-db',
759+
'module' => 'Documents',
760+
),
746761
"aos_products_quotes" =>
747762
array(
748763
'name' => 'aos_products_quotes',
@@ -763,6 +778,50 @@
763778
),
764779
),
765780
'relationships' => array(
781+
'aos_contracts_tasks' => array(
782+
'lhs_module' => 'AOS_Contracts',
783+
'lhs_table' => 'aos_contracts',
784+
'lhs_key' => 'id',
785+
'rhs_module' => 'Tasks',
786+
'rhs_table' => 'tasks',
787+
'rhs_key' => 'parent_id',
788+
'relationship_type' => 'one-to-many',
789+
'relationship_role_column' => 'parent_type',
790+
'relationship_role_column_value' => 'AOS_Contracts'
791+
),
792+
'aos_contracts_notes' => array(
793+
'lhs_module' => 'AOS_Contracts',
794+
'lhs_table' => 'aos_contracts',
795+
'lhs_key' => 'id',
796+
'rhs_module' => 'Notes',
797+
'rhs_table' => 'notes',
798+
'rhs_key' => 'parent_id',
799+
'relationship_type' => 'one-to-many',
800+
'relationship_role_column' => 'parent_type',
801+
'relationship_role_column_value' => 'AOS_Contracts'
802+
),
803+
'aos_contracts_meetings' => array(
804+
'lhs_module' => 'AOS_Contracts',
805+
'lhs_table' => 'aos_contracts',
806+
'lhs_key' => 'id',
807+
'rhs_module' => 'Meetings',
808+
'rhs_table' => 'meetings',
809+
'rhs_key' => 'parent_id',
810+
'relationship_type' => 'one-to-many',
811+
'relationship_role_column' => 'parent_type',
812+
'relationship_role_column_value' => 'AOS_Contracts'
813+
),
814+
'aos_contracts_calls' => array(
815+
'lhs_module' => 'AOS_Contracts',
816+
'lhs_table' => 'aos_contracts',
817+
'lhs_key' => 'id',
818+
'rhs_module' => 'Calls',
819+
'rhs_table' => 'calls',
820+
'rhs_key' => 'parent_id',
821+
'relationship_type' => 'one-to-many',
822+
'relationship_role_column' => 'parent_type',
823+
'relationship_role_column_value' => 'AOS_Contracts'
824+
),
766825
'aos_contracts_aos_products_quotes' =>
767826
array(
768827
'lhs_module' => 'AOS_Contracts',

‎modules/AOS_Invoices/vardefs.php

+18
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,24 @@
677677
'len' => '26,6',
678678
),
679679

680+
'accounts' =>
681+
array(
682+
'name' => 'accounts',
683+
'type' => 'link',
684+
'relationship' => 'account_aos_invoices',
685+
'module' => 'Accounts',
686+
'bean_name' => 'Account',
687+
'source' => 'non-db',
688+
),
689+
'contacts' =>
690+
array(
691+
'name' => 'contacts',
692+
'type' => 'link',
693+
'relationship' => 'contact_aos_invoices',
694+
'module' => 'Contacts',
695+
'bean_name' => 'Contact',
696+
'source' => 'non-db',
697+
),
680698
'aos_quotes_aos_invoices' =>
681699
array(
682700
'name' => 'aos_quotes_aos_invoices',

‎modules/AOS_Products/language/en_us.lang.php

+2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@
6464
'LBL_IMAGE_UPLOAD_FAIL' => 'ERROR: uploaded file exceeded the max filesize: max filesize: ',
6565
'LBL_AOS_PRODUCT_CATEGORYS_NAME' => 'Product Category',
6666
'LBL_AOS_PRODUCT_CATEGORY' => 'Product Category ID',
67+
'LBL_AOS_PRODUCT_CATEGORIES' => 'Product Categories',
6768
'LBL_COST_USDOLLAR' => 'Cost (Default Currency)',
6869
'LBL_PRICE_USDOLLAR' => 'Price (Default Currency)',
6970
'LBL_FILE_URL' => 'File URL',
7071
'LBL_CUSTOMERS_PURCHASED_PRODUCTS_SUBPANEL_TITLE' => 'Purchases',
72+
'LBL_PRODUCTS_PURCHASES' => 'Purchases',
7173
'LBL_AOS_QUOTE_NAME' => 'Quote',
7274
'LBL_ACCOUNT_NAME' => 'Account',
7375
);

‎modules/AOS_Products/vardefs.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'source' => 'non-db',
4949
'module' => 'AOS_Quotes',
5050
'bean_name' => 'AOS_Quotes',
51-
'vname' => 'LBL_AOS_PRODUCTS_PURCHASES_FROM_AOS_QUOTES_TITLE',
51+
'vname' => 'LBL_PRODUCTS_PURCHASES',
5252
),
5353
'maincode' =>
5454
array(
@@ -301,7 +301,7 @@
301301
'link_type' => 'one',
302302
'module' => 'AOS_Product_Categories',
303303
'bean_name' => 'AOS_Product_Categories',
304-
'vname' => 'LBL_AOS_PRODUCT_CATEGORIES_AOS_PRODUCTS_FROM_AOS_PRODUCT_CATEGORIES_TITLE',
304+
'vname' => 'LBL_AOS_PRODUCT_CATEGORIES',
305305
),
306306
'aos_product_category_name' => array(
307307
'required' => false,

‎modules/AOS_Quotes/vardefs.php

+18
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,24 @@
753753
'len' => '26,6',
754754
),
755755

756+
'accounts' =>
757+
array(
758+
'name' => 'accounts',
759+
'type' => 'link',
760+
'relationship' => 'account_aos_quotes',
761+
'module' => 'Accounts',
762+
'bean_name' => 'Account',
763+
'source' => 'non-db',
764+
),
765+
'contacts' =>
766+
array(
767+
'name' => 'contacts',
768+
'type' => 'link',
769+
'relationship' => 'contact_aos_quotes',
770+
'module' => 'Contacts',
771+
'bean_name' => 'Contact',
772+
'source' => 'non-db',
773+
),
756774
'opportunities' =>
757775
array(
758776
'name' => 'opportunities',

‎modules/AOW_WorkFlow/AOW_WorkFlow.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,9 @@ function build_flow_query_where($query = array()){
229229
$condition = new AOW_Condition();
230230
$condition->retrieve($row['id']);
231231
$query = $this->build_query_where($condition,$module,$query);
232-
232+
if(empty($query)){
233+
return $query;
234+
}
233235
}
234236
if($this->flow_run_on){
235237
switch($this->flow_run_on){

‎modules/Calls/vardefs.php

+8
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,14 @@
329329
'source' => 'non-db',
330330
'vname' => 'LBL_CONTACTS',
331331
),
332+
'aos_contracts' =>
333+
array (
334+
'name' => 'aos_contracts',
335+
'type' => 'link',
336+
'relationship' => 'aos_contracts_calls',
337+
'source'=>'non-db',
338+
'vname'=>'LBL_CONTRACT',
339+
),
332340
'users' =>
333341
array(
334342
'name' => 'users',

0 commit comments

Comments
 (0)