X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fir.pl;h=d6e162ed808f2805bdccbf41d189af463c5f91b4;hb=df41380a9c1150938985322c48ef20fe7f2cd98b;hp=7d5c36ab65b056189b929e8dbe9ec122e80661b1;hpb=9b67d27cd821260c8577a94358345f98e95a92db;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 7d5c36ab6..d6e162ed8 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -24,7 +24,8 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Inventory received module
@@ -34,14 +35,14 @@
use SL::FU;
use SL::IR;
use SL::IS;
-use SL::PE;
+use SL::DB::Default;
+use SL::DB::PurchaseInvoice;
use List::Util qw(max sum);
+use List::UtilsBy qw(sort_by);
require "bin/mozilla/io.pl";
-require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
-require "bin/mozilla/drafts.pl";
use strict;
@@ -57,7 +58,11 @@ sub add {
$main::auth->assert('vendor_invoice_edit');
- return $main::lxdebug->leave_sub() if (load_draft_maybe());
+ if (!$::instance_conf->get_allow_new_purchase_invoice) {
+ $::form->show_generic_error($::locale->text("You do not have the permissions to access this function."));
+ }
+
+ $form->{show_details} = $::myconfig{show_form_details};
$form->{title} = $locale->text('Record Vendor Invoice');
@@ -76,6 +81,8 @@ sub edit {
$main::auth->assert('vendor_invoice_edit');
+ $form->{show_details} = $::myconfig{show_form_details};
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
@@ -100,9 +107,6 @@ sub invoice_links {
$form->{vc} = 'vendor';
# create links
- $form->{webdav} = $::lx_office_conf{features}->{webdav};
- $form->{jsscript} = 1;
-
$form->create_links("AP", \%myconfig, "vendor");
#quote all_vendor Bug 133
@@ -116,39 +120,16 @@ sub invoice_links {
}
}
- my ($payment_id, $language_id, $taxzone_id, $currency);
- if ($form->{payment_id}) {
- $payment_id = $form->{payment_id};
- }
- if ($form->{language_id}) {
- $language_id = $form->{language_id};
- }
- if ($form->{taxzone_id}) {
- $taxzone_id = $form->{taxzone_id};
- }
- if ($form->{currency}) {
- $currency = $form->{currency};
- }
+ $form->backup_vars(qw(payment_id language_id taxzone_id
+ currency delivery_term_id intnotes cp_id));
- my $cp_id = $form->{cp_id};
IR->get_vendor(\%myconfig, \%$form);
IR->retrieve_invoice(\%myconfig, \%$form);
- $form->{cp_id} = $cp_id;
- if ($payment_id) {
- $form->{payment_id} = $payment_id;
- }
- if ($language_id) {
- $form->{language_id} = $language_id;
- }
- if ($taxzone_id) {
- $form->{taxzone_id} = $taxzone_id;
- }
- if ($currency) {
- $form->{currency} = $currency;
- }
+ $form->restore_vars(qw(payment_id language_id taxzone_id
+ currency delivery_term_id intnotes cp_id));
- my @curr = split(/:/, $form->{currencies}); #seems to be missing
+ my @curr = $form->get_all_currencies();
map { $form->{selectcurrency} .= "