diff --git a/doc/developper/Doxyfile b/doc/developper/Doxyfile
index f5af137b2..f2a201742 100644
--- a/doc/developper/Doxyfile
+++ b/doc/developper/Doxyfile
@@ -655,7 +655,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
-EXCLUDE = ../../html/addon ../../include/tfpdf
+EXCLUDE = ../../html/addon ../../include/tfpdf ../../unit-test
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/html/ajax.php b/html/ajax.php
index e8a9db99e..c56485e6b 100644
--- a/html/ajax.php
+++ b/html/ajax.php
@@ -41,7 +41,7 @@ if (isset($_REQUEST['plugin_code']) )
exit();
}
/* call the ajax script */
- require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->get_parameter('me_file'))).DIRECTORY_SEPARATOR.'ajax.php');
+ require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->getp('me_file'))).DIRECTORY_SEPARATOR.'ajax.php');
}
else
{
diff --git a/html/ajax_card.php b/html/ajax_card.php
index d1cd66f2d..3906c6e9c 100644
--- a/html/ajax_card.php
+++ b/html/ajax_card.php
@@ -53,7 +53,7 @@
* - ref if we want to refresh the window
*\see fiche fiche::Save constant.php
*/
-define ('ALLOWED',1);
+if ( ! defined('ALLOWED')) define ('ALLOWED',1);
require_once '../include/constant.php';
require_once('class_database.php');
@@ -94,6 +94,24 @@ $g_user=new User($cn);
$g_user->check(true);
$g_user->check_dossier($gDossier,true);
$html=var_export($_REQUEST,true);
+if ( LOGINPUT)
+ {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ fwrite ($file_loginput,"make_array($sql);
+ $array=$cn->get_array($sql);
$html=HtmlInput::title_box(_("Choix de la catégorie"), $ctl);
if ( empty($array))
@@ -269,22 +287,40 @@ case 'st':
else
{
$r='';
- $r.='
';
+ $r.='
';
$r.=_("Choississez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche").'
';
- $isel=new ISelect('fd_id');
- $isel->value=$array;
+
$r.='';
+ $r.='';
$html.=$r;
}
@@ -404,6 +440,7 @@ case 'ac':
*
*----------------------------------------------------------------------*/
$ipopup=str_replace('_content','',$ctl);
+ $msg="";$base="";
switch($cat)
{
case FICHE_TYPE_CLIENT:
@@ -418,9 +455,13 @@ case 'ac':
$msg=_(' d\'administration');
$base='';
break;
- case FICHE_TYPE_CONTACT:
- $msg=_(' de contacts');
- $base='';
+ case FICHE_TYPE_CONTACT:
+ $msg=_(' de contacts');
+ $base='';
+ case FICHE_TYPE_FIN:
+ $msg=_(' Banque');
+ $base=$cn->get_value("select p_value from parm_code where p_code='BANQUE'");
+
}
$html='';
@@ -514,13 +555,15 @@ case 'upc':
}
}
} // switch
-$html=escape_xml($html);
-
+$xml=escape_xml($html);
+if (DEBUG && headers_sent()) {
+ echo $html;return;
+}
header('Content-type: text/xml; charset=UTF-8');
echo <<
$ctl
-$html
+$xml
EOF;
diff --git a/html/ajax_history.php b/html/ajax_history.php
index cf2169e53..3ff482c67 100644
--- a/html/ajax_history.php
+++ b/html/ajax_history.php
@@ -23,6 +23,8 @@
* \brief show the history of a card of an accounting
* for the card f_id is set and for an accounting : pcm_val
*/
+if ( ! defined('ALLOWED')) define ('ALLOWED',1);
+
require_once '../include/constant.php';
require_once('class_database.php');
require_once('class_user.php');
@@ -33,7 +35,6 @@ require_once('class_acc_account.php');
require_once('class_exercice.php');
$div=$_REQUEST['div'];
mb_internal_encoding("UTF-8");
-define ('ALLOWED',1);
/**
*if $_SESSION['g_user'] is not set : echo a warning
@@ -46,7 +47,24 @@ $g_user=new User($cn);
if ( $g_user->check_dossier(dossier::id(),true) == 'X' ) exit();
$from_div = (isset($_REQUEST['ajax'])) ? 1 : $_GET['l'];
-
+if ( LOGINPUT)
+ {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ fwrite ($file_loginput,"
$div
-$html
+$xml
EOF;
diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php
index a28aa3ac6..a1ef7c46b 100644
--- a/html/ajax_ledger.php
+++ b/html/ajax_ledger.php
@@ -28,7 +28,8 @@
- for reconcialiation
- update of analytic content
*/
-define ('ALLOWED',1);
+if ( ! defined('ALLOWED')) define ('ALLOWED',1);
+
require_once '../include/constant.php';
require_once('class_database.php');
require_once('class_user.php');
@@ -63,7 +64,24 @@ ajax_disconnected($div);
$cn=new Database(dossier::id());
$g_parameter=new Own($cn);
-
+if ( LOGINPUT)
+ {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ fwrite ($file_loginput,"
@@ -493,6 +511,12 @@ case 'save':
//////////////////////////////////////////////////////////////////
$op->save_info($_POST['OTHER'],'OTHER');
$op->save_info($_POST['BON_COMMANDE'],'BON_COMMANDE');
+ ///////////////////////////////////////////////////////////////////
+ // Save related
+ //////////////////////////////////////////////////////////////////
+ $related=HtmlInput::default_value_post("related", "0");
+ if ($related == "0" ) throw new Exception('Parameter not send -> related'.__FILE__.__LINE__,10);
+ $op->insert_related_action($related);
}
echo _('Opération sauvée');
@@ -556,8 +580,9 @@ case 'reverseop':
break;
}
$html=escape_xml($html);
-header('Content-type: text/xml; charset=UTF-8');
-echo <<
$div
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 57119fb76..4be9f87c6 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -34,7 +34,8 @@
* dl : display form to modify, add and delete lettering for a given operation
*
*/
-define ('ALLOWED',1);
+if ( ! defined('ALLOWED')) define ('ALLOWED',1);
+
require_once '../include/constant.php';
require_once('class_database.php');
require_once ('class_fiche.php');
@@ -69,6 +70,24 @@ if ($gDossier<>0) {
}
$html = var_export($_REQUEST, true);
+if ( LOGINPUT)
+ {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ fwrite ($file_loginput,"Check();
if ($g_user->check_dossier(dossier::id()) == 'X') exit();
$xml="";
-
+if ( LOGINPUT)
+ {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ fwrite ($file_loginput,"exist_table('version') == false)
{
echo '' . _("Base de donnée invalide") . '
';
$base = dirname($_SERVER['REQUEST_URI']);
- echo HtmlInput::button_anchor('Retour', $base . '/user_login.php');
+ echo HtmlInput::button_anchor('Retour', $base . '/user_login.php');
exit();
}
if (DBVERSION < dossier::get_version($cn))
@@ -150,11 +150,34 @@ if ( isset ($_POST['set_preference'])) {
$_SESSION['g_pagesize']=$p_size;
$_SESSION['g_lang']=$lang;
}
+
/*
* if an action is requested
*/
if (isset($_REQUEST['ac']))
{
+ // When debugging save all the input in a file
+ if ( LOGINPUT)
+ {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ $tmp_ac=explode('/',trim(strtoupper($_REQUEST['ac'])));
+ $last=count($tmp_ac);
+ if ($last > 0) $last--;
+ fwrite ($file_loginput,"search($_REQUEST['plugin_code']) != -1 )
exit();
}
/* call the ajax script */
- require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->get_parameter('me_file'))).DIRECTORY_SEPARATOR.'raw.php');
+ require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->getp('me_file'))).DIRECTORY_SEPARATOR.'raw.php');
}
else
{
diff --git a/html/index.php b/html/index.php
index a71fc7705..d25d78c48 100644
--- a/html/index.php
+++ b/html/index.php
@@ -203,7 +203,7 @@ if ( strlen(domaine) > 0 )
echo '
-version 6.7.2.1 - '.$my_domain.'
+version 6.7.2.3 - '.$my_domain.'
diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index cc9b0ac24..849b739e5 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -645,8 +645,6 @@ function view_history_account(p_value,dossier)
{
success_box(req,xml);
g(id).style.top=calcy(140+(layer*3))+"px";
- g(id).style.left="10%";
- g(id).style.width='80%';
}
}
);
@@ -667,8 +665,6 @@ function update_history_account(obj)
{
success_box(req,xml);
g(obj.div).style.top=calcy(140+(layer*3))+"px";
- g(obj.div).style.left="10%";
- g(obj.div).style.width='80%';
}
});
} catch (e)
@@ -703,8 +699,6 @@ var popup={'id':
{
success_box(req,xml);
g(id).style.top=calcy(140+(layer*3))+"px";
- g(id).style.left="10%";
- g(id).style.width='80%';
}
}
);
@@ -724,8 +718,6 @@ function update_history_card(obj)
{
success_box(req,xml);
g(obj.div).style.top=calcy(140+(layer*3))+"px";
- g(obj.div).style.left="10%";
- g(obj.div).style.width='80%';
}
});
} catch (e)
@@ -804,8 +796,6 @@ function modifyOperation(p_value, dossier)
success_box(xml, txt);
$(id).style.position="absolute";
$(id).style.top = calcy(100 + (layer * 3))+"px";
- g(id).style.left = '10%';
- g(id).style.width = "80%";
}
}
);
@@ -994,8 +984,8 @@ function op_save(obj)
parameters:queryString,
onFailure:null,
onSuccess:infodiv
- }
- );
+ }
+ );
}
return false;
} catch (e)
diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js
index 39c6c5340..ea71d9de2 100644
--- a/html/js/accounting_item.js
+++ b/html/js/accounting_item.js
@@ -39,17 +39,37 @@ function set_jrn_parent(p_ctl,p_value)
f.value+=p_value;
}
}
+/**
+ * Display a box with accounting detail for update, delete or add
+ * @param {type} p_value pcmn_val
+ * @param {type} p_lib pcmn_lib
+ * @param {type} p_parent pcmn_val_parent
+ * @param {type} p_type pcmn_val_type
+ * @param {type} p_dossier gDossier
+ * @param {type} p_top position of the box
+ * @param {type} p_action = new | update | delete
+ * @returns {undefined}
+ */
-
-function PcmnUpdate(p_value,p_lib,p_parent,p_type,p_dossier)
+function PcmnUpdate(p_value,p_lib,p_parent,p_type,p_dossier,p_top,p_action)
{
+ console.log(p_type);
$('p_valu').value=p_value;
$('p_oldu').value=p_value;
$('p_libu').value=p_lib;
$('p_parentu').value=p_parent;
$('p_typeu').value=p_type;
- $('acc_update').style.top=posY+offsetY+"px";
- $('acc_update').style.left=posX+offsetX+"px";
+ var i=0;
+ for (i=0;i < $('p_typeu').options.length;i++) {
+ if ($('p_typeu').options[i].value== p_type) {$('p_typeu').options.selectedIndex= i; break; }
+ }
+ $('p_typeu').options.selectedIndex=p_type;
+ $('acc_update').style.top=(posY+offsetY+p_top)+"px";
+ $('acc_update').style.left="10%";
+ $('acc_update').style.width="80%";
+ $('acc_update_info').innerHTML="";
+ $('p_action').value=p_action;
+ $('delete_acc').checked=false;
$('acc_update').show();
}
/**
@@ -248,3 +268,95 @@ function errorPoste()
{
alert('Ajax failed');
}
+function pausecomp(millis)
+ {
+ var date = new Date();
+ var curDate = null;
+ do { curDate = new Date(); }
+ while(curDate-date < millis);
+}
+/**
+ * Update an accounting with the information in the form, called frmo
+ * param_pcmn.inc.php
+ * @param {type} p_obj_id id of the form
+ * @returns false
+ */
+function account_update(p_obj_id)
+{
+ try {
+ waiting_box();
+ console.log('call account_update');
+ // initialize variables
+ var gDossier=0;
+ var p_action="";
+ var p_oldu=-1;
+ var p_valu="";
+ var p_libu="";
+ var p_parentu="";
+ var form=$('acc_update_frm_id');
+ var notfound="not found:";
+ var p_typeu=-1;
+ // get them
+ if ( form['gDossier']) { gDossier=form['gDossier'].value;}else { notfound+='gDossier';}
+ if ( form['p_action']) { action=form['p_action'].value;}else { notfound+=', p_action ';}
+ if ( form['p_oldu']) { p_oldu=form['p_oldu'].value;}else { notfound+=', p_oldu';}
+ if ( form['p_valu']) { p_valu=form['p_valu'].value;}else { notfound+=', p_valu';}
+ if ( form['p_libu']) { p_libu=form['p_libu'].value;}else { notfound+=', p_libu ';}
+ if ( form['p_parentu']) { p_parentu=form['p_parentu'].value;}else { notfound+='p_parentu';}
+ if ( form['delete_acc']) {
+ if (form['delete_acc'].checked) { acc_delete=1;} else {acc_delete=0} }
+ else {
+ notfound += ', delete_acc';
+ }
+ if ( form['p_typeu']) { p_typeu=form['p_typeu'].value;} else { notfound+=", p_typeu";}
+
+ console.log (notfound);
+
+ if ( notfound != "not found:") throw notfound;
+
+ var queryString = "op=account_update" + "&gDossier=" + gDossier+ "&action=" + action + "&p_oldu=" + p_oldu+"&p_valu="+p_valu+"&p_libu="+p_libu+"&p_parentu="+p_parentu+"&acc_delete="+acc_delete+"&p_typeu="+p_typeu;
+ var ajax_action = new Ajax.Request(
+ "ajax_misc.php",
+ {
+ method: 'get',
+ parameters: queryString,
+ onFailure: error_box,
+ onSuccess: function(req, json) {
+ try
+ {
+ var name_ctl = 'acc_update_info';
+ var answer = req.responseXML;
+ remove_waiting_box();
+ var html = answer.getElementsByTagName('code');
+ var ctl = answer.getElementsByTagName('ctl')[0].textContent;
+ if (html.length == 0) {
+ var rec = req.responseText;
+ alert('erreur :' + rec);
+ }
+ console.log("ctl ");console.log(ctl);
+ console.log('Received ajax_call');
+ var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096 car.
+ code_html = unescape_xml(code_html);
+ console.log(code_html);
+
+ $(name_ctl).innerHTML = code_html;
+ if ( ctl == 'ok') {
+ window.location.reload();
+ }
+ } catch (e)
+ {
+ error_message(e.message);
+ return false;
+ }
+ }
+ }
+
+ );
+
+ }catch (e) {
+ if (console) { console.log('Account update'); }
+ return false;
+ }
+ return false;
+}
+
\ No newline at end of file
diff --git a/html/js/anc_script.js b/html/js/anc_script.js
index efef19707..a4887a98f 100644
--- a/html/js/anc_script.js
+++ b/html/js/anc_script.js
@@ -106,8 +106,8 @@ function anc_refresh_remain(p_table, p_seq)
var tot_table = compute_total_table(p_table, p_seq);
var remain = tot_line - tot_table;
remain = Math.round(remain * 100) / 100;
- var popup_table = p_table.toString();
- p_table = popup_table.replace("popup", "");
+ // var popup_table = p_table.toString();
+// p_table = popup_table.replace("popup", "");
$('remain' + p_table).innerHTML = remain;
if (remain == 0)
{
@@ -432,19 +432,13 @@ function anc_key_compute(p_dossier, p_table, p_amount, p_key_id)
* @param p_amount amount to distribute
* @param p_ledger
*/
-function anc_key_choice(p_dossier, p_table, p_amount)
+function anc_key_choice(p_dossier, p_table, p_amount,p_ledger)
{
waiting_box();
var op = 'op=anc_key_choice';
var queryString = op + "&gDossier=" + p_dossier + "&t=" + p_table + "&amount=" + p_amount;
try {
- var ledger=$('p_jrn');
- if (ledger == null ) {
- error_message('error : ledger is null ');
- return;
- }
-
- queryString+='&led='+ledger.value;
+ queryString+='&led='+p_ledger;
var action = new Ajax.Request(
"ajax_misc.php",
{
@@ -467,7 +461,8 @@ function anc_key_choice(p_dossier, p_table, p_amount)
var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096 car.
code_html = unescape_xml(code_html);
console.log(code_html);
- add_div({id: name_ctl, cssclass: 'inner_box', style: 'top:30%;right:35%;position:absolute', drag: 1});
+ var position=fixed_position(50,120);
+ add_div({id: name_ctl, cssclass: 'inner_box', style: position, drag: 1});
$(name_ctl).innerHTML = code_html;
} catch (e)
{
diff --git a/html/js/card.js b/html/js/card.js
index a70073201..166dabd4c 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -439,14 +439,14 @@ function select_card_type(obj)
var sx=0;
if ( window.scrollY)
{
- sx=window.scrollY+40;
+ sx=window.scrollY+160;
}
else
{
- sx=document.body.scrollTop+60;
+ sx=document.body.scrollTop+160;
}
- var str_style="top:"+sx+"px;left:25%;height:30%";
+ var str_style="top:"+sx+"px;height:auto";
waiting_box();
var popup={'id': content,'cssclass':'inner_box','style':str_style,'html':"",'drag':true};
@@ -510,7 +510,7 @@ function dis_blank_card(obj)
ref='&ref';
}
var content='div_new_card';
- var nTop=calcy(30);
+ var nTop=calcy(150);
var nLeft=posX;
var str_style="top:"+nTop+"px;right:"+nLeft+"px;height:auto";
diff --git a/html/js/gestion.js b/html/js/gestion.js
index 3448612d9..4fcfc2a07 100644
--- a/html/js/gestion.js
+++ b/html/js/gestion.js
@@ -79,7 +79,7 @@ function update_document(p_dossier,p_id)
*/
function remove_operation(p_dossier,p_id)
{
- queryString="gDossier="+p_dossier+"&a=rmop&id="+p_id;
+ var queryString="gDossier="+p_dossier+"&a=rmop&id="+p_id;
var action=new Ajax.Request (
"show_document.php",
{
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 37c4cc740..2c7f8f7e9 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -772,9 +772,7 @@ function success_box(req, json)
g(name_ctl).innerHTML = code_html;
g(name_ctl).style.height = 'auto';
- if (name_ctl != 'popup')
- g(name_ctl).style.width = '60%';
- else
+ if (name_ctl == 'popup')
g(name_ctl).style.width = 'auto';
}
catch (e)
@@ -1373,7 +1371,7 @@ function mod_menu(gdossier, pm_id)
waiting_box();
removeDiv('divdm' + pm_id);
var qs = "op=det_menu&gDossier=" + gdossier + "&pm_id=" + pm_id + "&ctl=divdm" + pm_id;
- var pos = fixed_position(250, 150);
+ var pos = fixed_position(50, 250);
var action = new Ajax.Request('ajax_misc.php',
{
method: 'get',
@@ -1575,7 +1573,6 @@ function search_action(dossier, ctl_concern)
var target = "search_action_div";
removeDiv(target);
var str_style = fixed_position(77, 99);
- str_style += ";width:80%";
var div = {id: target, cssclass: 'inner_box', style: str_style, html: loading(), drag: 1};
@@ -1682,7 +1679,7 @@ function stock_repo_change(p_dossier, r_id)
var queryString = "gDossier=" + p_dossier + "&op=mod_stock_repo" + "&r_id=" + r_id;
var nTop = calcy(posY);
var nLeft = "200px";
- var str_style = "top:" + nTop + "px;left:" + nLeft + ";width:50em;height:auto";
+ var str_style = "top:" + nTop + "px;left:" + nLeft + ";height:auto";
removeDiv('change_stock_repo_div');
waiting_box();
@@ -1705,7 +1702,7 @@ function stock_inv_detail(p_dossier, p_id)
var queryString = "gDossier=" + p_dossier + "&op=view_mod_stock" + "&c_id=" + p_id + "&ctl=view_mod_stock_div";
var nTop = calcy(posY);
var nLeft = "200px";
- var str_style = "top:" + nTop + "px;left:" + nLeft + ";width:75%;";
+ var str_style = "top:" + nTop + "px;left:" + nLeft + ";";
removeDiv('view_mod_stock_div');
waiting_box();
@@ -1894,7 +1891,8 @@ function filter_table(phrase, _id, colnr, start_row) {
aCol[0] = colnr;
}
var ele;
-
+ var tot_found=0;
+
for (var r = start_row; r < table.rows.length; r++) {
var found = 0;
for (var col = 0; col < aCol.length; col++)
@@ -1911,6 +1909,7 @@ function filter_table(phrase, _id, colnr, start_row) {
}
if (found === 1) {
+ tot_found++;
table.rows[r].style.display = '';
} else {
table.rows[r].style.display = 'none';
@@ -1918,6 +1917,15 @@ function filter_table(phrase, _id, colnr, start_row) {
$('info_div').style.display = "none";
$('info_div').innerHTML = "";
}
+ if (tot_found == 0) {
+ if ($('info_'+_id)) {
+ $('info_'+_id).innerHTML=" Aucun résultat ";
+ }
+ } else {
+ if ($('info_'+_id)) {
+ $('info_'+_id).innerHTML=" ";
+ }
+ }
}
/**
* @brief
@@ -2231,9 +2239,9 @@ function action_tag_select(p_dossier, ag_id)
}
var code_html = getNodeText(html[0]);
code_html = unescape_xml(code_html);
- add_div({id: 'tag_div', style: '', cssclass: 'inner_box', drag: 1});
- $('tag_div').style.top = (posY - 70)+"px";
- $('tag_div').style.left = (posX - 70)+"px";
+ pos=fixed_position(35,229 );
+ add_div({id: 'tag_div', style: pos, cssclass: 'inner_box tag', drag: 1});
+
remove_waiting_box();
$('tag_div').innerHTML = code_html;
}
@@ -2443,6 +2451,13 @@ function action_show_checkbox()
a[i].style.display = 'block';
}
}
+function action_hide_checkbox()
+{
+ var a = document.getElementsByName('ag_id_td');
+ for (var i = 0; i < a.length; i++) {
+ a[i].style.display = 'none';
+ }
+}
/**
*
* @param {type} obj
@@ -2542,4 +2557,64 @@ function show_description(p_id)
$('print_desc'+p_id).hide();
$('input_desc'+p_id).show();
+}
+/**
+ * Hightlight the row we select and restore previous one
+ * @param {type} x
+ * @returns {undefined}
+ */
+var old_class = null;
+var old_select = null;
+
+function select_cat(x)
+{
+ if (old_select != null)
+ {
+ $(old_select).className = old_class;
+ }
+ old_select = $('select_cat_row_' + x);
+ old_class = old_select.className;
+ $(old_select).className = "highlight";
+ $('fd_id').value = x;
+}
+/**
+ * Show the DIV and hide the other, the array of possible DIV are
+ * in a_tabs,
+ * @param {array} a_tabs name of possible tabs
+ * @param {strng} p_display_tab tab to display
+ */
+function show_tabs(a_tabs,p_display_tab)
+{
+ try
+ {
+ if ( a_tabs.length == 0 ) trow ('a_tabs in empty');
+ var i=0;
+ for ( i=0;i\n"
"Language-Team: American English \n"
"Language: en_US\n"
@@ -197,17 +197,24 @@ msgid "%s Vous avez ajouté %d mois depuis le %d/%d pour l'exercice %d "
msgstr "You have added% s% d months since% d /% d% d for the year"
#: include/class_acc_ledger.php:3234 include/class_acc_ledger.php:3303
+#: include/class_acc_ledger.php:3302
msgid "'Journaux Financier"
msgstr "Financial"
#: include/class_acc_ledger.php:3235 include/class_acc_ledger.php:3304
+#: include/class_acc_ledger.php:3303
msgid "'Journaux d'Opérations diverses"
msgstr "Miscellaneous ledger"
#: include/class_acc_ledger.php:3233 include/class_acc_ledger.php:3302
+#: include/class_acc_ledger.php:3301
msgid "'Journaux d'achat"
msgstr "Purchase ledgers"
+#: include/impress_rapport.inc.php:248
+msgid "1 mois"
+msgstr "1 month"
+
#: include/impress_bilan.inc.php:89
msgid ""
" Attention : si le bilan n'est pas équilibré.
"
@@ -313,6 +320,7 @@ msgid "Action interdite"
msgstr "Forbidden"
#: include/class_acc_ledger.php:3684 include/class_acc_ledger.php:3768
+#: include/class_acc_ledger.php:3767
msgid "Action non accessible"
msgstr "Folder not available"
@@ -667,6 +675,32 @@ msgstr "Warning : it is preferable to use card than accounting"
msgid "Attention : il y a %d enregistrements incorrects "
msgstr "Attention:% d records incorrect"
+#: include/impress_bilan.inc.php:65
+msgid ""
+"Attention : si le bilan n'est pas équilibré.
Vérifiez \n"
+" - L'affectation du résultat est fait
\n"
+" - Vos comptes actifs ont un solde débiteur (sauf les comptes dit "
+"inversés)
\n"
+" - les comptes passifs ont un solde créditeur (sauf les comptes dit "
+"inversés)
\n"
+"
\n"
+" Utilisez la balance des comptes pour vérifier."
+msgstr ""
+"Attention : if the outcome is not balanced
check "
+"\n"
+"- You allocate the results
\n"
+"- The asset has a saldo on debit (except the reverse accounting)
\n"
+"- The liability has a saldo on credit(except the reverse accounting) "
+"li>\n"
+"
\n"
+"Use the balance of accouting to check"
+
+#: include/impress_rapport.inc.php:257
+msgid ""
+"Attention : vous ne pouvez pas utiliser les étapes avec les dates "
+"calendriers."
+msgstr "Warning : you cannot use step with the calendar"
+
#: include/class_acc_ledger_purchase.php:1484
#: include/class_acc_ledger_sold.php:755
msgid "Attention Différence entre TVA calculée et donnée"
@@ -735,6 +769,8 @@ msgstr "No VAT code corresponds to the rate"
#: include/class_acc_ledger.php:3416 include/class_acc_ledger.php:3461
#: include/class_acc_ledger.php:3594 include/class_acc_ledger.php:3486
#: include/class_acc_ledger.php:3531 include/class_acc_ledger.php:3678
+#: include/class_acc_ledger.php:3485 include/class_acc_ledger.php:3530
+#: include/class_acc_ledger.php:3677
msgid "Aucun compte en banque n'est donné"
msgstr "No bank account given"
@@ -765,7 +801,7 @@ msgstr "No file"
msgid "Aucun fichier donné"
msgstr "Any given file"
-#: include/balance.inc.php:101
+#: include/balance.inc.php:101 include/balance.inc.php:102
msgid "Aucun filtre, tous les journaux"
msgstr "No filter, all ledgers"
@@ -927,7 +963,7 @@ msgstr "Other info"
msgid "Autres actions"
msgstr "atiAdd Action"
-#: include/database.item.php:117
+#: include/database.item.php:117 include/balance.inc.php:86
msgid "Avancé"
msgstr "Advanced"
@@ -959,7 +995,7 @@ msgstr "Date for every operation"
msgid "Avec date opérations"
msgstr "with date of operation "
-#: include/balance.inc.php:172
+#: include/balance.inc.php:172 include/balance.inc.php:173
msgid "Avec la balance de l'année précédente"
msgstr "With the balance of previous year"
@@ -1096,10 +1132,15 @@ msgstr "calculator"
#: include/template/dashboard.php:9 include/ajax_calendar_zoom.php:23
#: include/class_html_input.php:779 include/template/dashboard.php:6
-#: include/class_html_input.php:796
+#: include/class_html_input.php:796 include/impress_rapport.inc.php:209
msgid "Calendrier"
msgstr "Calendar"
+#: include/impress_rapport.inc.php:240
+#, fuzzy
+msgid "Calendrier depuis :"
+msgstr "Calendar"
+
#: include/template/impress_cat_card.php:6 include/ajax_boxcard_search.php:57
msgid "Categorie"
msgstr "Category"
@@ -1249,6 +1290,11 @@ msgstr "Expenses"
msgid "Chemin"
msgstr "Path"
+#: include/fiche.inc.php:91
+#, fuzzy
+msgid "Chercher"
+msgstr "Search"
+
#: html/ajax_misc.php:190
msgid "Choississez la TVA "
msgstr "Select the VAT"
@@ -1258,8 +1304,15 @@ msgid ""
"Choississez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche"
msgstr "Choose the category of card"
+#: include/impress_rapport.inc.php:203
+#, fuzzy
+msgid "Choississez le rapport"
+msgstr "Select the VAT"
+
#: include/balance.inc.php:45 include/impress_bilan.inc.php:48
#: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
+#: include/balance.inc.php:47 include/impress_bilan.inc.php:51
+#: include/impress_jrn.inc.php:86
msgid "Choississez un autre exercice"
msgstr "Choose another year"
@@ -1748,7 +1801,7 @@ msgid "Credit"
msgstr "Credit"
#: include/class_acc_ledger.php:3280 include/user_menu.php:51
-#: include/class_acc_ledger.php:3349
+#: include/class_acc_ledger.php:3349 include/class_acc_ledger.php:3348
msgid "Création"
msgstr "Creation"
@@ -1840,6 +1893,7 @@ msgstr "Credit"
#: include/ext/coprop/include/lot.inc.php:34 include/class_acc_ledger.php:1583
#: include/class_acc_ledger.php:3563 include/fiche.inc.php:113
#: include/ext/coprop/include/class_copro_budget.php:134
+#: include/class_acc_ledger.php:3562
msgid "Créer une nouvelle fiche"
msgstr "Add a new card"
@@ -2035,7 +2089,7 @@ msgstr "Disconnect"
#: include/class_acc_bilan.php:70 include/impress_gl_comptes.inc.php:62
#: include/impress_poste.inc.php:93 include/template/impress_cat_card.php:14
-#: include/class_anc_print.php:146
+#: include/class_anc_print.php:146 include/balance.inc.php:75
msgid "Depuis"
msgstr "From"
@@ -2768,6 +2822,10 @@ msgstr "Step"
msgid "Etape 1/3"
msgstr "Step 1/3"
+#: include/impress_bilan.inc.php:82
+msgid "Etape 2 :Impression"
+msgstr "Step 2 : printing"
+
#: include/ext/transform/include/intervat_listing_assujetti_step_2.inc.php:266
msgid "Etape 2/3"
msgstr "Step 2/3"
@@ -2806,7 +2864,8 @@ msgid "Exclure Etat"
msgstr "Exclude State"
#: include/ext/tools/index.php:43 include/bank.inc.php:73
-#: include/template/stock_state_search.php:35
+#: include/template/stock_state_search.php:35 include/impress_bilan.inc.php:49
+#: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
msgid "Exercice"
msgstr "Exercise"
@@ -3091,7 +3150,7 @@ msgstr "File to include (from the folder \"include\")"
#: include/ext/amortis/include/template/listing_histo.php:10
#: include/ajax_boxcard_search.php:46
#: include/template/result_cat_card_summary.php:5 include/menu.inc.php:150
-#: html/user_login.php:165
+#: html/user_login.php:165 include/balance.inc.php:280
msgid "Filtre"
msgstr "Filter"
@@ -3117,11 +3176,11 @@ msgstr "Filter"
msgid "Filtrer par "
msgstr "Filter by"
-#: include/balance.inc.php:109
+#: include/balance.inc.php:109 include/balance.inc.php:110
msgid "Filtré par catégorie"
msgstr "Filter on category"
-#: include/balance.inc.php:104
+#: include/balance.inc.php:104 include/balance.inc.php:105
msgid "Filtré par journal"
msgstr "filter on ledger"
@@ -3559,6 +3618,7 @@ msgid "Importer ce rapport"
msgstr "Import this report"
#: include/class_acc_ledger.php:3611 include/class_acc_ledger.php:3695
+#: include/class_acc_ledger.php:3694
msgid "Impossible d'effacer un journal qui contient des opérations"
msgstr "It is not possible to remove this ledger.It is still in use"
@@ -3711,6 +3771,7 @@ msgid "Journal inexistant"
msgstr "No existent ledger"
#: include/class_acc_ledger.php:3305 include/class_acc_ledger.php:3374
+#: include/class_acc_ledger.php:3373
msgid "Journal n'existe pas"
msgstr "The ledger does not exist"
@@ -3719,6 +3780,7 @@ msgid "Journaux"
msgstr "Ledgers"
#: include/class_acc_ledger.php:3232 include/class_acc_ledger.php:3301
+#: include/class_acc_ledger.php:3300
msgid "Journaux de vente"
msgstr "Ledger of sales"
@@ -3838,6 +3900,10 @@ msgstr "Reading"
msgid "Les 2"
msgstr "Both"
+#: include/impress_rapport.inc.php:259
+msgid "Les clauses FROM sont ignorés avec les dates calendriers"
+msgstr "statement FROM are ignored if you use calendar"
+
#: include/class_anc_print.php:120
msgid "Les dates sont en format DD.MM.YYYY"
msgstr "The date formats are DD.MM.YYYY"
@@ -4133,6 +4199,7 @@ msgstr "Update plugin, could you check the parameter setting?"
#: include/class_acc_ledger_purchase.php:1689
#: include/class_acc_ledger_sold.php:954 include/history_operation.inc.php:140
+#: include/history_operation.inc.php:141
msgid "Mise à jour paiement"
msgstr "Update payment"
@@ -4185,7 +4252,7 @@ msgstr "Change the document type"
#: include/ajax_mod_periode.php:49 include/ajax_mod_periode.php:75
msgid "Modifier les dates de début et fin de période"
-msgstr ""
+msgstr "Modify start and end date"
#: include/forecast.inc.php:360
msgid "Modifier nom ou catégories"
@@ -4346,7 +4413,7 @@ msgid "Montant initial"
msgstr "Initial amount"
#: include/ext/amortis/include/class_am_card.php:179
-#: include/class_acc_compute.php:194
+#: include/class_acc_compute.php:194 include/class_acc_compute.php:195
msgid "Montant invalide"
msgstr "Invalid amount"
@@ -4443,15 +4510,15 @@ msgstr "Can not save"
msgid "Ne remplissez pas s'il n'y a pas de mandataire"
msgstr "Do not complete if there is no representative"
-#: include/balance.inc.php:128
+#: include/balance.inc.php:128 include/balance.inc.php:129
msgid "Niveau 1"
msgstr "Level 1"
-#: include/balance.inc.php:129
+#: include/balance.inc.php:129 include/balance.inc.php:130
msgid "Niveau 2"
msgstr "level 2"
-#: include/balance.inc.php:130
+#: include/balance.inc.php:130 include/balance.inc.php:131
msgid "Niveau 3"
msgstr "Level 3"
@@ -4553,6 +4620,7 @@ msgid "Nombre d'unité"
msgstr "Number of unit"
#: include/class_acc_ledger.php:3406 include/class_acc_ledger.php:3476
+#: include/class_acc_ledger.php:3475
msgid "Nombre de ligne incorrect"
msgstr "Number of incorrect rows"
@@ -4952,6 +5020,16 @@ msgstr "Display order"
msgid "Oui"
msgstr "yes"
+#: include/class_acc_bilan.php:635
+#, fuzzy
+msgid "Ouverture fichier impossible"
+msgstr "Error opening file"
+
+#: include/impress_rapport.inc.php:208
+#, fuzzy
+msgid "Période comptable"
+msgstr "Accounting period"
+
#: include/class_acc_ledger.php:211 include/class_acc_ledger.php:210
msgid "PERIODE FERMEE"
msgstr "Close period"
@@ -5032,6 +5110,11 @@ msgstr "Per file"
msgid "Par gérant ou administrateur"
msgstr "By the manager or administrator"
+#: include/impress_rapport.inc.php:251
+#, fuzzy
+msgid "Par étape de"
+msgstr "Per year"
+
#: html/ajax_card.php:106
msgid "Parametre ad_id est invalide"
msgstr "Invalid parameter"
@@ -5096,6 +5179,10 @@ msgstr "No access"
msgid "Pas d'anomalie détectée"
msgstr "Correct"
+#: include/impress_rapport.inc.php:247
+msgid "Pas d'étape"
+msgstr "No step"
+
#: include/ext/invoicing/include/invoice_send_mail.inc.php:75
#: include/ext/invoicing/include/invoice_send_mail.inc.php:80
#: include/ext/invoicing/include/invoice_send_mail.inc.php:103
@@ -5133,6 +5220,7 @@ msgid "Payé"
msgstr "Paid"
#: include/class_acc_ledger.php:3478 include/class_acc_ledger.php:3548
+#: include/class_acc_ledger.php:3547
msgid "Payé par"
msgstr "Paid by"
@@ -5180,7 +5268,7 @@ msgstr "Receipt"
msgid "Pièces attachées"
msgstr "Attachment"
-#: include/balance.inc.php:162
+#: include/balance.inc.php:162 include/balance.inc.php:163
msgid "Plage de postes"
msgstr "Range accounting"
@@ -6244,7 +6332,7 @@ msgstr "Total Debit"
msgid "Total lettré"
msgstr "Total of lettered"
-#: include/balance.inc.php:334
+#: include/balance.inc.php:334 include/balance.inc.php:336
msgid "Total niveau"
msgstr "Total level"
@@ -6266,7 +6354,7 @@ msgstr "Actual total"
msgid "Totaux"
msgstr "Total"
-#: include/balance.inc.php:111
+#: include/balance.inc.php:111 include/balance.inc.php:112
msgid "Totaux par sous-niveaux"
msgstr "Subtotal"
@@ -6395,6 +6483,7 @@ msgid "URL"
msgstr "URL"
#: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480
+#: include/class_acc_ledger.php:3479
msgid "Un journal avec ce nom existe déjà"
msgstr "This name is already used"
@@ -6402,7 +6491,7 @@ msgstr "This name is already used"
msgid "Uniquement actions internes"
msgstr "Only internal actions"
-#: include/balance.inc.php:169
+#: include/balance.inc.php:169 include/balance.inc.php:170
msgid "Uniquement comptes non soldés"
msgstr "Only not balanced accounting"
@@ -6511,7 +6600,7 @@ msgstr "Sales"
msgid "Ventes"
msgstr "Sales"
-#: include/impress_bilan.inc.php:64
+#: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
msgid "Verification comptabilite"
msgstr "Check accountancy"
@@ -6541,6 +6630,7 @@ msgid "Visible Y ou N"
msgstr "Visible Y or N"
#: include/impress_rec.inc.php:79 include/balance.inc.php:175
+#: include/balance.inc.php:177 include/impress_rapport.inc.php:261
msgid "Visualisation"
msgstr "View"
@@ -6789,6 +6879,7 @@ msgid "choix des journaux"
msgstr "Ledgers"
#: include/class_acc_ledger.php:3527 include/class_acc_ledger.php:3610
+#: include/class_acc_ledger.php:3609
msgid "choix du type de journal"
msgstr "Select the type of ledger"
@@ -6860,7 +6951,8 @@ msgid "erreur"
msgstr "Error:"
#: include/class_acc_bilan.php:348 include/class_acc_bilan.php:656
-#: include/class_acc_bilan.php:681
+#: include/class_acc_bilan.php:681 include/class_acc_bilan.php:661
+#: include/class_acc_bilan.php:686
msgid "erreur Ouverture fichier"
msgstr "Error opening file"
@@ -6870,7 +6962,7 @@ msgid ""
"erreur aucune période par défaut, allez dans préférence pour en choisir une"
msgstr "Warning : no default period, choose one in your preference"
-#: include/class_acc_bilan.php:662
+#: include/class_acc_bilan.php:662 include/class_acc_bilan.php:667
msgid "erreur écriture fichier"
msgstr "Error writing file"
@@ -6903,10 +6995,16 @@ msgstr "inexistent"
msgid "journaux"
msgstr "ledger"
-#: include/balance.inc.php:164
+#: include/balance.inc.php:164 include/balance.inc.php:84
+#: include/balance.inc.php:165 include/impress_rapport.inc.php:242
msgid "jusque"
msgstr "Until"
+#: include/class_acc_bilan.php:249
+#, fuzzy
+msgid "le formulaire id n'est pas donnee"
+msgstr "rate is not a number"
+
#: include/dossier.inc.php:58
msgid "le modele "
msgstr "the template"
@@ -7314,9 +7412,6 @@ msgstr "You cannot record to an ealier time"
#~ msgid "Changez vos préférences"
#~ msgstr "Change your preferences"
-#~ msgid "Cherche"
-#~ msgstr "Search"
-
#~ msgid "Choisir un autre journal"
#~ msgstr "Choose another ledger"
diff --git a/html/lang/messages.po b/html/lang/messages.po
index 38a7a90c2..776bacf05 100644
--- a/html/lang/messages.po
+++ b/html/lang/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-04 15:15+0200\n"
+"POT-Creation-Date: 2014-11-05 21:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -41,6 +41,7 @@ msgstr ""
#: html/ajax_card.php:199 html/ajax_card.php:311 html/ajax_card.php:446
#: html/ajax_card.php:483 html/ajax_card.php:491 html/ajax_card.php:312
#: html/ajax_card.php:447 html/ajax_card.php:484 html/ajax_card.php:492
+#: html/ajax_card.php:448 html/ajax_card.php:485 html/ajax_card.php:493
msgid "Action interdite"
msgstr ""
@@ -80,7 +81,7 @@ msgstr ""
#: include/anc_acc_balance.inc.php:12 include/class_anc_print.php:128
#: include/class_anc_print.php:134 include/lettering.gestion.inc.php:53
#: include/ext/tools/include/export_document_anc.inc.php:35
-#: include/ext/tools/include/operation.inc.php:11
+#: include/ext/tools/include/operation.inc.php:11 include/class_icard.php:310
#, php-format
msgid "Recherche"
msgstr ""
@@ -94,15 +95,15 @@ msgstr ""
msgid "Recherche de fiche"
msgstr ""
-#: html/ajax_card.php:408 html/ajax_card.php:409
+#: html/ajax_card.php:408 html/ajax_card.php:409 html/ajax_card.php:410
msgid " de clients"
msgstr ""
-#: html/ajax_card.php:412 html/ajax_card.php:413
+#: html/ajax_card.php:412 html/ajax_card.php:413 html/ajax_card.php:414
msgid " de fournisseurs"
msgstr ""
-#: html/ajax_card.php:416 html/ajax_card.php:417
+#: html/ajax_card.php:416 html/ajax_card.php:417 html/ajax_card.php:418
msgid " d'administration"
msgstr ""
@@ -119,6 +120,7 @@ msgstr ""
#: html/ajax_card.php:431
#: include/ext/rapport_avance/include/class_rapav_listing_formula.php:386
#: include/ext/rapport_avance/include/class_rapav_listing_formula.php:806
+#: html/ajax_card.php:432
msgid "Recherche poste"
msgstr ""
@@ -130,23 +132,23 @@ msgstr ""
#: html/ajax_card.php:438 include/ajax_mod_predf_op.php:55
#: include/cfgledger.inc.php:122 include/template/dashboard.php:321
#: include/company.inc.php:145 include/template/dashboard.php:325
-#: include/template/detail-action.php:421
+#: include/template/detail-action.php:421 html/ajax_card.php:439
msgid "Sauve"
msgstr ""
-#: html/ajax_card.php:468 html/ajax_card.php:469
+#: html/ajax_card.php:468 html/ajax_card.php:469 html/ajax_card.php:470
msgid "Catégorie existe déjà"
msgstr ""
-#: html/ajax_card.php:470 html/ajax_card.php:471
+#: html/ajax_card.php:470 html/ajax_card.php:471 html/ajax_card.php:472
msgid "Catégorie sauvée"
msgstr ""
-#: html/ajax_card.php:475 html/ajax_card.php:476
+#: html/ajax_card.php:475 html/ajax_card.php:476 html/ajax_card.php:477
msgid "Le nom et la classe base ne peuvent être vide"
msgstr ""
-#: html/ajax_card.php:497 html/ajax_card.php:498
+#: html/ajax_card.php:497 html/ajax_card.php:498 html/ajax_card.php:499
msgid "Fiche non valide"
msgstr ""
@@ -268,6 +270,7 @@ msgstr ""
#: include/template/ledger_detail_bottom.php:116
#: include/ext/rapport_avance/ajax_listing_detail_modify.php:75
#: include/ext/amortis/include/template/material_detail.php:140
+#: include/ext/amortis/include/template/material_detail.php:160
msgid "Sauver"
msgstr ""
@@ -355,7 +358,7 @@ msgstr ""
#: include/ext/amortis/include/template/listing_histo.php:10
#: include/ajax_boxcard_search.php:46
#: include/template/result_cat_card_summary.php:5 include/menu.inc.php:150
-#: html/user_login.php:165
+#: html/user_login.php:165 include/balance.inc.php:280
msgid "Filtre"
msgstr ""
@@ -440,6 +443,8 @@ msgstr ""
#: include/ext/coprop/include/class_copro_budget.php:114
#: include/ext/coprop/include/lot.inc.php:34 include/class_acc_ledger.php:1583
#: include/class_acc_ledger.php:3563 include/fiche.inc.php:113
+#: include/ext/coprop/include/class_copro_budget.php:134
+#: include/class_acc_ledger.php:3562
msgid "Créer une nouvelle fiche"
msgstr ""
@@ -502,6 +507,7 @@ msgstr ""
#: include/ext/transform/include/intervat_listing_assujetti_step_1.inc.php:67
#: include/ajax_preference.php:115 include/class_acc_ledger_purchase.php:1731
#: include/class_acc_ledger_sold.php:1315
+#: include/class_acc_ledger_sold.php:1313
msgid "Période"
msgstr ""
@@ -581,6 +587,8 @@ msgstr ""
#: include/balance.inc.php:45 include/impress_bilan.inc.php:48
#: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
+#: include/balance.inc.php:47 include/impress_bilan.inc.php:51
+#: include/impress_jrn.inc.php:86
msgid "Choississez un autre exercice"
msgstr ""
@@ -719,6 +727,7 @@ msgstr ""
#: include/template/ledger_detail_ven.php:79
#: include/template/ledger_detail_ven.php:280
#: include/ext/tools/include/class_anc_grandlivre_ext.php:122
+#: include/class_acc_ledger_sold.php:1314
#, php-format
msgid "Libellé"
msgstr ""
@@ -730,7 +739,7 @@ msgstr ""
#: include/class_acc_bilan.php:70 include/impress_gl_comptes.inc.php:62
#: include/impress_poste.inc.php:93 include/template/impress_cat_card.php:14
-#: include/class_anc_print.php:146
+#: include/class_anc_print.php:146 include/balance.inc.php:75
msgid "Depuis"
msgstr ""
@@ -786,16 +795,18 @@ msgstr ""
#: include/template/ledger_detail_ven.php:144
#: include/class_acc_ledger.php:1442
#: include/template/ledger_detail_ven.php:150
+#: include/class_acc_ledger_fin.php:552
msgid "Compt. Analytique"
msgstr ""
#: include/class_acc_ledger_fin.php:1002 include/class_acc_ledger.php:1594
#: include/class_acc_ledger_purchase.php:1035
#: include/class_acc_ledger_sold.php:1055 include/class_acc_ledger.php:1591
+#: include/class_acc_ledger_fin.php:1003
msgid "Pas de journal disponible"
msgstr ""
-#: include/class_acc_ledger_fin.php:1007
+#: include/class_acc_ledger_fin.php:1007 include/class_acc_ledger_fin.php:1008
msgid "Tous les journaux financiers"
msgstr ""
@@ -803,6 +814,7 @@ msgstr ""
#: include/anc_great_ledger.inc.php:19 include/class_acc_ledger.php:2911
#: include/class_anc_balance_double.php:342
#: include/class_anc_balance_simple.php:172 include/class_anc_listing.php:42
+#: include/class_acc_ledger_fin.php:1038
msgid "Rechercher"
msgstr ""
@@ -881,6 +893,7 @@ msgstr ""
#: include/ext/modop/template_ledger_fin.php:7
#: include/ext/invoicing/include/invoice_send_mail_input.inc.php:94
#: include/ext/tools/include/class_anc_grandlivre_ext.php:119
+#: include/class_acc_ledger_sold.php:1310
msgid "Date"
msgstr ""
@@ -907,6 +920,7 @@ msgstr ""
#: include/class_acc_ledger_sold.php:1320 include/class_anc_grandlivre.php:189
#: include/class_anc_listing.php:76
#: include/ext/tools/include/class_anc_grandlivre_ext.php:120
+#: include/class_acc_ledger_sold.php:1318
msgid "Poste"
msgstr ""
@@ -930,6 +944,7 @@ msgstr ""
#: include/class_acc_ledger.php:1433 include/class_acc_ledger.php:1687
#: include/class_anc_grandlivre.php:195 include/class_anticipation.php:420
#: include/template/ledger_detail_ven.php:281
+#: include/ext/coprop/include/class_coprop_appel_fond.php:222
msgid "Débit"
msgstr ""
@@ -949,6 +964,7 @@ msgstr ""
#: include/anc_od.inc.php:150 include/class_acc_ledger.php:1434
#: include/class_anc_grandlivre.php:196 include/class_anticipation.php:421
#: include/template/ledger_detail_ven.php:282
+#: include/ext/coprop/include/class_coprop_appel_fond.php:223
msgid "Crédit"
msgstr ""
@@ -995,6 +1011,7 @@ msgstr ""
#: include/class_acc_ledger_sold.php:1317 include/class_anc_grandlivre.php:193
#: include/template/ledger_detail_ven.php:70
#: include/ext/tools/include/class_anc_grandlivre_ext.php:124
+#: include/class_acc_ledger_sold.php:1315
msgid "Pièce"
msgstr ""
@@ -1068,15 +1085,17 @@ msgid "Filtrer"
msgstr ""
#: include/class_acc_ledger.php:3280 include/user_menu.php:51
-#: include/class_acc_ledger.php:3349
+#: include/class_acc_ledger.php:3349 include/class_acc_ledger.php:3348
msgid "Création"
msgstr ""
#: include/class_acc_ledger.php:3305 include/class_acc_ledger.php:3374
+#: include/class_acc_ledger.php:3373
msgid "Journal n'existe pas"
msgstr ""
#: include/class_acc_ledger.php:3478 include/class_acc_ledger.php:3548
+#: include/class_acc_ledger.php:3547
msgid "Payé par"
msgstr ""
@@ -1189,6 +1208,7 @@ msgstr ""
#: include/class_acc_ledger_sold.php:1273 include/class_pre_op_ach.php:390
#: include/class_pre_op_ven.php:384 include/compta_fin.inc.php:142
#: include/ext/modop/modop_display.php:98
+#: include/class_acc_ledger_sold.php:1271
msgid "Ajout article"
msgstr ""
@@ -1261,6 +1281,7 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1751
#: include/class_acc_ledger_sold.php:1335
#: include/template/detail-action.php:306
+#: include/class_acc_ledger_sold.php:1333
msgid "quantité"
msgstr ""
@@ -1278,6 +1299,7 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1749
#: include/class_acc_ledger_sold.php:1333
#: include/template/detail-action.php:308
+#: include/class_acc_ledger_sold.php:1331
msgid "Montant TVA"
msgstr ""
@@ -1357,6 +1379,7 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1689
#: include/class_acc_ledger_sold.php:954 include/history_operation.inc.php:140
+#: include/history_operation.inc.php:141
msgid "Mise à jour paiement"
msgstr ""
@@ -1387,6 +1410,7 @@ msgstr ""
#: include/ext/transform/ajax_modify_intervat_assujetti.php:24
#: include/template/print_ledger_simple.php:10
#: include/template/ledger_detail_ven.php:58
+#: include/class_acc_ledger_sold.php:1258
msgid "Client"
msgstr ""
@@ -1652,6 +1676,7 @@ msgstr ""
#: include/template/detail-action.php:434
#: include/template/ledger_detail_bottom.php:125
#: include/ext/amortis/include/template/material_detail.php:142
+#: include/ext/amortis/include/template/material_detail.php:162
msgid "Effacer"
msgstr ""
@@ -1849,6 +1874,9 @@ msgstr ""
#: html/recherche.php:67 html/recherche.php:111
#: include/class_acc_ledger.php:2923
#: include/ext/amortis/include/template/material_detail.php:143
+#: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78
+#: include/ajax_mod_periode.php:89 include/class_html_input.php:706
+#: include/ext/amortis/include/template/material_detail.php:163
#, php-format
msgid "Fermer"
msgstr ""
@@ -2711,7 +2739,7 @@ msgstr ""
msgid "Tableau de bord"
msgstr ""
-#: include/database.item.php:117
+#: include/database.item.php:117 include/balance.inc.php:86
msgid "Avancé"
msgstr ""
@@ -3143,7 +3171,7 @@ msgstr ""
#: include/template/letter_all.php:29
#: include/class_acc_ledger_purchase.php:1734
#: include/class_acc_ledger_sold.php:1318 include/class_anc_grandlivre.php:194
-#: include/fiche.inc.php:444
+#: include/fiche.inc.php:444 include/class_acc_ledger_sold.php:1316
msgid "Interne"
msgstr ""
@@ -3285,7 +3313,7 @@ msgstr ""
msgid "Vous devez corriger"
msgstr ""
-#: include/impress_bilan.inc.php:64
+#: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
msgid "Verification comptabilite"
msgstr ""
@@ -3315,6 +3343,7 @@ msgid "Jusqu'au poste"
msgstr ""
#: include/impress_rec.inc.php:79 include/balance.inc.php:175
+#: include/balance.inc.php:177 include/impress_rapport.inc.php:261
msgid "Visualisation"
msgstr ""
@@ -3369,6 +3398,7 @@ msgstr ""
#: include/ext/coprop/include/appel_fond.inc.php:156
#: include/ext/coprop/include/class_coprop_appel_fond.php:204
#: include/anc_od.inc.php:151
+#: include/ext/coprop/include/class_coprop_appel_fond.php:224
msgid "Difference"
msgstr ""
@@ -3377,6 +3407,7 @@ msgstr ""
#: include/ext/coprop/include/appel_fond.inc.php:82
#: include/ext/coprop/include/appel_fond.inc.php:151
#: include/ext/coprop/include/class_coprop_appel_fond.php:199
+#: include/ext/coprop/include/class_coprop_appel_fond.php:219
msgid "Ajout d'une ligne"
msgstr ""
@@ -3612,6 +3643,7 @@ msgstr ""
#: include/template/dashboard.php:9 include/ajax_calendar_zoom.php:23
#: include/class_html_input.php:779 include/template/dashboard.php:6
+#: include/class_html_input.php:796 include/impress_rapport.inc.php:209
msgid "Calendrier"
msgstr ""
@@ -3703,6 +3735,7 @@ msgstr ""
#: include/class_acc_ledger_sold.php:1321
#: include/template/detail-action.php:231
#: include/ext/modop/template_ledger_fin.php:23
+#: include/class_acc_ledger_sold.php:1319
msgid "Commentaire"
msgstr ""
@@ -3725,6 +3758,7 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1748
#: include/class_acc_ledger_sold.php:1332
#: include/template/detail-action.php:307
+#: include/class_acc_ledger_sold.php:1330
msgid "Code TVA"
msgstr ""
@@ -3839,6 +3873,7 @@ msgstr ""
#: include/template/predf_ledger_detail.php:74
#: include/class_acc_ledger_purchase.php:1750
#: include/class_acc_ledger_sold.php:1334
+#: include/class_acc_ledger_sold.php:1332
msgid "Total HTVA"
msgstr ""
@@ -4464,7 +4499,8 @@ msgid "Rénuméroter des pièces justificative"
msgstr ""
#: include/ext/tools/index.php:43 include/bank.inc.php:73
-#: include/template/stock_state_search.php:35
+#: include/template/stock_state_search.php:35 include/impress_bilan.inc.php:49
+#: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
msgid "Exercice"
msgstr ""
@@ -4792,7 +4828,7 @@ msgid "Nombre annuités invalide"
msgstr ""
#: include/ext/amortis/include/class_am_card.php:179
-#: include/class_acc_compute.php:194
+#: include/class_acc_compute.php:194 include/class_acc_compute.php:195
msgid "Montant invalide"
msgstr ""
@@ -5068,6 +5104,7 @@ msgid "le taux n'est pas un nombre"
msgstr ""
#: include/ext/importbank/include/class_bank_item.php:63
+#: include/ext/importbank/include/class_bank_item.php:65
msgid "op. concernée"
msgstr ""
@@ -5532,6 +5569,9 @@ msgstr ""
#: include/ext/import_doli/include/template/input_file.php:7
#: include/ext/import_doli/include/template/test_file.php:8
#: include/ext/import_doli/include/template/test_operation.php:8
+#: include/ext/import_account/include/template/input_file.php:23
+#: include/ext/import_account/include/template/test_file.php:23
+#: include/ext/import_account/include/template/test_operation.php:23
msgid "Importation de données"
msgstr ""
@@ -5678,11 +5718,11 @@ msgstr ""
msgid "Fiche sauvée"
msgstr ""
-#: html/ajax_card.php:421
+#: html/ajax_card.php:421 html/ajax_card.php:422
msgid " de contacts"
msgstr ""
-#: html/ajax_card.php:504
+#: html/ajax_card.php:504 html/ajax_card.php:505
msgid "Détail fiche (sauvée)"
msgstr ""
@@ -6021,51 +6061,53 @@ msgid "Affiche aussi les actions fermées"
msgstr ""
#: include/template/action_search_result.php:32
-#: include/template/action_search_result.php:88
+#: include/template/action_search_result.php:88 include/search.inc.php:121
+#: include/search.inc.php:125
msgid "Mettre à jour"
msgstr ""
-#: include/balance.inc.php:101
+#: include/balance.inc.php:101 include/balance.inc.php:102
msgid "Aucun filtre, tous les journaux"
msgstr ""
-#: include/balance.inc.php:104
+#: include/balance.inc.php:104 include/balance.inc.php:105
msgid "Filtré par journal"
msgstr ""
-#: include/balance.inc.php:109
+#: include/balance.inc.php:109 include/balance.inc.php:110
msgid "Filtré par catégorie"
msgstr ""
-#: include/balance.inc.php:111
+#: include/balance.inc.php:111 include/balance.inc.php:112
msgid "Totaux par sous-niveaux"
msgstr ""
-#: include/balance.inc.php:128
+#: include/balance.inc.php:128 include/balance.inc.php:129
msgid "Niveau 1"
msgstr ""
-#: include/balance.inc.php:129
+#: include/balance.inc.php:129 include/balance.inc.php:130
msgid "Niveau 2"
msgstr ""
-#: include/balance.inc.php:130
+#: include/balance.inc.php:130 include/balance.inc.php:131
msgid "Niveau 3"
msgstr ""
-#: include/balance.inc.php:162
+#: include/balance.inc.php:162 include/balance.inc.php:163
msgid "Plage de postes"
msgstr ""
-#: include/balance.inc.php:164
+#: include/balance.inc.php:164 include/balance.inc.php:84
+#: include/balance.inc.php:165 include/impress_rapport.inc.php:242
msgid "jusque"
msgstr ""
-#: include/balance.inc.php:169
+#: include/balance.inc.php:169 include/balance.inc.php:170
msgid "Uniquement comptes non soldés"
msgstr ""
-#: include/balance.inc.php:172
+#: include/balance.inc.php:172 include/balance.inc.php:173
msgid "Avec la balance de l'année précédente"
msgstr ""
@@ -6202,11 +6244,12 @@ msgid "Aucun enregistrement trouve"
msgstr ""
#: include/class_acc_bilan.php:348 include/class_acc_bilan.php:656
-#: include/class_acc_bilan.php:681
+#: include/class_acc_bilan.php:681 include/class_acc_bilan.php:661
+#: include/class_acc_bilan.php:686
msgid "erreur Ouverture fichier"
msgstr ""
-#: include/class_acc_bilan.php:662
+#: include/class_acc_bilan.php:662 include/class_acc_bilan.php:667
msgid "erreur écriture fichier"
msgstr ""
@@ -6273,44 +6316,55 @@ msgid "Pour la fiche %s le poste comptable [%s] n'existe pas"
msgstr ""
#: include/class_acc_ledger.php:3232 include/class_acc_ledger.php:3301
+#: include/class_acc_ledger.php:3300
msgid "Journaux de vente"
msgstr ""
#: include/class_acc_ledger.php:3233 include/class_acc_ledger.php:3302
+#: include/class_acc_ledger.php:3301
msgid "'Journaux d'achat"
msgstr ""
#: include/class_acc_ledger.php:3234 include/class_acc_ledger.php:3303
+#: include/class_acc_ledger.php:3302
msgid "'Journaux Financier"
msgstr ""
#: include/class_acc_ledger.php:3235 include/class_acc_ledger.php:3304
+#: include/class_acc_ledger.php:3303
msgid "'Journaux d'Opérations diverses"
msgstr ""
#: include/class_acc_ledger.php:3406 include/class_acc_ledger.php:3476
+#: include/class_acc_ledger.php:3475
msgid "Nombre de ligne incorrect"
msgstr ""
#: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480
+#: include/class_acc_ledger.php:3479
msgid "Un journal avec ce nom existe déjà"
msgstr ""
#: include/class_acc_ledger.php:3416 include/class_acc_ledger.php:3461
#: include/class_acc_ledger.php:3594 include/class_acc_ledger.php:3486
#: include/class_acc_ledger.php:3531 include/class_acc_ledger.php:3678
+#: include/class_acc_ledger.php:3485 include/class_acc_ledger.php:3530
+#: include/class_acc_ledger.php:3677
msgid "Aucun compte en banque n'est donné"
msgstr ""
#: include/class_acc_ledger.php:3527 include/class_acc_ledger.php:3610
+#: include/class_acc_ledger.php:3609
msgid "choix du type de journal"
msgstr ""
#: include/class_acc_ledger.php:3611 include/class_acc_ledger.php:3695
+#: include/class_acc_ledger.php:3694
msgid "Impossible d'effacer un journal qui contient des opérations"
msgstr ""
#: include/class_acc_ledger.php:3684 include/class_acc_ledger.php:3768
+#: include/class_acc_ledger.php:3767
msgid "Action non accessible"
msgstr ""
@@ -6482,6 +6536,7 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1729
#: include/class_acc_ledger_sold.php:1313
#: include/template/ledger_detail_ven.php:44
+#: include/class_acc_ledger_sold.php:1311
msgid "Date paiement"
msgstr ""
@@ -6742,7 +6797,7 @@ msgstr ""
msgid "Choix des categories"
msgstr ""
-#: include/class_html_input.php:804
+#: include/class_html_input.php:804 include/class_html_input.php:821
msgid "choix des journaux"
msgstr ""
@@ -6752,6 +6807,7 @@ msgstr ""
#: include/ext/amortis/include/template/material_detail.php:128
#: include/ext/amortis/include/template/material_detail.php:135
+#: include/ext/amortis/include/template/material_detail.php:155
#, php-format
msgid "Différence entre le montant à amortir et le montant amorti = %d'"
msgstr ""
@@ -6794,7 +6850,7 @@ msgstr ""
msgid "Clef invalide"
msgstr ""
-#: include/balance.inc.php:334
+#: include/balance.inc.php:334 include/balance.inc.php:336
msgid "Total niveau"
msgstr ""
@@ -6804,71 +6860,85 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1727
#: include/class_acc_ledger_sold.php:1311
+#: include/class_acc_ledger_sold.php:1309
msgid "Numéro opération"
msgstr ""
#: include/class_acc_ledger_purchase.php:1730
#: include/class_acc_ledger_sold.php:1314
+#: include/class_acc_ledger_sold.php:1312
msgid "Date échéance"
msgstr ""
#: include/class_acc_ledger_purchase.php:1735
#: include/class_acc_ledger_sold.php:1319
+#: include/class_acc_ledger_sold.php:1317
msgid "Code journal"
msgstr ""
#: include/class_acc_ledger_purchase.php:1738
#: include/class_acc_ledger_sold.php:1322
+#: include/class_acc_ledger_sold.php:1320
msgid "Code Item"
msgstr ""
#: include/class_acc_ledger_purchase.php:1739
#: include/class_acc_ledger_sold.php:1323
+#: include/class_acc_ledger_sold.php:1321
msgid "N° fiche"
msgstr ""
#: include/class_acc_ledger_purchase.php:1740
#: include/class_acc_ledger_sold.php:1324
+#: include/class_acc_ledger_sold.php:1322
msgid "Nom fiche"
msgstr ""
#: include/class_acc_ledger_purchase.php:1741
#: include/class_acc_ledger_sold.php:1325
+#: include/class_acc_ledger_sold.php:1323
msgid "N° fiche fournisseur"
msgstr ""
#: include/class_acc_ledger_purchase.php:1742
#: include/class_acc_ledger_sold.php:1326
+#: include/class_acc_ledger_sold.php:1324
msgid "Nom fournisseur"
msgstr ""
#: include/class_acc_ledger_purchase.php:1743
#: include/class_acc_ledger_sold.php:1327
+#: include/class_acc_ledger_sold.php:1325
msgid "Code fournisseur"
msgstr ""
#: include/class_acc_ledger_purchase.php:1744
#: include/class_acc_ledger_sold.php:1328
+#: include/class_acc_ledger_sold.php:1326
msgid "Nom TVA"
msgstr ""
#: include/class_acc_ledger_purchase.php:1745
#: include/class_acc_ledger_sold.php:1329
+#: include/class_acc_ledger_sold.php:1327
msgid "Commentaire TVA"
msgstr ""
#: include/class_acc_ledger_purchase.php:1746
#: include/class_acc_ledger_sold.php:1330
+#: include/class_acc_ledger_sold.php:1328
msgid "TVA annulée"
msgstr ""
#: include/class_acc_ledger_purchase.php:1747
#: include/class_acc_ledger_sold.php:1331
+#: include/class_acc_ledger_sold.php:1329
msgid "Retrait TVA"
msgstr ""
#: include/class_acc_ledger_purchase.php:1752
#: include/class_acc_ledger_sold.php:1336
+#: include/class_acc_ledger_sold.php:1334
msgid "PU"
msgstr ""
@@ -6886,11 +6956,13 @@ msgstr ""
#: include/class_acc_ledger_purchase.php:1756
#: include/class_acc_ledger_sold.php:1337
+#: include/class_acc_ledger_sold.php:1335
msgid "HTVA Opération"
msgstr ""
#: include/class_acc_ledger_purchase.php:1757
#: include/class_acc_ledger_sold.php:1338
+#: include/class_acc_ledger_sold.php:1336
msgid "TVA Opération"
msgstr ""
@@ -7063,3 +7135,117 @@ msgstr ""
#: include/template/profile.php:45
msgid "Avec Direct Accès"
msgstr ""
+
+#: include/ajax_mod_periode.php:48
+msgid "Modification période"
+msgstr ""
+
+#: include/ajax_mod_periode.php:49 include/ajax_mod_periode.php:75
+msgid "Modifier les dates de début et fin de période"
+msgstr ""
+
+#: include/ajax_mod_periode.php:50
+msgid "Cela pourrait avoir un impact sur les opérations déjà existantes"
+msgstr ""
+
+#: include/ajax_mod_periode.php:55
+msgid " Début période : "
+msgstr ""
+
+#: include/ajax_mod_periode.php:56
+msgid " Fin période : "
+msgstr ""
+
+#: include/ajax_mod_periode.php:57
+msgid " Exercice : "
+msgstr ""
+
+#: include/ajax_mod_periode.php:59
+msgid "sauver"
+msgstr ""
+
+#: include/ajax_mod_periode.php:76
+msgid "Erreur date invalide"
+msgstr ""
+
+#: include/search.inc.php:118
+msgid "Liste limitée à "
+msgstr ""
+
+#: include/search.inc.php:118
+msgid " enregistrements. Le nombre d'enregistrements trouvés est de "
+msgstr ""
+
+#: include/template/profile.php:45
+msgid "Avec Accès Direct "
+msgstr ""
+
+#: include/ext/modop/modop_display.php:53
+msgid "On ne peut pas modifier dans une période fermée"
+msgstr ""
+
+#: include/ext/rapport_avance/include/class_rapav.php:150
+msgid " Erreur dans la formule "
+msgstr ""
+
+#: include/class_acc_bilan.php:249
+msgid "le formulaire id n'est pas donnee"
+msgstr ""
+
+#: include/class_acc_bilan.php:635
+msgid "Ouverture fichier impossible"
+msgstr ""
+
+#: include/fiche.inc.php:91
+msgid "Chercher"
+msgstr ""
+
+#: include/impress_bilan.inc.php:65
+msgid ""
+"Attention : si le bilan n'est pas équilibré.
Vérifiez \n"
+" - L'affectation du résultat est fait
\n"
+" - Vos comptes actifs ont un solde débiteur (sauf les comptes dit "
+"inversés)
\n"
+" - les comptes passifs ont un solde créditeur (sauf les comptes dit "
+"inversés)
\n"
+"
\n"
+" Utilisez la balance des comptes pour vérifier."
+msgstr ""
+
+#: include/impress_bilan.inc.php:82
+msgid "Etape 2 :Impression"
+msgstr ""
+
+#: include/impress_rapport.inc.php:203
+msgid "Choississez le rapport"
+msgstr ""
+
+#: include/impress_rapport.inc.php:208
+msgid "Période comptable"
+msgstr ""
+
+#: include/impress_rapport.inc.php:240
+msgid "Calendrier depuis :"
+msgstr ""
+
+#: include/impress_rapport.inc.php:247
+msgid "Pas d'étape"
+msgstr ""
+
+#: include/impress_rapport.inc.php:248
+msgid "1 mois"
+msgstr ""
+
+#: include/impress_rapport.inc.php:251
+msgid "Par étape de"
+msgstr ""
+
+#: include/impress_rapport.inc.php:257
+msgid ""
+"Attention : vous ne pouvez pas utiliser les étapes avec les dates "
+"calendriers."
+msgstr ""
+
+#: include/impress_rapport.inc.php:259
+msgid "Les clauses FROM sont ignorés avec les dates calendriers"
+msgstr ""
diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po
index fcf7444e4..48101919c 100644
--- a/html/lang/nl_NL/LC_MESSAGES/messages.po
+++ b/html/lang/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NOALYSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-30 23:30+0100\n"
+"POT-Creation-Date: 2014-11-05 21:05+0100\n"
"PO-Revision-Date: 2014-02-21 21:35+0100\n"
"Last-Translator: dany\n"
"Language-Team: American English \n"
@@ -202,18 +202,25 @@ msgid "%s Vous avez ajouté %d mois depuis le %d/%d pour l'exercice %d "
msgstr "Je hebt% s% d maanden sinds% d /% d% d voor het jaar toegevoegd"
#: include/class_acc_ledger.php:3234 include/class_acc_ledger.php:3303
+#: include/class_acc_ledger.php:3302
msgid "'Journaux Financier"
msgstr "Financiële"
#: include/class_acc_ledger.php:3235 include/class_acc_ledger.php:3304
+#: include/class_acc_ledger.php:3303
msgid "'Journaux d'Opérations diverses"
msgstr "Menu verschillende bewerkingen"
#: include/class_acc_ledger.php:3233 include/class_acc_ledger.php:3302
+#: include/class_acc_ledger.php:3301
#, fuzzy
msgid "'Journaux d'achat"
msgstr "Ver"
+#: include/impress_rapport.inc.php:248
+msgid "1 mois"
+msgstr ""
+
#: include/impress_bilan.inc.php:89
#, fuzzy
msgid ""
@@ -317,6 +324,7 @@ msgid "Action interdite"
msgstr "Verboden Actie"
#: include/class_acc_ledger.php:3684 include/class_acc_ledger.php:3768
+#: include/class_acc_ledger.php:3767
#, fuzzy
msgid "Action non accessible"
msgstr "Folder niet Bereikbaar"
@@ -693,6 +701,25 @@ msgstr ""
msgid "Attention : il y a %d enregistrements incorrects "
msgstr "Let op:% d administratie onjuist"
+#: include/impress_bilan.inc.php:65
+#, fuzzy
+msgid ""
+"Attention : si le bilan n'est pas équilibré.
Vérifiez \n"
+" - L'affectation du résultat est fait
\n"
+" - Vos comptes actifs ont un solde débiteur (sauf les comptes dit "
+"inversés)
\n"
+" - les comptes passifs ont un solde créditeur (sauf les comptes dit "
+"inversés)
\n"
+"
\n"
+" Utilisez la balance des comptes pour vérifier."
+msgstr "Accepteren"
+
+#: include/impress_rapport.inc.php:257
+msgid ""
+"Attention : vous ne pouvez pas utiliser les étapes avec les dates "
+"calendriers."
+msgstr ""
+
#: include/class_acc_ledger_purchase.php:1484
#: include/class_acc_ledger_sold.php:755
msgid "Attention Différence entre TVA calculée et donnée"
@@ -769,6 +796,8 @@ msgstr ""
#: include/class_acc_ledger.php:3416 include/class_acc_ledger.php:3461
#: include/class_acc_ledger.php:3594 include/class_acc_ledger.php:3486
#: include/class_acc_ledger.php:3531 include/class_acc_ledger.php:3678
+#: include/class_acc_ledger.php:3485 include/class_acc_ledger.php:3530
+#: include/class_acc_ledger.php:3677
#, fuzzy
msgid "Aucun compte en banque n'est donné"
msgstr "Geen Enkele analytisch kaart"
@@ -804,7 +833,7 @@ msgstr "Geen bestand"
msgid "Aucun fichier donné"
msgstr "Geen Gegevens"
-#: include/balance.inc.php:101
+#: include/balance.inc.php:101 include/balance.inc.php:102
#, fuzzy
msgid "Aucun filtre, tous les journaux"
msgstr "Logging Configuratie"
@@ -985,7 +1014,7 @@ msgstr "Andere Informatie"
msgid "Autres actions"
msgstr "Actie Toevoegen"
-#: include/database.item.php:117
+#: include/database.item.php:117 include/balance.inc.php:86
msgid "Avancé"
msgstr "Vergevorderd"
@@ -1020,7 +1049,7 @@ msgstr "Nieuwe extract"
msgid "Avec date opérations"
msgstr "Operatie Doorsturen"
-#: include/balance.inc.php:172
+#: include/balance.inc.php:172 include/balance.inc.php:173
msgid "Avec la balance de l'année précédente"
msgstr ""
@@ -1158,10 +1187,15 @@ msgstr "Rekenmachine"
#: include/template/dashboard.php:9 include/ajax_calendar_zoom.php:23
#: include/class_html_input.php:779 include/template/dashboard.php:6
-#: include/class_html_input.php:796
+#: include/class_html_input.php:796 include/impress_rapport.inc.php:209
msgid "Calendrier"
msgstr "Kalender"
+#: include/impress_rapport.inc.php:240
+#, fuzzy
+msgid "Calendrier depuis :"
+msgstr "Kalender"
+
#: include/template/impress_cat_card.php:6 include/ajax_boxcard_search.php:57
msgid "Categorie"
msgstr "Categorie"
@@ -1322,6 +1356,11 @@ msgstr "Kosten"
msgid "Chemin"
msgstr "Pad"
+#: include/fiche.inc.php:91
+#, fuzzy
+msgid "Chercher"
+msgstr "Vinden"
+
#: html/ajax_misc.php:190
msgid "Choississez la TVA "
msgstr ""
@@ -1331,8 +1370,15 @@ msgid ""
"Choississez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche"
msgstr "Kies de categorie lijst waar u een record toe te voegen"
+#: include/impress_rapport.inc.php:203
+#, fuzzy
+msgid "Choississez le rapport"
+msgstr "Kiez UW map"
+
#: include/balance.inc.php:45 include/impress_bilan.inc.php:48
#: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
+#: include/balance.inc.php:47 include/impress_bilan.inc.php:51
+#: include/impress_jrn.inc.php:86
msgid "Choississez un autre exercice"
msgstr "Kies een jaar"
@@ -1854,7 +1900,7 @@ msgid "Credit"
msgstr "Credit"
#: include/class_acc_ledger.php:3280 include/user_menu.php:51
-#: include/class_acc_ledger.php:3349
+#: include/class_acc_ledger.php:3349 include/class_acc_ledger.php:3348
msgid "Création"
msgstr "Schepping"
@@ -1954,6 +2000,7 @@ msgstr "Creditzijde"
#: include/ext/coprop/include/lot.inc.php:34 include/class_acc_ledger.php:1583
#: include/class_acc_ledger.php:3563 include/fiche.inc.php:113
#: include/ext/coprop/include/class_copro_budget.php:134
+#: include/class_acc_ledger.php:3562
msgid "Créer une nouvelle fiche"
msgstr "Maak EEN Nieuwe blad"
@@ -2162,7 +2209,7 @@ msgstr "Afmelden"
#: include/class_acc_bilan.php:70 include/impress_gl_comptes.inc.php:62
#: include/impress_poste.inc.php:93 include/template/impress_cat_card.php:14
-#: include/class_anc_print.php:146
+#: include/class_anc_print.php:146 include/balance.inc.php:75
msgid "Depuis"
msgstr "VANAF"
@@ -2929,6 +2976,11 @@ msgstr "Stap 1/3"
msgid "Etape 1/3"
msgstr "Stap 1/3"
+#: include/impress_bilan.inc.php:82
+#, fuzzy
+msgid "Etape 2 :Impression"
+msgstr "Indruk"
+
#: include/ext/transform/include/intervat_listing_assujetti_step_2.inc.php:266
msgid "Etape 2/3"
msgstr "Stap 2/3"
@@ -2968,7 +3020,8 @@ msgid "Exclure Etat"
msgstr "Uitsluiten State"
#: include/ext/tools/index.php:43 include/bank.inc.php:73
-#: include/template/stock_state_search.php:35
+#: include/template/stock_state_search.php:35 include/impress_bilan.inc.php:49
+#: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
msgid "Exercice"
msgstr "Oefening"
@@ -3261,7 +3314,7 @@ msgstr ""
#: include/ext/amortis/include/template/listing_histo.php:10
#: include/ajax_boxcard_search.php:46
#: include/template/result_cat_card_summary.php:5 include/menu.inc.php:150
-#: html/user_login.php:165
+#: html/user_login.php:165 include/balance.inc.php:280
msgid "Filtre"
msgstr "Filter"
@@ -3287,12 +3340,12 @@ msgstr "Filter"
msgid "Filtrer par "
msgstr "Filteren op"
-#: include/balance.inc.php:109
+#: include/balance.inc.php:109 include/balance.inc.php:110
#, fuzzy
msgid "Filtré par catégorie"
msgstr "Categorie Toevoegen"
-#: include/balance.inc.php:104
+#: include/balance.inc.php:104 include/balance.inc.php:105
#, fuzzy
msgid "Filtré par journal"
msgstr "Filteren op"
@@ -3758,6 +3811,7 @@ msgid "Importer ce rapport"
msgstr "Importeer dit verslag"
#: include/class_acc_ledger.php:3611 include/class_acc_ledger.php:3695
+#: include/class_acc_ledger.php:3694
msgid "Impossible d'effacer un journal qui contient des opérations"
msgstr ""
@@ -3911,6 +3965,7 @@ msgid "Journal inexistant"
msgstr "Module bestaat niet"
#: include/class_acc_ledger.php:3305 include/class_acc_ledger.php:3374
+#: include/class_acc_ledger.php:3373
msgid "Journal n'existe pas"
msgstr "Inloggen bestaat niet"
@@ -3920,6 +3975,7 @@ msgid "Journaux"
msgstr "Kranten"
#: include/class_acc_ledger.php:3232 include/class_acc_ledger.php:3301
+#: include/class_acc_ledger.php:3300
#, fuzzy
msgid "Journaux de vente"
msgstr "Sales Geschiedenis"
@@ -4044,6 +4100,10 @@ msgstr "Lezing"
msgid "Les 2"
msgstr "2"
+#: include/impress_rapport.inc.php:259
+msgid "Les clauses FROM sont ignorés avec les dates calendriers"
+msgstr ""
+
#: include/class_anc_print.php:120
msgid "Les dates sont en format DD.MM.YYYY"
msgstr "referentiepunt in formaat TT.MM.JJJJ"
@@ -4350,6 +4410,7 @@ msgstr "Werk plugin, kunt u de parameter instelling te controleren?"
#: include/class_acc_ledger_purchase.php:1689
#: include/class_acc_ledger_sold.php:954 include/history_operation.inc.php:140
+#: include/history_operation.inc.php:141
msgid "Mise à jour paiement"
msgstr "OPSLAAN"
@@ -4580,7 +4641,7 @@ msgid "Montant initial"
msgstr "Oorspronkelijk bedrag"
#: include/ext/amortis/include/class_am_card.php:179
-#: include/class_acc_compute.php:194
+#: include/class_acc_compute.php:194 include/class_acc_compute.php:195
#, fuzzy
msgid "Montant invalide"
msgstr "has EEN verkeerde Bedrag"
@@ -4683,17 +4744,17 @@ msgstr "Het kan-niet OPSLAAN"
msgid "Ne remplissez pas s'il n'y a pas de mandataire"
msgstr "Niet compleet als er geen vertegenwoordiger"
-#: include/balance.inc.php:128
+#: include/balance.inc.php:128 include/balance.inc.php:129
#, fuzzy
msgid "Niveau 1"
msgstr "Nieuw"
-#: include/balance.inc.php:129
+#: include/balance.inc.php:129 include/balance.inc.php:130
#, fuzzy
msgid "Niveau 2"
msgstr "Nieuw"
-#: include/balance.inc.php:130
+#: include/balance.inc.php:130 include/balance.inc.php:131
#, fuzzy
msgid "Niveau 3"
msgstr "Nieuw"
@@ -4802,6 +4863,7 @@ msgid "Nombre d'unité"
msgstr "Aantal eenheid"
#: include/class_acc_ledger.php:3406 include/class_acc_ledger.php:3476
+#: include/class_acc_ledger.php:3475
#, fuzzy
msgid "Nombre de ligne incorrect"
msgstr "Aantal geregistreerde lijnen"
@@ -5237,6 +5299,16 @@ msgstr "Volgorde van verschijning"
msgid "Oui"
msgstr "Ja"
+#: include/class_acc_bilan.php:635
+#, fuzzy
+msgid "Ouverture fichier impossible"
+msgstr "Opening Schrift"
+
+#: include/impress_rapport.inc.php:208
+#, fuzzy
+msgid "Période comptable"
+msgstr "Boekhoudingsperiode"
+
#: include/class_acc_ledger.php:211 include/class_acc_ledger.php:210
msgid "PERIODE FERMEE"
msgstr "Gesloten periode"
@@ -5326,6 +5398,11 @@ msgstr "Het blad"
msgid "Par gérant ou administrateur"
msgstr "Door de manager of beheerder"
+#: include/impress_rapport.inc.php:251
+#, fuzzy
+msgid "Par étape de"
+msgstr "Per jaar"
+
#: html/ajax_card.php:106
#, fuzzy
msgid "Parametre ad_id est invalide"
@@ -5394,6 +5471,10 @@ msgstr "Geen Toegang"
msgid "Pas d'anomalie détectée"
msgstr ""
+#: include/impress_rapport.inc.php:247
+msgid "Pas d'étape"
+msgstr ""
+
#: include/ext/invoicing/include/invoice_send_mail.inc.php:75
#: include/ext/invoicing/include/invoice_send_mail.inc.php:80
#: include/ext/invoicing/include/invoice_send_mail.inc.php:103
@@ -5433,6 +5514,7 @@ msgid "Payé"
msgstr "Betaald"
#: include/class_acc_ledger.php:3478 include/class_acc_ledger.php:3548
+#: include/class_acc_ledger.php:3547
msgid "Payé par"
msgstr "Betaald deur"
@@ -5480,7 +5562,7 @@ msgstr "Bewijs"
msgid "Pièces attachées"
msgstr "Documenten"
-#: include/balance.inc.php:162
+#: include/balance.inc.php:162 include/balance.inc.php:163
#, fuzzy
msgid "Plage de postes"
msgstr "Basisklasse"
@@ -6593,7 +6675,7 @@ msgstr "Debet Totaal"
msgid "Total lettré"
msgstr "Werkelijke totale"
-#: include/balance.inc.php:334
+#: include/balance.inc.php:334 include/balance.inc.php:336
#, fuzzy
msgid "Total niveau"
msgstr "Totaal"
@@ -6618,7 +6700,7 @@ msgstr "Werkelijke totale"
msgid "Totaux"
msgstr "Totalen"
-#: include/balance.inc.php:111
+#: include/balance.inc.php:111 include/balance.inc.php:112
msgid "Totaux par sous-niveaux"
msgstr ""
@@ -6752,6 +6834,7 @@ msgid "URL"
msgstr ""
#: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480
+#: include/class_acc_ledger.php:3479
msgid "Un journal avec ce nom existe déjà"
msgstr ""
@@ -6759,7 +6842,7 @@ msgstr ""
msgid "Uniquement actions internes"
msgstr "Alleen interne acties"
-#: include/balance.inc.php:169
+#: include/balance.inc.php:169 include/balance.inc.php:170
#, fuzzy
msgid "Uniquement comptes non soldés"
msgstr "Alleen interne acties"
@@ -6871,7 +6954,7 @@ msgstr "Sales / Recepten"
msgid "Ventes"
msgstr "Verkoop"
-#: include/impress_bilan.inc.php:64
+#: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
msgid "Verification comptabilite"
msgstr "Verificatie vand van Boekhouding"
@@ -6902,6 +6985,7 @@ msgid "Visible Y ou N"
msgstr "Zichtbare Y of N"
#: include/impress_rec.inc.php:79 include/balance.inc.php:175
+#: include/balance.inc.php:177 include/impress_rapport.inc.php:261
msgid "Visualisation"
msgstr "Visualisatie"
@@ -7159,6 +7243,7 @@ msgid "choix des journaux"
msgstr "Financiele"
#: include/class_acc_ledger.php:3527 include/class_acc_ledger.php:3610
+#: include/class_acc_ledger.php:3609
#, fuzzy
msgid "choix du type de journal"
msgstr "For the boek van soort"
@@ -7235,7 +7320,8 @@ msgid "erreur"
msgstr "Fout:"
#: include/class_acc_bilan.php:348 include/class_acc_bilan.php:656
-#: include/class_acc_bilan.php:681
+#: include/class_acc_bilan.php:681 include/class_acc_bilan.php:661
+#: include/class_acc_bilan.php:686
#, fuzzy
msgid "erreur Ouverture fichier"
msgstr "Opening Schrift"
@@ -7247,7 +7333,7 @@ msgid ""
msgstr ""
"enig verzuim periode gemaakte fout, ga dan naar een voorkeur voor kiezen"
-#: include/class_acc_bilan.php:662
+#: include/class_acc_bilan.php:662 include/class_acc_bilan.php:667
msgid "erreur écriture fichier"
msgstr ""
@@ -7280,11 +7366,17 @@ msgstr "onbestaand"
msgid "journaux"
msgstr "Kranten"
-#: include/balance.inc.php:164
+#: include/balance.inc.php:164 include/balance.inc.php:84
+#: include/balance.inc.php:165 include/impress_rapport.inc.php:242
#, fuzzy
msgid "jusque"
msgstr "peuter"
+#: include/class_acc_bilan.php:249
+#, fuzzy
+msgid "le formulaire id n'est pas donnee"
+msgstr "tarief is geen getal"
+
#: include/dossier.inc.php:58
msgid "le modele "
msgstr "Het model"
diff --git a/html/style-classic.css b/html/style-classic.css
index d85519860..65576f306 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -1,11 +1,10 @@
/* */
#add_todo_list {
- border:1px solid #0000FF;
+ border:1px solid #605D5D;
display:none;
background-color:#DDE6FF;
padding:0.07%;
@@ -961,16 +1004,16 @@ box-shadow: 10px 10px 5px #888;
font-size:14.4px;
font-size:0.90rem;
}
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 1281px) {
div.inner_box {
- width: 35%;
+ width: 55%;
}
}
-@media only screen and (max-width: 1024px) {
+@media only screen and (max-width: 1280px) {
div.inner_box {
- width: 90%;
- left:5%;
- margin-bottom: 5%;
+ width: 95%;
+ left:2%;
+ margin-bottom: 2%;
}
}
div.op_detail_title {
@@ -1039,7 +1082,7 @@ table.info_op tr
}
h2#jrn_name
{
- color:#0000FF;
+ color:#605D5D;
margin-right:30%;
float: right;
}
@@ -1126,7 +1169,7 @@ a.line,div.content a.line
{
text-decoration:underline;
display:inline;
- /* color: #0000FF; */
+ /* color: #605D5D; */
}
a.line:hover,div_content a.line
{
@@ -1138,9 +1181,9 @@ a.line:hover,div_content a.line
#close_div
{
background-color:#FFFFFF;
- color:#0000FF;
+ color:#605D5D;
text-decoration:none;
- border:1px solid #0000FF;
+ border:1px solid #605D5D;
margin-left: 2px;
margin-right:2px;
margin-top:0px;
@@ -1154,9 +1197,9 @@ a.line:hover,div_content a.line
#popmeout
{
background-color:#FFFFFF;
- color:#0000FF;
+ color:#605D5D;
text-decoration:none;
- border:1px solid #0000FF;
+ border:1px solid #605D5D;
margin-left: 2px;
margin-right:18px;
font-size:12px;
@@ -1229,13 +1272,21 @@ div.foldercontent {
}
h1.title {
- color: #0000FF;
+ color: #605D5D;
font-style: italic;
text-align:center;
text-transform: uppercase;
}
h2.title {
- background-color: #C4CBDB;
+
+background: rgb(149,149,149); /* Old browsers */
+background: -moz-linear-gradient(top, rgba(149,149,149,1) 0%, rgba(13,13,13,1) 46%, rgba(1,1,1,1) 50%, rgba(10,10,10,1) 53%, rgba(78,78,78,1) 76%, rgba(56,56,56,1) 87%, rgba(27,27,27,1) 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(149,149,149,1)), color-stop(46%,rgba(13,13,13,1)), color-stop(50%,rgba(1,1,1,1)), color-stop(53%,rgba(10,10,10,1)), color-stop(76%,rgba(78,78,78,1)), color-stop(87%,rgba(56,56,56,1)), color-stop(100%,rgba(27,27,27,1))); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#959595', endColorstr='#1b1b1b',GradientType=0 ); /* IE6-9 */
color:#FFFFFF;
text-align:center;
padding:0.24%;
@@ -1243,16 +1294,16 @@ h2.title {
}
h3.title {
- color: #0000FF;
+ color: #605D5D;
margin-left: 30px;
}
h4.title {
- color: #0000FF;
+ color: #605D5D;
margin-left: 45px;
text-decoration: underline;
}
h5.title {
- color: #0000FF;
+ color: #605D5D;
margin-left: 45px;
text-decoration: none;
font-style: italic;
@@ -1300,7 +1351,7 @@ div.menu3 {
font-size : 1.2em;
}*/
textarea.itextarea{
- border:solid #0000FF 1px;
+ border:solid #605D5D 1px;
width:90%;
margin-left:5%;
height:120px;
@@ -1433,7 +1484,7 @@ td.workday ol {
}
input.inum {
text-align:right;
- border:1px solid #0000FF;
+ border:1px solid #605D5D;
margin:2px
}
div.box {
diff --git a/html/style-mandarine.css b/html/style-mandarine.css
index 398d7d208..2194a53e9 100644
--- a/html/style-mandarine.css
+++ b/html/style-mandarine.css
@@ -2,7 +2,7 @@
BODY {
background-color: #FFF1ED;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
padding: 0px 0px 0px 0px ;
margin:0px;
color: #A52A2A;
@@ -27,7 +27,7 @@ table.resultfooter tfoot {
}
table.sortable th, table.table_large th,table.result th {
font-weight:bold;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
border-bottom:1px solid #FF7F50;
border-top:0;
@@ -38,7 +38,7 @@ table.sortable th, table.table_large th,table.result th {
}
h2 {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
color: #E95353;
margin:1px;
padding:1px;
@@ -164,7 +164,7 @@ div.lmenu {
div.lextmenu {
float:left;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
}
div.searchmenu {
@@ -177,7 +177,7 @@ div.searchmenu {
div.recherche_form{
width:700px;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
border-style:outset;
border-width:1px;
@@ -186,7 +186,7 @@ div.redcontent{
float:left;
padding-top:7px;
padding-left:8px;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
width:75%;
}
@@ -194,7 +194,7 @@ div.content{
padding-top:0.0030%;
margin-top:0.0030%;
width:100%;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
font-size:14.4px;
font-size:0.90rem;
@@ -204,12 +204,12 @@ div.content30{
float:left;
padding-top:7px;
width:35%;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
}
div.no span{
position:static;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
font-weight:bold;
color:#FF0000;
@@ -224,7 +224,7 @@ table.document {
}
table.document th{
font-weight:bold;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
border-bottom:2px solid #FF7F50;
border-top:0px;
color:#6D3F2E;
@@ -259,8 +259,9 @@ td.mtitle {
width:250px;
height :30px;
background-color: #FFD299;
- border:1px solid #99B1DF;
+ border:0px;
border-radius:5px;
+ font-weight: bold;
}
td.msubtitle {
text-align:center;
@@ -282,7 +283,7 @@ span.even {
}
tr.odd {
- background-color: #FFCC99;
+ background-color: #FFE9D6;
}
tr.highlight {
font-weight: bold;
@@ -407,7 +408,7 @@ a.one:hover {
a.detail
{
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
text-decoration: none;
display: block;
color: #DB6906;
@@ -415,7 +416,7 @@ a.detail
a.detail:hover
{
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
color: #FFFFFF;
background-color: #FF6600;
text-decoration: none;
@@ -428,7 +429,7 @@ li.menuv,ol.menuv {
padding:1rem 1rem;
}
div.redcontent a {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
text-decoration: none;
display: block;
color: #A52A2A;
@@ -436,7 +437,7 @@ div.redcontent a {
}
div.redcontent a:hover {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
color: #FFFFFF;
background-color:#336699;
text-decoration: none;
@@ -444,7 +445,7 @@ div.redcontent a:hover {
}
div.content a {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
text-decoration: none;
display: block;
color: #EF5F2B;
@@ -454,7 +455,7 @@ div.content a {
div.content a:hover {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
color: #FFFFFF;
background-color: #C76626;
text-decoration: none;
@@ -497,7 +498,7 @@ div.content a.mtitle:hover {
}
div.redcontent input.text {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
font-weight:normal;
border-color:#336699;
border-style:solid;
@@ -506,7 +507,7 @@ div.redcontent input.text {
color:#FF7F50;
}
div.content input.text {
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
font-weight:normal;
border-color:#336699;
border-style:solid;
@@ -827,11 +828,18 @@ a#anchorbutton, .button, a.button,div.content a.button {
margin:1px 2px 1px 2px;
border-radius: 5px;
moz-border-radius:5px;
- background-color: #EEBC8B;
border-radius: 2px;
border-width: 1px;
border-color: #6D3F2E;
+ background: #feccb1; /* Old browsers */
+background: -moz-linear-gradient(top, #feccb1 0%, #f17432 50%, #ea5507 51%, #fb955e 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#feccb1), color-stop(50%,#f17432), color-stop(51%,#ea5507), color-stop(100%,#fb955e)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* IE10+ */
+background: linear-gradient(to bottom, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 ); /* IE6-9 */
}
a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover {
cursor:pointer;
@@ -848,7 +856,7 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
font-family: arial,verdana,sans-serif,helvetica;
font-size:12px;
font-size:0.75rem;
- border-color: #6D3F2E;
+ border-color: orange;
border-style: solid;
border-width: 1px;
@@ -861,8 +869,14 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
margin:1px 2px 1px 2px;
border-radius: 2px;
moz-border-radius:2px;
-
- background-color: #EEBC8B;
+background: #feccb1; /* Old browsers */
+background: -moz-linear-gradient(top, #feccb1 0%, #f17432 50%, #ea5507 51%, #fb955e 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#feccb1), color-stop(50%,#f17432), color-stop(51%,#ea5507), color-stop(100%,#fb955e)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* IE10+ */
+background: linear-gradient(to bottom, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 ); /* IE6-9 */
}
a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.smallbutton:hover {
cursor:pointer;
@@ -940,7 +954,7 @@ box-shadow: 10px 10px 5px #888;
}
div.inner_box {
background-color: #FAF3EC;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
padding:2px;
margin:0px;
overflow:hidden;
@@ -954,16 +968,16 @@ box-shadow: 10px 10px 5px #888;
font-size:14.4px;
font-size:0.90rem;
}
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 1281px) {
div.inner_box {
- width: 35%;
+ width: 55%;
}
}
-@media only screen and (max-width: 1024px) {
+@media only screen and (max-width: 1280px) {
div.inner_box {
- width: 90%;
- left:5%;
- margin-bottom: 5%;
+ width: 95%;
+ left:2%;
+ margin-bottom: 2%;
}
}
div.op_detail_title {
@@ -1228,7 +1242,15 @@ h1.title {
text-transform: uppercase;
}
h2.title {
- background-color: #FFB483;
+
+ background: -moz-linear-gradient(top, rgba(242,130,91,0.94) 0%, rgba(229,91,43,0.98) 62%, rgba(240,113,70,0.99) 73%, rgba(240,113,70,1) 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(242,130,91,0.94)), color-stop(62%,rgba(229,91,43,0.98)), color-stop(73%,rgba(240,113,70,0.99)), color-stop(100%,rgba(240,113,70,1))); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); /* IE10+ */
+ background: linear-gradient(to bottom, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f0f2825b', endColorstr='#f07146',GradientType=0 ); /* IE6-9 */
+
color:#FFFFFF;
text-align:center;
padding:0.24%;
@@ -1315,7 +1337,7 @@ div#notice {
div#modele_op_div{
display: none;
background-color:#FFF1ED;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
padding:0px;
margin:0px;
overflow:hidden;
@@ -1336,7 +1358,7 @@ div#notice {
div#modele_op_div{
display: none;
background-color:#FFF1ED;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
padding:0px;
margin:0px;
overflow:hidden;
@@ -1362,15 +1384,13 @@ div.bxbutton
margin-right:0.48%;
}
div.inner_box tr.odd {
- background: #FEFFE0;
- color: br;
}
#modele_op_tab tr.odd {
background: #FFFFCC;
}
div#bookmark_div {
background-color:#FFF1ED;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
padding:2px;
margin:0px;
overflow:hidden;
@@ -1384,7 +1404,7 @@ div#bookmark_div {
}
div#preference_div {
background-color:#FFF1ED;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
padding:0px;
margin:0px;
overflow:hidden;
@@ -1432,7 +1452,7 @@ input.inum {
}
div.box {
background-color:#FFF1ED;
- font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
margin-top:10px;
margin-left:3px;
margin-right:3px;
diff --git a/html/test.php b/html/test.php
index 7cb1d49f3..2dc2fb563 100644
--- a/html/test.php
+++ b/html/test.php
@@ -1,4 +1,5 @@
'.$p_array['desc'].'';
- require $p_array['file'];
- call_user_func($p_array['function']);
-}
-// Test the connection
-echo __FILE__.":".__LINE__;
-print_r($_REQUEST);
-if ( ! isset($_REQUEST['gDossier']))
-{
- echo "Vous avez oublie de specifier le gDossier ;)";
- echo "L'url aurait du etre test.php?gDossier=xx";
- exit();
-}
-$cn=new Database($_GET['gDossier']);
-$a_route[]=array('desc'=>'test sur les menus par défauts','file'=>'class_default_menu.php','function'=>'Default_Menu::test_me');
-$a_route[]=array('desc'=>'test sur Acc_Operations','file'=>'class_acc_operation.php','function'=>'Acc_Operation::test_me');
-$a_route[]=array('desc'=>'test sur INVOICING','file'=>'../include/ext/invoicing/include/class_acc_ledger_sold_generate.php','function'=>'Acc_Ledger_Sold_Generate::test_me');
-$a_route[]=array('desc'=>'test sur menu_ref','file'=>'class_menu_ref_sql.php','function'=>'Menu_Ref_SQL::test_me');
-$called=HtmlInput::default_value_get("called", -1);
-if ($called == -1 )
-{
- for ($i=0;$i< count($a_route);$i++)
+/*
+ * Loading of all scenario
+ */
+$scan=scandir('../scenario/');
+$maxscan=count($scan);
+$cnt_scenario=0;$scenario=array();
+
+for ($e_scan=0; $e_scan<$maxscan; $e_scan++)
{
- start_test($a_route[$i]);
+ if (is_file('../scenario/'.$scan[$e_scan])&&strpos($scan[$e_scan], '.php')==true)
+ {
+ $description="";
+ $a_description=file('../scenario/'.$scan[$e_scan]);
+ $max_description=count($a_description);
+ for ($w=0; $w<$max_description; $w++)
+ {
+ if (strpos($a_description[$w], '@description:')==true)
+ {
+ $description=$a_description[$w];
+ $description=str_replace('//@description:', '', $description);
+ }
+ }
+ $scenario[$cnt_scenario]['file']=$scan[$e_scan];
+ $scenario[$cnt_scenario]['desc']=$description;
+ $cnt_scenario++;
+
+
+ }
}
-}
- else
+$script=HtmlInput::default_value_get('script', '');
+if ($script=="")
{
- start_test($a_route[$called]);
-}
\ No newline at end of file
+ echo "Test NOALYSS
";
+ /*
+ * cherche pour fichier a include, s'il y en a alors les affiche
+ * avec une description
+ */
+
+
+ echo '';
+ $get='test.php?'.http_build_query(array('script'=>"all", 'gDossier'=>$gDossierLogInput, 'description'=>"Tous les scripts"));
+ echo '';
+ echo '| ';
+ echo '';
+ echo "Tous ";
+ echo '';
+ echo ' | ';
+ echo 'Tous les scripts | ';
+ echo '
';
+
+ for ($e=0; $e<$cnt_scenario; $e++)
+ {
+
+ $get='test.php?'.http_build_query(array('script'=>$scenario[$e]['file'], 'gDossier'=>$gDossierLogInput, 'description'=>$scenario[$e]['desc']));
+ echo '';
+ echo '| ';
+ echo $e;
+ echo ' | ';
+ echo '';
+ echo '';
+ echo $scenario[$e]['file'];
+ echo '';
+ echo ' | ';
+ echo ''.$scenario[$e]['desc'].' | ';
+ echo '
';
+
+ }
+ echo '
';
+}
+else if ($script=='all')
+{
+ $nb=HtmlInput::default_value_get('nb_script', 0);
+
+ $start_mem=memory_get_usage();
+ $start_time=microtime(true);
+ $script=str_replace('../', '', $script);
+
+ echo ''.$nb." ".$scenario[$nb]['file']."
";
+ echo ' description = '.$scenario[$nb]["desc"].'
';
+ include '../scenario/'.$scenario[$nb]['file'];
+ echo '';
+ echo '';
+ $end_mem=memory_get_usage();
+ $end_time=microtime(true);
+
+ echo "start mem : ".$start_mem;
+ echo '
';
+ echo "end mem : ".$end_mem;
+ echo '
';
+ echo "Diff = ".($end_mem-$start_mem)." bytes ";
+ echo "
Diff = ".(round(($end_mem-$start_mem)/1024, 2))." kbytes ";
+ echo "
Diff = ".(round(($end_mem-$start_mem)/1024/1024, 2))." Mbytes ";
+ echo '
';
+ echo "Execution script ".$script." time = ".(round(($end_time-$start_time), 4))." secondes
";
+ $nb++;
+ if ( $nb == $maxscan ) {
+ echo "Dernier test";
+ } else {
+ $get='test.php?'.http_build_query(array('script'=>"all", 'gDossier'=>$gDossierLogInput, 'nb_script'=>$nb));
+ echo '';
+ echo $scenario[$nb]['file'];
+ }
+}
+else
+{
+ $start_mem=memory_get_usage();
+ $start_time=microtime(true);
+ $script=str_replace('../', '', $script);
+ $description=HtmlInput::default_value_get("description", "aucune description");
+ echo ''.$script."
";
+ echo ' description = '.$description.'
';
+ include '../scenario/'.$script;
+
+ $end_mem=memory_get_usage();
+ $end_time=microtime(true);
+
+ echo "
start mem : ".$start_mem;
+ echo '
';
+ echo "end mem : ".$end_mem;
+ echo '
';
+ echo "Diff = ".($end_mem-$start_mem)." bytes ";
+ echo "
Diff = ".(round(($end_mem-$start_mem)/1024, 2))." kbytes ";
+ echo "
Diff = ".(round(($end_mem-$start_mem)/1024/1024, 2))." Mbytes ";
+ echo '
';
+ echo "Execution script ".$script." time = ".(round(($end_time-$start_time), 4))." secondes
";
+}
\ No newline at end of file
diff --git a/include/ac_common.php b/include/ac_common.php
index 6250c822f..5dfd7e627 100644
--- a/include/ac_common.php
+++ b/include/ac_common.php
@@ -983,7 +983,15 @@ function show_menu($module, $idx)
$array=compute_variable($file[0]['me_parameter']);
put_global($array);
}
-
+ /*
+ * Log the file we input to put in the folder test-noalyss for replaying it
+ */
+ if (LOGINPUT) {
+ $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+ fwrite($file_loginput, "include '".$file[0]['me_file']."';");
+ fwrite($file_loginput,"\n");
+ fclose($file_loginput);
+ }
// if file is not a plugin, include the file, otherwise
// include the plugin launcher
if ( $file[0]['me_type'] != 'PL')
diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index e2b1b4056..689cc3d9c 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -52,7 +52,7 @@ if ( isset ($_POST['other_action_bt'])) {
case 'IMP':
//Impression
Follow_Up::action_print($cn,$_POST);
- exit(0);
+ return;
break;
case 'ST':
// Etat
@@ -124,7 +124,7 @@ if ($sub_action == "update")
echo '';
echo '
'._('Cette action ne vous est pas autorisée Contactez votre responsable').'
';
echo '';
- exit();
+ return;
}
$sub_action = "detail";
put_global(array(array('key' => "sa", "value" => "detail")));
@@ -195,7 +195,7 @@ if ($sub_action == 'detail')
else
{
echo h2info(_("Ce document n'est pas accessible"));
- exit();
+ return;
}
@@ -216,7 +216,7 @@ if ($sub_action == 'delete')
Follow_Up::show_action_list($cn, $base);
if (isset($act->ag_ref))
echo hb(_('Action ') . $act->ag_ref . _(' effacée'));
- exit();
+ return;
}
//--------------------------------------------------------------------------------
diff --git a/include/adm.inc.php b/include/adm.inc.php
index 6829fe4d7..f3cadd19c 100644
--- a/include/adm.inc.php
+++ b/include/adm.inc.php
@@ -142,7 +142,7 @@ if ( $low_action == 'detail')
{
/* Menu */
require_once('category_card.inc.php');
- exit();
+return;
}
diff --git a/include/ajax_account_update.php b/include/ajax_account_update.php
new file mode 100644
index 000000000..e0d0ba47c
--- /dev/null
+++ b/include/ajax_account_update.php
@@ -0,0 +1,213 @@
+
+
+if (!defined('ALLOWED')) die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief delete insert or update data from account_update (need right CFGPCMN)
+ * called from ajax_misc.php
+ * @param array
+ * @code
+ * 'op' => string 'account_update' (length=14)
+ 'gDossier' => string '44' (length=2)
+ 'action' => string 'update' (length=6)
+ 'p_oldu' => string '4124' (length=4)
+ 'p_valu' => string '4124' (length=4)
+ 'p_libu' => string 'Impôt belge sur le résultat' (length=29)
+ 'p_parentu' => string '412' (length=3)
+ 'acc_delete' => string '0' (length=1)
+ 'p_typeu' => string '0' (length=1)
+ * @endcode
+ */
+if ($g_user->check_module('CFGPCMN') == 0)
+ exit();
+
+$var=array('action', 'p_oldu', 'p_valu', 'p_libu', 'p_parentu', 'acc_delete', 'p_typeu');
+for ($i=0; $iset_parameter('libelle', $p_lib);
+ $acc->set_parameter('value', $p_val);
+ $acc->set_parameter('parent', $p_parent);
+ $acc->set_parameter('type', $p_type);
+ $acc->check();
+ }
+ catch (Exception $e)
+ {
+ $message=_("Valeurs invalides, pas de changement")." \n ".
+ $e->getMessage();
+ $ctl='nok';
+ }
+ if (strlen($p_val)!=0&&strlen($p_lib)!=0&&strlen($old_line)!=0)
+ {
+ if (strlen($p_val)==1)
+ {
+ $p_parent=0;
+ }
+ else
+ {
+ if (strlen($p_parent)==0)
+ {
+ $p_parent=substr($p_val, 0, strlen($p_val)-1);
+ }
+ }
+ /* Parent existe */
+ $Ret=$cn->exec_sql("select pcm_val from tmp_pcmn where pcm_val=$1", array($p_parent));
+ if (($p_parent!=0&&Database::num_row($Ret)==0)||$p_parent==$old_line)
+ {
+ $message=_("Ne peut pas modifier; aucun poste parent");
+ $ctl='nok';
+ }
+ else
+ {
+ try
+ {
+ $acc->update($old_line);
+ }
+ catch (Exception $e)
+ {
+ $message=$e->getMessage();
+ $ctl='nok';
+ }
+ }
+ }
+ else
+ {
+ $message=_('Update Valeurs invalides');
+ $ctl='nok';
+ }
+}
+//-----------------------------------------------------
+/* Ajout d'une ligne */
+if ($action=="new")
+{
+ $p_val=trim($p_valu);
+ $p_parent=trim($p_parentu);
+
+ if (isset($p_valu)&&isset($p_libu))
+ {
+ $p_val=trim($p_valu);
+
+ if (strlen($p_valu)!=0&&strlen($p_libu)!=0)
+ {
+ if (strlen($p_valu)==1)
+ {
+ $p_parentu=0;
+ }
+ else
+ {
+ if (strlen(trim($p_parentu))==0&&
+ (string) $p_parentu!=(string) (int) $p_parentu)
+ {
+ $p_parentu=substr($p_val, 0, strlen($p_valu)-1);
+ }
+ }
+ /* Parent existe */
+ $Ret=$cn->exec_sql("select pcm_val from tmp_pcmn where pcm_val=$1", array($p_parentu));
+ if ($p_parent!=0&&Database::num_row($Ret)==0)
+ {
+ $message=_(" Ne peut pas modifier; aucun poste parent");
+ $ctl='nok';
+ }
+ else
+ {
+ // Check if the account already exists
+
+ $Count=$cn->get_value("select count(*) from tmp_pcmn where pcm_val=$1", array($p_val));
+ if ($Count!=0)
+ {
+ // Alert message account already exists
+ $message=_("Ce poste existe déjà ");
+ $ctl='nok';
+ }
+ else
+ {
+ $Ret=$cn->exec_sql("insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) values ($1,$2,$3,$4)", array($p_val, $p_libu, $p_parent, $p_typeu));
+ }
+ }
+ }
+ else
+ {
+ $message=_("Valeurs invalides ");
+ $ctl='nok';
+ }
+ }
+}
+
+//-----------------------------------------------------
+// Action == remove a line
+if ($action=="update"&&$acc_delete==1)
+{
+ /* Ligne a enfant */
+ $R=$cn->exec_sql("select pcm_val from tmp_pcmn where pcm_val_parent=$1", array($p_valu));
+ if (Database::num_row($R)!=0)
+ {
+ $message=_("Ne peut pas effacer le poste: d'autres postes en dépendent");
+ $ctl='nok';
+ }
+ else
+ {
+ /* Vérifier que le poste n'est pas utilisé qq part dans les journaux */
+ $Res=$cn->exec_sql("select * from jrnx where j_poste=$1", array($p_valu));
+ if (Database::num_row($Res)!=0)
+ {
+ $message=_("Ne peut pas effacer le poste: il est utilisé dans les journaux");
+ $ctl='nok';
+ }
+ else
+ {
+ $Del=$cn->exec_sql("delete from tmp_pcmn where pcm_val=$1", array($p_valu));
+ } // if Database::num_row
+ } // if Database::num_row
+} //$action == del
+$message=escape_xml($message);
+ if ( ! headers_sent()) { header('Content-type: text/xml; charset=UTF-8');} else { echo "HTML".unescape_xml($html);}
+
+ echo <<
+
+$ctl
+$message
+
+EOF;
+?>
diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php
index 9a73ab4fc..af173e99b 100644
--- a/include/ajax_add_menu.php
+++ b/include/ajax_add_menu.php
@@ -25,7 +25,11 @@
* @brief show the form to add a menu
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-$type=$_GET['type'];
+$type=HtmlInput::default_value_get('type','XX');
+if ($type == 'XX') {
+ throw new Exception('invalid call');
+ return;
+}
if ( $type=='me')
{
$ame_code_dep=$cn->make_array("
diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php
index bc06030a0..96bb13071 100644
--- a/include/ajax_get_profile.php
+++ b/include/ajax_get_profile.php
@@ -33,15 +33,21 @@ $profile=new Profile_sql($cn,$p_id);
$gDossier=Dossier::id();
$add_menu=HtmlInput::button("add", "Ajout Menu","onclick=\"add_menu({dossier:$gDossier,p_id:$p_id,type:'me'})\"");
$add_impression=HtmlInput::button("add", "Ajout Menu","onclick=\"add_menu({dossier:$gDossier,p_id:$p_id,type:'pr'})\"");
+$call_tab=HtmlInput::default_value_post('tab', 'none');
+$a_tab=array('profile_gen_div'=>'tabs','profile_menu_div'=>'tabs','profile_print_div'=>'tabs','profile_gestion_div'=>'tabs','profile_repo_div'=>'tabs');
+$a_tab[$call_tab]='tabs_selected';
?>
Profil p_name?>
0 ) : ?>
-
-
-
-
-
+
0 )
}
else
{
- echo '';
+ echo '
';
}
echo '';
echo '
';
- echo '