';
$r.=' Taper une formule (ex 20*5.1) puis enter ';
var obj={id:sid,html:shtml,
- drag:true,style:'position:absolute;display:block;top:30px;left:150px;width:250px;border:1px solid black;background-color:#99b1df;font-size:12;padding: 2 2 2 2;'
+ drag:true,style:''
};
add_div(obj);
this.document.getElementById('inp').focus();
@@ -1024,6 +1024,7 @@ function save_predf_op(obj)
}
/**
*ctl_concern is the widget to update
+ *amount_id is either a html obj. or an amount
*/
function search_reconcile(dossier,ctl_concern,amount_id,ledger)
{
diff --git a/html/show_document_modele.php b/html/show_document_modele.php
index af7b2726f..3a45423cf 100644
--- a/html/show_document_modele.php
+++ b/html/show_document_modele.php
@@ -36,7 +36,7 @@ $User=new User($cn);
/*!\todo Add security here
*/
$User->Check();
-if ( $User->check_module("CFGDOCUMENT") == 0 ) exit();
+if ( $User->check_module("CFGDOC") == 0 ) exit();
// retrieve the document
$r=$cn->exec_sql("select md_id,md_lob,md_filename,md_mimetype
from document_modele where md_id=$1",array($_REQUEST['md_id']));
diff --git a/html/style.css b/html/style.css
index 007cdb522..61fd28ea4 100644
--- a/html/style.css
+++ b/html/style.css
@@ -714,7 +714,7 @@ div.autocomplete ul li {
/*height:32px;*/
cursor:pointer;
}
-span.informal{ font-size:12; }
+span.informal{ font-size:95%; color:black;}
ul.select_table {
/*padding:5px;*/
@@ -813,7 +813,7 @@ a#anchorbutton, .button, a.button,div.content a.button {
margin-top:3px;
cursor:pointer;
margin:1 2 1 2;
- -moz-border-radius:2 2;
+ -moz-border-radius:4 4;
}
a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover {
@@ -1041,11 +1041,28 @@ font-size:110%;
}
#close_div
{
- background-color:blue;
- color:white;
- text-decoration:none
+ background-color:white;
+ color:blue;
+ text-decoration:none;
+ border:1px solid blue;
+ margin-left: 2px;
+ margin-right:2px;
+ margin-top:2px;
+ font-size:10px;
}
table.table_large tr.odd ,table.table_large tr.even {
height:32px;
-}
\ No newline at end of file
+}
+#calc1
+{
+ position:absolute;
+ display:block;
+ top:30px;
+ left:150px;
+ width:300px;
+ border:1px solid black;
+ background-color:#aec3e8;
+ font-size:16;
+ padding: 20 20;
+}
diff --git a/include/constant.security.php b/include/constant.security.php
index d5d077db5..d45d29344 100644
--- a/include/constant.security.php
+++ b/include/constant.security.php
@@ -4,5 +4,6 @@ define ("FIC",805); //Création, modification et effacement de fiche
define ("FICCAT",910); //création, modification et effacement de catégorie de fiche
define ('RMDOC',1020); // Effacement de document pour follow up
define ('VIEWDOC',1010); // Voir document pour follow up
+define ('PARCATDOC',1050); // modifier type document pour follow up
global $audit; $audit=true;
?>
diff --git a/include/document_modele.inc.php b/include/document_modele.inc.php
index 37b1d452b..1d97f59c1 100644
--- a/include/document_modele.inc.php
+++ b/include/document_modele.inc.php
@@ -25,8 +25,7 @@
require_once("class_document_modele.php");
$sub_action=(isset ($_REQUEST['sa']))?$_REQUEST['sa']:"";
echo js_include('modele_document.js');
-
-echo "";
+echo '
';
// show the form for adding a template
//
$doc=new Document_modele($cn);
diff --git a/include/lettering.account.inc.php b/include/lettering.account.inc.php
index e729d4976..9e91d430b 100644
--- a/include/lettering.account.inc.php
+++ b/include/lettering.account.inc.php
@@ -36,7 +36,7 @@ echo '
';
$poste=new IPoste();
$poste->name="acc";
-$poste->table=1;
+$poste->table=0;
$poste->set_attribute('jrn',0);
$poste->set_attribute('gDossier',dossier::id());
$poste->set_attribute('ipopup','ipop_account');
diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php
index ee509fa85..bc415f5b2 100644
--- a/include/payment_middle.inc.php
+++ b/include/payment_middle.inc.php
@@ -101,10 +101,10 @@ if ($sb=='ins')
HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert');
echo $r;
echo HtmlInput::submit('insert',_('Enregistre'));
- echo '';
echo HtmlInput::button_anchor(_('Retour sans sauver'),
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac']
);
+ echo '';
exit();
}
diff --git a/include/periode.inc.php b/include/periode.inc.php
index d1560e197..f3ca20b11 100644
--- a/include/periode.inc.php
+++ b/include/periode.inc.php
@@ -38,7 +38,6 @@ if ($choose=='Valider') $choose='yes';
if ( isset ($_POST["add_per"] ))
{
- $g_user->can_request(PARPER,1);
extract($_POST);
$obj=new Periode($cn);
if ( $obj->insert($p_date_start,$p_date_end,$p_exercice) == 1 )
@@ -50,7 +49,6 @@ if ( isset ($_POST["add_per"] ))
}
if (isset($_POST['add_exercice']))
{
- $g_user->can_request(PARPER,1);
$obj=new Periode($cn);
$exercice=$cn->get_value('select max(p_exercice::float)+1 from parm_periode');
if ( $obj->insert_exercice($exercice) == 1 )
@@ -62,7 +60,6 @@ if (isset($_POST['add_exercice']))
}
if ( $action=="closed")
{
- $g_user->can_request(PARCLO);
$p_per=$_GET['p_per'];
$per=new Periode($cn);
$jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
@@ -74,7 +71,6 @@ if ( $action=="closed")
if ( $action== "delete_per" )
{
- $g_user->can_request(PARPER);
$p_per=$_GET["p_per"];
// Check if the periode is not used
if ( $cn->count_sql("select * from jrnx where j_tech_per=$p_per") != 0 )
@@ -89,7 +85,6 @@ if ( $action== "delete_per" )
}
if ( $action == 'reopen')
{
- $g_user->can_request(PARCLO);
$jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
$per=new Periode($cn);
$jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
diff --git a/include/profile.inc.php b/include/profile.inc.php
index b9f548d41..6ec61ce46 100644
--- a/include/profile.inc.php
+++ b/include/profile.inc.php
@@ -275,7 +275,7 @@ echo '';
echo '