[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 136/151: Esthetic for duplicate operation & C
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 136/151: Esthetic for duplicate operation & Correct esthetic |
Date: |
Sat, 4 Feb 2017 17:14:34 +0000 (UTC) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 3c922f98fb5919e20f811a254f4c2d4e15e99ba3
Author: Dany De Bontridder <address@hidden>
Date: Mon Jan 23 20:48:27 2017 +0100
Esthetic for duplicate operation & Correct esthetic
---
include/class/class_acc_ledger.php | 11 ++++++++---
include/compta_ach.inc.php | 8 +++++++-
include/compta_ods.inc.php | 14 ++++++++++----
include/compta_ven.inc.php | 7 ++++++-
4 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/include/class/class_acc_ledger.php
b/include/class/class_acc_ledger.php
index 3417b25..b28b522 100644
--- a/include/class/class_acc_ledger.php
+++ b/include/class/class_acc_ledger.php
@@ -3972,7 +3972,7 @@ class Acc_Ledger extends jrn_def_sql
function button_new_operation()
{
$url=http_build_query(array('ac'=>$_REQUEST['ac'],'gDossier'=>$_REQUEST['gDossier'],'p_jrn'=>$_REQUEST['p_jrn']));
- $button = HtmlInput::button_anchor(_("Nouvelle opération"),
'do.php?'.$url);
+ $button = HtmlInput::button_anchor(_("Nouvelle opération"),
'do.php?'.$url,"","","smallbutton");
return '<p>'.$button.'</p>';
}
/**
@@ -3983,7 +3983,7 @@ class Acc_Ledger extends jrn_def_sql
{
echo '<FORM METHOD="POST">';
echo HtmlInput::post_to_hidden(
- array("gDossier","ac","p_jrn","e_client","nb_item")
+
array("gDossier","ac","p_jrn","e_client","nb_item","desc","e_comm")
);
echo HtmlInput::hidden("correct","copy");
// e_march
@@ -3997,7 +3997,12 @@ class Acc_Ledger extends jrn_def_sql
"e_march".$i."_quant",
"e_march".$i."_label",
"e_march".$i."_tva_id",
- "e_march".$i."_tva_amount"
+ "e_march".$i."_tva_amount",
+ "poste".$i,
+ "ld".$i,
+ "amount".$i,
+ "ck".$i
+
));
}
echo HtmlInput::submit("copy_operation",_("Même opération"));
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index 099e404..f7623eb 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -198,9 +198,15 @@ if (isset($_POST['record']))
echo '<p class="notice">'._('Date invalide, opération
non extournée').'</p>';
}
}
+ echo '<ul class="aligned-block">';
+ echo "<li>";
echo $Ledger->button_new_operation();
+ echo "</li>";
+ echo "<li>";
echo $Ledger->button_copy_operation();
- echo '</div>';
+ echo "</li>";
+ echo "</ul>";
+ echo '</div>';
return;
}
}
diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php
index be27c9e..d4dd5bd 100644
--- a/include/compta_ods.inc.php
+++ b/include/compta_ods.inc.php
@@ -19,7 +19,8 @@
// Copyright Author Dany De Bontridder address@hidden
-/**\file
+/**
+ * \file
*
*
* \brief to write directly into the ledgers,the stock and the tables
@@ -128,15 +129,20 @@ elseif (isset($_POST['save']))
echo '<p class="notice">'._('Date invalide, opération
non extournée').'</p>';
}
}
-
+ echo '<ul class="aligned-block">';
+ echo "<li>";
echo $ledger->button_new_operation();
- echo $Ledger->button_copy_operation();
+ echo "</li>";
+ echo "<li>";
+ echo $ledger->button_copy_operation();
+ echo "</li>";
+ echo "</ul>";
}
catch (Exception $e)
{
require NOALYSS_INCLUDE.'/operation_ods_new.inc.php';
alert($e->getMessage());
- $p_msg=$e->getMessage();
+ $p_msg=$e->getMessage();
}
echo '</div>';
return;
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index c482532..cd76f17 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -214,9 +214,14 @@ show_tab(a_tab,'facturation_div_id');
echo '<p class="notice">'._('Date invalide, opération non
extournée').'</p>';
}
}
-
+ echo '<ul class="aligned-block">';
+ echo "<li>";
echo $Ledger->button_new_operation();
+ echo "</li>";
+ echo "<li>";
echo $Ledger->button_copy_operation();
+ echo "</li>";
+ echo "</ul>";
echo '</div>';
return;
}
- [Noalyss-commit] [noalyss] 91/151: Improve Performance Acc_Bilan::warning, (continued)
- [Noalyss-commit] [noalyss] 91/151: Improve Performance Acc_Bilan::warning, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 104/151: Improve Noalyss_SQL : add set and get, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 107/151: Add Receipt number to detail operation, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 118/151: correct typo, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 124/151: Test ManageTable ; fix parseXML function, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 129/151: #1380 : Duplication d'opérations, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 138/151: Merge branch 'master' of ns3:/srv/git/noalyss, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 134/151: Fix Bug : Predefined operation in Sales , impossible to add new items, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 139/151: ManageTable correct color of HighLigthed row, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 140/151: ManageTable use icon, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 136/151: Esthetic for duplicate operation & Correct esthetic,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 72/151: Documentation Task #2 - Documentation nouveau code, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 76/151: Ajout options Task #9 - PDF_Operation : ajout des options, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 83/151: Performance : improve VERIF, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 74/151: Export en PDF d'operation : PDF_Operation::print_section Task #10 - PDF_Operation : ajout titre Analytique, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 84/151: Performance : improve VERIF , change query pour fiche utilisé avec 2 postes, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 115/151: Correct doxygen, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 109/151: Add a class to manage the Param table (CRUD), Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 113/151: Correct doxygen doc, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 131/151: Doxygen, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 120/151: Add managetable.js to the script to load, Dany De Bontridder, 2017/02/04