Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 62ee225c

Von C. Braun vor mehr als 13 Jahren hinzugefügt

CSV-Import an neue Konfigurationsdatei angepasst. Bug-ID: 1632.

Unterschiede anzeigen:

doc/changelog
26 26
  - Bugfix 1626: Beim Festlegen der Standardkonten kann beim Warenbestand eine Überschrift ausgewählt werden.
27 27
  - Bugfix 1584: Summen und Saldenliste: Export to PDF/CSV in EÜR Modus falsch
28 28
  - Bugfix 1597: Report Lagerbestand wirft Fehler, wenn Artikelnummer ausgeblendet werden soll
29
  - Bugfix 1569: Zahlungseingang löschen bei Rechnung  
29
  - Bugfix 1569: Zahlungseingang löschen bei Rechnung 
30
  - Bugfix 1632: Nach Installation 2.6.2-0 aus .deb funktioniert CSV-Import nicht
30 31

  
31 32
2011-02-02 - Release 2.6.2
32 33

  
locale/fr/all
262 262
  'Bin From'                    => '',
263 263
  'Bin List'                    => '',
264 264
  'Bin To'                      => '',
265
  'Binding to the LDAP server as "#1" failed. Please check config/authentication.pl.' => '',
265
  'Binding to the LDAP server as "#1" failed. Please check config/lx_office.conf.' => '',
266 266
  'Bins saved.'                 => '',
267 267
  'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' => '',
268 268
  'Birthday'                    => '',
......
472 472
  'Database Connection Test'    => '',
473 473
  'Database Host'               => '',
474 474
  'Database User missing!'      => '',
475
  'Database backups and restorations are disabled in lx-erp.conf.' => '',
475
  'Database backups and restorations are disabled in lx_office.conf.' => '',
476 476
  'Database name'               => '',
477 477
  'Database template'           => '',
478 478
  'Database update error:'      => '',
......
808 808
  'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".' => '',
809 809
  'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => '',
810 810
  'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => '',
811
  'If you want to change any of these parameters then press the "Back" button, edit the file "config/authentication.pl" and login into the admin module again.' => '',
811
  'If you want to change any of these parameters then press the "Back" button, edit the file "config/lx_office.conf" and login into the admin module again.' => '',
812 812
  'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' => '',
813 813
  'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' => '',
814 814
  'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' => '',
......
1058 1058
  'No group has been selected, or the group does not exist anymore.' => '',
1059 1059
  'No groups have been added yet.' => '',
1060 1060
  'No licenses were found that match the search criteria.' => '',
1061
  'No or an unknown authenticantion module specified in "config/authentication.pl".' => '',
1061
  'No or an unknown authenticantion module specified in "config/lx_office.conf".' => '',
1062 1062
  'No part was found matching the search parameters.' => '',
1063 1063
  'No prices will be updated because no prices have been entered.' => '',
1064 1064
  'No problems were recognized.' => '',
......
1540 1540
  'The AP transaction #1 has been deleted.' => '',
1541 1541
  'The AR transaction #1 has been deleted.' => '',
1542 1542
  'The GL transaction #1 has been deleted.' => '',
1543
  'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => '',
1543
  'The LDAP server "#1:#2" is unreachable. Please check config/lx_office.conf.' => '',
1544 1544
  'The SEPA export has been created.' => '',
1545 1545
  'The access rights have been saved.' => '',
1546 1546
  'The account 3804 already exists, the update will be skipped.' => '',
1547 1547
  'The account 3804 will not be added automatically.' => '',
1548 1548
  'The assembly has been created.' => '',
1549 1549
  'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '',
1550
  'The authentication configuration file "config/authentication.pl" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '',
1550
  'The authentication configuration file "config/lx_office.conf" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '',
1551 1551
  'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' => '',
1552 1552
  'The available options depend on the varibale type:' => '',
1553 1553
  'The backup you upload here has to be a file created with "pg_dump -o -Ft".' => '',
......
1556 1556
  'The base unit does not exist.' => '',
1557 1557
  'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => '',
1558 1558
  'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => '',
1559
  'The config file "config/authentication.pl" contained invalid Perl code:' => '',
1560
  'The config file "config/authentication.pl" was not found.' => '',
1561
  'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/authentication.pl.' => '',
1559
  'The config file "config/lx_office.conf" contained invalid Perl code:' => '',
1560
  'The config file "config/lx_office.conf" was not found.' => '',
1561
  'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/lx_office.conf.' => '',
1562 1562
  'The connection to the authentication database failed:' => '',
1563 1563
  'The connection to the database could not be established.' => '',
1564 1564
  'The connection to the template database failed:' => '',
