Skip to content

Commit

Permalink
Updated AOW
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattlorimer
mattlorimer committed Mar 14, 2014
1 parent 0cb10c3 commit 5ec143b
Show file tree
Hide file tree
Showing 21 changed files with 806 additions and 129 deletions.
2 changes: 1 addition & 1 deletion custom/Extension/application/Ext/Extensions/aow_workflow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
* @author SalesAgility <info@salesagility.com>
*/

$extensions["schedulers"] = array("section" => "aow_actions", "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
$extensions["aow"] = array("section" => "aow_actions", "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
4 changes: 3 additions & 1 deletion custom/Extension/application/Ext/Language/en_us.AdvancedOpenWorkflow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
$app_list_strings['aow_condition_operator_list']['OR'] = 'OR';
$app_list_strings['aow_condition_type_list']['Value'] = 'Value';
$app_list_strings['aow_condition_type_list']['Field'] = 'Field';
$app_list_strings['aow_condition_type_list']['Any_Change'] = 'Any Change';
$app_list_strings['aow_condition_type_list']['SecurityGroup'] = 'In SecurityGroup';
$app_list_strings['aow_condition_type_list']['Date'] = 'Date';
$app_list_strings['aow_condition_type_list']['Multi'] = 'Multiple';
$app_list_strings['aow_condition_type_list']['Multi'] = 'One of';
$app_list_strings['aow_action_type_list']['Value'] = 'Value';
$app_list_strings['aow_action_type_list']['Field'] = 'Field';
$app_list_strings['aow_action_type_list']['Date'] = 'Date';
Expand Down
31 changes: 31 additions & 0 deletions custom/Extension/application/Ext/LogicHooks/AOW_WorkFlow_Hook.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php
/**
* 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
* (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 <info@salesagility.com>
*/

if (!isset($hook_array) || !is_array($hook_array)) {
$hook_array = array();
}
if (!isset($hook_array['after_save']) || !is_array($hook_array['after_save'])) {
$hook_array['after_save'] = array();
}
$hook_array['after_save'][] = Array(99, 'AOW_Workflow', 'modules/AOW_WorkFlow/AOW_WorkFlow.php','AOW_WorkFlow', 'run_bean_flows');
3 changes: 2 additions & 1 deletion custom/application/Ext/Extensions/extensions.ext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
* @author SalesAgility <info@salesagility.com>
*/

$extensions["schedulers"] = array("section" => "aow_actions", "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
$extensions["aow"] = array("section" => "aow_actions", "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");

?>
123 changes: 116 additions & 7 deletions custom/application/Ext/Language/fr_FR.lang.ext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,122 @@
//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 <support@salesagility.com>
* French localisation by Patrick Lahaye : patrick.lahaye@axxone.fr - 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
Expand Down Expand Up @@ -85,11 +201,4 @@





$app_list_strings["moduleList"]["SecurityGroups"] = "Gestion des équipes";
$app_strings['LBL_LOGIN_AS'] = "Ouverture comme ";
$app_strings['LBL_LOGOUT_AS'] = "Déconnexion comme ";


?>
31 changes: 31 additions & 0 deletions custom/application/Ext/LogicHooks/logichooks.ext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,35 @@
$hook_array['after_save'] = array();
}
$hook_array['after_save'][] = array(1, 'fts', 'include/SugarSearchEngine/SugarSearchEngineQueueManager.php', 'SugarSearchEngineQueueManager', 'populateIndexQueue');

/**
* 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
* (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 <info@salesagility.com>
*/

if (!isset($hook_array) || !is_array($hook_array)) {
$hook_array = array();
}
if (!isset($hook_array['after_save']) || !is_array($hook_array['after_save'])) {
$hook_array['after_save'] = array();
}
$hook_array['after_save'][] = Array(99, 'AOW_Workflow', 'modules/AOW_WorkFlow/AOW_WorkFlow.php','AOW_WorkFlow', 'run_bean_flows');
?>
27 changes: 13 additions & 14 deletions custom/modules/EmailTemplates/EditView.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,18 @@
if(isset($focus->name)) $xtpl->assign("NAME", $focus->name); else $xtpl->assign("NAME", "");

//Bug45632
/* BEGIN - SECURITY GROUPS */
/**
if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id); else $xtpl->assign("ASSIGNED_USER_ID", "");
*/
if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
else if(empty($focus->id) && empty($focus->assigned_user_id)) {
global $current_user;
$xtpl->assign("ASSIGNED_USER_ID", $current_user->id);
$xtpl->assign("ASSIGNED_USER_NAME", get_assigned_user_name($current_user->id));
}
else $xtpl->assign("ASSIGNED_USER_ID", "");
/* END - SECURITY GROUPS */
//Bug45632

if(isset($focus->description)) $xtpl->assign("DESCRIPTION", $focus->description); else $xtpl->assign("DESCRIPTION", "");
Expand All @@ -164,7 +175,7 @@
$xtpl->assign("TEXTONLY_VALUE","0");
}

require_once("custom/modules/EmailTemplates/generatrfields.php");
require_once("custom/modules/EmailTemplates/templateFields.php");

$xtpl->assign("FIELD_DEFS_JS", generateFieldDefsJS2());
$xtpl->assign("LBL_CONTACT",$app_list_strings['moduleList']['Contacts']);
Expand Down Expand Up @@ -250,19 +261,7 @@
$xtpl->assign("DEFAULT_MODULE",'Contacts');
//$xtpl->assign("CAMPAIGN_POPUP_JS", '<script type="text/javascript" src="include/javascript/sugar_3.js"></script>');
} else {
$dropdown="<option value='Accounts'>
".$app_list_strings['moduleListSingular']['Accounts']."
</option>
<option value='Contacts'>
".$lblContactAndOthers."
</option>
<option value='Contacts'>
".$app_list_strings['moduleListSingular']['Users']."
</option>
<option value='FP_events'>
".$app_list_strings['moduleList']['FP_events']."
</option>";
$xtpl->assign("DROPDOWN",$dropdown);
$xtpl->assign("DROPDOWN",genDropDownJS2());
$xtpl->assign("DEFAULT_MODULE",'Accounts');
}
//// END CAMPAIGNS
Expand Down
Loading

0 comments on commit 5ec143b

Please sign in to comment.