[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 236/238: Merge branch 'dev7102' into entrepri
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 236/238: Merge branch 'dev7102' into entreprise |
Date: |
Sat, 26 Oct 2019 04:41:14 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit a5a36c812baa9729a0194ccd5e6bba044323b753
Merge: de41232 0718b00
Author: Dany De Bontridder <address@hidden>
Date: Sat Oct 26 00:48:19 2019 +0200
Merge branch 'dev7102' into entreprise
html/index.css | 1 +
html/js/scripts.js | 1160 ++++++++++----------
.../class/acc_ledger_history_purchase.class.php | 2 +
include/class/acc_ledger_history_sale.class.php | 3 +-
include/class/acc_operation.class.php | 2 +-
include/class/print_ledger_simple.class.php | 2 +-
include/export/export_ledger_csv.php | 3 +
include/export/export_printtva_pdf.php | 64 +-
include/history_operation.inc.php | 6 +-
include/template/ledger_search.php | 2 +-
unit-test/create-dossier-test.sh | 6 +
unit-test/db/dossiertest.bin.gz | Bin 0 -> 68624 bytes
unit-test/global.example.php | 3 +-
unit-test/include/class/acc_balanceTest.class.php | 68 +-
unit-test/include/class/tax_summaryTest.class.php | 164 +++
15 files changed, 868 insertions(+), 618 deletions(-)
diff --cc html/js/scripts.js
index 4dd7aa9,e1700a9..ab16f97
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@@ -25,10 -25,7 +25,10 @@@
*/
var ask_reload = 0;
var tag_choose = '';
- var aDraggableElement=new Array();
+ var aDraggableElement = new Array();
+var viewport = document.viewport.getDimensions(); // Gets the viewport as an
object literal
+var width = viewport.width; // Usable window width
+var height = viewport.height;
/**
* callback function when we just need to update a hidden div with an info
@@@ -3579,24 -3590,9 +3593,24 @@@ function toggle_lock(p_domid
} else {
throw "toggle_lock failed";
}
-
-
+
+
}
+/**
+ *
+ * @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
diff --cc include/class/acc_ledger_history_purchase.class.php
index 0d92360,8782bfb..f2b7d38
--- a/include/class/acc_ledger_history_purchase.class.php
+++ b/include/class/acc_ledger_history_purchase.class.php
@@@ -289,12 -274,8 +289,13 @@@ 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[]=_("Date paiement");
+ $title[]=_("Code paiement");
$title[]=_("Méthode paiement");
$title[]=_("Montant paiement");
$title[]=_("n° opération");
diff --cc include/class/acc_ledger_history_sale.class.php
index 4cd7c92,22a0dc6..5d4d402
--- a/include/class/acc_ledger_history_sale.class.php
+++ b/include/class/acc_ledger_history_sale.class.php
@@@ -277,13 -260,8 +277,13 @@@ 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[]=_("Date paiement");
- $title[]=_("Méthode paiement");
+ $title[]=_("Code paiement");
$title[]=_("Montant paiement");
$title[]=_("n° opération");
- [Noalyss-commit] [noalyss] 207/238: Merge branch 'dev7109' into entreprise, (continued)
- [Noalyss-commit] [noalyss] 207/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 190/238: translate, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 222/238: Task #0001698: Problème affichage historique fiches, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 215/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 231/238: If currency not given then supposed to be the default one (id=0), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 233/238: gitlab #5 Achat propose l'anc pour toutes les lignes, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 232/238: Save_form_plan must use the array, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 238/238: Adapt printtva to entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 225/238: documentation + traduction, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 227/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 236/238: Merge branch 'dev7102' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 230/238: Merge branch 'bug-printtva' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 200/238: Merge branch 'master' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 204/238: Cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 211/238: Improve appearance, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 219/238: Merge branch 'Cosmetic-7100' into 'entreprise', Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 226/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 235/238: indent, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 153/238: Fix problem with total in balance export, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 202/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26