[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 201/238: Merge branch 'dev7109' into entrepri
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 201/238: Merge branch 'dev7109' into entreprise |
|
Date: |
Sat, 26 Oct 2019 04:41:06 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit f33ff144e5bc81bf4e646f53abe24e47e69d3d69
Merge: f275796 24439d4
Author: Dany De Bontridder <address@hidden>
Date: Sat Aug 17 22:22:59 2019 +0200
Merge branch 'dev7109' into entreprise
html/ajax_misc.php | 16 +-
html/do.php | 36 -
html/image/fontello/css/animation.css | 85 +++
html/image/fontello/css/fontello-codes.css | 96 +++
html/image/fontello/css/fontello-embedded.css | 149 ++++
html/image/fontello/css/fontello-ie7-codes.css | 96 +++
html/image/fontello/css/fontello-ie7.css | 107 +++
html/image/fontello/css/fontello.css | 152 ++++
html/image/fontello/demo.html | 446 ++++++++++++
html/js/acc_ledger.js | 18 +-
html/js/accounting_item.js | 4 +-
html/js/admin.js | 4 +-
html/js/ajax_fiche.js | 6 +-
html/js/anc_script.js | 8 +-
html/js/calc.js | 2 +-
html/js/card.js | 9 +-
html/js/compute_direct.js | 2 +-
html/js/gestion.js | 22 +-
html/js/managetable.js | 6 +-
html/js/modele_document.js | 2 +-
html/js/scripts.js | 139 ++--
html/js/todo_list.js | 21 +-
html/lang/en_US/LC_MESSAGES/messages.po | 771 ++++++++++++++++-----
html/style-light.css | 1 -
html/user_login.php | 23 -
include/ajax/ajax_card.php | 42 +-
include/ajax/ajax_payment_method.php | 71 ++
include/ajax/ajax_preference.php | 93 ++-
include/ajax/ajax_todo_list.php | 10 +-
include/class/acc_ledger_history.class.php | 27 +-
.../class/acc_ledger_history_financial.class.php | 1 +
.../class/acc_ledger_history_purchase.class.php | 39 +-
include/class/acc_ledger_history_sale.class.php | 30 +-
include/class/acc_payment.class.php | 87 +--
include/class/fiche_def.class.php | 2 +-
include/class/payment_method_mtable.class.php | 144 ++++
include/class/pre_operation.class.php | 2 +-
include/class/prepared_query.class.php | 83 +++
include/class/print_ledger.class.php | 1 -
include/class/print_ledger_detail_item.class.php | 47 +-
include/class/print_ledger_simple.class.php | 57 +-
.../print_ledger_simple_without_vat.class.php | 27 +-
include/class/todo_list.class.php | 6 +-
include/class/user.class.php | 4 +-
include/constant.php | 2 +-
include/database.item.php | 2 +-
include/database/payment_method_sql.class.php | 71 ++
include/export/export_ledger_csv.php | 46 +-
include/impress_jrn.inc.php | 6 +-
include/lib/ac_common.php | 2 +-
include/lib/database_core.class.php | 6 +-
include/lib/function_javascript.php | 13 +
include/lib/html_input.class.php | 18 +-
include/lib/manage_table_sql.class.php | 55 +-
include/lib/message_javascript.php | 124 ++--
include/lib/select_box.class.php | 24 +-
include/lib/user_menu.php | 54 +-
include/payment_middle.inc.php | 134 +---
include/sql/patch/upgrade134.sql | 8 +
include/sql/patch/upgrade135.sql | 23 +
.../acc_ledger_history_purchase_detail.php | 3 +-
.../acc_ledger_history_purchase_extended.php | 3 +-
.../acc_ledger_history_purchase_oneline.php | 6 +-
.../template/acc_ledger_history_sale_detail.php | 3 +-
.../template/acc_ledger_history_sale_extended.php | 4 +-
.../template/acc_ledger_history_sale_oneline.php | 3 +-
scenario/ajax-save-operation.php | 3 +-
scenario/select-box-test.php | 20 +-
scenario/test_manage_table_sql.php | 2 +-
sql/upgrade.sql | 1 -
70 files changed, 2833 insertions(+), 797 deletions(-)
diff --cc html/ajax_misc.php
index 37f5e0b,9129176..1ecefcd
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@@ -245,8 -251,10 +251,12 @@@ $path = array
'update_comment_followUp'=>'ajax_follow_up',
// TVA param
"tva_parameter"=>"ajax_tva_parameter",
- // Display all cards using an accounting
- "display_all_card"=>"ajax_display_all_card",
+ // Currency , delete a rate
+ "CurrencyRateDelete"=>"ajax_currency",
+ // payment_method
- "payment_method"=>"ajax_payment_method"
++ "payment_method"=>"ajax_payment_method",
++ // Display all cards using an accounting
++ "display_all_card"=>"ajax_display_all_card"
) ;
if (array_key_exists($op, $path)) {
diff --cc html/js/scripts.js
index f2161d2,7e19d0a..3c80251
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@@ -3546,18 -3578,29 +3581,44 @@@ function toggle_lock(p_domid
}
+/**
+ *
+ * @returns {undefined}
+ */
+function show_ledger_fin_currency()
+{
+ var ledger=$('p_jrn').value;
+ var dossier=$('gDossier').value;
+ // $('ledger_currency').
+ var a=new Ajax.Updater("ledger_currency",
+ "ajax_misc.php",
+ {
+ parameters:
{"op":"currencyCode","gDossier":dossier,"ledger":ledger}
+ });
- }
++}
+
+ /***
+ * Update Preference, applied the new CSS
+ */
+ function updatePreference()
+ {
+ try {
+ waiting_box();
+ var
param=$('preference_frm').serialize()+"&op=preference&action=save";
+
+ new Ajax.Request("ajax_misc.php",{
+ method:"post",
+ parameters:param,
+ onSuccess:function (req) {
+ var style=req.responseText.evalJSON();
+ $('pagestyle').setAttribute('href',style.style);
+ removeDiv('preference_div');
+ }
+ });
+ } catch (e)
+ {
+ smoke.alert(content[48] + e.message);
+ }
+ remove_waiting_box();
+
+ }
diff --cc html/lang/en_US/LC_MESSAGES/messages.po
index 61fc9b0,629d1fb..d723f65
--- a/html/lang/en_US/LC_MESSAGES/messages.po
+++ b/html/lang/en_US/LC_MESSAGES/messages.po
@@@ -954,7 -970,9 +987,9 @@@ msgid "Action non accessible
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:290 html/ajax_misc.php:382 html/ajax_misc.php:442
+ #: html/ajax_misc.php:390 include/lib/message_javascript.php:90
+ #: include/lib/message_javascript.php:92 html/ajax_misc.php:392
msgid "Action non autorisée"
msgstr "Unauthorized"
@@@ -1073,7 -1092,8 +1109,8 @@@ msgstr "Global Parameter
#: include/export/export_stock_resume_list.php:38
#: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604
#: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761
-#: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781
+#: include/class/fiche.class.php:1763 include/class/fiche.class.php:1833
+ #: include/class/fiche.class.php:1782
msgid "Adresse"
msgstr "Address"
@@@ -3098,7 -3130,8 +3176,8 @@@ msgstr "from
#: include/lib/manage_table_sql.class.php:935
#: 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:1046
+ #: include/lib/manage_table_sql.class.php:1069
msgid "Cancel"
msgstr "Cancel"
@@@ -3277,7 -3310,8 +3356,8 @@@ msgid "Ce plan n'existe pas
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:434 html/ajax_misc.php:546 html/ajax_misc.php:606
+ #: html/ajax_misc.php:554 html/ajax_misc.php:556
msgid "Ce plugin n'existe pas "
msgstr "No plugin"
@@@ -3455,9 -3488,9 +3535,9 @@@ msgid "Changer format
msgstr "Change format"
#: include/company.inc.php:123 include/company.inc.php:142
-#: include/company.inc.php:146
+#: include/company.inc.php:146 include/company.inc.php:166
msgid "Changer le libellé des détails"
- msgstr "Change the wording details"
+ msgstr "Change the label details"
#: include/ext/tools/index.php:41
msgid "Changer poste comptable ou fiche"
@@@ -3563,9 -3597,12 +3644,12 @@@ msgstr "full path to postgresql
#: include/ajax/ajax_navigator.php:46 include/class/acc_ledger.class.php:2175
#: include/class/fiche.class.php:2221 html/user_login.php:181
#: include/class/acc_ledger.class.php:2176 include/class/fiche.class.php:2223
-#: html/ajax_misc.php:456 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:2246
+#: html/ajax_misc.php:514 include/class/pre_operation.class.php:289
+#: include/class/acc_ledger.class.php:2358
+#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2294
+ #: html/user_login.php:158 html/ajax_misc.php:462
+ #: 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"
@@@ -3924,9 -3970,7 +4018,9 @@@ msgstr "Invalid key
#: include/class/acc_ledger_sold.class.php:707
#: include/class/acc_ledger_sold.class.php:1074
#: include/class/acc_ledger_sold.class.php:1330
- #: include/class/acc_ledger_sold.class.php:818
+ #: include/class/print_ledger_simple.class.php:103
+#: include/class/acc_ledger_sold.class.php:1238
+#: include/class/acc_ledger_sold.class.php:1494
msgid "Client"
msgstr "Customer"
@@@ -4885,9 -4884,9 +4980,9 @@@ msgstr "Confirm
#: include/compta_fin.inc.php:83 include/compta_fin.inc.php:84
#: include/operation_ods_confirm.inc.php:78
include/ext/importbank/ajax.php:232
#: include/ext/importbank/ajax.php:237 include/ext/importbank/ajax.php:238
-#: include/operation_ods_confirm.inc.php:89
+#: include/operation_ods_confirm.inc.php:89 include/compta_fin.inc.php:88
msgid "Confirmer"
- msgstr "Confirmed"
+ msgstr "To confirm"
#: include/template/anc_key_input.php:211
#: include/template/anc_key_input.php:212
@@@ -5087,7 -5085,8 +5182,8 @@@ msgstr "Creation template 2
#: include/fiche.inc.php:578
#: include/ext/tools/include/anc_grandlivre_ext.class.php:127
#: include/export/export_poste_detail_pdf.php:104
-#: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
+#: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:584
+ #: include/fiche.inc.php:589
msgid "Credit"
msgstr "Credit"
@@@ -5399,8 -5396,8 +5495,9 @@@ msgstr "D
#: include/export/export_poste_detail_csv.php:202
#: include/class/anc_listing.class.php:85
#: include/class/pdf_operation.class.php:250
+#: include/export/export_poste_detail_csv.php:218
#: include/class/anc_listing.class.php:87
+ #: include/class/pdfbalance_simple.class.php:59
msgid "D/C"
msgstr "D / C"
@@@ -5418,7 -5415,8 +5515,8 @@@ msgstr "DIFF
#: include/export/export_ledger_csv.php:260
#: include/class/acc_ledger_history_purchase.class.php:256
#: include/class/acc_ledger_history_purchase.class.php:257
-#: include/class/acc_ledger_history_purchase.class.php:258
+#: include/class/acc_ledger_history_purchase.class.php:272
+ #: include/class/acc_ledger_history_purchase.class.php:262
msgid "DNA"
msgstr "Unallowed fee"
@@@ -5656,33 -5640,24 +5758,36 @@@ msgstr "Database::get_row returns too m
#: include/class/anc_operation.class.php:296
#: include/class/print_ledger_misc.class.php:43
#: include/class/fiche.class.php:1382 include/class/fiche.class.php:1457
-#: include/template/stock_inv.php:37 include/fiche.inc.php:518
-#: include/class/acc_ledger.class.php:814
+#: include/template/currency_mtable_input_new.php:56
+#: include/template/currency_mtable_input.php:62
+#: include/template/currency_mtable_input.php:98
+#: include/template/form_ledger_detail.php:23
+#: include/template/form_ledger_fin.php:47
+#: include/template/form_ledger_fin.php:84 include/template/stock_inv.php:37
+#: include/export/export_poste_detail_csv.php:214 include/fiche.inc.php:518
+#: include/class/acc_ledger_history_generic.class.php:701
+#: include/class/acc_ledger_history_generic.class.php:795
+#: include/class/acc_ledger_sold.class.php:798
+#: include/class/acc_ledger_sold.class.php:1574
+#: include/class/acc_ledger.class.php:618
+#: include/class/acc_ledger.class.php:849
+#: include/class/acc_ledger_history_purchase.class.php:263
#: include/class/acc_ledger_search.class.php:638
#: include/class/acc_ledger_search.class.php:957
-#: include/class/acc_ledger_fin.class.php:548
-#: include/class/acc_ledger_fin.class.php:753
+#: include/class/acc_ledger_fin.class.php:547
+#: include/class/acc_ledger_fin.class.php:796
#: include/class/anc_listing.class.php:79
-#: include/class/anc_operation.class.php:297
include/class/fiche.class.php:1396
-#: include/class/fiche.class.php:1471 include/lib/ac_common.php:1210
-#: include/fiche.inc.php:527
-#: include/class/acc_ledger_history_generic.class.php:680
-#: include/class/acc_ledger_history_generic.class.php:767
-#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472
-#: include/export/export_ledger_csv.php:211
-#: include/class/print_ledger_simple.class.php:100
+#: include/class/acc_ledger_history_sale.class.php:260
+#: include/class/anc_operation.class.php:311
+#: include/class/acc_account_ledger.class.php:402
+#: include/class/fiche.class.php:1412 include/class/fiche.class.php:1487
+#: include/class/print_ledger_fin.class.php:60
+#: include/class/acc_ledger_purchase.class.php:1516
+#: include/class/acc_ledger_purchase.class.php:1980
+#: include/class/currency_mtable.class.php:61 include/lib/ac_common.php:1210
+ #: include/class/acc_ledger_history_purchase.class.php:249
+ #: include/export/export_ledger_csv.php:219
+ #: include/class/acc_ledger_history_purchase.class.php:253
msgid "Date"
msgstr "Date"
@@@ -5989,8 -5950,9 +6097,9 @@@ msgstr "Date of operation
#: include/class/acc_ledger_purchase.class.php:1824
#: include/class/acc_ledger_sold.class.php:1398
#: include/class/acc_ledger_purchase.class.php:1827
-#: include/export/export_ledger_csv.php:141
-#: include/class/acc_ledger_history_purchase.class.php:277
+#: include/class/acc_ledger_sold.class.php:1575
+#: include/class/acc_ledger_purchase.class.php:1981
+ #: include/class/acc_ledger_history_sale.class.php:263
msgid "Date paiement"
msgstr "Payment date"
@@@ -6050,7 -6008,8 +6159,8 @@@ msgstr "Inavlid limit date
#: include/fiche.inc.php:574
#: include/ext/tools/include/anc_grandlivre_ext.class.php:126
#: include/export/export_poste_detail_pdf.php:102
-#: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
+#: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:580
+ #: include/fiche.inc.php:585
msgid "Debit"
msgstr "Debit"
@@@ -6127,7 -6087,8 +6238,8 @@@ msgid "Dernières opérations
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:307 html/ajax_misc.php:399 html/ajax_misc.php:459
+ #: 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"
@@@ -6303,10 -6262,11 +6415,11 @@@
#: include/class/acc_ledger_search.class.php:654
#: include/class/acc_ledger_search.class.php:960
#: include/class/acc_ledger_search.class.php:1105
-#: include/class/anc_listing.class.php:83 include/class/fiche.class.php:1397
-#: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213
-#: include/template/param_jrn.php:85 include/class/fiche.class.php:1398
-#: include/class/fiche.class.php:1477
+#: include/class/anc_listing.class.php:83
+#: include/class/acc_account_ledger.class.php:407
+#: include/class/fiche.class.php:1413 include/class/fiche.class.php:1492
+#: include/lib/ac_common.php:1213
+ #: include/class/print_ledger_simple.class.php:108
msgid "Description"
msgstr "Description"
@@@ -6835,7 -6731,8 +6952,8 @@@ msgid "Download core
msgstr "Download core"
#: include/export/export_balance_pdf.php:109
-#: include/export/export_balance_pdf.php:110
+#, php-format
+ #, php-format
msgid "Du %s au %s"
msgstr "From %s to %s"
@@@ -6935,14 -6832,12 +7053,14 @@@ msgstr "Amortization term
#: include/class/anc_grandlivre.class.php:220
#: include/class/fiche.class.php:1462 include/class/acc_ledger.class.php:613
#: include/class/acc_ledger.class.php:884 include/class/fiche.class.php:1464
-#: include/operation_ods_new.inc.php:84 include/class/acc_ledger.class.php:889
-#: include/class/fiche.class.php:1478
+#: include/export/export_poste_detail_csv.php:93
+#: include/export/export_fiche_detail_csv.php:82
- #: include/operation_ods_new.inc.php:87 include/operation_ods_new.inc.php:96
- #: include/class/acc_ledger_history_generic.class.php:799
- #: include/class/acc_ledger.class.php:630
- #: include/class/acc_ledger.class.php:938
+ #: include/class/anc_balance_double.class.php:99
+ #: include/class/acc_ledger_history_generic.class.php:771
+ #: include/class/fiche.class.php:1479
+ #: include/class/pdfbalance_simple.class.php:56
+#: include/class/acc_account_ledger.class.php:411
+#: include/class/fiche.class.php:1496
msgid "Débit"
msgstr "Debit"
@@@ -6958,7 -6853,8 +7076,8 @@@ msgstr "Debit or credit
#: include/class_fiche.php:1232 include/class/class_fiche.php:1232
#: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238
#: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383
-#: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399
+#: include/class/fiche.class.php:1385 include/class/fiche.class.php:1415
+ #: include/class/fiche.class.php:1400
msgid "Débit/Crédit"
msgstr "Debit or credit"
@@@ -7800,8 -7701,9 +7945,9 @@@ msgstr "Removal forbidden
#: include/class/anc_operation.class.php:317
#: 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/template/ledger_detail_bottom.php:328
include/compta_fin.inc.php:154
- #: include/class/anc_operation.class.php:331
+ #: include/class/periode.class.php:596 include/class/periode.class.php:601
+ #: include/lib/manage_table_sql.class.php:768
msgid "Effacer"
msgstr "Remove"
@@@ -7884,7 -7786,8 +8030,8 @@@ msgstr "Remove an operation
#: include/lib/manage_table_sql.class.php:999
#: 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:1113
+ #: include/lib/manage_table_sql.class.php:1136
msgid "Effacé"
msgstr "Erased"
@@@ -8297,11 -8206,10 +8453,17 @@@ msgstr "Error log this type is not yet
msgid "Erreur date invalide"
msgstr "Invalid Date"
+#: include/class/acc_ledger_sold.class.php:566
+#: include/class/acc_ledger_purchase.class.php:868
+msgid "Erreur de balance"
+msgstr "Balance error"
+
++
+ #: include/lib/database_core.class.php:71
+ msgid "Erreur de connexion !"
+ msgstr "Disconnect"
+
++
#: include/ajax/ajax_periode.php:195
msgid "Erreur exercice invalide"
msgstr "Invalid exercice"
@@@ -8536,7 -8450,8 +8704,8 @@@ 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:347 html/ajax_misc.php:459 html/ajax_misc.php:519
+ #: html/ajax_misc.php:467 html/ajax_misc.php:469
msgid "Explication"
msgstr "Explanation"
@@@ -8598,9 -8513,11 +8767,11 @@@ msgstr "Export balance
#: include/class/fiche.class.php:1599 include/class/fiche.class.php:2189
#: html/popup.php:113 include/class/fiche.class.php:1601
#: include/class/fiche.class.php:2191 include/fiche.inc.php:297
-#: include/fiche.inc.php:333 include/class/fiche.class.php:1619
-#: include/class/fiche.class.php:2214 include/anc_pa.inc.php:123
+#: include/fiche.inc.php:333 include/class/acc_account_ledger.class.php:760
+#: include/class/fiche.class.php:1647 include/class/fiche.class.php:2262
- #: include/anc_pa.inc.php:123
+ #: include/fiche.inc.php:242 include/fiche.inc.php:302
+ #: include/fiche.inc.php:340 include/class/fiche.class.php:1620
+ #: include/class/fiche.class.php:2215
msgid "Export CSV"
msgstr "Export CSV"
@@@ -8698,9 -8615,9 +8869,9 @@@ msgstr "Export Ledger
#: html/popup.php:111 include/class/acc_account_ledger.class.php:757
#: include/class/fiche.class.php:1584 include/class/fiche.class.php:2211
#: html/popup.php:114 include/class/fiche.class.php:1586
-#: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604
+#: include/class/fiche.class.php:2213
- #: include/class/acc_account_ledger.class.php:782
- #: include/class/fiche.class.php:1632 include/class/fiche.class.php:2284
+ #: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605
+ #: include/class/fiche.class.php:2237
msgid "Export PDF"
msgstr "Export PDF"
@@@ -9127,7 -9041,8 +9299,8 @@@ msgstr "Closed
#: include/ext/amortis/include/template/material_detail.php:36
#: 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/template/form_ledger_fin.php:86 include/template/stock_inv.php:67
+ #: include/class/payment_method_mtable.class.php:41
msgid "Fiche"
msgstr "Card"
@@@ -9542,10 -9457,9 +9716,10 @@@ msgstr "Formula
#: include/class/acc_ledger_purchase.class.php:1430
#: include/class/acc_ledger_history_purchase.class.php:252
#: include/class/acc_ledger_history_sale.class.php:246
- #: include/class/acc_ledger_history_purchase.class.php:267
- #: include/class/acc_ledger_history_sale.class.php:264
- #: include/class/acc_ledger_purchase.class.php:1400
+ #: include/class/print_ledger_simple.class.php:105
+ #: include/class/acc_ledger_history_purchase.class.php:253
+ #: include/class/acc_ledger_history_purchase.class.php:257
+#: include/class/acc_ledger_purchase.class.php:1539
msgid "Fournisseur"
msgstr "Supplier"
@@@ -9682,9 -9596,8 +9857,9 @@@ msgstr "Global period for all ledgers
#: include/class/acc_ledger.class.php:364 include/database.item.php:66
#: include/class/acc_ledger.class.php:372
#: include/class/acc_ledger.class.php:373
+#: include/class/acc_ledger.class.php:389
msgid "Grand Livre"
- msgstr "Ledger"
+ msgstr "General Ledger"
#: include/verif_bilan.inc.php:78 include/verif_bilan.inc.php:105
msgid "Grand livre"
@@@ -10276,7 -10180,8 +10452,8 @@@ msgid "Il y a %s paramètre qui s
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:435 html/ajax_misc.php:547 html/ajax_misc.php:607
+ #: 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"
@@@ -10855,7 -10762,8 +11038,8 @@@ msgstr "Invalid command
msgid "Invalide"
msgstr "Invalide"
-#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
+#: html/ajax_misc.php:288 html/ajax_misc.php:348
+ #: html/ajax_misc.php:298
msgid "Invalide type"
msgstr "Invalide type"
@@@ -11476,12 -11371,13 +11663,13 @@@ msgstr "The plugin must be activated i
msgid "Le poste"
msgstr "The accounting item"
-#: include/class/acc_ledger.class.php:1124
+#: include/class/acc_ledger.class.php:1208
#, php-format
msgid "Le poste %s n'est pas dans ce journal"
- msgstr "The accounting %s is not in this ledger"
+ msgstr "Account %s doesn't belong to this ledger"
#: include/template/param_jrn.php:94 include/lib/message_javascript.php:70
+ #: 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"
@@@ -12161,11 -12065,7 +12367,10 @@@ msgstr "login
msgid "Lundi"
msgstr "Monday"
-#: include/class/periode.class.php:648 include/class/periode.class.php:650
+#: include/template/acc_ledger_history_financial_oneline.php:38
+msgid "M. Devise"
+msgstr "Amount Cur"
+
- #: include/class/periode.class.php:648
msgid "Mai"
msgstr "May"
@@@ -12703,7 -12612,8 +12920,8 @@@ msgstr "Missing description
#: include/lib/manage_table_sql.class.php:752
#: include/class/anc_operation.class.php:324
#: include/class/anc_operation.class.php:318
-#: include/class/anc_operation.class.php:319
+#: include/class/anc_operation.class.php:333
+ #: include/lib/manage_table_sql.class.php:755
msgid "Modifier"
msgstr "Modify"
@@@ -12992,24 -12893,15 +13212,23 @@@ msgstr "VAT Amount currency
#: include/class/acc_ledger_search.class.php:639
#: include/class/acc_ledger_search.class.php:949
#: include/class/print_ledger_misc.class.php:48
-#: include/class/fiche.class.php:1384
include/export/export_anc_axis_csv.php:46
-#: include/fiche.inc.php:522 include/class/acc_ledger.class.php:888
+#: include/class/fiche.class.php:1384
+#: include/template/acc_ledger_history_financial_oneline.php:37
+#: include/template/ledger_detail_ven.php:164
+#: include/template/form_ledger_fin.php:88
+#: include/template/ledger_detail_ach.php:158
+#: include/export/export_anc_axis_csv.php:46
+#: include/export/export_poste_detail_csv.php:217 include/fiche.inc.php:524
+#: include/class/acc_ledger_sold.class.php:841
+#: include/class/acc_ledger.class.php:937
#: include/class/acc_ledger_search.class.php:652
#: include/class/acc_ledger_search.class.php:962
-#: include/class/acc_ledger_fin.class.php:551
-#: include/class/acc_ledger_fin.class.php:754
-#: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398
-#: include/lib/ac_common.php:1215 include/fiche.inc.php:531
-#: include/class/fiche.class.php:1399
+#: include/class/acc_ledger_fin.class.php:550
+#: include/class/acc_ledger_fin.class.php:797
+#: include/class/print_ledger_misc.class.php:49
+#: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1414
+#: include/class/print_ledger_fin.class.php:65
+#: include/class/acc_ledger_purchase.class.php:1561
- #: include/lib/ac_common.php:1215
msgid "Montant"
msgstr "Amount"
@@@ -14422,9 -14259,9 +14653,9 @@@ msgstr "Receipt #
msgid "Numéro TVA"
msgstr "VAT number"
-#: include/class/acc_ledger_fin.class.php:535
+#: include/class/acc_ledger_fin.class.php:534
msgid "Numéro d'extrait"
- msgstr "Number of Bank receipt"
+ msgstr "Bank receipt number"
#: include/ext/transform/include/class_transform_declarant.php:173
#: include/ext/transform/include/transform_declarant.class.php:173
@@@ -14529,7 -14363,9 +14760,9 @@@ msgstr "#
#: include/export/export_ledger_csv.php:216
#: include/class/acc_ledger_history_generic.class.php:764
#: include/export/export_ledger_csv.php:210
-#: include/class/acc_ledger_history_generic.class.php:765
+#: include/class/acc_ledger_history_generic.class.php:793
+ #: include/export/export_ledger_csv.php:212
+ #: include/export/export_ledger_csv.php:220
msgid "N° Pièce"
msgstr "Receipt #"
@@@ -14887,10 -14717,14 +15121,12 @@@ msgstr "Not Reversed accounting
msgid "Opération non trouvée"
msgstr "operation not found"
-#: include/export/export_ledger_csv.php:144
-msgid "Opération paiement"
+#: include/operation_ods_new.inc.php:108
+#, php-format
+ msgstr "Payment Writing "
+
-#: include/operation_ods_new.inc.php:94
-#, php-format
msgid "Opération rapprochée : %s"
- msgstr "Linked operation %s"
+ msgstr "Linked operation : %s"
#: include/ext/importbank/ajax.php:283
msgid "Opération récupérée"
@@@ -15195,10 -15024,10 +15434,11 @@@ msgstr "Pu
#: include/class/acc_ledger_history_purchase.class.php:249
#: include/class/acc_ledger_history_sale.class.php:243
#: include/class/acc_ledger_search.class.php:631
-#: include/class/acc_ledger.class.php:2421
+#: include/class/acc_ledger.class.php:2625
+#: include/class/acc_ledger_history_purchase.class.php:264
#: include/class/acc_ledger_search.class.php:644
- #: include/class/acc_ledger_history_sale.class.php:261
+ #: include/class/acc_ledger_history_purchase.class.php:250
+ #: include/class/acc_ledger_history_purchase.class.php:254
msgid "Paiement"
msgstr "Payment"
@@@ -15818,17 -15652,12 +16068,17 @@@ msgstr "Receipt
#: include/class/acc_ledger_history_sale.class.php:245
#: include/class/acc_ledger_search.class.php:633
#: include/class/acc_ledger_search.class.php:945
-#: include/class/acc_ledger.class.php:858
+#: include/template/acc_ledger_history_financial_oneline.php:34
+#: include/class/acc_ledger_sold.class.php:1579
+#: include/class/acc_ledger.class.php:893
+#: include/class/acc_ledger_history_purchase.class.php:266
#: include/class/acc_ledger_search.class.php:646
-#: include/class/acc_ledger_search.class.php:958
include/lib/ac_common.php:1212
+#: include/class/acc_ledger_search.class.php:958
- #: include/class/acc_ledger_history_sale.class.php:263
- #: include/class/acc_account_ledger.class.php:403
- #: include/class/fiche.class.php:1488
+ #: include/class/print_ledger_simple.class.php:99
+ #: include/class/acc_ledger_history_purchase.class.php:252
+ #: include/class/acc_ledger_history_purchase.class.php:256
+#: include/class/acc_ledger_purchase.class.php:1985
+#: include/lib/ac_common.php:1212
msgid "Pièce"
msgstr "Receipt"
@@@ -16024,15 -15858,10 +16279,15 @@@ msgstr "Possible %d
#: include/class/acc_ledger_purchase.class.php:1834
#: include/class/acc_ledger.class.php:611
#: include/class/acc_ledger.class.php:881 include/class/fiche.class.php:1459
-#: include/class/acc_ledger.class.php:886
-#: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473
+#: include/template/ledger_detail_ven.php:161
+#: include/template/ledger_detail_ach.php:155
- #: include/export/export_poste_detail_csv.php:210
- #: include/class/acc_ledger_history_generic.class.php:796
+ #: include/class/acc_ledger_history_generic.class.php:768
+ #: include/class/fiche.class.php:1474
+#: include/class/acc_ledger_sold.class.php:1582
+#: include/class/acc_ledger.class.php:628
+#: include/class/acc_ledger.class.php:935
+#: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1489
+#: include/class/acc_ledger_purchase.class.php:1988
msgid "Poste"
msgstr "Account. Item"
@@@ -16064,6 -15898,8 +16324,7 @@@ msgstr "Post Charge
#: 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/class/pdfbalance_simple.class.php:55
msgid "Poste Comptable"
msgstr "Accounting item"
@@@ -16134,7 -15970,8 +16395,8 @@@ msgstr "Post load
#: include/class/class_fiche.php:1602
include/class/class_pdf_operation.php:246
#: include/class/fiche.class.php:1756
include/class/pdf_operation.class.php:246
#: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759
-#: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779
+#: include/class/fiche.class.php:1761 include/class/fiche.class.php:1831
+ #: include/class/fiche.class.php:1780
msgid "Poste comptable"
msgstr "Accounting"
@@@ -16228,9 -16052,11 +16490,11 @@@ msgstr "Accounting or card
#: include/class/fiche.class.php:845 include/class/fiche.class.php:988
#: include/class/fiche.class.php:989 include/class/fiche.class.php:1023
#: include/class/acc_plan_mtable.class.php:170
-#: include/class/fiche.class.php:818 include/class/fiche.class.php:848
-#: include/class/fiche.class.php:849 include/class/fiche.class.php:995
-#: include/class/fiche.class.php:996 include/class/fiche.class.php:1036
+#: include/class/fiche.class.php:818 include/class/fiche.class.php:850
+#: include/class/fiche.class.php:851 include/class/fiche.class.php:1007
+#: include/class/fiche.class.php:1008 include/class/fiche.class.php:1041
+ #: include/class/fiche.class.php:850 include/class/fiche.class.php:997
+ #: include/class/fiche.class.php:1037
msgid "Poste comptable trop long"
msgstr "Accounting too large"
@@@ -16966,8 -16790,9 +17242,9 @@@ msgstr "QuickCode gold
#: include/class/acc_account_ledger.class.php:394
#: include/class/acc_ledger_history_generic.class.php:768
#: include/export/export_ledger_csv.php:211
-#: include/class/acc_ledger_history_generic.class.php:769
-#: include/export/export_ledger_csv.php:213
+#: include/export/export_poste_detail_csv.php:212
+#: include/class/acc_ledger_history_generic.class.php:797
+ #: include/export/export_ledger_csv.php:221
msgid "QuickCode"
msgstr "QuickCode"
@@@ -17213,7 -17040,8 +17490,8 @@@ msgstr "Search accounting
#: include/class/anc_balance_double.class.php:368
#: include/class/acc_ledger_search.class.php:551
#: include/class/acc_ledger_search.class.php:560
-#: include/class/acc_ledger_fin.class.php:1087
+#: include/class/acc_ledger_fin.class.php:1170
+ #: include/class/anc_balance_double.class.php:370
msgid "Rechercher"
msgstr "Search"
@@@ -18000,7 -17837,10 +18288,10 @@@ msgstr "Company
#: include/balance.inc.php:317 include/class/acc_bilan.class.php:176
#: include/class/fiche.class.php:1764 include/class/fiche.class.php:1766
#: include/export/export_balance_pdf.php:135
-#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784
+#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1836
+ #: include/class/anc_balance_double.class.php:101
+ #: include/class/fiche.class.php:1785
include/export/export_balance_pdf.php:136
+ #: include/class/pdfbalance_simple.class.php:58
msgid "Solde"
msgstr "Balance"
@@@ -18108,10 -17948,10 +18401,15 @@@ msgstr "Stock
msgid "Stock et commande"
msgstr "Stock and Order"
+ #: include/impress_jrn.inc.php:156
+ msgid "Style d'impression"
+ msgstr "Printing type"
-
+#: include/template/form_ledger_fin.php:37
+msgid "Style de date"
+msgstr "Date format"
-
++#: include/impress_jrn.inc.php:156
++msgid "Style d'impression"
++msgstr "Printing type"
#: include/ext/importbank/ajax.php:82 include/ext/importbank/ajax.php:83
msgid "Suggestion"
msgstr "Suggest"
@@@ -18251,7 -18091,8 +18549,8 @@@ 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:346 html/ajax_misc.php:458 html/ajax_misc.php:518
+ #: html/ajax_misc.php:466 html/ajax_misc.php:468
msgid "Symbole"
msgstr "Symbol"
@@@ -18408,7 -18245,9 +18708,9 @@@ msgstr "VAT ND
#: include/export/export_ledger_csv.php:262
#: include/class/acc_ledger_history_purchase.class.php:258
#: include/class/acc_ledger_history_purchase.class.php:259
-#: include/class/print_ledger_simple.class.php:116
+#: include/class/acc_ledger_history_purchase.class.php:274
+ #: include/class/acc_ledger_history_purchase.class.php:260
+ #: include/class/acc_ledger_history_purchase.class.php:264
msgid "TVA NP"
msgstr "VAT ND"
@@@ -18711,50 -18530,9 +19017,50 @@@ msgstr "VAT rate
msgid "Taux de TVA invalide"
msgstr "Invalid VAT code"
+#: include/class/acc_ledger.class.php:1085
+msgid "Taux de conversion doit être supérieur à 0"
+msgstr "Rate must be greater than 0"
+
+#: include/export/export_fiche_balance_csv.php:166
+msgid "Taux de référence"
+msgstr "Reference rate"
+
+#: include/class/acc_ledger_sold.class.php:244
+#: include/class/acc_ledger_purchase.class.php:286
+msgid "Taux devise invalide"
+msgstr "Invalid currency rate "
+
+#: include/ajax/ajax_currency.php:82
+msgid "Taux effacé"
+msgstr "Rate removed"
+
+#: include/ajax/ajax_currency.php:73
+msgid "Taux inexistant"
+msgstr "Rate inexistent"
+
+#: include/class/acc_ledger_history_purchase.class.php:289
+#: include/class/acc_ledger_history_sale.class.php:283
+msgid "Taux ref"
+msgstr "Reference rate"
+
+#: include/export/export_poste_detail_csv.php:92
+#: include/export/export_fiche_detail_csv.php:81
+msgid "Taux référence"
+msgstr "Reference rate"
+
+#: include/template/ledger_detail_misc.php:210
+#: include/template/ledger_detail_ven.php:300
+#: include/template/ledger_detail_ach.php:290
+#: include/export/export_poste_detail_csv.php:91
+#: include/export/export_fiche_detail_csv.php:80
+#: include/class/acc_ledger_history_purchase.class.php:290
+#: include/class/acc_ledger_history_sale.class.php:284
+msgid "Taux utilisé"
+msgstr "Used rated"
+
#: scenario/inplace_edit.test.php:32 scenario/inplace_edit.test.php:33
msgid "Test Inplace_Edit"
- msgstr ""
+ msgstr "Test Inplace_Edit"
#: include/card_attr.inc.php:77 include/card_attr.inc.php:78
msgid "Texte"
@@@ -18808,12 -18586,11 +19114,14 @@@ msgstr "Theme
#: include/class/acc_ledger_search.class.php:637
#: include/class/print_ledger_misc.class.php:46
#: include/class/fiche.class.php:1461
+#: include/template/acc_ledger_history_financial_oneline.php:35
+#: include/export/export_poste_detail_csv.php:215
+#: include/class/acc_ledger_history_generic.class.php:704
#: include/class/acc_ledger_search.class.php:650
-#: include/class/fiche.class.php:1475
-#: include/class/acc_ledger_history_generic.class.php:683
+#: include/class/acc_account_ledger.class.php:406
+#: include/class/fiche.class.php:1491
+ #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214
+ #: include/export/export_ledger_csv.php:222
msgid "Tiers"
msgstr "Tiers"
@@@ -19772,12 -19551,12 +20110,16 @@@ msgstr "Users
msgid "Utilisateurs qui se sont connectés"
msgstr "Connected users"
+#: include/company.inc.php:159
+msgid "Utilisation de devises étrangères"
+msgstr "Use of foreign currency"
+
+ #: 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
+#: include/company.inc.php:137 include/company.inc.php:156
msgid "Utilisation de la compta. analytique"
msgstr "Use of the analytic accountancy"
@@@ -19791,13 -19570,13 +20133,13 @@@ msgstr "Use of stocks
msgid "Utilisation directe"
msgstr "Direct use"
-#: include/class/acc_ledger.class.php:1150
+#: include/class/acc_ledger.class.php:1234
#, php-format
msgid "Utilisation directe interdite du poste comptable %s"
- msgstr "Direct use of %s is forbidden by configuration"
+ msgstr "Forbidden use of the accounting %s"
#: include/company.inc.php:117 include/company.inc.php:136
-#: include/company.inc.php:140
+#: include/company.inc.php:140 include/company.inc.php:160
msgid "Utilisation du mode strict "
msgstr "Use of the strict mode"
@@@ -20174,7 -19932,8 +20524,8 @@@ msgstr "Do you want to delete this tran
#: include/lib/class_html_input.php:934 include/lib/class_html_input.php:945
#: 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:1084 include/lib/html_input.class.php:1085
+ #: include/lib/html_input.class.php:1100
#, php-format
msgid "Voulez-vous effacer cette relation "
msgstr "Do you want to delete this relation"
@@@ -21477,7 -21247,8 +21862,8 @@@ msgstr "receipt #
#: include/class_fiche.php:1228 include/class/class_fiche.php:1228
#: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234
#: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379
-#: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395
+#: include/class/fiche.class.php:1381 include/class/fiche.class.php:1411
+ #: include/class/fiche.class.php:1396
msgid "n° de pièce / Code interne"
msgstr "Internal code"
@@@ -21511,7 -21287,9 +21902,9 @@@ msgstr "No operation
#: include/export/export_poste_detail_csv.php:80
#: include/class/acc_ledger_history_generic.class.php:680
#: include/class/fiche.class.php:1456 include/class/fiche.class.php:1458
-#: include/class/fiche.class.php:1472
+#: include/class/acc_ledger_history_generic.class.php:702
+ #: include/class/acc_ledger_history_generic.class.php:681
+ #: include/class/fiche.class.php:1473
msgid "n° pièce"
msgstr "receipt #"
@@@ -21588,8 -21368,7 +21983,8 @@@ msgstr "Depending entry
#: include/class/acc_ledger_history_sale.class.php:262
#: include/class/acc_ledger_history_purchase.class.php:271
#: include/class/acc_ledger_history_sale.class.php:263
- #: include/class/acc_ledger_history_purchase.class.php:291
+ #: include/class/acc_ledger_history_purchase.class.php:272
+#: include/class/acc_ledger_history_sale.class.php:285
msgid "opérations liées"
msgstr "Linked operations"
@@@ -21961,13 -21734,14 +22362,14 @@@ msgstr "or noalyss/contrib/mono-dossier
msgid "soit y restaurer un backup ou un modèle"
msgstr "or restore un backup or a template"
-#: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587
+#: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:591
+ #: include/fiche.inc.php:596
msgid "solde"
msgstr "Balance"
- #: include/fiche.inc.php:596
+ #: include/fiche.inc.php:592 include/fiche.inc.php:601
msgid "solde crediteur"
-msgstr "Total credit"
+msgstr "Balance credit"
#: include/class_fiche.php:1231 include/class_fiche.php:1237
#: include/class_fiche.php:1254 include/class/class_fiche.php:1254
@@@ -21977,8 -21751,8 +22379,8 @@@
#: include/class/acc_account_ledger.class.php:475
#: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534
#: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536
-#: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552
+#: include/class/acc_account_ledger.class.php:500
- #: include/class/fiche.class.php:1437 include/class/fiche.class.php:1578
+ #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
msgid "solde créditeur"
msgstr "Total credit"
@@@ -21995,8 -21769,9 +22397,9 @@@ msgstr "Sum credit
#: include/class/acc_account_ledger.class.php:475
#: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534
#: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536
-#: include/fiche.inc.php:590 include/class/fiche.class.php:1421
+#: include/fiche.inc.php:594 include/class/acc_account_ledger.class.php:500
- #: include/class/fiche.class.php:1437 include/class/fiche.class.php:1578
+ #: include/class/fiche.class.php:1552 include/fiche.inc.php:599
+ #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
msgid "solde débiteur"
msgstr "Total debit"
diff --cc include/class/acc_ledger_history_purchase.class.php
index 618a4ee,51f75b8..0d92360
--- a/include/class/acc_ledger_history_purchase.class.php
+++ b/include/class/acc_ledger_history_purchase.class.php
@@@ -283,12 -274,11 +289,15 @@@ class Acc_Ledger_History_Purchase exten
}
}
$title[]=_("TVAC/TTC");
- $title[]=_("Date paiement");
+ $title[]=_("Devise");
+ $title[]=_("Devise HTVA");
+ $title[]=_("Devise TVA");
+ $title[]=_("Taux ref");
+ $title[]=_("Taux utilisé");
- $title[]=_("opérations liées");
++ $title[]=_("Date paiement");
+ $title[]=_("Méthode paiement");
+ $title[]=_("Montant paiement");
+ $title[]=_("n° opération");
-
$export->write_header($title);
foreach ($this->data as $line)
diff --cc include/class/acc_ledger_history_sale.class.php
index 92850d8,fbc6ca7..4cd7c92
--- a/include/class/acc_ledger_history_sale.class.php
+++ b/include/class/acc_ledger_history_sale.class.php
@@@ -277,12 -260,11 +277,16 @@@ class Acc_Ledger_History_Sale extends A
}
}
$title[]=_("TVAC/TTC");
- $title[]=_("Date paiement");
+ $title[]=_("Devise");
+ $title[]=_("Devise HTVA");
+ $title[]=_("Devise TVA");
+ $title[]=_("Taux ref");
+ $title[]=_("Taux utilisé");
- $title[]=_("opérations liées");
++ $title[]=_("Date paiement");
+ $title[]=_("Méthode paiement");
+ $title[]=_("Montant paiement");
+ $title[]=_("n° opération");
+
$export->write_header($title);
foreach ($this->data as $line)
diff --cc include/export/export_ledger_csv.php
index cfec3f7,82a467a..486812a
--- a/include/export/export_ledger_csv.php
+++ b/include/export/export_ledger_csv.php
@@@ -248,14 -254,8 +258,14 @@@ if ($get_option=="L" && ($jrn_type=='OD
{
$export->add($line['montant'], "number");
}
+ //-- add currency
+
$export->add(bcadd($line['sum_ocamount'],$line['sum_ocvat_amount']),"number");
+ $export->add($line['cr_code_iso']);
+ $export->add($line['currency_rate']);
+ $export->add($line['currency_rate_ref']);
+
//------ Add reconcilied operation ---------------
- $ret_reconcile=$cn->execute('reconcile_date_csv',
+ $ret_reconcile=$cn->execute('reconcile_date',
array($line['jr_id']));
$max=Database::num_row($ret_reconcile);
if ($max>0)
diff --cc include/lib/function_javascript.php
index a03245a,10079ac..f8487f4
--- a/include/lib/function_javascript.php
+++ b/include/lib/function_javascript.php
@@@ -2781,7 -2782,19 +2782,19 @@@ function load_all_script(
echo js_include('sorttable.js');
echo js_include('nicEdit.js');
echo js_include('managetable.js');
-
+ echo js_include('acc_currency.js');
}
+ /**
+ * Send header and json object
+ * @param array $p_answer this array will be converted to json object
+ * @see json_encode
+ */
+ function json_response($p_answer)
+ {
+ header("Content-type: text/json; charset: utf8", true);
+ echo json_encode($p_answer,
+ JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES|JSON_NUMERIC_CHECK);
+ }
+
?>
diff --cc include/lib/manage_table_sql.class.php
index b642c5d,3488a20..e25d9cc
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@@ -827,13 -832,16 +834,16 @@@ function check(
}
}
- if ( ! $found) {
+ if (!$found)
+ {
echo td("--");
-
}
-
+ }
- else
- {
+ } elseif ($this->get_col_type($v)=="custom") {
+ // For custom col
+ echo td($this->display_row_custom($v,$p_row[$v]));
+ }
+ else {
echo td($p_row[$v]);
}
}
diff --cc include/template/acc_ledger_history_purchase_oneline.php
index da9c5b4,8244b84..fcae528
--- a/include/template/acc_ledger_history_purchase_oneline.php
+++ b/include/template/acc_ledger_history_purchase_oneline.php
@@@ -59,12 -59,12 +59,15 @@@ if (!defined('ALLOWED')
<?=_('TVA')?>
</th>
- <th>
+ <th class="num">
<?=_('TVAC')?>
</th>
- <th>
+ <th class="num">
+ <?=_('Devise')?>
+ </th>
++ <th>
+ <?=_('Lien')?>
+ </th>
</tr>
<?php
$nb_data=count($this->data);
diff --cc sql/upgrade.sql
index d9c22d1,e69de29..e8af5a3
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@@ -1,14 -1,0 +1,13 @@@
+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;
+insert into "parameter" (pr_id ) values ('MY_DEFAULT_ROUND_ERROR_DEB');
+insert into "parameter" (pr_id ) values ('MY_DEFAULT_ROUND_ERROR_CRED');
+drop view if exists v_all_card_currency;
+
+create or replace view v_all_card_currency as
+select sum(oc_amount) as sum_oc_amount,sum(oc_vat_amount) as
sum_oc_vat_amount,f_id,j_id
+from
+operation_currency
+join jrnx using (j_id)
+group by f_id,j_id;
+
+commit ;
- [Noalyss-commit] [noalyss] 152/238: New function findSide return D if number is <0, (continued)
- [Noalyss-commit] [noalyss] 152/238: New function findSide return D if number is <0, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 168/238: translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 174/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 193/238: Php7.2 incompatibility, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 176/238: Mantis #1626: AFFICHAGE BALANCE FICHE - soldes nuls au débit, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 192/238: Mantis #0001618: Journaux - choix du type en premier, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 195/238: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Replace strip_tags , add a space before the "<", Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 228/238: Bug with p_jrn, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 223/238: Task #0001703: Faciliter effacement montants dans les filtres, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 234/238: fixup! Printtva , under some circumstance tva_summary::check fails, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 201/238: Merge branch 'dev7109' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 93/238: translate, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 98/238: Fin currency : detail operation show currency , rate and amount, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 104/238: Reverse for Currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 101/238: Currency : SQL quant_fin is adapted, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 100/238: Currency : financial use the rate depending of the operation date, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 108/238: acc_ledger_fin . translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 99/238: Modify quant_fin , we add a column j_id to have a fk to jrnx and operation_currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 109/238: Indentation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 116/238: Database upgrade 131, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 111/238: Currency : sales in listing mode, Dany De Bontridder, 2019/10/26