......
1604 1604
  'The group has been saved.'   => '',
1605 1605
  'The group memberships have been saved.' => '',
1606 1606
  'The group name is missing.'  => '',
1607
  'The licensing module has been deactivated in lx-erp.conf.' => '',
1607
  'The licensing module has been deactivated in lx_office.conf.' => '',
1608 1608
  'The list has been printed.'  => '',
1609 1609
  'The login is missing.'       => '',
1610 1610
  'The name in row %d has already been used before.' => '',
......
1917 1917
  'click here to edit cvars'    => '',
1918 1918
  'close'                       => '',
1919 1919
  'closed'                      => '',
1920
  'config/authentication.pl: Key "DB_config" is missing.' => '',
1921
  'config/authentication.pl: Key "LDAP_config" is missing.' => '',
1922
  'config/authentication.pl: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '',
1923
  'config/authentication.pl: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '',
1920
  'config/lx_office.conf: Key "DB_config" is missing.' => '',
1921
  'config/lx_office.conf: Key "LDAP_config" is missing.' => '',
1922
  'config/lx_office.conf: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '',
1923
  'config/lx_office.conf: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '',
1924 1924
  'continue'                    => '',
1925 1925
  'correction'                  => '',
1926 1926
  'cp_greeting to cp_gender migration' => '',
locale/fr/missing
259 259
  'Bin From'                    => '',
260 260
  'Bin List'                    => '',
261 261
  'Bin To'                      => '',
262
  'Binding to the LDAP server as "#1" failed. Please check config/authentication.pl.' => '',
262
  'Binding to the LDAP server as "#1" failed. Please check config/lx_office.conf.' => '',
263 263
  'Bins saved.'                 => '',
264 264
  'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' => '',
265 265
  'Birthday'                    => '',
......
469 469
  'Database Connection Test'    => '',
470 470
  'Database Host'               => '',
471 471
  'Database User missing!'      => '',
472
  'Database backups and restorations are disabled in lx-erp.conf.' => '',
472
  'Database backups and restorations are disabled in lx_office.conf.' => '',
473 473
  'Database name'               => '',
474 474
  'Database template'           => '',
475 475
  'Database update error:'      => '',
......
805 805
  'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".' => '',
806 806
  'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => '',
807 807
  'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => '',
808
  'If you want to change any of these parameters then press the "Back" button, edit the file "config/authentication.pl" and login into the admin module again.' => '',
808
  'If you want to change any of these parameters then press the "Back" button, edit the file "config/lx_office.conf" and login into the admin module again.' => '',
809 809
  'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' => '',
810 810
  'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' => '',
811 811
  'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' => '',
......
1055 1055
  'No group has been selected, or the group does not exist anymore.' => '',
1056 1056
  'No groups have been added yet.' => '',
1057 1057
  'No licenses were found that match the search criteria.' => '',
1058
  'No or an unknown authenticantion module specified in "config/authentication.pl".' => '',
1058
  'No or an unknown authenticantion module specified in "config/lx_office.conf".' => '',
1059 1059
  'No part was found matching the search parameters.' => '',
1060 1060
  'No prices will be updated because no prices have been entered.' => '',
1061 1061
  'No problems were recognized.' => '',
......
1537 1537
  'The AP transaction #1 has been deleted.' => '',
1538 1538
  'The AR transaction #1 has been deleted.' => '',
1539 1539
  'The GL transaction #1 has been deleted.' => '',
1540
  'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => '',
1540
  'The LDAP server "#1:#2" is unreachable. Please check config/lx_office.conf.' => '',
1541 1541
  'The SEPA export has been created.' => '',
1542 1542
  'The access rights have been saved.' => '',
1543 1543
  'The account 3804 already exists, the update will be skipped.' => '',
1544 1544
  'The account 3804 will not be added automatically.' => '',
1545 1545
  'The assembly has been created.' => '',
1546 1546
  'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '',
1547
  'The authentication configuration file "config/authentication.pl" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '',
1547
  'The authentication configuration file "config/lx_office.conf" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '',
1548 1548
  'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' => '',
1549 1549
  'The available options depend on the varibale type:' => '',
1550 1550
  'The backup you upload here has to be a file created with "pg_dump -o -Ft".' => '',
......
1553 1553
  'The base unit does not exist.' => '',
1554 1554
  'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => '',
1555 1555
  'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => '',
1556
  'The config file "config/authentication.pl" contained invalid Perl code:' => '',
1557
  'The config file "config/authentication.pl" was not found.' => '',
1558
  'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/authentication.pl.' => '',
1556
  'The config file "config/lx_office.conf" contained invalid Perl code:' => '',
1557
  'The config file "config/lx_office.conf" was not found.' => '',
