X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FGL.pm;h=9eb741d8396e84025157d629d30de4482d6a8ab6;hb=2b5c7398acb453bffc50dababebf6ee46e7fc134;hp=3b99238f702aad39987bd53c542157a6dddf33d5;hpb=e765ebf812bd760e24aa7a78e135403505fff28a;p=kivitendo-erp.git diff --git a/SL/GL.pm b/SL/GL.pm index 3b99238f7..9eb741d83 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -123,12 +123,12 @@ sub _post_transaction { $query = qq|UPDATE gl SET reference = ?, description = ?, notes = ?, - transdate = ?, deliverydate = ?, department_id = ?, taxincluded = ?, + transdate = ?, deliverydate = ?, tax_point = ?, department_id = ?, taxincluded = ?, storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ? WHERE id = ?|; @values = ($form->{reference}, $form->{description}, $form->{notes}, - conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f', + conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f', $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{id})); do_query($form, $dbh, $query, @values); @@ -637,7 +637,7 @@ sub transaction { if ($form->{id}) { $query = - qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, + qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, g.tax_point, g.storno, g.storno_id, g.department_id, d.description AS department, e.name AS employee, g.taxincluded, g.gldate, @@ -814,11 +814,12 @@ SL::GL - some useful GL functions =over 4 -=item C +=item C $transdate $tax_id -Returns a list of taxes for a certain chart and date to be used for dropdowns, -for e.g. ar/ap/gl records. +Returns a list of valid taxes for a certain chart. +If the optional param transdate exists one entry in the returning list +may get the attribute C for this specific tax-dependent date. The possible entries are filtered by the charttype of the tax, i.e. only taxes whose chart_categories match the category of the chart will be shown. @@ -828,6 +829,8 @@ dropdown anymore. If we are loading an old record and know its tax_id (from acc_trans), we can pass $tax_id as the third parameter and be sure that the original tax always appears in the dropdown. +The functions returns an array which may be used for building dropdowns in ar/ap/gl code. + =back =head1 TODO