>From 1d6581de68774165779106c9756f5d7963a57e3a Mon Sep 17 00:00:00 2001 From: Christian Fast Date: Wed, 19 Oct 2011 13:34:30 +0200 Subject: [PATCH 0/2] *** SUBJECT HERE *** *** BLURB HERE *** Christian Fast (2): Fix missing ; in line 1560 of jquery. Fix missing '' in line 2245 of jsgantt. - Call-by-reference of var "importid" in function "import_insert" of class "ImportCsv" - No printout of importid if column "import_key" don't exists in table (it's a workaround until this column exists in all importable tables) - Two new rules for array_import_convertvalue (fetchfromtable, fetchfromclass) - Additional imports schemes for product and customer - New option to delete all unused products in the purge page - Additional tables in elements in function "delete" of class Product dev/translation/langAutoParser.class.php | 5 +- htdocs/admin/tools/purge.php | 124 +++++++++++++------- htdocs/compta/clients.php | 1 + htdocs/imports/import.php | 12 +- htdocs/includes/jquery/plugins/flot/jquery.flot.js | 2 +- htdocs/includes/jsgantt/jsgantt.js | 2 +- .../includes/modules/import/import_csv.modules.php | 112 +++++++++++++++--- htdocs/includes/modules/modProduct.class.php | 42 ++++++- htdocs/includes/modules/modSociete.class.php | 35 ++++-- htdocs/langs/de_AT/admin.lang | 7 +- htdocs/langs/de_AT/companies.lang | 2 + htdocs/langs/es_ES/externalsite.lang | 13 ++ htdocs/langs/fr_FR/admin.lang | 7 +- htdocs/langs/fr_FR/companies.lang | 1 + htdocs/product/class/product.class.php | 3 +- 15 files changed, 283 insertions(+), 85 deletions(-) mode change 100755 => 100644 htdocs/includes/jquery/plugins/flot/jquery.flot.js mode change 100755 => 100644 htdocs/langs/de_AT/admin.lang mode change 100755 => 100644 htdocs/langs/de_AT/companies.lang create mode 100644 htdocs/langs/es_ES/externalsite.lang -- 1.7.7.msysgit.0