[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 84/119: Merge extension-crm
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 84/119: Merge extension-crm |
Date: |
Mon, 26 Oct 2020 18:27:30 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit e78e40a99439e28cb2bbbbf6e77876ee8046875d
Merge: e583325 dd5b8c2
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Mon Oct 12 10:43:18 2020 +0200
Merge extension-crm
html/ajax_misc.php | 62 +---
html/do.php | 6 +-
html/export.php | 1 +
html/fid.php | 2 +-
html/fid_card.php | 4 +-
html/js/card.js | 160 +++++++++--
html/js/scripts.js | 79 ++++-
html/js/taggroup.js | 70 +++++
html/style-classic.css | 19 +-
html/style-classic7.css | 17 +-
html/style-light.css | 18 +-
include/action.common.inc.php | 52 ++--
include/action.inc.php | 11 +-
include/adm.inc.php | 2 +-
include/ajax/ajax_action_remove_concerned.php | 9 +-
include/ajax/ajax_action_save_concerned.php | 29 +-
include/ajax/ajax_add_concerned_card.php | 80 +++++-
include/ajax/ajax_anc_search.php | 2 +-
include/ajax/ajax_card.php | 118 +++++---
include/ajax/ajax_card_attribute.php | 103 +++++++
include/ajax/ajax_cfgaction.php | 82 ++++++
include/ajax/ajax_contact_option_list.php | 67 +++++
include/ajax/ajax_display_card_option.php | 44 +++
include/ajax/ajax_get_profile.php | 5 +-
include/ajax/ajax_save_card_option.php | 55 ++++
include/ajax/ajax_search_add_tag.php | 40 ++-
include/ajax/ajax_search_display_tag.php | 5 +-
include/ajax/ajax_search_operation.php | 3 +
include/ajax/ajax_tag_add_action.php | 21 +-
include/ajax/ajax_tag_detail.php | 6 +-
include/ajax/ajax_tag_group.php | 64 +++++
include/ajax/ajax_tag_list.php | 2 +-
include/ajax/ajax_tag_save.php | 2 +-
include/ajax/ajax_tag_set_group.php | 77 +++++
include/card_attr.inc.php | 150 +---------
include/cat_document.inc.php | 90 ------
.../ajax_tag_add_action.php => cfg_action.inc.php} | 44 ++-
include/cfgtags.inc.php | 81 ++++--
include/class/acc_ledger.class.php | 21 +-
include/class/acc_ledger_history_generic.class.php | 2 +-
include/class/acc_ledger_search.class.php | 3 +
include/class/acc_operation.class.php | 8 +-
.../class/action_document_type_mtable.class.php | 244 ++++++++++++++++
include/class/card_attribut_mtable.class.php | 199 +++++++++++++
include/class/card_multiple.class.php | 164 +++++++++++
include/class/contact_option_ref_mtable.class.php | 50 ++++
include/class/document.class.php | 62 +++-
include/class/document_option.class.php | 102 +++++++
include/class/document_type.class.php | 42 +--
include/class/extension.class.php | 6 +
include/class/fiche.class.php | 19 +-
include/class/fiche_attr.class.php | 317 +++++++--------------
include/class/follow_up.class.php | 169 +++--------
include/class/follow_up_detail.class.php | 16 +-
include/class/operation_predef_mtable.class.php | 9 +-
include/class/pre_op_advanced.class.php | 5 +-
include/class/profile_menu.class.php | 3 +-
include/class/tag.class.php | 11 +-
include/class/tag_group_mtable.class.php | 95 ++++++
include/class/user.class.php | 16 ++
include/compta_ach.inc.php | 3 +-
include/constant.php | 3 +-
include/constant.security.php | 1 +
include/contact_option_ref.inc.php | 58 ++++
include/database/attr_def_sql.class.php | 68 +++++
include/database/contact_option_ref_sql.class.php | 66 +++++
include/database/document_type_sql.class.php | 68 +++++
.../tag_group_sql.class.php} | 68 +++--
include/export/export_follow_up_contact_csv.php | 68 +++++
include/lib/function_javascript.php | 1 +
include/lib/html_input.class.php | 18 +-
include/lib/icard.class.php | 3 +-
include/lib/iconcerned.class.php | 98 ++++---
include/lib/inplace_switch.class.php | 9 +-
include/lib/input_switch.class.php | 15 +-
include/lib/manage_table_sql.class.php | 34 ++-
include/lib/message_javascript.php | 1 +
include/param_sec.inc.php | 71 +++--
include/sql/patch/upgrade144.sql | 188 ++++++++++++
include/sql/patch/upgrade145.sql | 33 +++
include/template/action_button.php | 30 +-
.../template/action_document_type_mtable_input.php | 123 ++++++++
include/template/action_search.php | 21 +-
include/template/card_multiple_display_option.php | 120 ++++++++
include/template/card_multiple_result.php | 51 ++++
include/template/card_result.php | 30 +-
include/template/detail-action.php | 161 +++--------
include/template/document_mod_change.php | 87 ------
include/template/follow_up_detail_display.php | 207 ++++++++++++++
include/template/param_jrn.php | 2 +-
include/template/predf_ledger_detail.php | 2 +-
include/template/security_list_action.php | 3 +-
include/template/tag_list.php | 14 +-
include/template/tag_search_select.php | 61 +++-
include/template/tag_select.php | 9 +-
scenario/HtmlInput.test.php | 8 +-
sql/upgrade.sql | 44 ---
unit-test/include/class/acc_ledger.Test.php | 65 +++--
98 files changed, 3848 insertions(+), 1309 deletions(-)
diff --cc html/js/scripts.js
index 7a469d6,f1658da..66c9c83
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@@ -3685,4 -3723,4 +3723,25 @@@ function json_concat(p_json1,p_json2
}
return result;
+ }
++
++/**
++ * return a json object which is the merge of the 2 json objects
++ * from 2015 : Object.assign(obj1, obj2);
++ * @param p_json1 object 1 to merge
++ * @param p_json2 object 2 to merge
++ * @returns new json object
++ */
++function json_concat(p_json1,p_json2)
++{
++
++ var result = {};
++ for (var key in p_json1) {
++ result[key] = p_json1[key];
++ }
++ for (var key in p_json2) {
++ result[key] = p_json2[key];
++ }
++ return result;
++
+}
diff --cc html/style-classic.css
index 6874bcb,f4ac0d3..e163c16
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@@ -2434,10 -2434,11 +2434,17 @@@ span.title_tab_row
color : white !important;
}
++p.info {
++ font-size:90%;
++ font-family: sans-serif;
++ font-style: italic;
++}
+
- /**
- * dialog box for adding, modifying predefined operation
- */
- #prdfop {
-
- }
+ /* Cell with tag */
+ span.tagcell {
+ border:1px solid darkgray;
+ padding:2px;margin:1px;
+ display: inline-block;
+ color:black;
+
-}
++}
diff --cc html/style-light.css
index 6474f1d,7fc3883..8384b90
--- a/html/style-light.css
+++ b/html/style-light.css
@@@ -2368,10 -2368,11 +2368,16 @@@ span.title_tab_row
color : white !important;
}
++p.info {
++ font-size:90%;
++ font-family: sans-serif;
++ font-style: italic;
++}
- /**
- * dialog box for adding, modifying predefined operation
- */
- #prdfop {
-
- }
+ /* Cell with tag */
+ span.tagcell {
+ border:1px solid blue;
+ padding:1px;margin:1px;
+ display: inline-block;
+ color:black;
-}
++}
- [Noalyss-commit] [noalyss] 72/119: Tag Limit column size , replace input_switch by check_box, (continued)
- [Noalyss-commit] [noalyss] 72/119: Tag Limit column size , replace input_switch by check_box, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 61/119: Search Card Paginate, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 64/119: InPlace_Switch : do not echo , return a string instead, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 68/119: Add new type of attribute : check, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 81/119: Search card :typo, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 90/119: select_box cosmetic font, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 92/119: Follow-Up create doc new Tags COMMENTS, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 93/119: Follow-up new column "Status", Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 98/119: Follow up add followup action, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 103/119: Improve : Quick filter on history, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 84/119: Merge extension-crm,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 96/119: Cosmetic, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 100/119: Notice, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 101/119: Grand livre waiting box, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 107/119: Follow-Up : comment optional, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 108/119: fix SQL bug, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 113/119: Bug : create card failed, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 112/119: Cosmetic Follow Up add waiting box for search, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 114/119: Cosmetic & version, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 115/119: Analytic accountancy protect against divide by zero, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 82/119: Follow up search card, add a button to select all , cosmetic add qcode in dialog box for contact option, Dany De Bontridder, 2020/10/26