';
$r.='
Totaux
';
$other_tax_label="";
$other_tax_amount="";
@@ -1142,6 +1152,7 @@ EOF;
$r.=HtmlInput::hidden('e_client', $e_client);
$r.=HtmlInput::hidden('nb_item', $nb_item);
$r.=HtmlInput::hidden('p_jrn', $p_jrn);
+ $r.=HtmlInput::hidden('jrn_note_input',h($p_array['jrn_note_input']));
$mt = microtime(true);
$r.=HtmlInput::hidden('mt', $mt);
$r.=HtmlInput::post_to_hidden(['p_currency_rate','p_currency_code']);
@@ -1259,11 +1270,12 @@ EOF;
// load ledger definition
$this->load();
$http=new HttpInput();
+ $http->set_array([]);
if ($p_array != null) {
extract($p_array, EXTR_SKIP);
$http->set_array($p_array);
}
- $http->set_array([]);
+ if ( !isset($p_array['jrn_note_input'])) {$p_array['jrn_note_input']='';}
$flag_tva = $g_parameter->MY_TVA_USE;
/* Add button */
diff --git a/include/class/acc_operation_note.class.php b/include/class/acc_operation_note.class.php
new file mode 100644
index 000000000..47f829a33
--- /dev/null
+++ b/include/class/acc_operation_note.class.php
@@ -0,0 +1,126 @@
+jrn_note_sql = $p_Jrn_Note_SQL;
+ $this->id=$p_Jrn_Note_SQL->n_id;
+ $this->note=$p_Jrn_Note_SQL->n_text;
+ $this->operation_id=$p_Jrn_Note_SQL->jr_id;
+ }
+
+ /**
+ * @return Jrn_Note_SQL
+ */
+ public function getJrnNoteSql(): Jrn_Note_SQL
+ {
+ return $this->jrn_note_sql;
+ }
+
+ /**
+ * @param Jrn_Note_SQL $jrn_note_sql
+ */
+ public function setJrnNoteSql(Jrn_Note_SQL $jrn_note_sql): Acc_Operation_Note
+ {
+ $this->jrn_note_sql = $jrn_note_sql;
+ return $this;
+ }
+
+ /**
+ * @param $p_jr_id
+ * @return void
+ */
+ static function build_jrn_id($p_jr_id) {
+ $cn=Dossier::connect();
+ $n_id=$cn->get_value("select n_id from jrn_note where jr_id=$1",[$p_jr_id]);
+ if ( $cn->count() == 0) {
+ $n_id=-1;
+ }
+
+ return new Acc_Operation_Note(new Jrn_Note_SQL($cn,$n_id));
+
+ }
+ function save()
+ {
+ $cn=Dossier::connect();
+ $this->jrn_note_sql->setp("jr_id",$this->operation_id);
+ $this->jrn_note_sql->setp("n_text",$this->note);
+
+ if ( empty($this->jrn_note_sql->n_text) && $this->id > -1 ) {
+ $this->jrn_note_sql->delete();
+ return $this;
+ }
+ $this->jrn_note_sql->save();
+ $this->id=$this->jrn_note_sql->n_id;
+ return $this;
+ }
+ function setNote($p_note) {
+ $this->note=$p_note;
+
+ return $this;
+ }
+ function setOperation_id($p_jrid) {
+ $this->operation_id=$p_jrid;
+ return $this;
+ }
+ function getNote() {
+ return $this->note;
+ }
+ function getOperation_id() {
+ return $this->operation_id;
+ }
+ function load()
+ {
+ $this->jrn_note_sql->load();
+ $this->operation_id=$this->jrn_note_sql->jr_id;
+ $this->note=$this->jrn_note_sql->n_text;
+ $this->id=$this->jrn_note_sql->n_id;
+ }
+ static function input($p_current)
+ {
+ require NOALYSS_TEMPLATE.'/acc_operation_note-input.php';
+ }
+ function fromPost()
+ {
+
+ }
+ function print()
+ {
+ echo '
'.h($this->note).'
';
+ }
+}
\ No newline at end of file
diff --git a/include/database/jrn_note_sql.class.php b/include/database/jrn_note_sql.class.php
new file mode 100644
index 000000000..08604a4a5
--- /dev/null
+++ b/include/database/jrn_note_sql.class.php
@@ -0,0 +1,66 @@
+table="public.jrn_note";
+ $this->primary_key="n_id";
+ /*
+ * List of columns
+ */
+ $this->name=array(
+ "n_id"=>"n_id"
+ , "jr_id"=>"jr_id"
+ ,"n_text"=>"n_text"
+ );
+ /*
+ * Type of columns
+ */
+ $this->type=array(
+ "n_id"=>"number"
+ , "jr_id"=>"number"
+ ,"n_text"=>"text"
+ );
+
+
+ $this->default=array(
+ "n_id"=>"auto"
+ );
+
+ $this->date_format="DD.MM.YYYY";
+ parent::__construct($p_cn, $p_id);
+ }
+
+}
\ No newline at end of file
diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index 6e865164a..65a3485ee 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -458,7 +458,17 @@ class Icon_Action
$r=sprintf('
%s',
- $p_domid,$p_domid,$p_size,"");
+ $p_domid,$p_domid,$p_size,"");
+ return $r;
+ }
+ /**
+ * @brief Increase size of input_text (p_domid) with p_domid
+ * @param $p_domid domid of the input "text" element
+ * @param $p_size size of the element
+ * @return string HTML string
+ */
+ static function show_note($p_domid) {
+ $r='
';
return $r;
}
}
diff --git a/include/template/acc_operation_note-input.php b/include/template/acc_operation_note-input.php
new file mode 100644
index 000000000..17efd9ad7
--- /dev/null
+++ b/include/template/acc_operation_note-input.php
@@ -0,0 +1,37 @@
+
+
+
\ No newline at end of file
diff --git a/include/template/form_ledger_detail.php b/include/template/form_ledger_detail.php
index 12ad9303b..ed6a7c342 100644
--- a/include/template/form_ledger_detail.php
+++ b/include/template/form_ledger_detail.php
@@ -67,6 +67,16 @@
+
+ |
+
+
+ |
+
+
+ |
+
+
|
@@ -78,7 +88,11 @@
|
-
+