admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ns3:/srv/git/noalyss

Browse source
This commit is contained in:
Dany De Bontridder 2017-01-25 22:01:47 +01:00
commit 1a3dbac663
5 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/class/class_acc_ledger.php
View file

@ -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
@ -3996,7 +3996,13 @@ class Acc_Ledger extends jrn_def_sql
"e_march".$i."_price",
"e_march".$i."_quant",
"e_march".$i."_label",
"e_march".$i."_tva_amount"
"e_march".$i."_tva_id",
"e_march".$i."_tva_amount",
"poste".$i,
"ld".$i,
"amount".$i,
"ck".$i
));
}
echo HtmlInput::submit("copy_operation",_("Même opération"));

11
include/class/class_pre_op_ven.php
View file

@ -30,10 +30,11 @@ require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php';
class Pre_op_ven extends Pre_operation_detail
{
var $op;
//< Pre_operation
function __construct($cn,$p_id=0)
{
parent::__construct($cn,$p_id);
$this->operation->od_direct='f';
$this->operation->od_direct='f'; //< Pre_operation
}
function get_post()
@ -137,7 +138,13 @@ class Pre_op_ven extends Pre_operation_detail
}
}
}
$array['nb_item']=$count;
// Find the ledger
$ledger=new Acc_Ledger($this->db,$this->operation->jrn_def_id);
// Find the max line of the ledger
$max_row=$ledger->GetDefLine();
// compute nb_item
$array['nb_item']=($max_row > $count)?$max_row:$count;
return $array;
}
/*!\brief load the data from the database and return an array

8
include/compta_ach.inc.php
View file

@ -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;
}
}

14
include/compta_ods.inc.php
View file

@ -19,7 +19,8 @@
// Copyright Author Dany De Bontridder danydb@aevalys.eu
/**\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;

7
include/compta_ven.inc.php
View file

@ -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;
}