diff --git a/html/js/card.js b/html/js/card.js index 3e990f4fb..1bbf38073 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -188,7 +188,7 @@ function fill_data(text,li) { *@param the input field *@see ICard */ -function fill_data_fin_onchange(ctl) { +function fill_fin_data_onchange(ctl) { ajaxFid(ctl); ajax_saldo($('phpsessid'),ctl.id); } @@ -419,4 +419,4 @@ function save_card_category(obj) { /** *@brief Display a form to modify a category * - */ \ No newline at end of file + */ diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index a13c0c537..847099f2f 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -3,14 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-07 00:32+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-03-07 00:38+0100\n" +"Last-Translator: Dany De Bontridder \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2499,11 +2498,11 @@ msgstr "Eenheid prijs zonder BTW" #: include/template/form_ledger_detail.php:33 msgid "tot.tva" -msgstr "" +msgstr "tot btw" #: include/template/form_ledger_detail.php:34 msgid "tvac" -msgstr "" +msgstr "met btw" #: include/template/form_ledger_fin.php:11 msgid "Extrait de compte" @@ -2527,67 +2526,67 @@ msgstr "" #: include/template/ledger_search.php:1 msgid "Critères de Recherche" -msgstr "" +msgstr "Zoeken criteria" #: include/template/ledger_search.php:5 msgid "Dans le journal" -msgstr "" +msgstr "En in het boek" #: include/template/ledger_search.php:14 msgid "Et Compris entre les date" -msgstr "" +msgstr "En tussen de datum" #: include/template/ledger_search.php:17 include/template/ledger_search.php:35 msgid "et" -msgstr "" +msgstr "en" #: include/template/ledger_search.php:23 msgid "Et contenant dans la description, pièce justificative ou n° interne" -msgstr "" +msgstr "En met de interne number, de beschrijving, " #: include/template/ledger_search.php:32 msgid "Et compris entre les montants" -msgstr "" +msgstr "En tussen de bedragen" #: include/template/ledger_search.php:40 msgid "Et utilisant la fiche (quick code)" -msgstr "" +msgstr "En met de blad (quick code)" #: include/template/ledger_search.php:48 msgid "Et utilisant le poste comptable" -msgstr "" +msgstr "En met de rekening" #: include/template/ledger_search.php:58 msgid "Et uniquement non payées" -msgstr "" +msgstr "En alleen niet betalend" #: include/template/new_mod_payment.php:2 msgid "Nouveau moyen de paiement" -msgstr "" +msgstr "Niew methode van betaling" #: include/template/new_mod_payment.php:25 msgid "Pour le type de journal" -msgstr "" +msgstr "Voor de soort van boek" #: include/template/new_mod_payment.php:34 msgid "Paiement enregistré dans " -msgstr "" +msgstr "Betaling geregistreerd in" #: include/template/new_mod_payment.php:43 msgid "Avec la fiche" -msgstr "" +msgstr "Met de blad" #: include/template/param_jrn.php:4 msgid "Nom journal" -msgstr "" +msgstr "Boek naam" #: include/template/param_jrn.php:8 msgid "Postes utilisables journal (débit/crédit)" -msgstr "" +msgstr "beschikbaar rekening (debit/credit) " #: include/template/param_jrn.php:22 msgid "Type de journal" -msgstr "" +msgstr "Soort van boek" #: include/template/param_jrn.php:28 msgid "Préfixe code interne" @@ -2603,11 +2602,11 @@ msgstr "" #: include/template/param_jrn.php:40 msgid "N° pièce justificative" -msgstr "" +msgstr "Nummer " #: include/template/param_jrn.php:44 msgid "La numérotation est propre à chaque journal" -msgstr "" +msgstr "De nummering hangt journal" #: include/template/param_jrn.php:53 msgid "Fiches Débit" @@ -2844,19 +2843,19 @@ msgstr "BTW %" #: include/class_anc_print.php:122 msgid "Plan Analytique :" -msgstr "" +msgstr "Analytische plan" #: include/class_anc_print.php:126 msgid "Entre le poste " -msgstr "" +msgstr "Tussen de rekening" #: include/class_anc_print.php:128 msgid "Choix Poste" -msgstr "" +msgstr "keuze van de rekening" #: include/class_anc_print.php:133 msgid " et le poste " -msgstr "" +msgstr " en de rekening " #: include/fiche.inc.php:71 msgid "Recherche :" @@ -2870,59 +2869,59 @@ msgstr "Termijn" #: include/ext/stock/class_ext_stock.php:347 #: include/ext/stock/class_ext_stock.php:326 msgid "Discount" -msgstr "" +msgstr "Korting" #: include/class_fiche.php:1076 include/class_fiche.php:1078 msgid "Code interne" -msgstr "" +msgstr "Interne code" #: include/class_fiche.php:1248 include/class_fiche.php:1250 msgid "Quick Code" -msgstr "" +msgstr "Quick Code" #: include/class_fiche.php:1250 include/class_fiche.php:1252 msgid "Adresse" -msgstr "" +msgstr "Adress" #: include/class_fiche.php:1251 include/class_fiche.php:1253 msgid "Total débit" -msgstr "" +msgstr "Debit totaal" #: include/class_fiche.php:1252 include/class_fiche.php:1254 msgid "Total crédit" -msgstr "" +msgstr "Credit totaal" #: include/client.inc.php:72 msgid "Vous ne pouvez pas enlever de fiche" -msgstr "" +msgstr "U mag geen blad verwijderen" #: include/class_acc_account.php:167 #, php-format msgid "Numéro de classe" -msgstr "" +msgstr "rekeningsnummer" #: include/class_acc_account.php:171 #, php-format msgid "Classe Parent" -msgstr "" +msgstr "Rekening " #: include/class_acc_bilan.php:72 msgid " jusque " -msgstr "" +msgstr "tot" #: include/class_acc_bilan.php:81 msgid "Choix du bilan" -msgstr "" +msgstr "Keuze van de handelsbalans" #: include/class_acc_ledger_fin.php:59 include/class_acc_ledger.php:1436 #: include/class_acc_ledger_purchase.php:60 #: include/class_acc_ledger_sold.php:64 msgid "Accès interdit" -msgstr "" +msgstr "Verboden" #: include/impress_bilan.inc.php:46 msgid "Verification comptabilite" -msgstr "" +msgstr "Verificatie vand de boekhouding" #: include/impress_bilan.inc.php:66 msgid "" @@ -2936,11 +2935,20 @@ msgid "" " \n" "Utilisez la balance des comptes pour vérifier. " msgstr "" +" Opgelet: als de balans niet in evenwicht.
" +"Check
    \n" +"
  • verdeling van de inkomsten is gemaakt \n" +"Uw
  • actieve accounts hebben een negatief saldo (exclusief rekeningen zei omgekeerd)" +" \n" +"
  • passiva rekeningen hebben een tegoed (exclusief rekeningen zei" +"omgekeerd) \n" +" \n" +"Gebruik de rekening van de betalingsbalans te controleren. " #: html/parametre.php:139 msgid "Catégorie de documents" -msgstr "" +msgstr "Categorie van documenten" #: html/parametre.php:139 msgid "Ajoute des catégories de documents,..." -msgstr "" +msgstr "Voegt categorieën van documenten toe" diff --git a/html/quick_code_pdf.php b/html/quick_code_pdf.php index c220293b7..4fc71a14a 100644 --- a/html/quick_code_pdf.php +++ b/html/quick_code_pdf.php @@ -54,7 +54,7 @@ if ( count($array) == 0 ) { } $Libelle=utf8_decode(sprintf("(%s) %s ",$Fiche->id,$Fiche->getName())); header_pdf($cn,$pdf); -// $pdf->ezText($Libelle,30); + $pdf->ezTable($array, array ('jr_internal'=>'Operation', 'j_date_fmt' => 'Date', diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 377a61654..aa41db93d 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -2097,7 +2097,7 @@ function get_last_date() if ( $p_action == 'gl') $p_action='ALL'; /* actions from commercial.php */ if ( $p_action == 'client') $p_action='ALL'; - if ( $p_action == 'fournisseur') $p_action='ALL'; + if ( $p_action == 'supplier') $p_action='ALL'; if ( $p_action == 'adm') $p_action='ALL'; if ( $p_action == 'quick_writing') $p_action='ALL'; diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index 07fa91a26..5b5adee53 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -279,8 +279,7 @@ class Acc_Ledger_Fin extends Acc_Ledger { // Add the callback function to filter the card on the jrn $ibank->set_callback('filter_card'); $ibank->set_function('fill_fin_data'); - $ibank->javascript=sprintf(' onchange="fill_fin_data_onchange(\'%s\');" ', - $ibank->name); + $ibank->javascript=sprintf(' onchange="fill_fin_data_onchange(this);" '); $f_legend_detail='Opérations financières'; //-------------------------------------------------- @@ -337,7 +336,7 @@ class Acc_Ledger_Fin extends Acc_Ledger { $W1->set_attribute('ipopup','ipopcard'); // name of the field to update with the name of the card - $W1->set_attribute('label','e_other'.$i.'_comment'); + $W1->set_attribute('label','e_other'.$i.'_label'); // name of the field to update with the name of the card $W1->set_attribute('typecard','filter'); // Add the callback function to filter the card on the jrn diff --git a/include/class_acc_operation.php b/include/class_acc_operation.php index 7c1bcb500..313c2a5f8 100644 --- a/include/class_acc_operation.php +++ b/include/class_acc_operation.php @@ -236,6 +236,9 @@ function get_internal() { /*!\brief add a limit of payment to the operation (jrn.jr_ech) */ function operation_update_date_limit($p_text) { + if ( isDate($p_text) == null ) { + $p_text=null; + } $sql="update jrn set jr_ech=to_date($1,'DD.MM.YYYY') where jr_id=$2"; $this->db->exec_sql($sql,array($p_text,$this->jr_id)); } diff --git a/include/class_anticipation.php b/include/class_anticipation.php index 5d2766443..7ebc0535b 100644 --- a/include/class_anticipation.php +++ b/include/class_anticipation.php @@ -237,7 +237,7 @@ class Anticipation $periode=new Periode($this->cn); $aPeriode=$this->cn->make_array("select p_id,to_char(p_start,'MM.YYYY') as label from parm_periode where to_char(p_start,'DD')!='31' order by p_start"); $aPeriode[]=array('value'=>0,'label'=>'Mensuel'); - $value=$this->cn->get_array("select fi_id,fi_text,fi_account,fi_card,fc_id,fi_amount,fi_debit ". + $value=$this->cn->get_array("select fi_id,fi_text,fi_account,fi_card,fc_id,fi_amount,fi_debit,fi_pid ". " from forecast_item ". " where fc_id in (select fc_id from forecast_cat where f_id = $1)",array($this->f_id)); for ($i=0;$iset_attribute('gDossier',dossier::id()); $wMonth->set_attribute('phpsessid',$_REQUEST['PHPSESSID']); $month_year=$wMonth->input().$wMonth->get_js_attr(); + ob_start(); require_once('template/calendar.php'); $ret=ob_get_contents(); @@ -113,6 +114,9 @@ class Calendar { " from parm_periode where p_id=$1",array($this->default_periode)); $this->month=$array[0]['month']; $this->year=$array[0]['year']; + $this->day=self::$nb_day[$this->month-1]; + if ( $this->year % 4 == 0 && $this->month=2) + $this->day=29; } /** *@brief get the periode from the preference of the current user diff --git a/include/class_database.php b/include/class_database.php index 521866e7d..4b5f47d6d 100644 --- a/include/class_database.php +++ b/include/class_database.php @@ -97,7 +97,8 @@ de données"); */ function exec_sql( $p_string,$p_array=null) { try { - + $this->sql=$p_string; + $this->array=$p_array; if ( $p_array==null ) { $this->ret=pg_query($this->db,$p_string); } else { @@ -440,7 +441,16 @@ de données"); return false; return true; } - /*! + /* + *!\brief test if a schema exists + * \return true if the schemas exists otherwise false + */ + function exist_schema($p_name) { + $r=$this->count_sql("select nspname from pg_namespace where nspname=lower($1)",array($p_name)); + if ( $r==0) + return false; + return true; + } /*! *\brief create a string containing the value separated by comma * for use in a SQL in statement *\return the string or empty if nothing is found diff --git a/include/class_fiche.php b/include/class_fiche.php index 22b6c419e..284fc0389 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -960,7 +960,6 @@ Array " ( to_date($2,'DD.MM.YYYY') <= j_date and ". " to_date($3,'DD.MM.YYYY') >= j_date )". " order by j_date",array($qcode,$p_from,$p_to)); - return $this->get_row_result($Res); } diff --git a/include/import_inc.php b/include/import_inc.php index 62e6a7be6..b9c672330 100644 --- a/include/import_inc.php +++ b/include/import_inc.php @@ -92,7 +92,7 @@ $p_cn->commit(); * modify the Quick Code or remove record poss.value are form, remove */ function ShowBox($p_val,$counter,$p_cn,$p_form='form'){ - $w=new ICard(); + $w=new ICard(); $w->jrn=$p_val['jrn']; $w->name='poste'.$counter; $w->extra='filter'; @@ -181,7 +181,6 @@ function VerifImport($p_cn){ $Res=$p_cn->exec_sql($sql); $Num=Database::num_row($Res); echo $Num._(" opérations à complèter")."

    "; - $i=1; // include javascript for popup echo JS_CARD; echo JS_LEDGER; @@ -192,7 +191,6 @@ function VerifImport($p_cn){ echo dossier::hidden(); ShowBox($val,$i,$p_cn,'form'); echo ''; - $i++; } } diff --git a/include/restore.inc.php b/include/restore.inc.php index ec36733e5..1ae745a5f 100644 --- a/include/restore.inc.php +++ b/include/restore.inc.php @@ -134,7 +134,7 @@ if ( isset ($_REQUEST['sa'] )) { echo '

    Restauration réussie du modèle '.$lname.'

    '; $new_cn=new Database($id,'mod'); - apply_patch($new_cn,$name,0); + $new_cn->apply_patch($name,0); echo ''.'Ne pas recharger la page, sinon votre base de données sera restaurée une fois de plus'.''; echo $retour;