[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 75/107: Task #0001731: Moyen de paiement
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 75/107: Task #0001731: Moyen de paiement |
|
Date: |
Mon, 26 Aug 2019 10:32:04 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 282c26a9f0f3612cbb659c6426b7bfa16b66a10d
Author: Dany De Bontridder <address@hidden>
Date: Thu Aug 8 09:06:44 2019 +0200
Task #0001731: Moyen de paiement
---
html/ajax_misc.php | 4 +-
html/lang/en_US/LC_MESSAGES/messages.po | 90 +++++--
html/lang/messages.po | 337 +++++++++++++++++++-------
html/lang/nl_NL/LC_MESSAGES/messages.po | 96 ++++++--
include/ajax/ajax_payment_method.php | 71 ++++++
include/class/acc_payment.class.php | 75 +-----
include/class/payment_method_mtable.class.php | 144 +++++++++++
include/constant.php | 2 +-
include/database/payment_method_sql.class.php | 71 ++++++
include/lib/message_javascript.php | 3 +-
include/payment_middle.inc.php | 134 +---------
include/sql/patch/upgrade134.sql | 8 +
sql/upgrade.sql | 21 --
13 files changed, 718 insertions(+), 338 deletions(-)
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index d34d7ee..9129176 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -252,7 +252,9 @@ $path = array(
// TVA param
"tva_parameter"=>"ajax_tva_parameter",
// Display all cards using an accounting
- "display_all_card"=>"ajax_display_all_card"
+ "display_all_card"=>"ajax_display_all_card",
+ // payment_method
+ "payment_method"=>"ajax_payment_method"
) ;
if (array_key_exists($op, $path)) {
diff --git a/html/lang/en_US/LC_MESSAGES/messages.po
b/html/lang/en_US/LC_MESSAGES/messages.po
index 4e8aaab..1b5b2be 100644
--- a/html/lang/en_US/LC_MESSAGES/messages.po
+++ b/html/lang/en_US/LC_MESSAGES/messages.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: NOALYSS 672\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 15:00+0200\n"
-"PO-Revision-Date: 2019-08-07 15:04+0100\n"
+"POT-Creation-Date: 2019-08-08 01:27+0200\n"
+"PO-Revision-Date: 2019-08-08 01:28+0100\n"
"Last-Translator: dany <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
"Language: en_US\n"
@@ -969,7 +969,7 @@ msgstr "Folder not available"
#: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262
#: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384
#: html/ajax_misc.php:390 include/lib/message_javascript.php:90
-#: include/lib/message_javascript.php:92
+#: include/lib/message_javascript.php:92 html/ajax_misc.php:392
msgid "Action non autorisée"
msgstr "Unauthorized"
@@ -1202,6 +1202,8 @@ msgstr "Help "
#: include/lib/manage_table_sql.class.php:652
#: include/class/acc_ledger_search.class.php:248
#: include/class/acc_ledger_search.class.php:250
+#: include/lib/manage_table_sql.class.php:616
+#: include/lib/manage_table_sql.class.php:655
msgid "Ajout"
msgstr "Add"
@@ -1271,6 +1273,7 @@ msgstr "Add item"
#: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984
#: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
+#: include/lib/html_input.class.php:1112
msgid "Ajout autres"
msgstr "Adding others"
@@ -3112,7 +3115,7 @@ msgstr "calculator is visible"
#: include/template/calendar-list.php:34 include/lib/html_input.class.php:943
#: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
#: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
-#: include/lib/html_input.class.php:1007
+#: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
msgid "Calendrier"
msgstr "Calendar"
@@ -3125,6 +3128,7 @@ msgstr "from"
#: include/lib/manage_table_sql.class.php:1008
#: include/lib/manage_table_sql.class.php:1028
#: include/lib/manage_table_sql.class.php:1025
+#: include/lib/manage_table_sql.class.php:1069
msgid "Cancel"
msgstr "Cancel"
@@ -3304,7 +3308,7 @@ msgstr "This plan does not exist"
#: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
#: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
-#: html/ajax_misc.php:554
+#: html/ajax_misc.php:554 html/ajax_misc.php:556
msgid "Ce plugin n'existe pas "
msgstr "No plugin"
@@ -3594,7 +3598,8 @@ msgstr "full path to postgresql"
#: include/class/acc_ledger.class.php:2185
#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246
#: html/user_login.php:158 html/ajax_misc.php:462
-#: include/class/fiche.class.php:2247
+#: include/class/fiche.class.php:2247 html/ajax_misc.php:464
+#: include/lib/manage_table_sql.class.php:634
#, php-format
msgid "Cherche"
msgstr "Search"
@@ -3641,6 +3646,7 @@ msgid ""
msgstr "Select the exercice ( N-1 ) to report for the Report As New"
#: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
+#: html/ajax_misc.php:462
msgid "Choisissez la TVA"
msgstr "Select the VAT"
@@ -3690,6 +3696,11 @@ msgstr "Select another year"
msgid "Choisissez un dossier"
msgstr "Select your folder"
+#: include/class/payment_method_mtable.class.php:77
+#: include/class/payment_method_mtable.class.php:87
+msgid "Choisissez un journal"
+msgstr "Select a ledger"
+
#: include/class_pre_operation.php:281
#: include/class/class_pre_operation.php:281
#: include/class/class_pre_operation.php:284
@@ -3700,6 +3711,10 @@ msgstr "Select a template"
msgid "Choisissez un poste"
msgstr "Select an accouting"
+#: include/class/payment_method_mtable.class.php:115
+msgid "Choisissez un type de fiche"
+msgstr "Select a type of card"
+
#: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298
#: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279
#: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287
@@ -6056,7 +6071,7 @@ msgstr "Last entries"
#: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279
#: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
-#: html/ajax_misc.php:407
+#: html/ajax_misc.php:407 html/ajax_misc.php:409
msgid "Des actions dépendent de cette catégorie"
msgstr "Event depends on this category"
@@ -7670,6 +7685,7 @@ msgstr "Removal forbidden"
#: include/class/anc_operation.class.php:316
#: include/template/ledger_detail_bottom.php:328
#: include/class/periode.class.php:596 include/class/periode.class.php:601
+#: include/lib/manage_table_sql.class.php:768
msgid "Effacer"
msgstr "Remove"
@@ -7753,6 +7769,7 @@ msgstr "Remove an operation"
#: include/lib/manage_table_sql.class.php:1075
#: include/lib/manage_table_sql.class.php:1095
#: include/lib/manage_table_sql.class.php:1092
+#: include/lib/manage_table_sql.class.php:1136
msgid "Effacé"
msgstr "Erased"
@@ -7959,6 +7976,10 @@ msgstr "Record"
msgid "Enregistrement"
msgstr "Record"
+#: include/class/payment_method_mtable.class.php:39
+msgid "Enregistrement dans"
+msgstr "Recorded in"
+
#: include/action.common.inc.php:160 include/action.common.inc.php:258
#: include/compta_ach.inc.php:222 include/compta_ven.inc.php:238
#: include/action.common.inc.php:177 include/action.common.inc.php:309
@@ -8175,6 +8196,11 @@ msgstr "Disconnect"
msgid "Erreur exercice invalide"
msgstr "Invalid exercice"
+#: include/class/payment_method_mtable.class.php:140
+#, php-format
+msgid "Erreur key %s value %s"
+msgstr "Error key %s value %s"
+
#: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239
#: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295
#: html/do.php:264
@@ -8407,7 +8433,7 @@ msgstr "exercice is not a number"
#: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230
#: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
#: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
-#: html/ajax_misc.php:467
+#: html/ajax_misc.php:467 html/ajax_misc.php:469
msgid "Explication"
msgstr "Explanation"
@@ -8998,6 +9024,7 @@ msgstr "Closed"
#: include/class/acc_plan_mtable.class.php:49 include/database.item.php:78
#: include/database.item.php:110 include/category_card.inc.php:75
#: include/template/stock_inv.php:67
+#: include/class/payment_method_mtable.class.php:41
msgid "Fiche"
msgstr "Card"
@@ -9039,6 +9066,10 @@ msgstr "VAT record"
msgid "Fiche contenant"
msgstr "Card"
+#: include/class/payment_method_mtable.class.php:98
+msgid "Fiche inexistante"
+msgstr "Inexistent card"
+
#: include/ext/import_account/include/class_impacc_csv.php:53
#: include/ext/import_account/include/impacc_csv.class.php:53
msgid "Fiche non disponible pour journal"
@@ -10124,7 +10155,7 @@ msgstr "There are %s invalid parameters"
#: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
#: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
-#: html/ajax_misc.php:555
+#: html/ajax_misc.php:555 html/ajax_misc.php:557
msgid "Il y a une erreur, ce plugin n'existe pas"
msgstr "This plugin doesn't exist"
@@ -10706,6 +10737,7 @@ msgid "Invalide"
msgstr "Invalide"
#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
+#: html/ajax_misc.php:298
msgid "Invalide type"
msgstr "Invalide type"
@@ -11754,6 +11786,7 @@ msgstr "label"
#: include/class/anc_operation.class.php:298
#: include/class/acc_ledger_history_generic.class.php:770
#: include/export/export_balance_pdf.php:127
+#: include/class/payment_method_mtable.class.php:38
#, php-format
msgid "Libellé"
msgstr "Label"
@@ -11828,6 +11861,12 @@ msgstr "Skipped rows"
msgid "Limite dossiers"
msgstr "Folders limit"
+#: include/lib/message_javascript.php:104
+msgid ""
+"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement "
+"avec journaux OD"
+msgstr ""
+
#: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58
#: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60
#: include/ext/listing/index.php:60 include/ext/listing/index.php:58
@@ -12530,6 +12569,7 @@ msgstr "Missing description"
#: include/class/anc_operation.class.php:324
#: include/class/anc_operation.class.php:318
#: include/class/anc_operation.class.php:319
+#: include/lib/manage_table_sql.class.php:755
msgid "Modifier"
msgstr "Modify"
@@ -13980,7 +14020,7 @@ msgstr "New bank statement"
#: include/lib/html_input.class.php:1043
#: include/template/action_display_short.php:81
#: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
-#: include/lib/html_input.class.php:1119
+#: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
msgid "Nouvel événement"
msgstr "New event"
@@ -14373,6 +14413,7 @@ msgstr "MW analytic"
#: include/lib/manage_table_sql.class.php:1005
#: include/lib/manage_table_sql.class.php:1025
#: include/lib/manage_table_sql.class.php:1022
+#: include/lib/manage_table_sql.class.php:1066
msgid "OK"
msgstr "OK"
@@ -16147,6 +16188,10 @@ msgid ""
"Pour le passer en unicode, faites-en un backup puis restaurez le fichier reçu"
msgstr "To convert it in unicode, do first year in backup restore it"
+#: include/lib/message_javascript.php:105
+msgid "Pour les journaux FIN, ce sera la fiche du journal"
+msgstr "For the FIN Ledger, it will be the card of the ledger"
+
#: include/template/impress_cat_card.php:21
msgid "Pour toutes les catégories"
msgstr "For all categories"
@@ -17958,7 +18003,7 @@ msgstr "Deleted"
#: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229
#: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
#: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
-#: html/ajax_misc.php:466
+#: html/ajax_misc.php:466 html/ajax_misc.php:468
msgid "Symbole"
msgstr "Symbol"
@@ -18356,7 +18401,7 @@ msgstr ""
#: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228
#: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317
#: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459
-#: html/ajax_misc.php:465
+#: html/ajax_misc.php:465 html/ajax_misc.php:467
msgid "Taux"
msgstr "Spleen"
@@ -19100,6 +19145,7 @@ msgstr "Type of document"
#: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121
#: include/payment_middle.inc.php:122
+#: include/class/payment_method_mtable.class.php:40
msgid "Type de fiche"
msgstr "Type of card"
@@ -19196,6 +19242,11 @@ msgstr "A moment please"
msgid "Un journal avec ce nom existe déjà"
msgstr "This name is already used"
+#: include/class/payment_method_mtable.class.php:68
+#: include/class/payment_method_mtable.class.php:92
+msgid "Un libellé est obligatoire"
+msgstr "mandatory label"
+
#: include/profile.inc.php:322
msgid "Un menu ne peut pas dépendre de lui-même"
msgstr "A menu can not depend of itself"
@@ -19394,6 +19445,10 @@ msgstr "Users"
msgid "Utilisateurs qui se sont connectés"
msgstr "Connected users"
+#: include/class/payment_method_mtable.class.php:42
+msgid "Utilisation dans"
+msgstr "Used in "
+
#: include/company.inc.php:114 include/company.inc.php:133
#: include/company.inc.php:137
msgid "Utilisation de la compta. analytique"
@@ -19772,6 +19827,7 @@ msgstr "Do you want to delete this transaction"
#: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972
#: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
+#: include/lib/html_input.class.php:1100
#, php-format
msgid "Voulez-vous effacer cette relation "
msgstr "Do you want to delete this relation"
@@ -20338,7 +20394,7 @@ msgstr "Choose"
#: include/class/acc_ledger_search.class.php:111
#: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018
#: include/class/acc_ledger_search.class.php:112
-#: include/lib/html_input.class.php:1033
+#: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
msgid "choix des journaux"
msgstr "Ledgers"
@@ -20378,7 +20434,7 @@ msgstr "Click here to update "
#: include/class/pdf_operation.class.php:149
#: include/class/pdf_operation.class.php:194
#: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
-#: html/ajax_misc.php:458 html/ajax_misc.php:464
+#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
msgid "code"
msgstr "code"
@@ -21014,6 +21070,10 @@ msgstr "Name of the ledger"
msgid "non actif"
msgstr "Not asset"
+#: include/lib/manage_table_sql.class.php:965
+msgid "non implémenté"
+msgstr "Not implemented"
+
#: include/balance_age.inc.php:40 include/balance_age.inc.php:44
#: include/balance_age.inc.php:43
msgid "non lettrées"
@@ -21705,7 +21765,7 @@ msgstr "vat"
#: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400
#: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517
#: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
-#: html/ajax_misc.php:525
+#: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
msgid "tva inconnue"
msgstr "VAT unknown"
diff --git a/html/lang/messages.po b/html/lang/messages.po
index 0278114..74f2de6 100644
--- a/html/lang/messages.po
+++ b/html/lang/messages.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 15:00+0200\n"
+"POT-Creation-Date: 2019-08-08 01:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -337,12 +337,11 @@ msgstr ""
#: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54
#: include/cfgledger.inc.php:137 include/template/pcmn_update.php:53
#: include/template/dashboard.php:350
-#: include/template/todo_list_display.php:105 include/payment_middle.inc.php:53
-#: include/cfgledger.inc.php:137 include/compta_fin.inc.php:149
-#: include/ajax/ajax_mod_predf_op.php:54 include/ajax/ajax_card.php:203
-#: include/ajax/ajax_card.php:517 include/report.inc.php:88
-#: include/report.inc.php:103 include/company.inc.php:149
-#: include/class/fiche_def.class.php:812
+#: include/template/todo_list_display.php:105 include/cfgledger.inc.php:137
+#: include/compta_fin.inc.php:149 include/ajax/ajax_mod_predf_op.php:54
+#: include/ajax/ajax_card.php:203 include/ajax/ajax_card.php:517
+#: include/report.inc.php:88 include/report.inc.php:103
+#: include/company.inc.php:149 include/class/fiche_def.class.php:812
msgid "Sauve"
msgstr ""
@@ -492,7 +491,7 @@ msgstr ""
#: include/class/pdf_operation.class.php:149
#: include/class/pdf_operation.class.php:194
#: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
-#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:464
+#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
#: include/class/pdf_operation.class.php:149
#: include/class/pdf_operation.class.php:194
#: include/class/pdf_operation.class.php:247
@@ -502,21 +501,21 @@ msgstr ""
#: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228
#: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317
#: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459
-#: html/ajax_misc.php:465 html/ajax_misc.php:465
+#: html/ajax_misc.php:465 html/ajax_misc.php:467
msgid "Taux"
msgstr ""
#: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229
#: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
#: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
-#: html/ajax_misc.php:466 html/ajax_misc.php:466
+#: html/ajax_misc.php:466 html/ajax_misc.php:468
msgid "Symbole"
msgstr ""
#: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230
#: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
#: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
-#: html/ajax_misc.php:467 html/ajax_misc.php:467
+#: html/ajax_misc.php:467 html/ajax_misc.php:469
msgid "Explication"
msgstr ""
@@ -526,7 +525,7 @@ msgstr ""
#: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400
#: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517
#: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
-#: html/ajax_misc.php:525 html/ajax_misc.php:520 html/ajax_misc.php:525
+#: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
msgid "tva inconnue"
msgstr ""
@@ -788,7 +787,9 @@ msgstr ""
#: include/template/ledger_detail_bottom.php:88
#: include/template/ledger_detail_misc.php:99 include/ajax/ajax_poste.php:64
#: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470
-#: include/class/fiche.class.php:469 include/template/fiche_list.php:41
+#: include/class/fiche.class.php:469
+#: include/class/pdfbalance_simple.class.php:55
+#: include/template/fiche_list.php:41
#: include/template/ledger_detail_misc.php:99
#: include/template/ledger_detail_bottom.php:88
#: include/template/operation_detail_misc.php:32 include/ajax/ajax_poste.php:65
@@ -1084,9 +1085,10 @@ msgstr ""
#: include/contact.inc.php:98 include/manager.inc.php:105
#: include/template/action_search.php:152 include/customer.inc.php:103
#: include/template/action_search.php:148 scenario/select-box-test.php:62
-#: include/template/action_search.php:148 include/contact.inc.php:98
-#: include/customer.inc.php:103 include/manager.inc.php:105
-#: include/supplier.inc.php:104 include/bank.inc.php:99 include/adm.inc.php:100
+#: scenario/select-box-test.php:62 include/template/action_search.php:148
+#: include/contact.inc.php:98 include/customer.inc.php:103
+#: include/manager.inc.php:105 include/supplier.inc.php:104
+#: include/bank.inc.php:99 include/adm.inc.php:100
msgid "recherche"
msgstr ""
@@ -1609,8 +1611,8 @@ msgstr ""
#: include/template/dashboard.php:21 include/user_detail.inc.php:245
#: include/cat_document.inc.php:85 include/class/anc_key.class.php:352
#: include/class/acc_ledger_search.class.php:250
-#: include/lib/manage_table_sql.class.php:613
-#: include/lib/manage_table_sql.class.php:652
+#: include/lib/manage_table_sql.class.php:616
+#: include/lib/manage_table_sql.class.php:655
msgid "Ajout"
msgstr ""
@@ -1657,6 +1659,7 @@ msgstr ""
#: include/category_card.inc.php:75
#: include/ajax/ajax_anc_detail_operation.php:54 include/database.item.php:78
#: include/database.item.php:110
+#: include/class/payment_method_mtable.class.php:41
#: include/class/anc_group_operation.class.php:121
#: include/class/acc_plan_mtable.class.php:49 include/card_attr.inc.php:83
msgid "Fiche"
@@ -1949,6 +1952,7 @@ msgstr ""
#: include/class/acc_ledger_fin.class.php:754
#: include/class/anc_operation.class.php:298
#: include/class/acc_ledger_history_generic.class.php:770
+#: include/export/export_balance_pdf.php:127
#: include/template/balance_aged_result.php:50
#: include/template/operation_detail_fin.php:33
#: include/template/acc_ledger_history_financial_oneline.php:35
@@ -1969,6 +1973,7 @@ msgstr ""
#: include/export/export_poste_detail_pdf.php:98
#: include/export/export_balance_pdf.php:127
#: include/export/export_gl_csv.php:96 include/balance.inc.php:307
+#: include/class/payment_method_mtable.class.php:38
#: include/class/print_ledger_detail_item.class.php:60
#: include/class/acc_ledger_history_generic.class.php:770
#: include/class/acc_ledger_sold.class.php:703
@@ -3010,8 +3015,10 @@ msgstr ""
#: include/class/fiche.class.php:1478
#: include/class/anc_balance_double.class.php:99
#: include/class/acc_ledger_history_generic.class.php:771
-#: include/class/fiche.class.php:1479 include/impress_gl_comptes.inc.php:216
-#: include/template/letter_prop.php:37 include/template/letter_prop.php:80
+#: include/class/fiche.class.php:1479
+#: include/class/pdfbalance_simple.class.php:56
+#: include/impress_gl_comptes.inc.php:216 include/template/letter_prop.php:37
+#: include/template/letter_prop.php:80
#: include/template/ledger_detail_misc.php:102
#: include/template/ledger_detail_bottom.php:91
#: include/template/anc_balance_group.php:49
@@ -3103,8 +3110,10 @@ msgstr ""
#: include/class/fiche.class.php:1479
#: include/class/anc_balance_double.class.php:100
#: include/class/acc_ledger_history_generic.class.php:772
-#: include/class/fiche.class.php:1480 include/impress_gl_comptes.inc.php:215
-#: include/template/letter_prop.php:40 include/template/letter_prop.php:83
+#: include/class/fiche.class.php:1480
+#: include/class/pdfbalance_simple.class.php:57
+#: include/impress_gl_comptes.inc.php:215 include/template/letter_prop.php:40
+#: include/template/letter_prop.php:83
#: include/template/ledger_detail_misc.php:103
#: include/template/ledger_detail_bottom.php:92
#: include/template/operation_detail_misc.php:36
@@ -5601,6 +5610,7 @@ msgstr ""
#: include/class/anc_listing.class.php:85
#: include/class/pdf_operation.class.php:250
#: include/class/anc_listing.class.php:87
+#: include/class/pdfbalance_simple.class.php:59
#: include/export/export_fiche_balance_csv.php:160
#: include/export/export_poste_detail_csv.php:202
#: include/ajax/ajax_anc_detail_operation.php:57
@@ -5617,7 +5627,7 @@ msgid "Aucun plan défini"
msgstr ""
#: include/class_anc_print.php:120 include/lib/message_javascript.php:68
-#: include/lib/message_javascript.php:70
+#: include/lib/message_javascript.php:70 include/lib/message_javascript.php:70
msgid "Les dates sont en format DD.MM.YYYY"
msgstr ""
@@ -5650,6 +5660,7 @@ msgstr ""
#: include/class_anc_print.php:140 include/class_anc_print.php:181
#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75
+#: include/lib/message_javascript.php:75
msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche"
msgstr ""
@@ -5936,6 +5947,7 @@ msgstr ""
#: include/class/periode.class.php:594 include/class/periode.class.php:599
#: include/class/anc_operation.class.php:316
#: include/template/ledger_detail_bottom.php:328
+#: include/class/periode.class.php:596 include/class/periode.class.php:601
#: include/template/ledger_detail_bottom.php:328
#: include/template/anc_key_input.php:212 include/preod.inc.php:112
#: include/anc_group.inc.php:88 include/dossier.inc.php:281
@@ -5946,7 +5958,7 @@ msgstr ""
#: include/class/anc_operation.class.php:317
#: include/class/periode.class.php:596 include/class/periode.class.php:601
#: include/class/document_modele.class.php:71
-#: include/lib/manage_table_sql.class.php:765 include/forecast.inc.php:347
+#: include/lib/manage_table_sql.class.php:768 include/forecast.inc.php:347
#: include/card_attr.inc.php:110
msgid "Effacer"
msgstr ""
@@ -6083,7 +6095,7 @@ msgstr ""
#: include/class/document_type.class.php:75
#: include/class/anc_operation.class.php:319
#: include/class/document_modele.class.php:92
-#: include/lib/manage_table_sql.class.php:752 include/stock_cfg.inc.php:110
+#: include/lib/manage_table_sql.class.php:755 include/stock_cfg.inc.php:110
msgid "Modifier"
msgstr ""
@@ -6095,8 +6107,7 @@ msgstr ""
#: include/ajax/ajax_plugin_detail.php:32
#: include/class/class_document_type.php:83 include/ajax/ajax_add_menu.php:137
#: include/ajax/ajax_add_menu.php:145 include/class/document_type.class.php:83
-#: include/payment_middle.inc.php:46 include/ajax/ajax_add_menu.php:145
-#: include/ajax/ajax_get_menu_detail.php:53
+#: include/ajax/ajax_add_menu.php:145 include/ajax/ajax_get_menu_detail.php:53
#: include/ajax/ajax_plugin_detail.php:32
#: include/class/document_type.class.php:83
msgid "Vous confirmez"
@@ -6179,10 +6190,11 @@ msgstr ""
#: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200
#: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
#: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33
-#: include/lib/message_javascript.php:78 include/template/fiche_list.php:30
-#: include/template/stock_inv.php:33 include/ajax/ajax_create_menu.php:13
-#: include/ajax/ajax_add_menu.php:200 include/class/fiche_def.class.php:791
-#: include/class/fiche_def.class.php:796 include/lib/message_javascript.php:80
+#: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80
+#: include/template/fiche_list.php:30 include/template/stock_inv.php:33
+#: include/ajax/ajax_create_menu.php:13 include/ajax/ajax_add_menu.php:200
+#: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
+#: include/lib/message_javascript.php:80
msgid "Vous confirmez ?"
msgstr ""
@@ -6365,7 +6377,9 @@ msgstr ""
#: include/export/export_balance_pdf.php:135
#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784
#: include/class/anc_balance_double.class.php:101
-#: include/class/fiche.class.php:1785 include/template/anc_balance_group.php:51
+#: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136
+#: include/class/pdfbalance_simple.class.php:58
+#: include/template/anc_balance_group.php:51
#: include/template/anc_balance_group.php:72
#: include/export/export_gl_pdf.php:88
#: include/export/export_balance_pdf.php:136
@@ -6562,6 +6576,7 @@ msgstr ""
#: include/class_ibutton.php:82 include/class_ibutton.php:84
#: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84
#: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99
+#: include/lib/message_javascript.php:99
msgid "Calculatrice"
msgstr ""
@@ -7710,6 +7725,7 @@ msgstr ""
#: include/database.item.php:78 include/lib/user_menu.php:123
#: include/lib/user_menu.php:131 include/lib/user_menu.php:124
#: include/lib/user_menu.php:143 include/database.item.php:75
+#: include/lib/user_menu.php:81 include/lib/user_menu.php:100
#: include/database.item.php:73 include/lib/user_menu.php:81
#: include/lib/user_menu.php:100
msgid "Accueil"
@@ -7760,7 +7776,8 @@ msgstr ""
#: include/database.item.php:104 include/lib/user_menu.php:124
#: include/lib/user_menu.php:125 include/lib/user_menu.php:144
#: include/database.item.php:107 include/database.item.php:101
-#: include/database.item.php:99 include/database.item.php:99
+#: include/database.item.php:99 include/lib/user_menu.php:82
+#: include/lib/user_menu.php:101 include/database.item.php:99
#: include/lib/user_menu.php:82 include/lib/user_menu.php:101
msgid "Sortie"
msgstr ""
@@ -8642,7 +8659,8 @@ msgstr ""
#: include/database.item.php:171 include/database.item.php:176
#: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518
#: include/class/periode_ledger_table.class.php:99
-#: include/ajax/ajax_display_letter.php:116 include/database.item.php:171
+#: include/class/periode.class.php:520 include/ajax/ajax_display_letter.php:116
+#: include/database.item.php:171
#: include/class/periode_ledger_table.class.php:99
#: include/class/periode.class.php:520
msgid "Date Fin"
@@ -8853,9 +8871,10 @@ msgstr ""
#: include/class/acc_ledger_search.class.php:1074 include/database.item.php:209
#: include/database.item.php:220 include/cfgledger.inc.php:170
#: include/class/acc_ledger_search.class.php:1082
-#: include/class/acc_ledger_search.class.php:1095 include/cfgledger.inc.php:170
-#: include/database.item.php:209 include/database.item.php:220
#: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136
+#: include/cfgledger.inc.php:170 include/database.item.php:209
+#: include/database.item.php:220 include/class/acc_ledger_search.class.php:1095
+#: include/lib/user_menu.php:136
msgid "Financier"
msgstr ""
@@ -9603,15 +9622,13 @@ msgstr ""
#: include/ajax/ajax_admin.php:276 include/cfgledger.inc.php:136
#: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
#: include/ajax/ajax_card.php:171 include/cfgledger.inc.php:139
-#: include/payment_middle.inc.php:54 include/cfgledger.inc.php:139
-#: include/ajax/ajax_card.php:171 include/ajax/ajax_admin.php:254
-#: include/ajax/ajax_admin.php:280
+#: include/cfgledger.inc.php:139 include/ajax/ajax_card.php:171
+#: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
msgid "Efface"
msgstr ""
#: include/payment_middle.inc.php:56 include/payment_middle.inc.php:104
#: include/payment_middle.inc.php:55 include/payment_middle.inc.php:105
-#: include/payment_middle.inc.php:106 include/payment_middle.inc.php:55
#: include/payment_middle.inc.php:106
msgid "Retour sans sauver"
msgstr ""
@@ -9620,7 +9637,7 @@ msgstr ""
#: include/anc_pa.inc.php:99 include/anc_pa.inc.php:192
#: include/anc_pa.inc.php:194 include/payment_middle.inc.php:104
#: include/anc_pa.inc.php:57 include/payment_middle.inc.php:105
-#: include/payment_middle.inc.php:105 include/anc_pa.inc.php:57
+#: include/anc_pa.inc.php:57
msgid "Enregistre"
msgstr ""
@@ -9674,6 +9691,7 @@ msgstr ""
#: include/lib/user_menu.php:116 include/lib/user_menu.php:129
#: include/lib/user_menu.php:117 include/lib/user_menu.php:140
#: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:74 include/lib/user_menu.php:97
msgid "Utilisateurs"
msgstr ""
@@ -9681,16 +9699,19 @@ msgstr ""
#: include/lib/user_menu.php:116 include/lib/user_menu.php:129
#: include/lib/user_menu.php:117 include/lib/user_menu.php:140
#: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:74 include/lib/user_menu.php:97
msgid "Gestion des utilisateurs"
msgstr ""
#: include/user_menu.php:111 include/lib/user_menu.php:117
#: include/lib/user_menu.php:118 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:75
msgid "Dossiers"
msgstr ""
#: include/user_menu.php:111 include/lib/user_menu.php:117
#: include/lib/user_menu.php:118 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:75
msgid "Gestion des dossiers"
msgstr ""
@@ -9698,22 +9719,26 @@ msgstr ""
#: include/modele.inc.php:250 include/lib/user_menu.php:118
#: include/modele.inc.php:274 include/lib/user_menu.php:119
#: include/modele.inc.php:257 include/modele.inc.php:258
-#: include/modele.inc.php:258 include/lib/user_menu.php:76
+#: include/lib/user_menu.php:76 include/modele.inc.php:258
+#: include/lib/user_menu.php:76
msgid "Modèles"
msgstr ""
#: include/user_menu.php:112 include/lib/user_menu.php:118
#: include/lib/user_menu.php:119 include/lib/user_menu.php:76
+#: include/lib/user_menu.php:76
msgid "Gestion des modèles"
msgstr ""
#: include/user_menu.php:113 include/lib/user_menu.php:119
#: include/lib/user_menu.php:120 include/lib/user_menu.php:77
+#: include/lib/user_menu.php:77
msgid "Restaure"
msgstr ""
#: include/user_menu.php:113 include/lib/user_menu.php:119
#: include/lib/user_menu.php:120 include/lib/user_menu.php:77
+#: include/lib/user_menu.php:77
msgid "Restaure une base de données"
msgstr ""
@@ -9721,6 +9746,7 @@ msgstr ""
#: include/lib/user_menu.php:121 include/lib/user_menu.php:130
#: include/lib/user_menu.php:122 include/lib/user_menu.php:141
#: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:79 include/lib/user_menu.php:98
msgid "Audit"
msgstr ""
@@ -9728,48 +9754,49 @@ msgstr ""
#: include/lib/user_menu.php:121 include/lib/user_menu.php:130
#: include/lib/user_menu.php:122 include/lib/user_menu.php:141
#: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:79 include/lib/user_menu.php:98
msgid "Utilisateurs qui se sont connectés"
msgstr ""
#: include/user_menu.php:147 include/user_menu.php:151
#: include/lib/user_menu.php:160 include/lib/user_menu.php:173
-#: include/lib/user_menu.php:131
+#: include/lib/user_menu.php:131 include/lib/user_menu.php:131
msgid " Hors Bilan"
msgstr ""
#: include/user_menu.php:148 include/user_menu.php:152
#: include/lib/user_menu.php:161 include/lib/user_menu.php:174
-#: include/lib/user_menu.php:132
+#: include/lib/user_menu.php:132 include/lib/user_menu.php:132
msgid " Immobilisé"
msgstr ""
#: include/user_menu.php:149 include/user_menu.php:153
#: include/lib/user_menu.php:162 include/lib/user_menu.php:175
-#: include/lib/user_menu.php:133
+#: include/lib/user_menu.php:133 include/lib/user_menu.php:133
msgid "Actif a un an au plus"
msgstr ""
#: include/user_menu.php:150 include/user_menu.php:154
#: include/lib/user_menu.php:163 include/lib/user_menu.php:176
-#: include/lib/user_menu.php:134
+#: include/lib/user_menu.php:134 include/lib/user_menu.php:134
msgid "Stock et commande"
msgstr ""
#: include/user_menu.php:151 include/user_menu.php:155
#: include/lib/user_menu.php:164 include/lib/user_menu.php:177
-#: include/lib/user_menu.php:135
+#: include/lib/user_menu.php:135 include/lib/user_menu.php:135
msgid "Compte tiers"
msgstr ""
#: include/user_menu.php:153 include/user_menu.php:157
#: include/lib/user_menu.php:166 include/lib/user_menu.php:179
-#: include/lib/user_menu.php:137
+#: include/lib/user_menu.php:137 include/lib/user_menu.php:137
msgid "Charges"
msgstr ""
#: include/user_menu.php:154 include/user_menu.php:158
#: include/lib/user_menu.php:167 include/lib/user_menu.php:180
-#: include/lib/user_menu.php:138
+#: include/lib/user_menu.php:138 include/lib/user_menu.php:138
msgid "Produits"
msgstr ""
@@ -9778,6 +9805,7 @@ msgstr ""
#: include/lib/user_menu.php:168 include/lib/user_menu.php:169
#: include/lib/user_menu.php:181 include/lib/user_menu.php:182
#: include/lib/user_menu.php:139 include/lib/user_menu.php:140
+#: include/lib/user_menu.php:139 include/lib/user_menu.php:140
msgid "Hors Comptabilité"
msgstr ""
@@ -9937,9 +9965,9 @@ msgstr ""
#: include/template/calendar-list.php:34 include/lib/html_input.class.php:943
#: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
#: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
-#: include/template/dashboard.php:6 include/template/calendar-list.php:34
-#: include/impress_rapport.inc.php:234 include/ajax/ajax_calendar_zoom.php:32
-#: include/lib/html_input.class.php:1007
+#: include/lib/html_input.class.php:1007 include/template/dashboard.php:6
+#: include/template/calendar-list.php:34 include/impress_rapport.inc.php:234
+#: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:1008
msgid "Calendrier"
msgstr ""
@@ -10934,13 +10962,12 @@ msgstr ""
#: include/template/new_mod_payment.php:10 include/payment_middle.inc.php:120
#: include/payment_middle.inc.php:121 include/template/new_mod_payment.php:10
-#: include/payment_middle.inc.php:121
msgid "Pour le journal"
msgstr ""
#: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121
#: include/payment_middle.inc.php:122 include/template/new_mod_payment.php:28
-#: include/payment_middle.inc.php:122
+#: include/class/payment_method_mtable.class.php:40
msgid "Type de fiche"
msgstr ""
@@ -10951,7 +10978,6 @@ msgstr ""
#: include/template/new_mod_payment.php:47 include/payment_middle.inc.php:123
#: include/payment_middle.inc.php:124 include/template/new_mod_payment.php:47
-#: include/payment_middle.inc.php:124
msgid "Avec la fiche"
msgstr ""
@@ -11021,7 +11047,7 @@ msgid "Préfixe pièce justificative"
msgstr ""
#: include/template/param_jrn.php:94 include/lib/message_javascript.php:70
-#: include/lib/message_javascript.php:72
+#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:72
msgid ""
"Le préfixe des pièces doit être différent pour chaque journal, on peut aussi "
"utiliser l'année"
@@ -11048,7 +11074,7 @@ msgid "La numérotation est propre à chaque journal"
msgstr ""
#: include/template/param_jrn.php:118 include/lib/message_javascript.php:71
-#: include/lib/message_javascript.php:73
+#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:73
msgid "Laissez à 0 pour ne pas changer le numéro"
msgstr ""
@@ -11305,8 +11331,9 @@ msgstr ""
#: include/class/acc_ledger.class.php:86 include/lib/http_input.class.php:120
#: include/class/acc_ledger.class.php:88 include/class/periode.class.php:235
#: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89
-#: include/lib/http_input.class.php:123 include/class/acc_ledger.class.php:89
-#: include/class/periode.class.php:237 include/lib/http_input.class.php:123
+#: include/lib/http_input.class.php:123 include/class/periode.class.php:237
+#: include/class/acc_ledger.class.php:89 include/class/periode.class.php:237
+#: include/lib/http_input.class.php:123
msgid "Paramètre invalide"
msgstr ""
@@ -11468,6 +11495,7 @@ msgstr ""
#: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519
#: include/class/periode_ledger_table.class.php:100
#: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142
+#: include/class/periode.class.php:521
#: include/template/periode_add_exercice.php:25
#: include/template/stock_state_search.php:35
#: include/template/stock_inv.php:126 include/impress_rapport.inc.php:207
@@ -11520,6 +11548,7 @@ msgstr ""
#: include/ext/tva/ext_list_assujetti.class.php:54
#: include/ext/tva/ext_tvagen.class.php:114
#: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96
+#: include/lib/message_javascript.php:96
msgid "Afficher"
msgstr ""
@@ -11957,7 +11986,7 @@ msgstr ""
#: include/lib/manage_table_sql.class.php:1075
#: include/lib/manage_table_sql.class.php:1095
#: include/lib/manage_table_sql.class.php:1092
-#: include/lib/manage_table_sql.class.php:1092
+#: include/lib/manage_table_sql.class.php:1136
msgid "Effacé"
msgstr ""
@@ -13235,7 +13264,8 @@ msgstr ""
#: include/lib/ac_common.php:1209 include/export/export_fiche_detail_csv.php:60
#: include/template/ledger_detail_bottom.php:286 include/lib/ac_common.php:1221
#: include/lib/ac_common.php:1223 include/template/ledger_detail_bottom.php:287
-#: include/lib/ac_common.php:1247 include/template/ledger_detail_bottom.php:287
+#: include/lib/ac_common.php:1247 include/lib/message_javascript.php:102
+#: include/template/ledger_detail_bottom.php:287
#: include/export/export_fiche_detail_csv.php:60
#: include/lib/message_javascript.php:102 include/lib/ac_common.php:1247
msgid "Aucune donnée"
@@ -14969,6 +14999,7 @@ msgstr ""
#: include/export/export_poste_detail_csv.php:39
#: include/export/export_balance_pdf.php:128
#: include/export/export_balance_pdf.php:125
+#: include/export/export_balance_pdf.php:126
#: include/export/export_poste_detail_csv.php:39
#: include/export/export_balance_pdf.php:126
msgid "poste"
@@ -15038,8 +15069,9 @@ msgstr ""
#: include/class/acc_ledger_search.class.php:111
#: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018
#: include/class/acc_ledger_search.class.php:112
-#: include/class/acc_ledger_search.class.php:112
#: include/lib/html_input.class.php:1033
+#: include/class/acc_ledger_search.class.php:112
+#: include/lib/html_input.class.php:1034
msgid "choix des journaux"
msgstr ""
@@ -15988,25 +16020,29 @@ msgstr ""
#: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
#: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
-#: include/ajax/ajax_periode.php:171 include/class/periode.class.php:704
+#: include/class/periode.class.php:704 include/ajax/ajax_periode.php:171
+#: include/class/periode.class.php:704
msgid " Début période : "
msgstr ""
#: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
#: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
-#: include/ajax/ajax_periode.php:172 include/class/periode.class.php:705
+#: include/class/periode.class.php:705 include/ajax/ajax_periode.php:172
+#: include/class/periode.class.php:705
msgid " Fin période : "
msgstr ""
#: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
#: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
-#: include/ajax/ajax_periode.php:173 include/class/periode.class.php:706
+#: include/class/periode.class.php:706 include/ajax/ajax_periode.php:173
+#: include/class/periode.class.php:706
msgid " Exercice : "
msgstr ""
#: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
#: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
-#: include/ajax/ajax_periode.php:175 include/class/periode.class.php:708
+#: include/class/periode.class.php:708 include/ajax/ajax_periode.php:175
+#: include/class/periode.class.php:708
msgid "sauver"
msgstr ""
@@ -16427,6 +16463,7 @@ msgstr ""
#: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972
#: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
+#: include/lib/html_input.class.php:1100
#, php-format
msgid "Voulez-vous effacer cette relation "
msgstr ""
@@ -16438,6 +16475,7 @@ msgstr ""
#: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984
#: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
+#: include/lib/html_input.class.php:1112
msgid "Ajout autres"
msgstr ""
@@ -17852,7 +17890,7 @@ msgstr ""
#: include/ajax/ajax_display_letter.php:98
#: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517
#: include/class/periode_ledger_table.class.php:98
-#: include/ajax/ajax_display_letter.php:103
+#: include/class/periode.class.php:519 include/ajax/ajax_display_letter.php:103
#: include/class/periode_ledger_table.class.php:98
#: include/class/periode.class.php:519
msgid "Date Début"
@@ -18190,13 +18228,14 @@ msgstr ""
#: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262
#: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384
#: html/ajax_misc.php:390 include/lib/message_javascript.php:90
-#: html/ajax_misc.php:390 include/lib/message_javascript.php:92
+#: include/lib/message_javascript.php:92 html/ajax_misc.php:392
+#: include/lib/message_javascript.php:92
msgid "Action non autorisée"
msgstr ""
#: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279
#: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
-#: html/ajax_misc.php:407 html/ajax_misc.php:407
+#: html/ajax_misc.php:407 html/ajax_misc.php:409
msgid "Des actions dépendent de cette catégorie"
msgstr ""
@@ -18317,7 +18356,8 @@ msgstr ""
#: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78
#: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
#: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
-#: include/ajax/ajax_periode.php:176 include/class/periode.class.php:709
+#: include/class/periode.class.php:709 include/ajax/ajax_periode.php:176
+#: include/class/periode.class.php:709
msgid "fermer"
msgstr ""
@@ -18389,8 +18429,9 @@ msgstr ""
#: include/lib/html_input.class.php:1043
#: include/template/action_display_short.php:81
#: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
-#: include/template/action_display_short.php:81
#: include/lib/html_input.class.php:1119
+#: include/template/action_display_short.php:81
+#: include/lib/html_input.class.php:1120
msgid "Nouvel événement"
msgstr ""
@@ -18425,12 +18466,11 @@ msgstr ""
#: include/payment_middle.inc.php:119
#: include/ext/importbank/bank_constant.php:56
-#: include/payment_middle.inc.php:120 include/payment_middle.inc.php:120
+#: include/payment_middle.inc.php:120
msgid "Libelle"
msgstr ""
#: include/payment_middle.inc.php:122 include/payment_middle.inc.php:123
-#: include/payment_middle.inc.php:123
msgid "Enregistré dans le journal"
msgstr ""
@@ -18706,6 +18746,7 @@ msgstr ""
#: include/lib/class_database.php:429 include/lib/class_database.php:434
#: include/lib/database.class.php:433 include/lib/database.class.php:442
#: include/lib/database.class.php:443 include/class/database.class.php:125
+#: include/class/database.class.php:125
msgid "Base de donnée vide"
msgstr ""
@@ -18847,13 +18888,13 @@ msgstr ""
#: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
#: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
-#: html/ajax_misc.php:554 html/ajax_misc.php:554
+#: html/ajax_misc.php:554 html/ajax_misc.php:556
msgid "Ce plugin n'existe pas "
msgstr ""
#: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
#: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
-#: html/ajax_misc.php:555 html/ajax_misc.php:555
+#: html/ajax_misc.php:555 html/ajax_misc.php:557
msgid "Il y a une erreur, ce plugin n'existe pas"
msgstr ""
@@ -20006,8 +20047,9 @@ msgstr ""
#: html/install.php:271 html/install.php:277 html/install.php:228
#: html/install.php:235 include/upgrade-plugin.php:113
#: include/lib/user_menu.php:121 html/install.php:238
-#: include/upgrade-plugin.php:125 html/install.php:238
-#: include/lib/user_menu.php:78 include/upgrade-plugin.php:125
+#: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
+#: html/install.php:238 include/lib/user_menu.php:78
+#: include/upgrade-plugin.php:125
msgid "Installation"
msgstr ""
@@ -20176,6 +20218,7 @@ msgstr ""
#: include/lib/user_menu.php:122 include/lib/user_menu.php:123
#: include/lib/user_menu.php:142 include/lib/user_menu.php:80
+#: include/lib/user_menu.php:99 include/lib/user_menu.php:80
#: include/lib/user_menu.php:99
msgid "Information système"
msgstr ""
@@ -20228,7 +20271,7 @@ msgstr ""
#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246
#: html/user_login.php:158 html/ajax_misc.php:462
#: include/class/fiche.class.php:2247 html/user_login.php:158
-#: html/ajax_misc.php:462 include/user.inc.php:138
+#: html/ajax_misc.php:464 include/user.inc.php:138
#: include/template/todo_list_list_user.php:31
#: include/template/anc_key_display_list.php:28
#: include/template/tag_search_select.php:12 include/template/tag_select.php:16
@@ -20240,7 +20283,7 @@ msgstr ""
#: include/balance.inc.php:302 include/class/pre_operation.class.php:289
#: include/class/acc_ledger.class.php:2185
#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2247
-#: include/lib/manage_table_sql.class.php:631
+#: include/lib/manage_table_sql.class.php:634
#, php-format
msgid "Cherche"
msgstr ""
@@ -20654,6 +20697,7 @@ msgid ""
msgstr ""
#: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66
+#: include/lib/message_javascript.php:66
msgid ""
"le type vaut :<ul>\t<li> ME pour Menu</li>\t<li> PR pour les impressions </"
"li>\t<li> PL pour les plugins</li>\t<li> SP pour des valeurs spéciales</li>"
@@ -20661,10 +20705,12 @@ msgid ""
msgstr ""
#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67
+#: include/lib/message_javascript.php:67
msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"
msgstr ""
#: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68
+#: include/lib/message_javascript.php:68
msgid "Cliquez sur le chemin pour ouvrir le menu"
msgstr ""
@@ -20675,6 +20721,7 @@ msgid ""
msgstr ""
#: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71
+#: include/lib/message_javascript.php:71
msgid ""
"La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer "
"le numéro"
@@ -20712,6 +20759,7 @@ msgid ""
msgstr ""
#: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69
+#: include/lib/message_javascript.php:69
msgid ""
"En utilisant les dates d échéance ou de paiement, seuls les journaux de type "
"ACH et VEN seront utilisés ,vous excluez d office les autres journaux"
@@ -21666,6 +21714,7 @@ msgstr ""
#: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97
#: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98
#: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105
+#: include/lib/sendmail_core.class.php:105
#, php-format
msgid "%s est vide"
msgstr ""
@@ -21673,6 +21722,7 @@ msgstr ""
#: include/lib/class_sendmail.php:152 include/lib/class_sendmail.php:153
#: include/lib/class_sendmail.php:155 include/lib/sendmail.class.php:157
#: include/lib/sendmail.class.php:161 include/class/sendmail.class.php:38
+#: include/class/sendmail.class.php:38
msgid "Email non envoyé"
msgstr ""
@@ -21848,6 +21898,7 @@ msgstr ""
#: include/balance.inc.php:440 include/export/export_balance_pdf.php:309
#: include/balance.inc.php:458 include/export/export_balance_pdf.php:334
#: include/export/export_balance_pdf.php:329
+#: include/export/export_balance_pdf.php:330
#: include/export/export_balance_pdf.php:330 include/balance.inc.php:458
msgid "Résumé Exercice précédent"
msgstr ""
@@ -21856,6 +21907,7 @@ msgstr ""
#: include/balance.inc.php:447 include/export/export_balance_pdf.php:316
#: include/balance.inc.php:465 include/export/export_balance_pdf.php:341
#: include/export/export_balance_pdf.php:336
+#: include/export/export_balance_pdf.php:337
#: include/export/export_balance_pdf.php:337 include/balance.inc.php:465
msgid "Résumé Exercice courant"
msgstr ""
@@ -21891,7 +21943,7 @@ msgstr ""
#: include/lib/manage_table_sql.class.php:1005
#: include/lib/manage_table_sql.class.php:1025
#: include/lib/manage_table_sql.class.php:1022
-#: include/lib/manage_table_sql.class.php:1022
+#: include/lib/manage_table_sql.class.php:1066
msgid "OK"
msgstr ""
@@ -21900,7 +21952,7 @@ msgstr ""
#: include/lib/manage_table_sql.class.php:1008
#: include/lib/manage_table_sql.class.php:1028
#: include/lib/manage_table_sql.class.php:1025
-#: include/lib/manage_table_sql.class.php:1025
+#: include/lib/manage_table_sql.class.php:1069
msgid "Cancel"
msgstr ""
@@ -22324,6 +22376,7 @@ msgid "Invalide value"
msgstr ""
#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74
+#: include/lib/message_javascript.php:74
msgid "Mettez le pourcentage <br> à zéro pour effacer la ligne"
msgstr ""
@@ -22352,6 +22405,7 @@ msgstr ""
#: include/export/export_balance_pdf.php:127
#: include/export/export_balance_pdf.php:124
#: include/export/export_balance_pdf.php:125
+#: include/export/export_balance_pdf.php:125
msgid "Balance comptable"
msgstr ""
@@ -22722,12 +22776,12 @@ msgid "Vous n'avez encore sauvé aucun modèle"
msgstr ""
#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:296
+#: html/ajax_misc.php:298
msgid "Invalide type"
msgstr ""
#: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
-#: html/ajax_misc.php:460
+#: html/ajax_misc.php:462
msgid "Choisissez la TVA"
msgstr ""
@@ -22795,6 +22849,7 @@ msgstr ""
#: include/balance.inc.php:314 include/export/export_balance_pdf.php:135
#: include/class/acc_operation.class.php:727
#: include/export/export_balance_pdf.php:132
+#: include/export/export_balance_pdf.php:133
#: include/export/export_balance_pdf.php:133 include/balance.inc.php:314
#: include/class/acc_operation.class.php:727
msgid "Ouverture"
@@ -22889,7 +22944,8 @@ msgid "Ajout exercice"
msgstr ""
#: include/periode.inc.php:113 include/class/periode.class.php:687
-#: include/periode.inc.php:113 include/class/periode.class.php:689
+#: include/class/periode.class.php:689 include/periode.inc.php:113
+#: include/class/periode.class.php:689
msgid "Ajout période"
msgstr ""
@@ -23145,14 +23201,17 @@ msgid "Cliquez pour éditer"
msgstr ""
#: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76
+#: include/lib/message_javascript.php:76
msgid "Autoliquidation : Utilisé en même temps au crédit et au débit"
msgstr ""
#: include/lib/message_javascript.php:75 include/lib/message_javascript.php:77
+#: include/lib/message_javascript.php:77
msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat"
msgstr ""
#: include/lib/message_javascript.php:76 include/lib/message_javascript.php:78
+#: include/lib/message_javascript.php:78
msgid ""
"Ne donner pas ce poste comptable si ce code n'est pas utilisé à la vente"
msgstr ""
@@ -23163,6 +23222,7 @@ msgid "Encodage invalide"
msgstr ""
#: include/lib/user_menu.php:121 include/lib/user_menu.php:78
+#: include/lib/user_menu.php:78
msgid "Installation Mise à jour du système et des bases de données"
msgstr ""
@@ -23266,12 +23326,14 @@ msgstr ""
#: include/export/export_balance_pdf.php:136
#: include/export/export_balance_pdf.php:133
#: include/export/export_balance_pdf.php:134
+#: include/export/export_balance_pdf.php:134
msgid "Total Débit"
msgstr ""
#: include/export/export_balance_pdf.php:137
#: include/export/export_balance_pdf.php:134
#: include/export/export_balance_pdf.php:135
+#: include/export/export_balance_pdf.php:135
msgid "Total Crédit"
msgstr ""
@@ -23428,50 +23490,61 @@ msgid "Installé le %s"
msgstr ""
#: include/class/periode.class.php:251 include/class/periode.class.php:253
+#: include/class/periode.class.php:253
msgid "Période chevauchant une autre"
msgstr ""
#: include/class/periode.class.php:421 include/class/periode.class.php:423
+#: include/class/periode.class.php:423
msgid "Exercice n'est pas un nombre"
msgstr ""
#: include/class/periode.class.php:424 include/class/periode.class.php:426
+#: include/class/periode.class.php:426
#, php-format
msgid "Exercice doit être entre %s et %s "
msgstr ""
#: include/class/periode.class.php:427 include/class/periode.class.php:429
+#: include/class/periode.class.php:429
msgid "Année n'est pas un nombre"
msgstr ""
#: include/class/periode.class.php:430 include/class/periode.class.php:432
+#: include/class/periode.class.php:432
#, php-format
msgid "Année doit être entre %s et %s "
msgstr ""
#: include/class/periode.class.php:434 include/class/periode.class.php:436
+#: include/class/periode.class.php:436
msgid "Nombre de mois n'est pas un nombre"
msgstr ""
#: include/class/periode.class.php:436 include/class/periode.class.php:438
+#: include/class/periode.class.php:438
msgid "Nombre de mois doit être compris entre 1 & 60 "
msgstr ""
#: include/class/periode.class.php:438 include/class/periode.class.php:440
-#: include/class/periode.class.php:440 include/class/periode.class.php:442
+#: include/class/periode.class.php:442 include/class/periode.class.php:440
+#: include/class/periode.class.php:442
msgid "Mois de début n'existe pas "
msgstr ""
#: include/class/periode.class.php:520 include/class/periode.class.php:522
+#: include/class/periode.class.php:522
msgid "nb opérations"
msgstr ""
#: include/class/periode.class.php:521 include/class/periode.class.php:523
+#: include/class/periode.class.php:523
msgid "Status"
msgstr ""
#: include/class/periode.class.php:585
#: include/class/periode_ledger_table.class.php:142
+#: include/class/periode.class.php:587
#: include/class/periode_ledger_table.class.php:142
#: include/class/periode.class.php:587
msgid "Fermée"
@@ -23480,6 +23553,7 @@ msgstr ""
#: include/class/periode.class.php:585
#: include/class/periode_ledger_table.class.php:142
#: include/class/periode_ledger_table.class.php:144
+#: include/class/periode.class.php:587
#: include/class/periode_ledger_table.class.php:142
#: include/class/periode_ledger_table.class.php:144
#: include/class/periode.class.php:587
@@ -23487,58 +23561,72 @@ msgid "Ouvert"
msgstr ""
#: include/class/periode.class.php:647 include/class/periode.class.php:649
+#: include/class/periode.class.php:649
msgid "Janvier"
msgstr ""
#: include/class/periode.class.php:647 include/class/periode.class.php:649
+#: include/class/periode.class.php:649
msgid "Février"
msgstr ""
#: include/class/periode.class.php:647 include/class/periode.class.php:649
+#: include/class/periode.class.php:649
msgid "Mars"
msgstr ""
#: include/class/periode.class.php:647 include/class/periode.class.php:649
+#: include/class/periode.class.php:649
msgid "Avril"
msgstr ""
#: include/class/periode.class.php:648 include/class/periode.class.php:650
+#: include/class/periode.class.php:650
msgid "Mai"
msgstr ""
#: include/class/periode.class.php:648 include/class/periode.class.php:650
+#: include/class/periode.class.php:650
msgid "Juin"
msgstr ""
#: include/class/periode.class.php:648 include/class/periode.class.php:650
+#: include/class/periode.class.php:650
msgid "Juillet"
msgstr ""
#: include/class/periode.class.php:648 include/class/periode.class.php:650
+#: include/class/periode.class.php:650
msgid "Août"
msgstr ""
#: include/class/periode.class.php:648 include/class/periode.class.php:650
+#: include/class/periode.class.php:650
msgid "Septembre"
msgstr ""
#: include/class/periode.class.php:649 include/class/periode.class.php:651
+#: include/class/periode.class.php:651
msgid "Octobre"
msgstr ""
#: include/class/periode.class.php:649 include/class/periode.class.php:651
+#: include/class/periode.class.php:651
msgid "Novembre"
msgstr ""
#: include/class/periode.class.php:649 include/class/periode.class.php:651
+#: include/class/periode.class.php:651
msgid "Décembre"
msgstr ""
#: include/class/periode.class.php:673 include/class/periode.class.php:675
+#: include/class/periode.class.php:675
msgid "Effacement impossible"
msgstr ""
#: include/class/periode.class.php:688 include/class/periode.class.php:690
+#: include/class/periode.class.php:690
msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
msgstr ""
@@ -23837,6 +23925,7 @@ msgstr ""
#: include/export/export_balance_pdf.php:109
#: include/export/export_balance_pdf.php:110
+#: include/export/export_balance_pdf.php:110
#, php-format
msgid "Du %s au %s"
msgstr ""
@@ -23942,99 +24031,121 @@ msgid "Poste Analytique"
msgstr ""
#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79
+#: include/lib/message_javascript.php:79
msgid "Un instant svp"
msgstr ""
#: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81
+#: include/lib/message_javascript.php:81
msgid "Echec "
msgstr ""
#: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82
+#: include/lib/message_javascript.php:82
msgid "Echec donnée manquante ou incorrecte"
msgstr ""
#: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83
+#: include/lib/message_javascript.php:83
msgid "Vous confirmez effacement ?"
msgstr ""
#: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84
+#: include/lib/message_javascript.php:84
msgid "Vous confirmez mise à jour ?"
msgstr ""
#: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85
+#: include/lib/message_javascript.php:85
msgid "Si vous changez de page vous perdez les reconciliations, continuez ?"
msgstr ""
#: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86
+#: include/lib/message_javascript.php:86
msgid "Echec réponse"
msgstr ""
#: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87
+#: include/lib/message_javascript.php:87
msgid "Désolé, les montants pour la comptabilité analytique sont incorrects"
msgstr ""
#: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88
+#: include/lib/message_javascript.php:88
msgid "Maximum 15 lignes"
msgstr ""
#: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89
+#: include/lib/message_javascript.php:89
msgid "Maximum"
msgstr ""
#: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90
+#: include/lib/message_javascript.php:90
msgid "calculé"
msgstr ""
#: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91
+#: include/lib/message_javascript.php:91
msgid "Balance incorrecte D/C"
msgstr ""
#: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93
+#: include/lib/message_javascript.php:93
msgid "Donnée manquante ou déjà supprimée"
msgstr ""
#: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94
+#: include/lib/message_javascript.php:94
msgid "Désolé, événement en cours de création à sauver"
msgstr ""
#: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95
+#: include/lib/message_javascript.php:95
msgid "Cacher"
msgstr ""
#: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97
+#: include/lib/message_javascript.php:97
msgid "Traitement en cours"
msgstr ""
#: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98
+#: include/lib/message_javascript.php:98
msgid "Un instant"
msgstr ""
#: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100
+#: include/lib/message_javascript.php:100
msgid "Taper une formule (ex 20*5.1) puis enter"
msgstr ""
#: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101
+#: include/lib/message_javascript.php:101
msgid ""
"Calculatrice simplifiée: écrivez simplement les opérations que vous voulez "
"puis la touche retour. exemple : 1+2+3*(1/5)"
msgstr ""
#: include/class/pre_operation.class.php:149
+#: include/class/pre_operation.class.php:149
#, php-format
msgid "Echec PreOperatoin chargement %s"
msgstr ""
#: include/class/pdfbalance_simple.class.php:35
+#: include/class/pdfbalance_simple.class.php:35
#, php-format
msgid "Balance simple %s"
msgstr ""
#: include/class/pdfbalance_simple.class.php:45
+#: include/class/pdfbalance_simple.class.php:45
#, php-format
msgid "Balance simple poste %s %s date %s %s"
msgstr ""
-#: include/lib/message_javascript.php:65
+#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:65
msgid ""
"<h3> Remarque : choix possibles </h3> <ul> <li> Détail "
"opérations ne donne pas le même résultat si on regarde tous les journaux ou "
@@ -24047,40 +24158,94 @@ msgid ""
msgstr ""
#: include/lib/message_javascript.php:103
+#: include/lib/message_javascript.php:103
msgid "Votre demande est en cours de traitement"
msgstr ""
#: include/lib/database_core.class.php:60
+#: include/lib/database_core.class.php:60
msgid "Impossible de se connecter à postgreSql"
msgstr ""
#: include/lib/database_core.class.php:62
+#: include/lib/database_core.class.php:62
msgid "Vos paramètres sont incorrectes"
msgstr ""
#: include/lib/database_core.class.php:64
+#: include/lib/database_core.class.php:64
#, php-format
msgid "base de donnée = %s"
msgstr ""
#: include/lib/database_core.class.php:65
+#: include/lib/database_core.class.php:65
#, php-format
msgid "Port %s"
msgstr ""
#: include/lib/database_core.class.php:66
+#: include/lib/database_core.class.php:66
#, php-format
msgid "Utilisateur : %s"
msgstr ""
#: include/lib/database_core.class.php:71
+#: include/lib/database_core.class.php:71
msgid "Erreur de connexion !"
msgstr ""
#: include/lib/database_core.class.php:73
+#: include/lib/database_core.class.php:73
msgid "Erreur Connexion"
msgstr ""
#: include/lib/database_core.class.php:464
+#: include/lib/database_core.class.php:464
msgid "Database:get_row retourne trop de lignes"
msgstr ""
+
+#: include/class/payment_method_mtable.class.php:39
+msgid "Enregistrement dans"
+msgstr ""
+
+#: include/class/payment_method_mtable.class.php:42
+msgid "Utilisation dans"
+msgstr ""
+
+#: include/class/payment_method_mtable.class.php:68
+#: include/class/payment_method_mtable.class.php:92
+msgid "Un libellé est obligatoire"
+msgstr ""
+
+#: include/class/payment_method_mtable.class.php:77
+#: include/class/payment_method_mtable.class.php:87
+msgid "Choisissez un journal"
+msgstr ""
+
+#: include/class/payment_method_mtable.class.php:98
+msgid "Fiche inexistante"
+msgstr ""
+
+#: include/class/payment_method_mtable.class.php:115
+msgid "Choisissez un type de fiche"
+msgstr ""
+
+#: include/class/payment_method_mtable.class.php:140
+#, php-format
+msgid "Erreur key %s value %s"
+msgstr ""
+
+#: include/lib/message_javascript.php:104
+msgid ""
+"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement "
+"avec journaux OD"
+msgstr ""
+
+#: include/lib/message_javascript.php:105
+msgid "Pour les journaux FIN, ce sera la fiche du journal"
+msgstr ""
+
+#: include/lib/manage_table_sql.class.php:965
+msgid "non implémenté"
+msgstr ""
diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po
b/html/lang/nl_NL/LC_MESSAGES/messages.po
index 72550f0..b6b3406 100644
--- a/html/lang/nl_NL/LC_MESSAGES/messages.po
+++ b/html/lang/nl_NL/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NOALYSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 15:00+0200\n"
+"POT-Creation-Date: 2019-08-08 01:27+0200\n"
"PO-Revision-Date: 2019-07-31 13:23+0100\n"
"Last-Translator: dany <address@hidden>\n"
"Language-Team: English <address@hidden>\n"
@@ -967,7 +967,7 @@ msgstr "Actie is ontoegankelijk"
#: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262
#: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384
#: html/ajax_misc.php:390 include/lib/message_javascript.php:90
-#: include/lib/message_javascript.php:92
+#: include/lib/message_javascript.php:92 html/ajax_misc.php:392
#, fuzzy
msgid "Action non autorisée"
msgstr "Bewerking Opgeslagen"
@@ -1206,6 +1206,8 @@ msgstr "Hulp voor de wiki"
#: include/lib/manage_table_sql.class.php:652
#: include/class/acc_ledger_search.class.php:248
#: include/class/acc_ledger_search.class.php:250
+#: include/lib/manage_table_sql.class.php:616
+#: include/lib/manage_table_sql.class.php:655
msgid "Ajout"
msgstr "Toevoeging"
@@ -1278,6 +1280,7 @@ msgstr "Artikel toevoegen"
#: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984
#: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
+#: include/lib/html_input.class.php:1112
#, fuzzy
msgid "Ajout autres"
msgstr "Factuur toevoegen"
@@ -3225,7 +3228,7 @@ msgstr "Rekenmachine"
#: include/template/calendar-list.php:34 include/lib/html_input.class.php:943
#: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
#: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
-#: include/lib/html_input.class.php:1007
+#: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
msgid "Calendrier"
msgstr "Kalender"
@@ -3239,6 +3242,7 @@ msgstr "Kalender"
#: include/lib/manage_table_sql.class.php:1008
#: include/lib/manage_table_sql.class.php:1028
#: include/lib/manage_table_sql.class.php:1025
+#: include/lib/manage_table_sql.class.php:1069
#, fuzzy
msgid "Cancel"
msgstr "Evenwicht"
@@ -3428,7 +3432,7 @@ msgstr "Dit plan bestaat niet"
#: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
#: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
-#: html/ajax_misc.php:554
+#: html/ajax_misc.php:554 html/ajax_misc.php:556
#, fuzzy
msgid "Ce plugin n'existe pas "
msgstr "Dit plan bestaat niet"
@@ -3725,7 +3729,8 @@ msgstr ""
#: include/class/acc_ledger.class.php:2185
#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246
#: html/user_login.php:158 html/ajax_misc.php:462
-#: include/class/fiche.class.php:2247
+#: include/class/fiche.class.php:2247 html/ajax_misc.php:464
+#: include/lib/manage_table_sql.class.php:634
#, fuzzy, php-format
msgid "Cherche"
msgstr "Vinden"
@@ -3774,6 +3779,7 @@ msgid ""
msgstr ""
#: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
+#: html/ajax_misc.php:462
#, fuzzy
msgid "Choisissez la TVA"
msgstr "Kies de BTW"
@@ -3832,6 +3838,12 @@ msgstr "Kies een andere oefening"
msgid "Choisissez un dossier"
msgstr "Kies een dossier"
+#: include/class/payment_method_mtable.class.php:77
+#: include/class/payment_method_mtable.class.php:87
+#, fuzzy
+msgid "Choisissez un journal"
+msgstr "Kies uw dossier"
+
#: include/class_pre_operation.php:281
#: include/class/class_pre_operation.php:281
#: include/class/class_pre_operation.php:284
@@ -3844,6 +3856,11 @@ msgstr "Kies een dossier"
msgid "Choisissez un poste"
msgstr "Kies een dossier"
+#: include/class/payment_method_mtable.class.php:115
+#, fuzzy
+msgid "Choisissez un type de fiche"
+msgstr "Kies een andere oefening"
+
#: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298
#: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279
#: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287
@@ -6284,7 +6301,7 @@ msgstr "Laatste handelingen"
#: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279
#: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
-#: html/ajax_misc.php:407
+#: html/ajax_misc.php:407 html/ajax_misc.php:409
#, fuzzy
msgid "Des actions dépendent de cette catégorie"
msgstr "Kan dit bestand op te slaan"
@@ -7950,6 +7967,7 @@ msgstr "Erasure"
#: include/class/anc_operation.class.php:316
#: include/template/ledger_detail_bottom.php:328
#: include/class/periode.class.php:596 include/class/periode.class.php:601
+#: include/lib/manage_table_sql.class.php:768
msgid "Effacer"
msgstr "Wissen"
@@ -8036,6 +8054,7 @@ msgstr "Alle activiteiten"
#: include/lib/manage_table_sql.class.php:1075
#: include/lib/manage_table_sql.class.php:1095
#: include/lib/manage_table_sql.class.php:1092
+#: include/lib/manage_table_sql.class.php:1136
msgid "Effacé"
msgstr "Verwijderen"
@@ -8245,6 +8264,11 @@ msgstr "OPSLAAN"
msgid "Enregistrement"
msgstr "Opgeslagen"
+#: include/class/payment_method_mtable.class.php:39
+#, fuzzy
+msgid "Enregistrement dans"
+msgstr "Opgeslagen"
+
#: include/action.common.inc.php:160 include/action.common.inc.php:258
#: include/compta_ach.inc.php:222 include/compta_ven.inc.php:238
#: include/action.common.inc.php:177 include/action.common.inc.php:309
@@ -8474,6 +8498,11 @@ msgstr "Afmelden"
msgid "Erreur exercice invalide"
msgstr "Ongeldig datum"
+#: include/class/payment_method_mtable.class.php:140
+#, fuzzy, php-format
+msgid "Erreur key %s value %s"
+msgstr "Ongeldig datum"
+
#: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239
#: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295
#: html/do.php:264
@@ -8717,7 +8746,7 @@ msgstr "tarief is geen getal"
#: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230
#: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
#: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
-#: html/ajax_misc.php:467
+#: html/ajax_misc.php:467 html/ajax_misc.php:469
msgid "Explication"
msgstr "Uitleg"
@@ -9330,6 +9359,7 @@ msgstr "Dicht"
#: include/class/acc_plan_mtable.class.php:49 include/database.item.php:78
#: include/database.item.php:110 include/category_card.inc.php:75
#: include/template/stock_inv.php:67
+#: include/class/payment_method_mtable.class.php:41
msgid "Fiche"
msgstr "Blad"
@@ -9375,6 +9405,11 @@ msgstr "BTW fiche"
msgid "Fiche contenant"
msgstr "Blad Bevat"
+#: include/class/payment_method_mtable.class.php:98
+#, fuzzy
+msgid "Fiche inexistante"
+msgstr "Map niet bestaat"
+
#: include/ext/import_account/include/class_impacc_csv.php:53
#: include/ext/import_account/include/impacc_csv.class.php:53
#, fuzzy
@@ -10493,7 +10528,7 @@ msgstr ""
#: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
#: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
-#: html/ajax_misc.php:555
+#: html/ajax_misc.php:555 html/ajax_misc.php:557
msgid "Il y a une erreur, ce plugin n'existe pas"
msgstr ""
@@ -11086,6 +11121,7 @@ msgid "Invalide"
msgstr "Bevestigen"
#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
+#: html/ajax_misc.php:298
#, fuzzy
msgid "Invalide type"
msgstr "Bevestigen"
@@ -12141,6 +12177,7 @@ msgstr "smaad"
#: include/class/anc_operation.class.php:298
#: include/class/acc_ledger_history_generic.class.php:770
#: include/export/export_balance_pdf.php:127
+#: include/class/payment_method_mtable.class.php:38
#, php-format
msgid "Libellé"
msgstr "Opstellen"
@@ -12219,6 +12256,12 @@ msgstr "Regel niet geïmporteerd"
msgid "Limite dossiers"
msgstr "Records Management"
+#: include/lib/message_javascript.php:104
+msgid ""
+"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement "
+"avec journaux OD"
+msgstr ""
+
#: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58
#: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60
#: include/ext/listing/index.php:60 include/ext/listing/index.php:58
@@ -12954,6 +12997,7 @@ msgstr "Verandering"
#: include/class/anc_operation.class.php:324
#: include/class/anc_operation.class.php:318
#: include/class/anc_operation.class.php:319
+#: include/lib/manage_table_sql.class.php:755
msgid "Modifier"
msgstr "Veranderen"
@@ -14465,7 +14509,7 @@ msgstr "Nieuwe bankafschrift"
#: include/lib/html_input.class.php:1043
#: include/template/action_display_short.php:81
#: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
-#: include/lib/html_input.class.php:1119
+#: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
#, fuzzy
msgid "Nouvel événement"
msgstr "Voeg dit element toe"
@@ -14870,6 +14914,7 @@ msgstr "Analytische OD"
#: include/lib/manage_table_sql.class.php:1005
#: include/lib/manage_table_sql.class.php:1025
#: include/lib/manage_table_sql.class.php:1022
+#: include/lib/manage_table_sql.class.php:1066
msgid "OK"
msgstr ""
@@ -16732,6 +16777,11 @@ msgstr ""
"Om over te schakelen naar unicode, maak een back-up en vervolgens het "
"ontvangen bestand herstellen"
+#: include/lib/message_javascript.php:105
+#, fuzzy
+msgid "Pour les journaux FIN, ce sera la fiche du journal"
+msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt"
+
#: include/template/impress_cat_card.php:21
msgid "Pour toutes les catégories"
msgstr "Voor alle categorieën"
@@ -18584,7 +18634,7 @@ msgstr ""
#: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229
#: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
#: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
-#: html/ajax_misc.php:466
+#: html/ajax_misc.php:466 html/ajax_misc.php:468
msgid "Symbole"
msgstr "Symbool"
@@ -18988,7 +19038,7 @@ msgstr ""
#: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228
#: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317
#: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459
-#: html/ajax_misc.php:465
+#: html/ajax_misc.php:465 html/ajax_misc.php:467
msgid "Taux"
msgstr "Tarief"
@@ -19760,6 +19810,7 @@ msgstr "Soort document"
#: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121
#: include/payment_middle.inc.php:122
+#: include/class/payment_method_mtable.class.php:40
msgid "Type de fiche"
msgstr "Soort blad"
@@ -19863,6 +19914,12 @@ msgstr ""
msgid "Un journal avec ce nom existe déjà"
msgstr "Een journaal met deze naam bestaat al"
+#: include/class/payment_method_mtable.class.php:68
+#: include/class/payment_method_mtable.class.php:92
+#, fuzzy
+msgid "Un libellé est obligatoire"
+msgstr "Het onderwerp is verplicht"
+
#: include/profile.inc.php:322
msgid "Un menu ne peut pas dépendre de lui-même"
msgstr ""
@@ -20081,6 +20138,11 @@ msgstr "Users"
msgid "Utilisateurs qui se sont connectés"
msgstr "Gebruikers die zijn aangesloten"
+#: include/class/payment_method_mtable.class.php:42
+#, fuzzy
+msgid "Utilisation dans"
+msgstr "Gebruik van de voorraden"
+
#: include/company.inc.php:114 include/company.inc.php:133
#: include/company.inc.php:137
msgid "Utilisation de la compta. analytique"
@@ -20470,6 +20532,7 @@ msgstr "Wilt u deze transactie verwijderen"
#: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972
#: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
+#: include/lib/html_input.class.php:1100
#, fuzzy, php-format
msgid "Voulez-vous effacer cette relation "
msgstr "Wilt u deze actie wilt verwijderen"
@@ -21047,7 +21110,7 @@ msgstr "kiezen"
#: include/class/acc_ledger_search.class.php:111
#: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018
#: include/class/acc_ledger_search.class.php:112
-#: include/lib/html_input.class.php:1033
+#: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
msgid "choix des journaux"
msgstr "keuze van de dagboeken"
@@ -21088,7 +21151,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken"
#: include/class/pdf_operation.class.php:149
#: include/class/pdf_operation.class.php:194
#: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
-#: html/ajax_misc.php:458 html/ajax_misc.php:464
+#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
msgid "code"
msgstr "code"
@@ -21762,6 +21825,11 @@ msgstr "Boek Naam"
msgid "non actif"
msgstr "Totale activa"
+#: include/lib/manage_table_sql.class.php:965
+#, fuzzy
+msgid "non implémenté"
+msgstr "Geletterde operaties"
+
#: include/balance_age.inc.php:40 include/balance_age.inc.php:44
#: include/balance_age.inc.php:43
#, fuzzy
@@ -22485,7 +22553,7 @@ msgstr "btw"
#: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400
#: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517
#: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
-#: html/ajax_misc.php:525
+#: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
msgid "tva inconnue"
msgstr "onbekend btw"
diff --git a/include/ajax/ajax_payment_method.php
b/include/ajax/ajax_payment_method.php
new file mode 100644
index 0000000..a041559
--- /dev/null
+++ b/include/ajax/ajax_payment_method.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of NOALYSS.
+ *
+ * PhpCompta is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpCompta is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpCompta; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+// Copyright (2018) Author Dany De Bontridder <address@hidden>
+
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief Manage the payement method, existing variable (from ajax_misc.php)
+ * - $http
+ * - $gDossier
+ * - $cn
+ *
+ * @see Payment_Method_SQL
+ * @see Payment_Method_MTable
+ *
+ */
+require_once NOALYSS_INCLUDE."/database/payment_method_sql.class.php";
+require_once NOALYSS_INCLUDE."/class/payment_method_mtable.class.php";
+
+$id=$http->request("p_id", "number", -1);
+$action=$http->request("action");
+$ctl=$http->request("ctl");
+
+$payment_method_sql=new Payment_method_SQL($cn, $id);
+$payment_method_mtable=new Payment_Method_MTable($payment_method_sql);
+
+$payment_method_mtable->add_json_param("op", "payment_method");
+$payment_method_mtable->set_callback("ajax_misc.php");
+$payment_method_mtable->set_object_name($ctl);
+
+// Display a form for modifying or adding an element
+if ($action=="input")
+{
+ $payment_method_mtable->send_header();
+ echo $payment_method_mtable->ajax_input()->saveXML();
+ return;
+}
+// Save it
+elseif ($action=="save")
+{
+ $xml=$payment_method_mtable->ajax_save();
+ $payment_method_mtable->send_header();
+ echo $xml->saveXML();
+ return;
+}
+// delete the row
+elseif ($action=="delete")
+{
+ $payment_method_mtable->send_header();
+ echo $payment_method_mtable->ajax_delete()->saveXML();
+ return;
+}
\ No newline at end of file
diff --git a/include/class/acc_payment.class.php
b/include/class/acc_payment.class.php
index 5f64c33..6ebafc4 100644
--- a/include/class/acc_payment.class.php
+++ b/include/class/acc_payment.class.php
@@ -90,71 +90,7 @@ class Acc_Payment
{
return var_export(self::$variable,true);
}
- public function verify()
- {
- // Verify that the elt we want to add is correct
- }
- public function save()
- {
- /* please adapt */
- if ( $this->get_parameter("id") == 0 )
- $this->insert();
- else
- $this->update();
- }
-
- public function insert()
- {
- if ( $this->verify() != 0 ) return;
- $sql='INSERT INTO payment_method(
- mp_lib, mp_jrn_def_id, mp_fd_id, mp_qcode,jrn_def_id)
- VALUES ($1, $2, $3, upper($4),$5) returning mp_id';
- $this->mp_id=$this->cn->exec_sql($sql,array(
- $this->mp_lib,
- $this->mp_jrn_def_id,
- $this->mp_fd_id,
- $this->mp_qcode,
- $this->jrn_def_id));
- }
-
- public function update()
- {
- if ( $this->verify() != 0 ) return;
-
- $sql="update payment_method set
mp_lib=$1,mp_qcode=$2,mp_jrn_def_id=$3,mp_fd_id=$4,jrn_def_id=$5 ".
- " where mp_id = $6";
- $res=$this->cn->exec_sql(
- $sql,
- array($this->mp_lib,
- $this->mp_qcode,
- $this->mp_jrn_def_id,
- $this->mp_fd_id,
- $this->jrn_def_id,
- $this->mp_id)
- );
- if ( strlen (trim($this->mp_jrn_def_id))==0)
- $this->cn->exec_sql(
- 'update payment_method '.
- 'set mp_jrn_def_id = null where mp_id=$1',
- array($this->mp_id));
- if ( strlen (trim($this->jrn_def_id))==0)
- $this->cn->exec_sql(
- 'update payment_method '.
- 'set mp_jrn_def_id = null where mp_id=$1',
- array($this->mp_id));
- if ( strlen (trim($this->mp_qcode))==0)
- $this->cn->exec_sql(
- 'update payment_method '.
- 'set mp_qcode = null where mp_id=$1',
- array($this->mp_id));
- if ( strlen (trim($this->mp_fd_id))==0)
- $this->cn->exec_sql(
- 'update payment_method '.
- 'set mp_fd_id = null where mp_id=$1',
- array($this->mp_id));
-
- }
-
+
public function load()
{
$sql='select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_def_id
from payment_method '.
@@ -172,14 +108,7 @@ class Acc_Payment
}
}
- /**
- *@brief remove a middle of payment
- */
- public function delete()
- {
- $sql="delete from payment_method where mp_id=$1";
- $this->cn->exec_sql($sql,array($this->mp_id));
- }
+
/*!\brief retrieve all the data for all ledgers
*\param non
*\return an array of row
diff --git a/include/class/payment_method_mtable.class.php
b/include/class/payment_method_mtable.class.php
new file mode 100644
index 0000000..f67b602
--- /dev/null
+++ b/include/class/payment_method_mtable.class.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of NOALYSS.
+ *
+ * PhpCompta is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpCompta is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpCompta; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+// Copyright (2018) Author Dany De Bontridder <address@hidden>
+
+/**
+ * @file
+ * @brief
+ * @see Payment_Method_SQL
+ * @see ajax_payment_method.php
+ */
+require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
+
+class Payment_Method_MTable extends Manage_Table_SQL
+{
+
+ function __construct(\Data_SQL $p_table)
+ {
+ parent::__construct($p_table);
+
+ // Column header
+ $this->set_col_label("mp_lib", _("Libellé"));
+ $this->set_col_label("mp_jrn_def_id", _("Enregistrement dans"));
+ $this->set_col_label("mp_fd_id", _("Type de fiche"));
+ $this->set_col_label("mp_qcode", _("Fiche"));
+ $this->set_col_label("jrn_def_id", _("Utilisation dans"));
+ // Hide id
+ $this->set_property_visible("mp_id", FALSE);
+ $this->icon_mod="right";
+
+ // Set value for col
+ $this->set_col_type("mp_qcode","custom");
+ $this->set_col_type("mp_jrn_def_id", "select",
+ $p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def
where jrn_def_type in ('FIN','ODS') and jrn_enable=1 order by 2",1));
+ $this->set_col_type("mp_fd_id", "select",
+ $p_table->cn->make_array("select fd_id,fd_label from fiche_def
order by 2",1));
+ $this->set_col_type("jrn_def_id", "select",
+ $p_table->cn->make_array("select jrn_def_id,jrn_def_name from
jrn_def where jrn_def_type in ('ACH','VEN') and jrn_enable=1 order by 2",1));
+ $this->set_col_tips("mp_fd_id", 71);
+ $this->set_col_tips("mp_qcode", 72);
+
$this->set_order(["mp_lib","jrn_def_id","mp_jrn_def_id","mp_fd_id","mp_qcode"]);
+
+ }
+
+ function check()
+ {
+ $table=$this->get_table();
+ $cn=$table->cn;
+ $has_error=0;
+
+ if ( trim($table->mp_lib) == "") {
+ $this->set_error("mp_lib", _("Un libellé est obligatoire"));
+ $has_error++;
+ }
+ $count_ledger_target=0;
+ if ( trim($table->mp_jrn_def_id) !="") {
+ $count_ledger_target=$cn->get_value("select count(*) from jrn_def
where jrn_def_id=$1",[$table->mp_jrn_def_id]);
+
+ }
+ if ($count_ledger_target == 0 ) {
+ $this->set_error("mp_jrn_def_id", _("Choisissez un journal"));
+ $has_error++;
+ }
+
+ $count_ledger_used=0;
+ if ( trim($table->jrn_def_id) != "") {
+ $count_ledger_used=$cn->get_value("select count(*) from jrn_def
where jrn_def_id=$1",[$table->jrn_def_id]);
+ }
+
+ if ($count_ledger_used == 0) {
+ $this->set_error("jrn_def_id", _("Choisissez un journal"));
+ $has_error++;
+ }
+ // if the ledger is financial, the qcode MUST be the default one
+ if ( trim($table->mp_lib) == "") {
+ $this->set_error("mp_lib", _("Un libellé est obligatoire"));
+ $has_error++;
+ }
+ if (trim ($table->mp_qcode) != "" && $a_row['jrn_def_type'] != 'FIN')
{
+ $fiche=new Fiche($cn);
+ if ( $fiche->get_by_qcode($table->mp_qcode,FALSE) == 1) {
+ $this->set_error("mp_qcode",_("Fiche inexistante"));
+ $has_error++;
+ }
+ }
+ // get the type of the ledger
+ $a_row= $cn->get_row("select jrn_def_type,jrn_def_bank from jrn_def
where jrn_def_id = $1",[$table->mp_jrn_def_id]);
+
+ // if ledger FIN then set the mp_qcode to the right card and set
mp_fd_id to the same than mp_qcode
+ if ( $a_row['jrn_def_type'] == 'FIN') {
+ $fiche=new Fiche($cn,$a_row['jrn_def_bank']);
+ $table->mp_qcode=$fiche->get_quick_code();
+ $table->mp_fd_id=$cn->get_value("select fd_id from fiche where
f_id=$1",[$a_row['jrn_def_bank']]);
+ }
+
+
+ if ( $a_row['jrn_def_type'] != 'FIN' && $table->mp_fd_id == -1)
+ {
+ $this->set_error("mp_fd_id",_("Choisissez un type de fiche"));
+ $has_error++;
+ }
+ if ( $has_error > 0) return FALSE;
+ return TRUE;
+ }
+ /**
+ * For the quickcode
+ * @param type $p_key
+ * @param type $p_value
+ */
+ function input_custom($p_key,$p_value)
+ {
+ $cn=$this->get_table()->cn;
+ switch ($p_key)
+ {
+ case "mp_qcode":
+ $w=new ICard("mp_qcode",$p_value);
+ $w->set_attribute("typecard", "all");
+ $w->autocomplete=0;
+
+ echo $w->input();
+ echo $w->search();
+ break;
+ default:
+ printf (_("Erreur key %s value %s"),$p_key,$p_value);
+ break;
+ }
+ }
+}
diff --git a/include/constant.php b/include/constant.php
index 748d264..cc27a55 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -108,7 +108,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
if ( ! defined ("SYSINFO_DISPLAY")) {
define ("SYSINFO_DISPLAY",TRUE);
}
-define ("DBVERSION",134);
+define ("DBVERSION",135);
define ("MONO_DATABASE",25);
define ("DBVERSIONREPO",18);
define ('NOTFOUND','--not found--');
diff --git a/include/database/payment_method_sql.class.php
b/include/database/payment_method_sql.class.php
new file mode 100644
index 0000000..2154e95
--- /dev/null
+++ b/include/database/payment_method_sql.class.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Autogenerated file
+ * This file is part of NOALYSS.
+ *
+ * NOALYSS is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * NOALYSS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NOALYSS; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+/**
+ * @file
+ * @brief abstract of the table public.payment_method
+ */
+
+/**
+ * @brief abstract of the table public.payment_method
+ */
+class Payment_method_SQL extends Noalyss_SQL
+{
+
+ function __construct(Database $p_cn, $p_id=-1)
+ {
+ $this->table="public.payment_method";
+ $this->primary_key="mp_id";
+ /*
+ * List of columns
+ */
+ $this->name=array(
+ "mp_id"=>"mp_id"
+ , "mp_lib"=>"mp_lib"
+ , "mp_jrn_def_id"=>"mp_jrn_def_id"
+ , "mp_fd_id"=>"mp_fd_id"
+ , "mp_qcode"=>"mp_qcode"
+ , "jrn_def_id"=>"jrn_def_id"
+ );
+ /*
+ * Type of columns
+ */
+ $this->type=array(
+ "mp_id"=>"numeric"
+ , "mp_lib"=>"text"
+ , "mp_jrn_def_id"=>"numeric"
+ , "mp_fd_id"=>"numeric"
+ , "mp_qcode"=>"text"
+ , "jrn_def_id"=>"numeric"
+ );
+
+
+ $this->default=array(
+ "mp_id"=>"auto"
+ );
+
+ $this->date_format="DD.MM.YYYY";
+ parent::__construct($p_cn, $p_id);
+ }
+
+}
diff --git a/include/lib/message_javascript.php
b/include/lib/message_javascript.php
index 5b17c7e..78de05b 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -101,6 +101,7 @@ content[67]="<?php echo escape_xml(_('Taper une formule (ex
20*5.1) puis enter')
content[68]="<?php echo escape_xml(_("Calculatrice simplifiée: écrivez
simplement les opérations que vous voulez puis la touche retour. exemple :
1+2+3*(1/5)"));?>";
content[69]="<?php echo escape_xml(_("Aucune donnée"))?>";
content[70]="<?php echo escape_xml(_("Votre demande est en cours de
traitement"))?>";
-
+content[71]="<?php echo _('Limite le type fiche si vous choisissez la fiche à
la saisie, uniquement avec journaux OD');?>";
+content[72]="<?php echo _("Pour les journaux FIN, ce sera la fiche du
journal");?>";
</script>
\ No newline at end of file
diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php
index a8db6f0..f86f57e 100644
--- a/include/payment_middle.inc.php
+++ b/include/payment_middle.inc.php
@@ -19,133 +19,15 @@
// Copyright Author Dany De Bontridder address@hidden
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/class/acc_payment.class.php';
-require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php';
-//---------------------------------------------------------------------------
-// Common variable
-$td='<TD>';
-$etd='</td>';
-$tr='<tr>';
-$etr='</tr>';
-$th='<th>';
-$eth='</th>';
-global $http;
-/*!\file
- * \brief payment mode
- */
-$sb=$http->request('sb', "string","");
-echo '<div class="content">';
-//----------------------------------------------------------------------
-// change
-if ( $sb=='change')
-{
- if ( !isset($_GET['id'])) exit;
- $row=new Acc_Payment($cn,$_GET['id']);
- $row->load();
- echo '<form method="post" id="modify_acc_pay_frm" onsubmit="return
confirm_box(\'modify_acc_pay_frm\',\''._('Vous confirmez').'\')">';
- echo dossier::hidden();
- echo HtmlInput::hidden('sa','mp');
- echo HtmlInput::hidden('sb','save');
- echo HtmlInput::hidden('id',$row->get_parameter("id"));
- echo HtmlInput::hidden('delete_ck',0);
- echo $row->form();
- echo HtmlInput::submit('save',_('Sauve'), '
onclick="$(\'delete_ck\').value=0"');
- echo HtmlInput::submit('delete',_('Efface'),'
onclick="$(\'delete_ck\').value=1"');
- echo HtmlInput::button_anchor(_('Retour sans sauver'),
-
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'],
- "","","smallbutton");
- echo '</form>';
- return;
-}
-//----------------------------------------------------------------------
-// Save the change
-//
-if ( $sb=='save')
-{
- $http=new HttpInput();
- $delete=$http->post("delete_ck","string", 0);
- if ( $delete == 0 )
- {
- $row=new Acc_Payment($cn,$_POST ['id']);
- $row->from_array($_POST);
- $row->update();
- } else {
-//---------------------------------------------------------------------------
-// Delete a card
-//---------------------------------------------------------------------------
- $row=new Acc_Payment($cn,$_POST['id']);
- $row->from_array($_POST);
- $row->delete();
-
- }
-}
-//---------------------------------------------------------------------------
-// Insert a new mod of payment
-//---------------------------------------------------------------------------
-if ( isset($_POST['insert']))
-{
- $row=new Acc_Payment($cn);
- $row->from_array($_POST);
- $row->insert();
- $sb="list";
-}
+require_once NOALYSS_INCLUDE."/database/payment_method_sql.class.php";
+require_once NOALYSS_INCLUDE."/class/payment_method_mtable.class.php";
-//---------------------------------------------------------------------------
-// Show form to enter a new one
-//---------------------------------------------------------------------------
-if ($sb=='ins')
-{
- $mp=new Acc_Payment($cn);
- $r=$mp->blank();
- echo '<form method="POST" id="payment_frm" onsubmit="return
confirm_box(this,\'Vous confirmez ?\')">';
- echo dossier::hidden();
- echo HtmlInput::hidden('ac',$_REQUEST['ac']),HtmlInput::hidden('insert',0);
- echo $r;
- echo HtmlInput::submit('insertsub',_('Enregistre'));
- echo HtmlInput::button_anchor(_('Retour sans sauver'),
-
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'],
- "","","smallbutton");
- echo '</form>';
+$payment_method_sql=new Payment_method_SQL($cn);
+$payment_method_mtable=new Payment_Method_MTable($payment_method_sql);
- return;
-}
-//--------------------------------------------------------------------------------
-//LIST
-//--------------------------------------------------------------------------------
-/* Get the data from database */
-$header=new Sort_Table();
-$base_url=$_SERVER['PHP_SELF']."?".Dossier::get()."&ac=".$_REQUEST['ac'];
+$payment_method_mtable->add_json_param("op", "payment_method");
+$payment_method_mtable->set_callback("ajax_misc.php");
+$payment_method_mtable->create_js_script();
-$header->add(_("Libelle"),$base_url,"order by mp_lib asc","order by mp_lib
desc",'la','ld');
-$header->add(_("Pour le journal"),$base_url,"order by jrn_def_name asc","order
by jrn_def_name desc",'ja','jd');
-$header->add(_("Type de fiche"),$base_url,"order by fd_label asc","order by
fd_label desc",'tc','td');
-$header->add(_("Enregistré dans le journal"),$base_url,"order by jrn_target
asc","order by jrn_target desc",'jta','jtd');
-$header->add(_("Avec la fiche"),$base_url,"order by vw_name asc","order by
vw_name desc",'na','nd');
-
-$order=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
-
-$sql=$header->get_sql_order($order);
-
-$array=$cn->get_array("
- select
-
mp_id,mp_lib,mp_jrn_def_id,mp_fd_id,mp_qcode,j.jrn_def_id,
- j.jrn_def_name as jrn_def_name,
- j2.jrn_def_name as jrn_target,
- fd_label,
- coalesce(mp_qcode,'A choisir à l''encodage') as vw_name
- from payment_method as mp
- left join jrn_def as j on (j.jrn_def_id=mp.jrn_def_id)
- left join jrn_def as j2 on
(j2.jrn_def_id=mp.mp_jrn_def_id)
- left join fiche_def as fd on (mp.mp_fd_id=fd.fd_id)
- $sql
- ");
-/* if there are data show them in a table */
-if ( ! empty ($array))
-{
-
- require_once NOALYSS_TEMPLATE.'/list_mod_payment.php';
-}
-echo HtmlInput::button_anchor("Ajout",
$base_url."&sb=ins","","","smallbutton");
-echo '</div>';
-?>
+echo $payment_method_mtable->display_table();
diff --git a/include/sql/patch/upgrade134.sql b/include/sql/patch/upgrade134.sql
new file mode 100644
index 0000000..17d4f18
--- /dev/null
+++ b/include/sql/patch/upgrade134.sql
@@ -0,0 +1,8 @@
+begin;
+
+update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def
where frd_id in (4,8,9,14))' where ad_id=25;
+
+alter table mod_payment rename to payment_method;
+
+insert into version (val,v_description) values (135,'rename table
mod_payment');
+commit ;
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index ea4b131..e69de29 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,21 +0,0 @@
-update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def
where frd_id in (4,8,9,14))' where ad_id=25;
-
-alter table mod_payment rename to payment_method;
-
-alter table payment_method add column type_payment_id varchar(6);
-
-
-comment on column payment_method.type_payment_id is 'Type of payment method';
-
-create table type_payment_ref (id varchar(6 ) primary key,tp_description
varchar(80) not null);
-
-insert into type_payment_ref (id,tp_description) values ('CACRD','Carte de
crédit'),
- ('CHCK','Chèque'),
- ('CASH','Liquide'),
-
('ELECT','Electronique'),
- ('VIRT','Virement');
-update payment_method set type_payment_id = 'VIRT';
-
-alter table payment_method add constraint type_payment_ref_fk foreign key
(type_payment_id) references type_payment_ref(id);
-
-alter table payment_method alter type_payment_id set not null;
\ No newline at end of file
- [Noalyss-commit] [noalyss] 83/107: Task#1734 New : Add PRINTTVA to have a summary of VAT by ledger, (continued)
- [Noalyss-commit] [noalyss] 83/107: Task#1734 New : Add PRINTTVA to have a summary of VAT by ledger, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 93/107: Documentation, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 92/107: Code : remove direct use of $_GET, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 39/107: Code cleaning : split database into database (for noalyss) and databasecore , with the functions, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 98/107: New :: function Icon_Action::tips for short comment New : Icon_Action::unlock, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 84/107: Task #1734 Upgrade patch for PRINTTVA, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 46/107: Code Cleaning split PDF into PDF_Core and PDF, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 105/107: fixup! New Task 1728: Aide à l'encodage - Journaux négatifs (note de crédit), Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 106/107: cosmetic, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 64/107: Add demo for fontello, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 75/107: Task #0001731: Moyen de paiement,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 81/107: Task #0001733: Impression moyen paiement, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 56/107: New function PDF_Core:is_fill add documentation, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 38/107: load_all must always return an array, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 67/107: SQL : add constraint for payment_method, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 44/107: fixup! fixup! Code cleaning : split database into database (for noalyss) and databasecore , with the functions, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 36/107: Bug : card cannot use a attribute of the type "card", reason : the query was wrong and there were a confusion between this->name and this->id in "get_js_attr()", Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 47/107: Improve doxygen, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 51/107: Code Cleaning split sendmail between sendmail_core (not related to noalyss) and sendmail which is used by noalyss, Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 54/107: Merge branch 'dev7109', Dany De Bontridder, 2019/08/26
- [Noalyss-commit] [noalyss] 59/107: #0001729: Preference : ne plus recharger la page, Dany De Bontridder, 2019/08/26