7.1beta

custom/Extension/application/Ext/Extensions/aow_workflow.php

@@ -22,4 +22,4 @@
  * @author SalesAgility <[email protected]>
  */
 
-$extensions["aowactions"] =  array("section" => "aow_actions",	  "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
+$extensions["schedulers"] =  array("section" => "aow_actions",	  "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");

custom/Extension/application/Ext/Language/en_us.AdvancedOpenWorkflow.php

@@ -3,7 +3,7 @@
  * Advanced OpenWorkflow, Automating SugarCRM.
  * @package Advanced OpenWorkflow for SugarCRM
  * @copyright SalesAgility Ltd http://www.salesagility.com
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -79,5 +79,10 @@
 $app_list_strings['aow_email_type_list']['Record Email'] = 'Record Email';
 $app_list_strings['aow_email_type_list']['Specify User'] = 'User';
 $app_list_strings['aow_email_type_list']['Related Field'] = 'Related Field';
+$app_list_strings['aow_run_on_list']['All_Records'] = 'All Records';
+$app_list_strings['aow_run_on_list']['New_Records'] = 'New Records';
+$app_list_strings['aow_run_on_list']['Modified_Records'] = 'Modified Records';
+
+
 
 

custom/application/Ext/Extensions/extensions.ext.php

@@ -25,5 +25,5 @@
  * @author SalesAgility <[email protected]>
  */
 
-$extensions["aowactions"] =  array("section" => "aow_actions",	  "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
+$extensions["schedulers"] =  array("section" => "aow_actions",	  "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
 ?>

custom/application/Ext/Language/en_us.lang.ext.php

@@ -330,7 +330,7 @@
  * Advanced OpenWorkflow, Automating SugarCRM.
  * @package Advanced OpenWorkflow for SugarCRM
  * @copyright SalesAgility Ltd http://www.salesagility.com
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -406,6 +406,11 @@
 $app_list_strings['aow_email_type_list']['Record Email'] = 'Record Email';
 $app_list_strings['aow_email_type_list']['Specify User'] = 'User';
 $app_list_strings['aow_email_type_list']['Related Field'] = 'Related Field';
+$app_list_strings['aow_run_on_list']['All_Records'] = 'All Records';
+$app_list_strings['aow_run_on_list']['New_Records'] = 'New Records';
+$app_list_strings['aow_run_on_list']['Modified_Records'] = 'Modified Records';
+
+
 
 
 

custom/application/Ext/Language/fr_FR.lang.ext.php

@@ -2,122 +2,6 @@
  //WARNING: The contents of this file are auto-generated
 
 
-
-$app_list_strings["moduleList"]["SecurityGroups"] = "Gestion des équipes";
-$app_strings['LBL_LOGIN_AS'] = "Ouverture comme ";
-$app_strings['LBL_LOGOUT_AS'] = "Déconnexion comme ";
-
-
-
-/**
- * Products, Quotations & Invoices modules.
- * Extensions to SugarCRM
- * @package Advanced OpenSales for SugarCRM
- * @subpackage Products
- * @copyright SalesAgility Ltd http://www.salesagility.com
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author Salesagility Ltd <[email protected]>
- * French localisation by Patrick Lahaye : [email protected] - www.axxone.fr
- */
-
-$app_list_strings['moduleList']['AOS_Contracts'] = 'Contrats';
-$app_list_strings['moduleList']['AOS_Invoices'] = 'Factures';
-$app_list_strings['moduleList']['AOS_PDF_Templates'] = 'Mod&eagrave;les de PDF';
-$app_list_strings['moduleList']['AOS_Product_Categories'] = 'Product Categories';
-$app_list_strings['moduleList']['AOS_Products'] = 'Produits';
-$app_list_strings['moduleList']['AOS_Products_Quotes'] = 'Offres de produits';
-$app_list_strings['moduleList']['AOS_Line_Item_Groups'] = 'Line Item Groups';
-$app_list_strings['moduleList']['AOS_Quotes'] = 'Offres';
-$app_list_strings['aos_quotes_type_dom'][''] = '';
-$app_list_strings['aos_quotes_type_dom']['Analyst'] = 'Analyste';
-$app_list_strings['aos_quotes_type_dom']['Competitor'] = 'Concurrent';
-$app_list_strings['aos_quotes_type_dom']['Customer'] = 'Client';
-$app_list_strings['aos_quotes_type_dom']['Integrator'] = 'Int&eacute;grateur';
-$app_list_strings['aos_quotes_type_dom']['Investor'] = 'Investisseur';
-$app_list_strings['aos_quotes_type_dom']['Partner'] = 'Partenaire';
-$app_list_strings['aos_quotes_type_dom']['Press'] = 'Presse';
-$app_list_strings['aos_quotes_type_dom']['Prospect'] = 'Prospect';
-$app_list_strings['aos_quotes_type_dom']['Reseller'] = 'Revendeur';
-$app_list_strings['aos_quotes_type_dom']['Other'] = 'Autre';
-$app_list_strings['template_ddown_c_list'][''] = '';
-$app_list_strings['quote_stage_dom']['Draft'] = 'Ebauche';
-$app_list_strings['quote_stage_dom']['Negotiation'] = 'N&eacute;gociation';
-$app_list_strings['quote_stage_dom']['Delivered'] = 'Livr&eacute;';
-$app_list_strings['quote_stage_dom']['On Hold'] = 'En attente';
-$app_list_strings['quote_stage_dom']['Confirmed'] = 'Confirm&ecute';
-$app_list_strings['quote_stage_dom']['Closed Accepted'] = 'Affaire gag&eacute;e';
-$app_list_strings['quote_stage_dom']['Closed Lost'] = 'Affaire perdue';
-$app_list_strings['quote_stage_dom']['Closed Dead'] = 'Affaire morte';
-$app_list_strings['quote_term_dom']['Net 15'] = 'Net 15';
-$app_list_strings['quote_term_dom']['Net 30'] = 'Net 30';
-$app_list_strings['quote_term_dom']['Net 45'] = 'Net 45';
-$app_list_strings['quote_term_dom'][''] = '';
-$app_list_strings['approval_status_dom']['Approved'] = 'Approv&eacute;';
-$app_list_strings['approval_status_dom']['Not Approved'] = 'Non approv&eacute;';
-$app_list_strings['approval_status_dom'][''] = '';
-$app_list_strings['vat_list']['5.0'] = '5%';
-$app_list_strings['vat_list']['7.5'] = '7.5%';
-$app_list_strings['vat_list']['17.5'] = '17.5%';
-$app_list_strings['vat_list']['20.0'] = '20%';
-$app_list_strings['discount_list']['Percentage'] = 'Pourcentage';
-$app_list_strings['discount_list']['Amount'] = 'Montant';
-$app_list_strings['aos_invoices_type_dom'][''] = '';
-$app_list_strings['aos_invoices_type_dom']['Analyst'] = 'Analyste';
-$app_list_strings['aos_invoices_type_dom']['Competitor'] = 'Concurrent';
-$app_list_strings['aos_invoices_type_dom']['Customer'] = 'Client';
-$app_list_strings['aos_invoices_type_dom']['Integrator'] = 'Int&eacute;grateur';
-$app_list_strings['aos_invoices_type_dom']['Investor'] = 'Investisseurr';
-$app_list_strings['aos_invoices_type_dom']['Partner'] = 'Partnaire';
-$app_list_strings['aos_invoices_type_dom']['Press'] = 'Presse';
-$app_list_strings['aos_invoices_type_dom']['Prospect'] = 'Prospect';
-$app_list_strings['aos_invoices_type_dom']['Reseller'] = 'Revendeur';
-$app_list_strings['aos_invoices_type_dom']['Other'] = 'Autre';
-$app_list_strings['invoice_status_dom']['Paid'] = 'Pay&eacute;e';
-$app_list_strings['invoice_status_dom']['Unpaid'] = 'Non pay&eacute;e';
-$app_list_strings['invoice_status_dom']['Cancelled'] = 'Annul&eacute;e';
-$app_list_strings['invoice_status_dom'][''] = '';
-$app_list_strings['quote_invoice_status_dom']['Not Invoiced'] = 'Non factur&eacute;e';
-$app_list_strings['quote_invoice_status_dom']['Invoiced'] = 'Factur&eacute;e';
-$app_list_strings['product_code_dom']['XXXX'] = 'XXXX';
-$app_list_strings['product_code_dom']['YYYY'] = 'YYYY';
-$app_list_strings['product_category_dom']['Laptops'] = 'Ordi portable';
-$app_list_strings['product_category_dom']['Desktops'] = 'PC';
-$app_list_strings['product_category_dom'][''] = '';
-$app_list_strings['product_type_dom']['Good'] = 'Marchandise';
-$app_list_strings['product_type_dom']['Service'] = 'Service';
-$app_list_strings['product_quote_parent_type_dom']['AOS_Quotes'] = 'Offres';
-$app_list_strings['product_quote_parent_type_dom']['AOS_Invoices'] = 'Factures';
-$app_list_strings['pdf_template_type_dom']['AOS_Quotes'] = 'Offres';
-$app_list_strings['pdf_template_type_dom']['AOS_Invoices'] = 'Factures';
-$app_list_strings['pdf_template_type_dom']['Accounts'] = 'Comptes';
-$app_list_strings['pdf_template_type_dom']['Contacts'] = 'Contacts';
-$app_list_strings['pdf_template_type_dom']['Leads'] = 'Leads';
-$app_list_strings['pdf_template_sample_dom'][''] = '';
-$app_list_strings['contract_status_list']['Not Started'] = 'Non d&eacute;marr&eacute;e';
-$app_list_strings['contract_status_list']['In Progress'] = 'En cours';
-$app_list_strings['contract_status_list']['Signed'] = 'Sign&eacute;e';
-$app_list_strings['contract_type_list']['Type'] = 'Type';
-$app_strings['LBL_GENERATE_LETTER'] = 'G&eacute;n&eacute;rer une lettre';
-$app_strings['LBL_SELECT_TEMPLATE'] = 'Merci de choisir un mod&egarve;le';
-$app_strings['LBL_NO_TEMPLATE'] = 'ERREUR\nAucun mod&eagrave;le trouv&eacute;.\nMerci d&apos;en cr&eacute; un dans le module de cr&eacute;ation de mod&eagrave;le PDF';
-
-
-
 /**
  * Advanced OpenWorkflow, Automating SugarCRM.
  * @package Advanced OpenWorkflow for SugarCRM
@@ -201,4 +85,11 @@
 
 
 
+
+
+$app_list_strings["moduleList"]["SecurityGroups"] = "Gestion des équipes";
+$app_strings['LBL_LOGIN_AS'] = "Ouverture comme ";
+$app_strings['LBL_LOGOUT_AS'] = "Déconnexion comme ";
+
+
 ?>

modules/AOW_Actions/actions.php

@@ -25,6 +25,7 @@
     $aow_actions_list[]='CreateRecord';
     $aow_actions_list[]='ModifyRecord';
     $aow_actions_list[]='SendEmail';
+    $aow_actions_list[]='SetApproval';
 
 
 if (file_exists('custom/modules/AOW_Actions/Ext/Actions/actions.ext.php')) {

modules/AOW_Actions/actions/actionBase.php

@@ -42,7 +42,7 @@ function edit_display($line,SugarBean $bean = null, $params = array()){
 
     }
 
-    function run_action(SugarBean $bean, $params = array()){
+    function run_action(SugarBean $bean, $params = array(), $in_save=false){
 
         return true;
 

modules/AOW_Actions/actions/actionCreateRecord.php

@@ -91,7 +91,7 @@ function edit_display($line,SugarBean $bean = null, $params = array()){
 
     }
 
-    function run_action(SugarBean $bean, $params = array()){
+    function run_action(SugarBean $bean, $params = array(), $in_save=false){
         global $beanList;
 
         if(isset($params['record_type']) && $params['record_type'] != ''){
@@ -119,7 +119,7 @@ function run_action(SugarBean $bean, $params = array()){
         return false;
     }
 
-    function set_record(SugarBean $record, SugarBean $bean, $params = array()){
+    function set_record(SugarBean $record, SugarBean $bean, $params = array(), $in_save = false){
         global $app_list_strings, $timedate;
 
         $record_vardefs = $record->getFieldDefinitions();
@@ -160,9 +160,9 @@ function set_record(SugarBean $record, SugarBean $bean, $params = array()){
                                         $value = $businessHours->addBusinessHours($amount);
                                     }else if($dateToUse == "field"){
                                         $dateToUse = $params['field'][$key];
-                                        $value = $businessHours->addBusinessHours($amount, $timedate->fromDb($record->fetched_row[$dateToUse]));
+                                        $value = $businessHours->addBusinessHours($amount, $timedate->fromDb($bean->$dateToUse));
                                     }else{
-                                        $value = $businessHours->addBusinessHours($amount, $timedate->fromDb($bean->fetched_row[$dateToUse]));
+                                        $value = $businessHours->addBusinessHours($amount, $timedate->fromDb($bean->$dateToUse));
                                     }
                                     $value = $timedate->asDb( $value );
                                     break;
@@ -273,9 +273,12 @@ function set_record(SugarBean $record, SugarBean $bean, $params = array()){
                 $record->$field = $value;
             }
         }
-        $record->process_save_dates =false;
 
-        $check_notify = $record->assigned_user_id != $record->fetched_row['assigned_user_id'];
+        $check_notify = false;
+        if($in_save) $record->processed = true;
+        else $check_notify = $record->assigned_user_id != $record->fetched_row['assigned_user_id'];
+
+        $record->process_save_dates =false;
 
         $record->save($check_notify);
     }

modules/AOW_Actions/actions/actionModifyRecord.php

@@ -88,9 +88,9 @@ function updateFlowModule(){
         return $html;
     }
 
-    function run_action(SugarBean $bean, $params = array()){
-
-        $this->set_record($bean, $bean, $params);
+    function run_action(SugarBean $bean, $params = array(), $in_save=false){
+        $GLOBALS['log']->fatal('Running Action modify record for bean - '.$bean->id);
+        $this->set_record($bean, $bean, $params, $in_save);
         $this->set_relationships($bean, $bean, $params);
 
         return true;

modules/AOW_Actions/actions/actionSendEmail.php

@@ -191,7 +191,7 @@ private function getEmailFromParams(SugarBean $bean, $params){
         return "";
     }
 
-    function run_action(SugarBean $bean, $params = array()){
+    function run_action(SugarBean $bean, $params = array(), $in_save=false){
         global $sugar_config;
 
         include_once('modules/EmailTemplates/EmailTemplate.php');
@@ -245,7 +245,7 @@ function sendEmail($emailTo, $emailSubject, $emailBody, $altemailBody, SugarBean
         //now create email
         if (@$mail->Send()) {
             $emailObj->to_addrs= $emailTo;
-            $emailObj->type= 'archived';
+            $emailObj->type= 'out';
             $emailObj->deleted = '0';
             $emailObj->name = $mail->Subject;
             $emailObj->description = $mail->AltBody;

modules/AOW_Conditions/AOW_Condition.php

@@ -46,6 +46,7 @@ class AOW_Condition extends Basic {
 	var $modified_user_link;
 	var $aow_workflow_id;
 	var $condition_order;
+    var $module_path;
 	var $field;
 	var $operator;
 	var $value;

modules/AOW_Conditions/conditionLines.js

@@ -109,7 +109,7 @@ function showModuleField(ln, operator_value, type_value, field_value){
             success: function(result) {
                 document.getElementById('aow_conditions_fieldInput'+ln).innerHTML = result.responseText;
                 SUGAR.util.evalScript(result.responseText);
-                enableQS(false);
+                enableQS(true);
             },
             failure: function(result) {
                 document.getElementById('aow_conditions_fieldInput'+ln).innerHTML = '';

modules/AOW_Conditions/vardefs.php

@@ -68,6 +68,13 @@
     'enable_range_search' => false,
     'disable_num_format' => '',
   ),
+  'module_path' =>
+  array (
+    'name' => 'module_path',
+    'type' => 'longtext',
+    'vname' => 'LBL_MODULE_PATH',
+    'isnull' => true,
+  ),
   'field' => 
   array (
     'required' => false,

modules/AOW_Processed/vardefs.php

@@ -166,6 +166,11 @@
 	'relationships'=>array (
 ),
     'indices' => array(
+        array(
+            'name' => 'aow_processed_index_workflow',
+            'type' => 'index',
+            'fields' => array('aow_workflow_id','status','parent_id','deleted'),
+        ),
         array(
             'name' => 'aow_processed_index_status',
             'type' => 'index',