1558
  'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/lx_office.conf.' => '',
1559 1559
  'The connection to the authentication database failed:' => '',
1560 1560
  'The connection to the database could not be established.' => '',
1561 1561
  'The connection to the template database failed:' => '',
......
1601 1601
  'The group has been saved.'   => '',
1602 1602
  'The group memberships have been saved.' => '',
1603 1603
  'The group name is missing.'  => '',
1604
  'The licensing module has been deactivated in lx-erp.conf.' => '',
1604
  'The licensing module has been deactivated in lx_office.conf.' => '',
1605 1605
  'The list has been printed.'  => '',
1606 1606
  'The login is missing.'       => '',
1607 1607
  'The name in row %d has already been used before.' => '',
......
1914 1914
  'click here to edit cvars'    => '',
1915 1915
  'close'                       => '',
1916 1916
  'closed'                      => '',
1917
  'config/authentication.pl: Key "DB_config" is missing.' => '',
1918
  'config/authentication.pl: Key "LDAP_config" is missing.' => '',
1919
  'config/authentication.pl: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '',
1920
  'config/authentication.pl: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '',
1917
  'config/lx_office.conf: Key "DB_config" is missing.' => '',
1918
  'config/lx_office.conf: Key "LDAP_config" is missing.' => '',
1919
  'config/lx_office.conf: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '',
1920
  'config/lx_office.conf: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '',
1921 1921
  'continue'                    => '',
1922 1922
  'correction'                  => '',
1923 1923
  'cp_greeting to cp_gender migration' => '',
lxo-import/addressB.php
14 14

  
15 15
require ("import_lib.php");
16 16

  
17
function ende($txt) {
18
  echo "Abbruch: $txt<br>";
19
  exit(1);
20
}
21

  
17 22
if (!$_SESSION["db"]) {
18
    $conffile="../config/authentication.pl";
23
    $conffile="../config/lx_office.conf";
19 24
    if (!is_file($conffile)) {
20
        ende("authentication.pl nicht gefunden oder unlesbar");
25
        ende("lx_office.conf nicht gefunden oder unlesbar");
21 26
    }
22 27
}
23 28

  
......
44 49

  
45 50
$crm=checkCRM();
46 51

  
47
function ende($txt) {
48
    echo "Abbruch: $txt<br>";
49
    exit(1);
50
}
51 52
$dir = "../users/";
52 53
clearstatcache ();
53 54
//print_r($_FILES);
lxo-import/blz.php
30 30
	require ("import_lib.php");
31 31

  
32 32
	if (!$_SESSION["db"]) {
33
		$conffile="../config/authentication.pl";
33
		$conffile="../config/lx_office.conf";
34 34
		if (!is_file($conffile)) {
35 35
			ende(4);
36 36
		}
lxo-import/contactB.php
12 12

  
13 13
*/
14 14
if (!$_SESSION["db"]) {
15
	$conffile="../config/authentication.pl";
15
	$conffile="../config/lx_office.conf";
16 16
	if (!is_file($conffile)) {
17 17
		ende(4);
18 18
	}
19 19
}
20

  
21
function ende($nr) {
22
  echo "Abbruch: $nr\n";
23
  exit($nr);
24
}
25

  
26

  
20 27
require ("import_lib.php");
21 28

  
22 29
if (!anmelden()) ende(5);
......
41 48
	}
42 49
	$nun=time();
43 50

  
44
	function ende($nr) {
45
		echo "Abbruch: $nr\n";
46
		exit($nr);
47
	}
48 51
	if ($_POST["ok"]=="Hilfe") {
49 52
		echo "Importfelder:<br>";
50 53
		echo "Feldname => Bedeutung<br>";
lxo-import/partsB.php
19 19
}
20 20

  
21 21
if (!$_SESSION["db"]) {
22
    $conffile="../config/authentication.pl";
22
    $conffile="../config/lx_office.conf";
23 23
    if (!is_file($conffile)) {
24
        ende("authentication.pl nicht gefunden oder kein Leserecht.");
24
        ende("lx_office.conf nicht gefunden oder kein Leserecht.");
25 25
    }
26 26
}
27 27
require ("import_lib.php");
lxo-import/shiptoB.php
30 30
    };
31 31

  
32 32
if (!$_SESSION["db"]) {
33
    $conffile="../config/authentication.pl";
33
    $conffile="../config/lx_office.conf";
34 34
    if (!is_file($conffile)) {
35
        ende("authentication.pl nicht gefunden oder unlesbar");
35
        ende("lx_office.conf nicht gefunden oder unlesbar");
36 36
    }
37 37
}
38 38

  

Auch abrufbar als: Unified diff