[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 167/218: Currency : set default accounting fo
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 167/218: Currency : set default accounting for change difference when using currency |
Date: |
Thu, 12 Sep 2019 15:59:03 -0400 (EDT) |
sparkyx pushed a commit to branch entreprise
in repository noalyss.
commit fb7505ffd4dd334ac8edee366523d098518b1f37
Author: Dany De Bontridder <address@hidden>
Date: Sat Jan 12 15:21:58 2019 +0100
Currency : set default accounting for change difference when using currency
---
include/company.inc.php | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/include/company.inc.php b/include/company.inc.php
index 1dfaf3e..f433c31 100644
--- a/include/company.inc.php
+++ b/include/company.inc.php
@@ -49,7 +49,8 @@ if (isset($_POST['record_company']))
$m->MY_UPDLAB = $http->post("p_updlab");
$m->MY_STOCK =$http->post("p_stock");
$m->MY_CURRENCY =$http->post("p_currency");
-
+ $m->MY_DEFAULT_ROUND_ERROR_DEB=$http->post("p_round_error_deb");
+ $m->MY_DEFAULT_ROUND_ERROR_CRED=$http->post("p_round_error_cred");
$m->Update();
}
@@ -117,6 +118,18 @@ $use_currency->table = 1;
$use_currency->value = $updlab_array;
$use_currency->selected = $my->MY_CURRENCY;
+$default_error_deb=new
IPoste("p_round_error_deb",$my->MY_DEFAULT_ROUND_ERROR_DEB);
+$default_error_deb->name = 'p_round_error_deb';
+$default_error_deb->set_attribute('gDossier',Dossier::id());
+$default_error_deb->set_attribute('jrn',0);
+$default_error_deb->set_attribute('account','p_round_error_deb');
+
+$default_error_cred=new
IPoste("p_round_error_deb",$my->MY_DEFAULT_ROUND_ERROR_CRED);
+$default_error_cred->name = 'p_round_error_cred';
+$default_error_cred->set_attribute('gDossier',Dossier::id());
+$default_error_cred->set_attribute('jrn',0);
+$default_error_cred->set_attribute('account','p_round_error_cred');
+
// other parameters
$all = new IText();
$all->table = 1;
@@ -151,7 +164,18 @@ echo "<tr>" . td(_("Suggérer la date"),
'style="text-align:right"') . $date_sug
echo '<tr>' . td(_('Afficher la période comptable pour éviter les erreurs de
date'), 'style="text-align:right"') . $check_periode->input('p_check_periode',
$strict_array) . '</tr>';
echo '<tr>' . td(_('Utilisez des postes comptables alphanumérique'),
'style="text-align:right"') . $alpha_num->input('p_alphanum') . '</tr>';
echo '<tr>' . td(_('Changer le libellé des détails'),
'style="text-align:right"') . $updlab->input('p_updlab') . '</tr>';
-
+echo '<tr>' .
+ td(_("Poste comptable de CHARGE (D) pour les différences d'arrondi
pour les opérations en devise")).
+ '<td>'.$default_error_deb->input().
+ '</td>'.
+ '</tr>';
+
+echo '<tr>' .
+ td(_("Poste comptable en PRODUIT (C) pour les différences d'arrondi
pour les opérations en devise")).
+ '<td>'.$default_error_cred->input().
+ '</td>'.
+ '</tr>';
+
echo "</table>";
echo HtmlInput::submit("record_company", _("Sauve"));
echo "</form>";
- [Noalyss-commit] [noalyss] 118/218: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate, (continued)
- [Noalyss-commit] [noalyss] 118/218: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 146/218: Currency : history for accounting , correct amount in currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 145/218: Currency : the meaning is : 1 euro is worth xxx Currency , so we divide the amount with the currency rate to compute the EUR value, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 150/218: Currency : detail operation Sale , the amount in currency were wrong in the summary, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 154/218: by default jrn is an empty array, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 164/218: Currency Show currency info for MISC, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 161/218: PHP 7.2 incomptability : sizeof of not array, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 155/218: Task #0001309: Association d'une opération avec elle-même., Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 158/218: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 160/218: Protect parameters, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 167/218: Currency : set default accounting for change difference when using currency,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 165/218: Database upgrade, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 168/218: translation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 169/218: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 176/218: Mantis #1626: AFFICHAGE BALANCE FICHE - soldes nuls au débit, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 177/218: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 184/218: CSS : cosmetic, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 185/218: Merge issue : inappropriate rollback, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 186/218: Fix Inappropriate merge, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 188/218: Fix broken merge, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 181/218: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2019/09/12