Merge lp:~mikel-martin/openobject-addons/extra-5.0_esale_osc_enhancement into lp:openobject-addons/extra-5.0

[mikel]

[lp:~mikel-martin/openobject-addons/extra-5.0_esale_osc_enhancement]

6. By mikel <mikel@pcl2> on 2010-06-14

ok

7. By mikel <mikel@pcl2> on 2010-07-08

Merge totnto

8. By mikel <mikel@pcl2> on 2010-07-21

Fix oscom_prod_url qhen not oscommerce o not in root folder
Fix import multiple variants qhen options value name is different in different languages
Add option to avoid syncronization of shop products whit openerp's maodifies data

Unmerged revisions

8. By mikel <mikel@pcl2> on 2010-07-21

Fix oscom_prod_url qhen not oscommerce o not in root folder
Fix import multiple variants qhen options value name is different in different languages
Add option to avoid syncronization of shop products whit openerp's maodifies data

7. By mikel <mikel@pcl2> on 2010-07-08

Merge totnto

6. By mikel <mikel@pcl2> on 2010-06-14

ok

5. By mikel <mikel@pcl2> on 2010-04-26

Ability to define a default category for imported partners

added:
  .bzrignore
modified:
  esale_osc/connector/openerp-synchro.php
  esale_osc/esale_oscom.py
  esale_osc/esale_oscom_view.xml
  esale_osc/i18n/es_ES.po
  esale_osc/i18n/esale_osc.pot

4. By mikel <mikel@pcl2> on 2010-04-22

Comentarios idiomas y bug en sincronización de descripciones de productos
removed:
  esale_osc/i18n/es.po
modified:
  esale_osc/__terp__.py
  esale_osc/connector/openerp-synchro.php
  esale_osc/i18n/es_ES.po*
  esale_osc/i18n/esale_osc.pot*

3. By mikel <mikel@pcl2> on 2010-03-15

changes in credits

2. By mikel <mikel@pcl2> on 2010-03-12

missing files

1. By mikel <mikel@pcl2> on 2010-03-12

Added to esale_osc:
- ZenCart compatibility
- osCommerce admin authentication

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-07-21 10:31:39 +0000
@@ -0,0 +1,4 @@
+.orig
+*.orig
+*.pyc
+*~
 
=== modified file 'esale_osc/__terp__.py'
--- esale_osc/__terp__.py	2009-11-16 19:09:09 +0000
+++ esale_osc/__terp__.py	2010-07-21 10:31:39 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -23,7 +24,7 @@
 
 {
 	"name" : "OScommerce Interface / ZenCart",
-	"version" : "1.0",
+	"version" : "1.5",
 	"author" : "Axelor/Zikzakmedia",
 	"license" : "GPL-3",
 	"category" : "Interfaces/CMS & eCommerce",
@@ -41,7 +42,12 @@
  2. Export Stocks. 
  3. Change Oscommerce Order status and include comments. Upload Osc Status and comments. 
 
-Developed by Tiny, Axelor, Zikzakmedia and Ana Juaristi""",
+New in this version (1.5.0):
+  * User validation at store's administration
+  * Out of the box ZenCart compatibility
+  * Encoding isues
+
+Developed by Tiny, Axelor, Zikzakmedia, Ana Juaristi and ZhenIT Software""",
 	"init_xml" : [],
 	"demo_xml" : [],
 	"update_xml" : [
 
=== added file 'esale_osc/connector/ZhenIT_zencart_compatibility_functions.php'
--- esale_osc/connector/ZhenIT_zencart_compatibility_functions.php	1970-01-01 00:00:00 +0000
+++ esale_osc/connector/ZhenIT_zencart_compatibility_functions.php	2010-07-21 10:31:39 +0000
@@ -0,0 +1,244 @@
+<?
+/*
+   OsCommerce/Zencart Compatibility Payment Module Copyright (c) 2010 ZhenIT Software
+
+	 Valid for osCommerce, Zencart & soon for xt:commerce
+
+  http://ZhenIT.com
+  [e-mail]
+
+  Released under the GNU General Public License
+
+	No se limita la reutilización o mejora de este código pero se ruega
+	se mantengan los créditos y las referencias a ZhenIT, tanto las
+	explícitas como en los nombres de ficheros o de funciones.
+
+*/
+define('PLATAFORMA','zen');
+define("IS_ADMIN_FLAG","true");
+// include("../".DIR_WS_CLASSES."class.base.php");
+// require("../".DIR_WS_CLASSES."db/" .DB_TYPE . '/query_factory.php');
+// $db = new queryFactory();
+// $db->connect(DB_SERVER, DB_SERVER_USERNAME, DB_SERVER_PASSWORD, DB_DATABASE, USE_PCONNECT, false);
+if (file_exists("../".DIR_WS_INCLUDES."compat_ZhenIT/ZhenIT_zencart_compatibility_functions.php")){
+  include_once("../".DIR_WS_INCLUDES."compat_ZhenIT/ZhenIT_zencart_compatibility_functions.php");
+}else{
+  function tep_db_query($query)
+  {
+          global $db;
+          return($db->Execute($query));
+  }
+
+  function tep_db_fetch_array(&$query){
+    if(!$query->EOF){
+      $array = $query->fields;
+      $query->MoveNext();
+      return $array;
+    }
+    return false;
+  }
+
+  function tep_db_num_rows($query)
+  {
+          return($query->RecordCount());
+  }
+
+  function tep_db_input($string) {
+    if (function_exists('mysql_escape_string')) {
+      return mysql_escape_string($string);
+    }
+    return addslashes($string);
+  }
+
+  function tep_db_perform($table, $data, $action = 'insert', $parameters = '') {
+    reset($data);
+    if ($action == 'insert') {
+      $query = 'insert into ' . $table . ' (';
+      while (list($columns, ) = each($data)) {
+        $query .= $columns . ', ';
+      }
+      $query = substr($query, 0, -2) . ') values (';
+      reset($data);
+      while (list(, $value) = each($data)) {
+        switch ((string)$value) {
+          case 'now()':
+            $query .= 'now(), ';
+            break;
+          case 'null':
+            $query .= 'null, ';
+            break;
+          default:
+            $query .= '\'' . tep_db_input($value) . '\', ';
+            break;
+        }
+      }
+      $query = substr($query, 0, -2) . ')';
+    } elseif ($action == 'update') {
+      $query = 'update ' . $table . ' set ';
+      while (list($columns, $value) = each($data)) {
+        switch ((string)$value) {
+          case 'now()':
+            $query .= $columns . ' = now(), ';
+            break;
+          case 'null':
+            $query .= $columns .= ' = null, ';
+            break;
+          default:
+            $query .= $columns . ' = \'' . tep_db_input($value) . '\', ';
+            break;
+        }
+      }
+      $query = substr($query, 0, -2) . ' where ' . $parameters;
+    }
+
+    return tep_db_query($query);
+  }
+
+  function tep_db_insert_id() {
+    return mysql_insert_id();
+  }
+
+  function tep_draw_hidden_field($name, $value = '', $parameters = '') {
+    return zen_draw_hidden_field($name,$value,$parameters);
+  }
+
+  function tep_redirect($url) {
+    zen_redirect($url);
+  }
+
+  function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
+    return zen_href_link($page , $parameters, $connection , $add_session_id , $search_engine_safe);
+  }
+
+  function tep_cfg_pull_down_zone_classes($zone_class_id, $key = '') {
+    return zen_cfg_pull_down_zone_classes($zone_class_id, $key);
+  }
+  function tep_cfg_pull_down_order_statuses($zone_class_id, $key = '') {
+    return zen_cfg_pull_down_order_statuses($zone_class_id, $key);
+  }
+  function tep_get_order_status_name($zone_class_id, $key = '') {
+    return zen_get_order_status_name($zone_class_id, $key);
+  }
+  function tep_get_zone_class_title($zone_class_id, $key = '') {
+    return zen_get_zone_class_title($zone_class_id, $key);
+  }
+
+  function tep_cfg_select_option($select_array, $key_value, $key = '') {
+    return zen_cfg_select_option($select_array, $key_value, $key) ;
+  }
+  function tep_session_id($sessid = '') {
+    return  zen_session_id($sessid );
+  }
+  function tep_session_register($param) {
+      return  zen_session_register($param);
+  }
+  function tep_session_unregister($param) {
+      return  zen_session_unregister($param);
+  }
+  function tep_cfg_pull_down_tax_classes($tax_class_id, $key = '') {
+      return  zen_cfg_pull_down_tax_classes($tax_class_id, $key);
+  }
+  function tep_get_tax_class_title($tax_class_id) {
+      return  zen_get_tax_class_title($tax_class_id);
+  }
+
+  function tep_get_tax_rate($tax_class_id){
+      return  zen_get_tax_rate($tax_class_id);
+  }
+  function tep_get_tax_description($tax_class_id, $country, $zone){
+      return  zen_get_tax_description($tax_class_id, $country, $zone);
+  }
+  function tep_calculate_tax($amount, $rate){
+      return  zen_calculate_tax($amount, $rate);
+  }
+  function tep_get_prid($id){
+    return zen_get_prid($id);
+  }
+  function tep_not_null($variable){
+    return zen_not_null($variable);
+  }
+  function tep_session_is_registered($variable) {
+      if (PHP_VERSION < 4.3) {
+        return session_is_registered($variable);
+      } else {
+        return isset($_SESSION) && array_key_exists($variable, $_SESSION);
+      }
+  }
+  function tep_image($src, $alt = '', $width = '', $height = '', $parameters = '') {
+    return zen_image($src, $alt, $width, $height, $parameters);
+  }
+  function tep_image_button($image, $alt = '', $parameters = '') {
+    global $language;
+    return zen_image(DIR_WS_LANGUAGES . $language . '/images/buttons/' . $image, $alt, '', '', $parameters);
+  }
+  function tep_draw_separator($image = 'pixel_black.gif', $width = '100%', $height = '1') {
+    return zen_image(DIR_WS_IMAGES . $image, '', $width, $height);
+  }
+  function tep_catalog_href_link($page = '', $parameters = '', $connection = 'NONSSL') {
+    return zen_catalog_href_link($page , $parameters , $connection );
+  }
+  function tep_call_function($function, $parameter, $object = '') {
+    return zen_call_function($function, $parameter, $object = '');
+  }
+  function tep_get_all_get_params($exclude_array = ''){
+    return zen_get_all_get_params($exclude_array);
+  }
+  function tep_db_prepare_input($sql){
+    return zen_db_prepare_input($sql);
+  }
+  function tep_date_short($raw_date){
+    return zen_date_short($raw_date);
+  }
+  function tep_datetime_short($raw_datetime) {
+    return zen_datetime_short($raw_date);
+  }
+  function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = '', $required = false) {
+    return zen_draw_pull_down_menu($name, $values, $default, $parameters, $required);
+  }
+  function tep_draw_input_field($name, $value = '', $parameters = '', $required = false, $type = 'text', $reinsert_value = true){
+    return zen_draw_input_field($name, $value = '', $parameters = '', $required = false, $type = 'text', $reinsert_value = true);
+  }
+  function tep_draw_form($name, $action, $parameters = '', $method = 'post', $params = ''){
+    return zen_draw_form($name, $action, $parameters , $method, $params );
+  }
+  function tep_image_submit($image, $alt = '', $parameters = '') {
+    return zen_image_submit($image, $alt, $parameters);
+  }
+  function tep_hide_session_id() {
+    return zen_hide_session_id();
+  }
+  function tep_address_format($address_format_id, $address, $html, $boln, $eoln) {
+    return zen_address_format($address_format_id, $address, $html, $boln, $eoln) ;
+  }
+  function tep_display_tax_value($value, $padding = TAX_DECIMAL_PLACES) {
+    return zen_display_tax_value($value, $padding);
+  }
+  function tep_add_tax($price, $tax, $override = false) {
+    return zen_add_tax($price, $tax, $override );
+  }
+  function tep_db_output($string) {
+    return zen_db_output($string);
+  }
+  function tep_draw_textarea_field($name, $wrap, $width, $height, $text = '', $parameters = '', $reinsert_value = true) {
+    return zen_draw_textarea_field($name, $wrap, $width, $height, $text, $parameters, $reinsert_value);
+  }
+  function tep_draw_checkbox_field($name, $value = '', $checked = false, $compare = '') {
+    return zen_draw_checkbox_field($name, $value , $checked , $compare);
+  }
+  function tep_draw_radio_field($name, $value = '', $checked = false, $compare = '') {
+    return zen_draw_radio_field($name, $value , $checked , $compare );
+  }
+  function tep_get_category_name($category_id, $language_id) {
+    return zen_get_category_name($category_id, $language_id);
+  }
+  function tep_get_country_name($country_id){
+    return zen_get_country_name($country_id);
+  }
+  function tep_get_languages(){
+    return zen_get_languages();
+  }
+  function tep_validate_password($plain, $encrypted) {
+      return zen_validate_password($plain, $encrypted);
+  }
+}
+?>
 \ No newline at end of file
 
=== modified file 'esale_osc/connector/openerp-synchro.php'
--- esale_osc/connector/openerp-synchro.php	2010-02-02 20:22:20 +0000
+++ esale_osc/connector/openerp-synchro.php	2010-07-21 10:31:39 +0000
@@ -3,9 +3,12 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 2008 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
-#                       Jordi Esteve <[e-mail]> 
+#                       Jordi Esteve <[e-mail]>
 #                       Ana Juaristi <[e-mail]>
-#    $Id$
+#
+#    Copyright (c) 2010 ZhenIT Software http://ZhenIT.com
+#                       Added ZenCart compatibility out of the box
+#                       Added user validation in the stores administration.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -21,57 +24,75 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////   On windows servers line 65 use return utf8_encode($text);                   ////////////////////
-/////////////////      PLEASE CONFIGURE THE RIGHT INCLUDES AND DEFINES FOR YOUR CONFIGURATION   ////////////////////
-
+//SET YOUR PREFERENCES
+define('DIR_WS_INCLUDES', 'includes/');
+define('TRANSACTIONAL',true); //Set true if you have installed transactional feature.
+define('DEBUG_MODE', true); //Absolute path to debug and warning file
+define('DEBUG_FILE', '../images/debug.xmlrpc.txt'); //Absolute path to debug and warning file
+
+
+///////login//////////////
+include("openerp_login.php");
+$url = ($_SERVER['HTTPS']?'https':'http').'://'.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'],0,strrpos($_SERVER['PHP_SELF'],'/')+1);
+login($url,$_GET['admin_user'],$_GET['admin_pass']);
+//////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////   THIS INCLUDES SHOULD BE OK, BUT CHANGE THEM IF YOU NEED   ////////////////////
+include(DIR_WS_INCLUDES."application_top.php");
 include("xmlrpcutils/xmlrpc.inc");
 include("xmlrpcutils/xmlrpcs.inc");
-include("../../includes/configure.php");
-
-define('TRANSACTIONAL',true); //Set true if you have intalled transactional feature.
-define('RESPONSE_ENCODING', 'ISO-8859-1'); //It must be your DDBB encoding
-define('DEBUG_FILE', '../../temp/debug.xmlrpc.txt'); //Absolute path to debug and warning file
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+////ZENCARTS FUCNTIONS MAPPING///////////////////////////////////////////////////////////////////
+if(function_exists('zen_redirect')){
+    include_once('ZhenIT_zencart_compatibility_functions.php');
+}else{
+	define('PLATAFORMA','osc');
+}
+////////////////INSTALL/////////////
+//CHECKS TO MAKE ONCE (CREATE FIELDS IN DB ETC...)
+@include("openerp_runonce.php");
+////////////////////////////////////
+
+/////DEBUG/////////////////////////
+if(DEBUG_MODE){
+    @ini_set('display_errors', '1');
+    error_reporting(E_ALL & ~E_NOTICE);
+    function debug($s) {
+        $fp = fopen(DEBUG_FILE,"a");
+        fwrite($fp, $s."\n");
+        fclose($fp);
+    }
+
+    function debug_arr($para_arr,$tab='') {
+        if (is_array($para_arr)) {
+            foreach($para_arr as $key=>$values) {
+                debug($tab.'Key :'.$key.' Value :'.$values);
+            }
+        }
+    }
+}else{
+    function debug($s) {return;}
+    function debug_arr($para_arr,$tab='') {return;}
+}
 
 $con = mysql_pconnect(DB_SERVER, DB_SERVER_USERNAME, DB_SERVER_PASSWORD);
 mysql_select_db(DB_DATABASE);
 
-
-function debug($s) {
-    $fp = fopen(DEBUG_FILE,"a");
-    fwrite($fp, $s."\n");
-    fclose($fp);
-}
-
-function debug_arr($para_arr,$tab='') {
-    if (is_array($para_arr)) {
-        foreach($para_arr as $key=>$values) {
-            debug($tab.'Key :'.$key.' Value :'.$values);
-            /*
-            if (is_array($values)) {
-                $tab.='\t';
-                debug_arr($values,$tab);
-            }*/
-        }
-    }
-}
-
-function clean_special_chars($text){
-    for ($i=128; $i<=159; $i++){
-        $text = ereg_replace(chr($i), "?", $text );
-    }
-    return $text;
+//This function should let openERP know about the shop
+function init() {
+    $values = array();
+    $values[] = new xmlrpcval(PLATAFORMA, "string");
+    return new xmlrpcresp( new xmlrpcval($values, "array"));
 }
 
 function get_taxes() {
     $taxes = array();
 
-    $result = mysql_query("select tax_class_id, tax_class_title from tax_class;");
+    $result = mysql_query("select tax_class_id, tax_class_title from ".TABLE_TAX_CLASS.";");
     if ($result) while ($row = mysql_fetch_row($result)) {
-        $taxes[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval($row[1], "string")), "array");
+        $taxes[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(utf8_encode($row[1]), "string")), "array");
     }
     return new xmlrpcresp( new xmlrpcval($taxes, "array"));
 }
@@ -79,9 +100,9 @@
 function get_statuses() {
     $status = array();
 
-    $result = mysql_query("select orders_status_id, orders_status_name, language_id from orders_status;");
+    $result = mysql_query("select orders_status_id, orders_status_name, language_id from ".TABLE_ORDERS_STATUS);
     if ($result) while ($row = mysql_fetch_row($result)) {
-        $status[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(clean_special_chars($row[1]), "string"), new xmlrpcval($row[2], "int")), "array");
+        $status[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(utf8_encode($row[1]), "string"), new xmlrpcval($row[2], "int")), "array");
     }
     return new xmlrpcresp( new xmlrpcval($status, "array"));
 }
@@ -89,10 +110,9 @@
 
 function get_languages() {
     $languages = array();
-
-    $result = mysql_query("select languages_id, name from languages;");
+    $result = mysql_query("select languages_id, name from ".TABLE_LANGUAGES.";");
     if ($result) while ($row = mysql_fetch_row($result)) {
-        $languages[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(clean_special_chars($row[1]), "string")), "array");
+        $languages[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(utf8_encode($row[1]), "string")), "array");
     }
     return new xmlrpcresp(new xmlrpcval($languages, "array"));
 }
@@ -101,11 +121,11 @@
 function get_categories() {
     $categories = array();
 
-    $result = mysql_query("select categories_id, min(language_id) from categories_description group by categories_id;");
+    $result = mysql_query("select categories_id, min(language_id) from ".TABLE_CATEGORIES_DESCRIPTION." group by categories_id;");
     if ($result) while ($row = mysql_fetch_row($result)) {
-        $resultb = mysql_query("select categories_id, categories_name from categories_description where categories_id=".$row[0]." and language_id=".$row[1].";");
+        $resultb = mysql_query("select categories_id, categories_name from ".TABLE_CATEGORIES_DESCRIPTION." where categories_id=".$row[0]." and language_id=".$row[1].";");
         if ($resultb and $row = mysql_fetch_row($resultb)) {
-            $categories[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(clean_special_chars(parent_category($row[0],$row[1])), "string")), "array");
+            $categories[] = new xmlrpcval(array(new xmlrpcval($row[0], "int"), new xmlrpcval(utf8_encode(parent_category($row[0],$row[1])), "string")), "array");
         }
     }
     return new xmlrpcresp( new xmlrpcval($categories, "array"));
@@ -115,17 +135,16 @@
     $categories = array();
     $lang_ids = "";
 
-    foreach ($languages as $lang)
-            $lang_ids = $lang.", ";
+    foreach ($languages as $lang){
+        $lang_ids = $lang.", ";
+    }
     $lang_ids = substr($lang_ids, 0, strlen($lang_ids)-2);
-    $result = mysql_query("select categories_id, parent_id from categories order by parent_id;");
+    $result = mysql_query("select categories_id, parent_id from ".TABLE_CATEGORIES." order by parent_id;");
     if ($result) while ($row = mysql_fetch_row($result)) {
-        //debug('Category: ' . $row[0].'-'. $row[1]);
         $cat = array(new xmlrpcval($row[0], "int"), new xmlrpcval($row[1], "int"));
-        $resultlang = mysql_query("select categories_id, categories_name from categories_description where categories_id=".$row[0]." and language_id in ($lang_ids);");
+        $resultlang = mysql_query("select categories_id, categories_name from ".TABLE_CATEGORIES_DESCRIPTION." where categories_id=".$row[0]." and language_id in ($lang_ids);");
         if ($resultlang) while ($rowl = mysql_fetch_row($resultlang)) {
-            //debug('Category language: ' .$rowl[1]);
-            $cat[] = new xmlrpcval(clean_special_chars($rowl[1]), "string");
+            $cat[] = new xmlrpcval(utf8_encode($rowl[1]), "string");
         }
         $categories[] = new xmlrpcval($cat, "array");
     }
@@ -133,6 +152,7 @@
 }
 
 function get_products($languages, $osCodIni, $block, $last_date) {
+	global $languages_id;
     $products = array();
     $prod = array();
     $prod_desc = array();
@@ -159,59 +179,59 @@
         products_status,
         products_tax_class_id,
         manufacturers_id
-        from products";
+  from ".TABLE_PRODUCTS;
 
     $nexo = ' where ';
 
     if (TRANSACTIONAL){
         $sQuery .= $nexo . "( products_last_modified >= '" . $last_date . "' ";
-		$nexo = ' or ';
+        $nexo = ' or ';
         $sQuery .= $nexo . "products_date_added >= '" . $last_date . "' )" ;
-		$nexo = ' and ';
-	}
+        $nexo = ' and ';
+    }
 
     if ($osCodIni>0){
         $sQuery .= $nexo . "products_id > " . $osCodIni;
-		$nexo = ' and ';
-	}
+        $nexo = ' and ';
+    }
 
-	$sQuery .= " order by products_id LIMIT " . $block;
+    $sQuery .= " order by products_id LIMIT " . $block;
     debug('Query: ' .$sQuery);
     $result = mysql_query($sQuery);
 
     //debug('IF-WHILE-get_products');
     if ($result) while ($row_product = mysql_fetch_row($result)) {
-        $resultcateg = mysql_query("select min(categories_id) from products_to_categories
+        $resultcateg = mysql_query("select min(categories_id) from ".TABLE_PRODUCTS_TO_CATEGORIES."
             where products_id=".$row_product[0]." group by products_id;");
         if ($resultcateg) {
-                $row = mysql_fetch_row($resultcateg);
+            $row = mysql_fetch_row($resultcateg);
             $prod_cat = $row[0];
 
         }
         debug('Producto: ' .$row_product[0]);
         //Get product's manufacturer name
         if ($row_product[11] > 0){
-            $resultmanuf = mysql_query("select manufacturers_name from manufacturers where manufacturers_id = ".$row_product[11].";");
+            $resultmanuf = mysql_query("select manufacturers_name from ".TABLE_MANUFACTURERS." where manufacturers_id = ".$row_product[11].";");
             if ($resultmanuf){
                 $row_manuf = mysql_fetch_row($resultmanuf);
                 if (strlen($row_manuf[0]) > 0)
-                    $manufacturers_name = $row_manuf[0];
+                $manufacturers_name = $row_manuf[0];
                 else
-                    $manufacturers_name = "";
+                $manufacturers_name = "";
             }
             //Get product's manufacturer url on each language
             $manuf_url = array();
             $resultmanuflang = mysql_query("select manufacturers_url, languages_id
-                from manufacturers_info where manufacturers_id = ".$row_product[11]." and languages_id in (".$lang_ids.");");
+                 from ".TABLE_MANUFACTURERS_INFO." where manufacturers_id = ".$row_product[11]." and languages_id in (".$lang_ids.");");
             if ($resultmanuflang) while ($row_manuflang = mysql_fetch_row($resultmanuflang)) {
                 if (strlen($row_manuflang[0]) == 0)
-                    $manufacturers_url = "";
+                $manufacturers_url = "";
                 else
-                    $manufacturers_url = $row_manuflang[0];
+                $manufacturers_url = $row_manuflang[0];
                 $manuf_url[] = new xmlrpcval(array(
                     "languages_id" => new xmlrpcval($row_manuflang[1],"int"),
                     "manufacturers_url" => new xmlrpcval($manufacturers_url,"string"),
-                    ), "struct");
+                ), "struct");
             }
         } else {
             $manufacturers_name = "";
@@ -221,16 +241,16 @@
         $prod = new xmlrpcval(array(
             "products_id" => new xmlrpcval($row_product[0],"int"),
             "products_quantity" => new xmlrpcval($row_product[1],"int"),
-            "products_model" => new xmlrpcval(clean_special_chars($row_product[2]),"string"),
-            "products_image" => new xmlrpcval(clean_special_chars($row_product[3]),"string"),
-            "products_price" => new xmlrpcval(clean_special_chars($row_product[4]),"string"),
-            "products_date_added" => new xmlrpcval(clean_special_chars($row_product[5]),"string"),
-            "products_last_modified" => new xmlrpcval(clean_special_chars($row_product[6]),"string"),
-            "products_date_available" => new xmlrpcval(clean_special_chars($row_product[7]),"string"),
-            "products_weight" => new xmlrpcval(clean_special_chars($row_product[8]),"string"),
+            "products_model" => new xmlrpcval(utf8_encode($row_product[2]),"string"),
+            "products_image" => new xmlrpcval(utf8_encode($row_product[3]),"string"),
+            "products_price" => new xmlrpcval(utf8_encode($row_product[4]),"string"),
+            "products_date_added" => new xmlrpcval(utf8_encode($row_product[5]),"string"),
+            "products_last_modified" => new xmlrpcval(utf8_encode($row_product[6]),"string"),
+            "products_date_available" => new xmlrpcval(utf8_encode($row_product[7]),"string"),
+            "products_weight" => new xmlrpcval(utf8_encode($row_product[8]),"string"),
             "products_status" => new xmlrpcval($row_product[9],"int"),
             "products_tax_class_id" => new xmlrpcval($row_product[10],"int"),
-            "manufacturers_name" => new xmlrpcval(clean_special_chars($manufacturers_name),"string"),
+            "manufacturers_name" => new xmlrpcval(utf8_encode($manufacturers_name),"string"),
             "categ_id" => new xmlrpcval($prod_cat,"int")), "struct");
         //debug('Product_id: ' . $row_product[0] . '-IMG:' .$row_product[3]. '-CAT:' . $prod_cat);
 
@@ -242,33 +262,23 @@
             products_description,
             products_url,
             products_viewed
-            from products_description where products_id=".$row_product[0]." and language_id in (".$lang_ids.");");
+            from ".TABLE_PRODUCTS_DESCRIPTION." where products_id=".$row_product[0]." and language_id in (".$lang_ids.");");
         if ($resultlang) while ($row_desc = mysql_fetch_row($resultlang)) {
-        /*    if (strlen($row_desc[3] == 0))
-                $products_description_str = "";
-            else
-                $products_description_str = $row_desc[3];
-            if (strlen($row_desc[4] == 0))
-                $products_url_str = "";
-            else
-                $products_url_str = $row_desc[4];
-        */        
-
-            $description=clean_special_chars($row_desc[3]);
-			if ($description!=$row_desc[3]){
+            $description=utf8_encode($row_desc[3]);
+            if ($description!=$row_desc[3]){
                 debug(date(DATE_ATOM) . ' -- Product_id: ' . $row_desc[0] . ' Language_id: ' . $row_desc[1] . ' -> Undefined characters: Description has been updated.');
             }
 
             $prod_desc[] = new xmlrpcval(array(
-                //"products_id" => new xmlrpcval($row_desc[0],"int"),
+            //"products_id" => new xmlrpcval($row_desc[0],"int"),
                 "language_id" => new xmlrpcval($row_desc[1],"int"),
-                "products_name" => new xmlrpcval(clean_special_chars($row_desc[2]),"string"),
-                "products_description" => new xmlrpcval($description,"string"),
-                "products_url" => new xmlrpcval(clean_special_chars($row_desc[4]),"string"),
-                "products_viewed" => new xmlrpcval(clean_special_chars($row_desc[5]),"string")), "struct");
+                "products_name" => new xmlrpcval(utf8_encode($row_desc[2]),"string"),
+                "products_description" => new xmlrpcval(utf8_encode($row_desc[3]),"string"),
+                "products_url" => new xmlrpcval(utf8_encode($row_desc[4]),"string"),
+                "products_viewed" => new xmlrpcval(utf8_encode($row_desc[5]),"string")), "struct");
             //debug('Product_id: ' . $row_desc[0] . 'language_id: ' . $row_desc[1] . 'products_name: ' . $row_desc[2]);
         }
-        
+
         // Get product discounts
         $prod_spec = new xmlrpcval(array(), "struct"); // If product has not any discount
         $resultspec = mysql_query("select specials_new_products_price,
@@ -277,48 +287,44 @@
             expires_date,
             date_status_change,
             status
-            from specials where products_id=". $row_product[0] .
+            from ".TABLE_SPECIALS." where products_id=". $row_product[0] .
                             " and specials_date_added =
-                            (select max(specials_date_added) from specials where products_id=". $row_product[0] . ");");
+                 (select max(specials_date_added) from ".TABLE_SPECIALS." where products_id=". $row_product[0] . ");");
         if ($resultspec) {
             $rowesp = mysql_fetch_row($resultspec);
             //debug('Product specials: ' . $rowesp[0] . " " . $rowesp[3]);
             $prod_spec = new xmlrpcval(array(
                 "specials_new_products_price" => new xmlrpcval($rowesp[0],"string"),
-                //"specials_date_added" => new xmlrpcval($rowesp[1],"string"),
-                //"specials_last_modified" => new xmlrpcval($rowesp[2],"string"),
+            //"specials_date_added" => new xmlrpcval($rowesp[1],"string"),
+            //"specials_last_modified" => new xmlrpcval($rowesp[2],"string"),
                 "expires_date" => new xmlrpcval($rowesp[3],"string"),
-                //"date_status_change" => new xmlrpcval($rowesp[4],"string"),
+            //"date_status_change" => new xmlrpcval($rowesp[4],"string"),
                 "status" => new xmlrpcval($rowesp[5],"int")), "struct");
         }
         // Get product attributes
         debug('Inicio atributos: ' . $row_product[0]);
-        debug("Query: SELECT p.products_id, op.products_options_name , opv.products_options_values_name
-                                     FROM products p, products_attributes pa, products_options op, products_options_values opv
+        $sql = "SELECT p.products_id, op.products_options_name , opv.products_options_values_name
+                                     FROM ".TABLE_PRODUCTS." p, ".TABLE_PRODUCTS_ATTRIBUTES." pa, ".TABLE_PRODUCTS_OPTIONS." op, ".TABLE_PRODUCTS_OPTIONS_VALUES." opv
                                      WHERE p.products_id = pa.products_id
                                      AND pa.options_id = op.products_options_id
                                      AND pa.options_values_id = opv.products_options_values_id 
-                                     and p.products_id =". $row_product[0]);
+                                     and p.products_id =". $row_product[0] . "
+                                     AND opv.language_id=".(int)$languages_id.";";
+        debug("Query: ".$sql);
 
         $prod_atrib = array();// If product has not attributes
-        
-        $result_atrib = mysql_query("SELECT p.products_id, op.products_options_name , opv.products_options_values_name
-                                     FROM products p, products_attributes pa, products_options op, products_options_values opv
-                                     WHERE p.products_id = pa.products_id
-                                     AND pa.options_id = op.products_options_id
-                                     AND pa.options_values_id = opv.products_options_values_id 
-                                     and p.products_id =". $row_product[0] . ";");
+        $result_atrib = mysql_query($sql);
         if ($result_atrib) while ($rowatr = mysql_fetch_row($result_atrib)) {
 
-            $num_atrib =  explode("-", clean_special_chars($rowatr[2])); 
-            $auxi_model = clean_special_chars($row_product[2]) . '-' . $num_atrib[0];
+            $num_atrib =  explode("-", utf8_encode($rowatr[2]));
+            $auxi_model = utf8_encode($row_product[2]) . '-' . $num_atrib[0];
 
             debug('Product atributes: ' . $rowatr[0] . " " . $rowatr[1]. " " . $rowatr[2] . 'Codigo prod: ' .  $auxi_model);
             $prod_atrib[] = new xmlrpcval(array(
-                "variants_name" => new xmlrpcval(clean_special_chars($rowatr[1]),"string"),
-                "variants_value" => new xmlrpcval(clean_special_chars($rowatr[2]),"string"),
+                "variants_name" => new xmlrpcval(utf8_encode($rowatr[1]),"string"),
+                "variants_value" => new xmlrpcval(utf8_encode($rowatr[2]),"string"),
                 "composed_code" => new xmlrpcval($auxi_model,"string"),
-                                          ), "struct");
+            ), "struct");
         }
 
 
@@ -328,50 +334,59 @@
             'product_special' => $prod_spec,
             'manufacturers_url' => new xmlrpcval($manuf_url, "array"),
             'variants' => new xmlrpcval($prod_atrib, "array"),
-            ), "struct");
+        ), "struct");
     }
     //debug('END-IF-WHILE-get_products');
     return new xmlrpcresp(new xmlrpcval($products, "array"));
 }
 
 function get_payment_methods() {
+	global $language;
     $payment_methods = array();
 
-    $result_modules = mysql_query("SELECT configuration_value FROM configuration WHERE (configuration_key = 'MODULE_PAYMENT_INSTALLED');");
+    $result_modules = mysql_query("SELECT configuration_value FROM ".TABLE_CONFIGURATION." WHERE (configuration_key = 'MODULE_PAYMENT_INSTALLED');");
     if ($result_modules && $row_modules=mysql_fetch_row($result_modules)) {
         $modules = explode(';', $row_modules[0]);
     }
     reset($modules);
     while (list($key, $value) = each($modules)) {
-        include("../../includes/modules/payment/".$value);
-        include("../../includes/languages/espanol/modules/payment/".$value);
+        $file = DIR_FS_CATALOG_MODULES."payment/".$value;
+        if (!file_exists($file))continue;
+        include($file);
+        include(DIR_FS_CATALOG_LANGUAGES.$language."/modules/payment/".$value);
         $class = substr($value, 0, strrpos($value, '.'));
         $obj = new $class();
-        $payment_methods[] = new xmlrpcval(array(new xmlrpcval($key, "int"), new xmlrpcval(clean_special_chars($obj->title), "string")), "array");
+        $payment_methods[] = new xmlrpcval(array(new xmlrpcval($key, "int"), new xmlrpcval(trim(utf8_encode(html_entity_decode(strip_tags($obj->title)))), "string")), "array");
     }
     return new xmlrpcresp( new xmlrpcval($payment_methods, "array"));
 }
 
+$arrLanguagesDirs = null;
+function _loadArrLanguageDirs(){//Avoid making this query more then once
+    global $arrLanguagesDirs;
+    $arrLanguagesDirs = array();;
+    $result=mysql_query("select directory from ".TABLE_LANGUAGES.";");
+    if ($result) while ($row=mysql_fetch_row($result)) {
+        $arrLanguagesDirs[] = $row[0];
+    }
+}
+
 function search_payment_method($payment_name) {
-    $languages = array();
+    global $arrLanguagesDirs;
+    if(is_null($arrLanguagesDirs))_loadArrLanguageDirs();
 
-    $result_modules = mysql_query("SELECT configuration_value FROM configuration WHERE (configuration_key = 'MODULE_PAYMENT_INSTALLED');");
+    $result_modules = mysql_query("SELECT configuration_value FROM ".TABLE_CONFIGURATION." WHERE (configuration_key = 'MODULE_PAYMENT_INSTALLED');");
     if ($result_modules && $row_modules = mysql_fetch_row($result_modules)) {
         $modules = explode(';', $row_modules[0]);
     }
 
-    $result=mysql_query("select directory from languages;");
-    if ($result) while ($row=mysql_fetch_row($result)) {
-        $languages[] = $row[0];
-    }
-
     reset($modules);
     while (list($key, $value) = each($modules)) {
-        foreach ($languages as $lang) {
+        foreach ($arrLanguagesDirs as $lang) {
             $title = "";
             // We must extract the payment method name from the translation file of the payment module
             // We search lines containing the TEXT_TITLE constant like: define('MODULE_PAYMENT_COD_TEXT_TITLE', 'Cash on Delivery');
-            $gestor = @fopen("../../includes/languages/$lang/modules/payment/$value", "r");
+            $gestor = @fopen(DIR_FS_CATALOG_LANGUAGES.$lang."/modules/payment/$value", "r");
             if ($gestor) {
                 while (!feof($gestor) and $title=="") {
                     // Read translation file line by line
@@ -392,14 +407,14 @@
 
 
 function parent_category($id, $name) {
-    $result = mysql_query("select parent_id from categories where categories_id=".$id.";");
+    $result = mysql_query("select parent_id from ".TABLE_CATEGORIES." where categories_id=".$id.";");
     if ($result && $row = mysql_fetch_row($result)) {
         if ($row[0] == 0) {
             return $name;
         } else {
-            $resultb = mysql_query("select min(language_id) from categories_description where categories_id=".$row[0].";");
+            $resultb = mysql_query("select min(language_id) from ".TABLE_CATEGORIES_DESCRIPTION." where categories_id=".$row[0].";");
             if ($resultb && $rowb=mysql_fetch_row($resultb)) {
-                $resultb = mysql_query("select categories_name from categories_description where categories_id=".$row[0]." and language_id=".$rowb[0].";\n");
+                $resultb = mysql_query("select categories_name from ".TABLE_CATEGORIES_DESCRIPTION." where categories_id=".$row[0]." and language_id=".$rowb[0].";\n");
                 if ($resultb && $rowb=mysql_fetch_row($resultb)) {
                     $name = parent_category($row[0], $rowb[0] . " \\ ". $name);
                     return $name;
@@ -415,13 +430,15 @@
 }
 
 function setSyncronizedFlag($product_id) {
-	mysql_query("update products set products_syncronized = 1, products_last_syncronized = now() where products_id=" . $product_id . ";");
-	return new xmlrpcresp(new xmlrpcval(true,"boolean"));
+    if(mysql_query("update ".TABLE_PRODUCTS." set products_syncronized = 1, products_last_syncronized = now() where products_id=" . $product_id . ";")){
+      return new xmlrpcresp(new xmlrpcval(true,"boolean"));
+    }
+    return new xmlrpcresp(new xmlrpcval(false,"boolean"));
 }
 
 function set_product_stock($tiny_product) {
-    mysql_query("update products set products_quantity=".$tiny_product['quantity']." where products_id=".$tiny_product['product_id'].";");
-    mysql_query("update products set products_status=".(($tiny_product['quantity']>0)?1:0)." where products_id=".$tiny_product['product_id'].";");
+    mysql_query("update ".TABLE_PRODUCTS." set products_quantity=".$tiny_product['quantity']." where products_id=".$tiny_product['product_id'].";");
+    mysql_query("update ".TABLE_PRODUCTS." set products_status=".(($tiny_product['quantity']>0)?1:0)." where products_id=".$tiny_product['product_id'].";");
     return new xmlrpcresp(new xmlrpcval(0,"int"));
 }
 
@@ -430,29 +447,29 @@
     $oscom_id = 0;
 
     if(array_key_exists('manufacturers_name',$tiny_product)) {
-        $result = mysql_query("select l.languages_id from languages as l ,configuration as c where
+        $result = mysql_query("select l.languages_id from ".TABLE_LANGUAGES." as l ,configuration as c where
         c.configuration_key='DEFAULT_LANGUAGE' and c.configuration_value=l.code;");
 
         if ($result && $row = mysql_fetch_row($result)) {
             $lang_id = $row[0];
         }
-        $result = mysql_query("select manufacturers_id from manufacturers where (manufacturers_name='".$tiny_product['manufacturers_name']."');");
+        $result = mysql_query("select manufacturers_id from ".TABLE_MANUFACTURERS." where (manufacturers_name='".$tiny_product['manufacturers_name']."');");
         if ($result && $row = mysql_fetch_row($result)) {
             $id_exist = 1;
             $oscom_id = $row[0];
         }
         if ($id_exist == 0) {
-            mysql_query("insert into manufacturers (manufacturers_name, date_added) values ('".$tiny_product['manufacturers_name']."', now());");
+            mysql_query("insert into ".TABLE_MANUFACTURERS." (manufacturers_name, date_added) values ('".$tiny_product['manufacturers_name']."', now());");
             $oscom_id = mysql_insert_id();
-            mysql_query("insert into manufacturers_info (manufacturers_id, languages_id,manufacturers_url) values (".$oscom_id.",".$lang_id.",'".$tiny_product['manufacturers_url']."');");
+            mysql_query("insert into ".TABLE_MANUFACTURERS_INFO." (manufacturers_id, languages_id,manufacturers_url) values (".$oscom_id.",".$lang_id.",'".$tiny_product['manufacturers_url']."');");
             foreach ($tiny_product['manufacturer_langs'] as $lang=>$values){
-                mysql_query("insert into manufacturers_info (manufacturers_id, languages_id,manufacturers_url) values (".$oscom_id.",".$lang.",'".$values['manufacturers_url']."');");
+                mysql_query("insert into ".TABLE_MANUFACTURERS_INFO." (manufacturers_id, languages_id,manufacturers_url) values (".$oscom_id.",".$lang.",'".$values['manufacturers_url']."');");
             }
         } else {
-            mysql_query("update manufacturers_info set manufacturers_url='".$tiny_product['manufacturers_url']."' where manufacturers_id=".$oscom_id." and languages_id=".$lang_id.";");
+            mysql_query("update ".TABLE_MANUFACTURERS_INFO." set manufacturers_url='".$tiny_product['manufacturers_url']."' where manufacturers_id=".$oscom_id." and languages_id=".$lang_id.";");
             foreach ($tiny_product['manufacturer_langs'] as $lang=>$values){
-                mysql_query("delete from manufacturers_info where manufacturers_id=".$oscom_id." and languages_id=".$lang.";");
-                mysql_query("insert into manufacturers_info (manufacturers_id, languages_id,manufacturers_url) values (".$oscom_id.",".$lang.",'".$values['manufacturers_url']."');");
+                mysql_query("delete from ".TABLE_MANUFACTURERS_INFO." where manufacturers_id=".$oscom_id." and languages_id=".$lang.";");
+                mysql_query("insert into ".TABLE_MANUFACTURERS_INFO." (manufacturers_id, languages_id,manufacturers_url) values (".$oscom_id.",".$lang.",'".$values['manufacturers_url']."');");
             }
         }
     }
@@ -472,123 +489,31 @@
             $i = $i + 1;
         }
         foreach(array('_description','_to_categories','') as $key) {
-            mysql_query("delete from products".$key." where products_id in (".$a.");");
+            mysql_query("delete from ".TABLE_PRODUCTS.$key." where products_id in (".$a.");");
         }
     }
     return new xmlrpcresp(new xmlrpcval(1, "int"));
 }
 
 function del_spe_price($tiny_val) {
-    mysql_query("delete from specials where products_id = ".$tiny_val.";");
+    mysql_query("delete from ".TABLE_SPECIALS." where products_id = ".$tiny_val.";");
     return new xmlrpcresp(new xmlrpcval(1, "int"));
 }
 
 function set_product_spe($tiny_product) {
-    $lang_id = 1;
-    $id_exist = 0;
-
-    ////////Check for existance of product_id ///////////
-    debug("localizando producto Oferta: select products_id from products where products_model='".$tiny_product['model']."'");
-    $result = mysql_query("select products_id from products where (products_id=".$tiny_product['product_id'].");");
-    if ($result && $row=mysql_fetch_row($result)) {
-        $id_exist = 1;
-    }
-
-    $result = mysql_query("select l.languages_id from languages as l configuration as c where c.configuration_key='DEFAULT_LANGUAGE' and c.configuration_value = l.code;");
-
-    if ($result && $row = mysql_fetch_row($result)) {
-        $lang_id = $row[0];
-    }
-    //if ($tiny_product['quantity']>0) {
-    //    $tiny_product['status']=1;
-    //} else {
-    //    $tiny_product['status']=0;
-    //}
-    $manufacturers_id = set_product_manufacturer($tiny_product);
-    if ($id_exist == 0) {
-        mysql_query("insert into products (products_quantity, products_model, products_price, products_weight, products_tax_class_id, products_status, manufacturers_id, products_date_added) values (".$tiny_product['quantity'].", '". $tiny_product['model']."', ".$tiny_product['price'].", ".$tiny_product['weight'].", ".$tiny_product['tax_class_id'].", ".$tiny_product['status'].", ".$manufacturers_id.", now());");
-
-        $oscom_id = mysql_insert_id();
-        if ( $tiny_product['date_available'] != 'NULL') {
-            mysql_query("update products set products_date_available='".$tiny_product['date_available']."' where products_id=".$oscom_id.";");
-        }
-        mysql_query("insert into specials (products_id, specials_new_products_price, specials_date_added, date_status_change, status) values (".$oscom_id.",".$tiny_product['spe_price'].",now(),now(),".$tiny_product['spe_price_status'].");");
-        if ( $tiny_product['exp_date'] != 'NULL') {
-            mysql_query("update specials set expires_date='".$tiny_product['exp_date']."' where products_id=".$oscom_id.";");
-        }
-        mysql_query("insert into products_description (products_id, language_id, products_name, products_description, products_url) values (".$oscom_id.", ".$lang_id.", '".$tiny_product['name']."', '".$tiny_product['description']."', '".$tiny_product['url']."');");
-        mysql_query("insert into products_to_categories (categories_id, products_id) values(".$tiny_product['category_id'].",".$oscom_id.");");
-        foreach ($tiny_product['langs'] as $lang=>$values) {
-            mysql_query("insert into products_description(products_id, language_id, products_name, products_description, products_url)
-            values (".$oscom_id.", ".$lang.", '".$values['name']."', '".$values['description']."', '".$values['url']."');");
-        }
-    } else {
-        debug("localizando producto Modelo existe: select products_id from products where products_id=".$tiny_product['product_id']);
-        $result = mysql_query("select products_id from products where (products_id=".$tiny_product['product_id'].");");
-        if ($result && $row=mysql_fetch_row($result)) {
-            $id_exist = 1;
-        }
-        if ($id_exist){
-        $oscom_id = $tiny_product['product_id'];
-        foreach (array('quantity', 'price', 'weight', 'tax_class_id', 'status', 'date_available') as $key) {
-            if ($key == 'date_available' and $tiny_product[$key] != 'NULL') {
-                mysql_query("update products set products_".$key."='".$tiny_product[$key]."' where products_id=".$oscom_id.";");
-            } else {
-                mysql_query("update products set products_".$key."=".$tiny_product[$key]." where products_id=".$oscom_id.";");
-            }
-        }
-        mysql_query("delete from specials where products_id=".$oscom_id.";");
-        mysql_query("insert into specials (products_id, specials_new_products_price, specials_date_added, date_status_change, status) values (".$oscom_id.",".$tiny_product['spe_price'].",now(),now(),".$tiny_product['spe_price_status'].");");
-        if ( $tiny_product['exp_date'] != 'NULL') {
-            mysql_query("update specials set expires_date='".$tiny_product['exp_date']."' where products_id=".$oscom_id.";");
-        }
-
-        mysql_query("update products set products_model='".$tiny_product['model']."', manufacturers_id=".$manufacturers_id." where products_id=".$oscom_id.";");
-
-        mysql_query("update products_to_categories set categories_id=".$tiny_product['category_id']." where products_id=".$oscom_id.";");
-        foreach ($tiny_product['langs'] as $lang=>$values) {
-            mysql_query("update products_description set ". 
-                         " products_id  = " .  $oscom_id . 
-                         ", language_id = ". $lang .
-                         ", products_name = '".$values['name']."'" .
-                         ", products_description =  '".$values['description']."'" .
-                         ", products_url = '".$values['url']."'".
-                         " where products_id=".$oscom_id." and language_id=".$lang.";");           
-        }
-    }
-    }
-
-    $cpt = 0;
-    if ($tiny_product['haspic']==1) {
-        if (file_exists('../../images/'.$cpt.'-'.$tiny_product['fname'])) {
-            unlink('../../images/'.$cpt.'-'.$tiny_product['fname']); // DELETE THE EXISTING IMAGES
-        }
-        if ($hd = fopen('../../images/'.$cpt.'-'.$tiny_product['fname'], "w")) {
-            fwrite($hd, base64_decode($tiny_product['picture']));
-            fclose($hd);
-            mysql_query("update products set products_image='".$cpt."-".$tiny_product['fname']."' where products_id=".$oscom_id.";");
-        }
-    } else if ($tiny_product['haspic']==2) {
-        if (file_exists('../../images/'.$cpt.'-'.$tiny_product['fname'])) {
-            unlink('../../images/'.$cpt.'-'.$tiny_product['fname']); // DELETE THE EXISTING IMAGES
-        }
-        mysql_query("update products set products_image='".$tiny_product['fname']."' where products_id=".$oscom_id.";");
-    } else {
-        mysql_query("update products set products_image=NULL where products_id=".$oscom_id.";");
-    }
-    return new xmlrpcresp(new xmlrpcval($oscom_id, "int"));
+    return set_product_classical($tiny_product,true);
 }
 
-function set_product_classical($tiny_product) {
+function set_product_classical($tiny_product,$spe = false ) {
     $lang_id = 1;
     $id_exist = 0;
 
     ////////Check for existance of product ///////////
-    $result = mysql_query("select products_id from products where (products_id=".$tiny_product['product_id'].");");
+    $result = mysql_query("select products_id from ".TABLE_PRODUCTS." where (products_id=".$tiny_product['product_id'].");");
     if ($result && $row=mysql_fetch_row($result)) {
         $id_exist = 1;
     }
-    $result = mysql_query("select l.languages_id from languages as l configuration as c where c.configuration_key='DEFAULT_LANGUAGE' and c.configuration_value=l.code;");
+    $result = mysql_query("select l.languages_id from ".TABLE_LANGUAGES." as l, ".TABLE_CONFIGURATION." as c where c.configuration_key='DEFAULT_LANGUAGE' and c.configuration_value=l.code;");
 
     if ($result && $row = mysql_fetch_row($result)) {
         $lang_id = $row[0];
@@ -600,75 +525,87 @@
     //}
     $manufacturers_id = set_product_manufacturer($tiny_product);
     if ($id_exist == 0) {
-        mysql_query("insert into products (products_quantity, products_model, products_price, products_weight, products_tax_class_id, products_status, manufacturers_id, products_date_added) values (".$tiny_product['quantity'].", '". $tiny_product['model']."', ".$tiny_product['price'].", ".$tiny_product['weight'].", ".$tiny_product['tax_class_id'].", ".$tiny_product['status'].", ".$manufacturers_id.", now());");
+        mysql_query("insert into ".TABLE_PRODUCTS." (products_quantity, products_model, products_price, products_weight, products_tax_class_id, products_status, manufacturers_id, products_date_added) values (".$tiny_product['quantity'].", '". $tiny_product['model']."', ".$tiny_product['price'].", ".$tiny_product['weight'].", ".$tiny_product['tax_class_id'].", ".$tiny_product['status'].", ".$manufacturers_id.", now());");
 
         $oscom_id = mysql_insert_id();
         if ( $tiny_product['date_available'] != 'NULL') {
-            mysql_query("update products set products_date_available='".$tiny_product['date_available']."' where products_id=".$oscom_id.";");
-        }
-        mysql_query("insert into products_description (products_id, language_id, products_name, products_description, products_url) values (".$oscom_id.", ".$lang_id.", '".$tiny_product['name']."', '".$tiny_product['description']."', '".$tiny_product['url']."');");
-        mysql_query("insert into products_to_categories (categories_id, products_id) values(".$tiny_product['category_id'].",".$oscom_id.");");
+            mysql_query("update ".TABLE_PRODUCTS." set products_date_available='".$tiny_product['date_available']."' where products_id=".$oscom_id.";");
+        }
+        if($spe){
+          mysql_query("insert into ".TABLE_SPECIALS." (products_id, specials_new_products_price, specials_date_added, date_status_change, status) values (".$oscom_id.",".$tiny_product['spe_price'].",now(),now(),".$tiny_product['spe_price_status'].");");
+          if ( $tiny_product['exp_date'] != 'NULL') {
+              mysql_query("update ".TABLE_SPECIALS." set expires_date='".$tiny_product['exp_date']."' where products_id=".$oscom_id.";");
+          }
+        }
+        mysql_query("insert into ".TABLE_PRODUCTS_DESCRIPTION." (products_id, language_id, products_name, products_description, products_url) values (".$oscom_id.", ".$lang_id.", '".$tiny_product['name']."', '".$tiny_product['description']."', '".$tiny_product['url']."');");
+        mysql_query("insert into ".TABLE_PRODUCTS_TO_CATEGORIES." (categories_id, products_id) values(".$tiny_product['category_id'].",".$oscom_id.");");
         foreach ($tiny_product['langs'] as $lang=>$values) {
-            mysql_query("insert into products_description(products_id, language_id, products_name, products_description, products_url)
+            mysql_query("insert into ".TABLE_PRODUCTS_DESCRIPTION." (products_id, language_id, products_name, products_description, products_url)
             values (".$oscom_id.", ".$lang.", '".$values['name']."', '".$values['description']."', '".$values['url']."');");
         }
     } else {
-        debug("localizando producto Modelo existe: select products_id from products where products_id=".$tiny_product['product_id']);
-        $result = mysql_query("select products_id from products where (products_id=".$tiny_product['product_id'].");");
+        $sql = "select products_id from ".TABLE_PRODUCTS." where (products_id=".$tiny_product['product_id'].");";
+        debug("localizando producto Modelo existe: ".$sql);
+        $result = mysql_query($sql);
         if ($result && $row=mysql_fetch_row($result)) {
             $id_exist = 1;
         }
         if ($id_exist){
-        
-        $oscom_id = $tiny_product['product_id'];
-        foreach (array('quantity', 'price', 'weight', 'tax_class_id', 'status', 'date_available') as $key) {
-            if ($key == 'date_available' and $tiny_product[$key] != 'NULL') {
-                mysql_query("update products set products_".$key."='".$tiny_product[$key]."' where products_id=".$oscom_id.";");
-            } else {
-                mysql_query("update products set products_".$key."=".$tiny_product[$key]." where products_id=".$oscom_id.";");
-            }
-        }
-
-        mysql_query("update products set products_model='".$tiny_product['model']."', manufacturers_id=".$manufacturers_id." where products_id=".$oscom_id.";");
-
-        mysql_query("update products_to_categories set categories_id=".$tiny_product['category_id']." where products_id=".$oscom_id.";");
-        foreach ($tiny_product['langs'] as $lang=>$values) {
-            mysql_query("update products_description set ". 
+
+            $oscom_id = $tiny_product['product_id'];
+            foreach (array('quantity', 'price', 'weight', 'tax_class_id', 'status', 'date_available') as $key) {
+                if ($key == 'date_available' and $tiny_product[$key] != 'NULL') {
+                    mysql_query("update ".TABLE_PRODUCTS." set products_".$key."='".$tiny_product[$key]."' where products_id=".$oscom_id.";");
+                } else {
+                    mysql_query("update ".TABLE_PRODUCTS." set products_".$key."=".$tiny_product[$key]." where products_id=".$oscom_id.";");
+                }
+            }
+            if($spe){
+                mysql_query("delete from ".TABLE_SPECIALS." where products_id=".$oscom_id.";");
+                mysql_query("insert into ".TABLE_SPECIALS." (products_id, specials_new_products_price, specials_date_added, date_status_change, status) values (".$oscom_id.",".$tiny_product['spe_price'].",now(),now(),".$tiny_product['spe_price_status'].");");
+                if ( $tiny_product['exp_date'] != 'NULL') {
+                    mysql_query("update ".TABLE_SPECIALS." set expires_date='".$tiny_product['exp_date']."' where products_id=".$oscom_id.";");
+                }
+            }
+            mysql_query("update ".TABLE_PRODUCTS." set products_model='".$tiny_product['model']."', manufacturers_id=".$manufacturers_id." where products_id=".$oscom_id.";");
+
+            mysql_query("update ".TABLE_PRODUCTS_TO_CATEGORIES." set categories_id=".$tiny_product['category_id']." where products_id=".$oscom_id.";");
+            foreach ($tiny_product['langs'] as $lang=>$values) {
+                mysql_query("update ".TABLE_PRODUCTS_DESCRIPTION." set ".
                          " products_id  = " .  $oscom_id . 
                          ", language_id = ". $lang .
                          ", products_name = '".$values['name']."'" .
                          ", products_description =  '".$values['description']."'" .
                          ", products_url = '".$values['url']."'".
                          " where products_id=".$oscom_id." and language_id=".$lang.";");           
+            }
         }
     }
-    }
     $cpt = 0;
     if ($tiny_product['haspic']==1) {
-        if (file_exists('../../images/'.$cpt.'-'.$tiny_product['fname'])) {
-            unlink('../../images/'.$cpt.'-'.$tiny_product['fname']); // DELETE THE EXISTING IMAGES
+        if (file_exists(DIR_WS_CATALOG_IMAGES.$cpt.'-'.$tiny_product['fname'])) {
+            unlink(DIR_WS_CATALOG_IMAGES.$cpt.'-'.$tiny_product['fname']); // DELETE THE EXISTING IMAGES
         }
-        if ($hd=fopen('../../images/'.$cpt.'-'.$tiny_product['fname'], "w")){
+        if ($hd=fopen(DIR_WS_CATALOG_IMAGES.$cpt.'-'.$tiny_product['fname'], "w")){
             fwrite($hd, base64_decode($tiny_product['picture']));
             fclose($hd);
-            mysql_query("update products set products_image='".$cpt."-".$tiny_product['fname']."' where products_id=".$oscom_id.";");
+            mysql_query("update ".TABLE_PRODUCTS." set products_image='".$cpt."-".$tiny_product['fname']."' where products_id=".$oscom_id.";");
         }
     } else if ($tiny_product['haspic']==2) {
-        if (file_exists('../../images/'.$cpt.'-'.$tiny_product['fname'])) {
-            unlink('../../images/'.$cpt.'-'.$tiny_product['fname']); // DELETE THE EXISTING IMAGES
+        if (file_exists(DIR_WS_CATALOG_IMAGES.$cpt.'-'.$tiny_product['fname'])) {
+            unlink(DIR_WS_CATALOG_IMAGES.$cpt.'-'.$tiny_product['fname']); // DELETE THE EXISTING IMAGES
         }
-        mysql_query("update products set products_image='".$tiny_product['fname']."' where products_id=".$oscom_id.";");
+        mysql_query("update ".TABLE_PRODUCTS." set products_image='".$tiny_product['fname']."' where products_id=".$oscom_id.";");
     } else {
-        mysql_query("update products set products_image=NULL where products_id=".$oscom_id.";");
+        mysql_query("update ".TABLE_PRODUCTS." set products_image=NULL where products_id=".$oscom_id.";");
     }
     return new xmlrpcresp(new xmlrpcval($oscom_id, "int"));
 }
 
-
 function get_order_address($address_condition, $oscom_id, $name, $street, $street2, $zip, $city, $state, $zone, $country, $email="", $phone="", $fax="") {
     $addresses = array();
-    $num_rows = 0; 
-    $query = "SELECT address_book_id,CONCAT(entry_firstname,' ',entry_lastname) as name, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id FROM address_book";
+    $num_rows = 0;
+    $query = "SELECT address_book_id,CONCAT(entry_firstname,' ',entry_lastname) as name, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id FROM ".TABLE_ADDRESS_BOOK;
     //debug("Init address controll:". $name . "-zip: ". $zip . "-city" . $city . "-state" . $state . "-country" . $country);
 
     if (is_array($address_condition)) {
@@ -692,7 +629,7 @@
         }
         $result = mysql_query($query.$where);
         $num_rows = mysql_num_rows($result);
-   }
+    }
     if ($num_rows>0) {
         return get_partner_address($address_condition,$email, $phone, $fax);
     }
@@ -708,16 +645,16 @@
         $state_data = get_state_detail($country,$state_name);
         $ret_address = array(
             "esale_oscom_id" => new xmlrpcval($oscom_id,"int"),
-            "name" => new xmlrpcval(clean_special_chars($name),"string"),
-            "street" => new xmlrpcval(clean_special_chars($street),"string"),
-            "street2" => new xmlrpcval(clean_special_chars($street2),"string"),
-            "zip" => new xmlrpcval(clean_special_chars($zip),"string"),
-            "city" => new xmlrpcval(clean_special_chars($city),"string"),
+            "name" => new xmlrpcval(utf8_encode($name),"string"),
+            "street" => new xmlrpcval(utf8_encode($street),"string"),
+            "street2" => new xmlrpcval(utf8_encode($street2),"string"),
+            "zip" => new xmlrpcval(utf8_encode($zip),"string"),
+            "city" => new xmlrpcval(utf8_encode($city),"string"),
             "state" => $state_data,
             "country" => $country_data,
-            "email" => new xmlrpcval(clean_special_chars($email),"string"),
-            "phone" => new xmlrpcval(clean_special_chars($phone),"string"),
-            "fax" => new xmlrpcval(clean_special_chars($fax),"string")
+            "email" => new xmlrpcval(utf8_encode($email),"string"),
+            "phone" => new xmlrpcval(utf8_encode($phone),"string"),
+            "fax" => new xmlrpcval(utf8_encode($fax),"string")
         );
 
         $addresses[] = new xmlrpcval($ret_address,"struct");
@@ -729,7 +666,7 @@
 
 function get_partner_address($address_condition, $email="", $phone="", $fax="") {
     $addresses = array();
-    $query = "SELECT address_book_id,CONCAT(entry_firstname,' ',entry_lastname) as name, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id FROM address_book";
+    $query = "SELECT address_book_id,CONCAT(entry_firstname,' ',entry_lastname) as name, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id FROM ".TABLE_ADDRESS_BOOK;
 
     if (is_array($address_condition)) {
         $where = " where ";
@@ -762,16 +699,16 @@
         $state_data = get_state_detail($row_address['entry_country_id'],$state_name);
         $ret_address = array(
             "esale_oscom_id" => new xmlrpcval($row_address['address_book_id'],"int"),
-            "name" => new xmlrpcval(clean_special_chars($row_address['name']),"string"),
-            "street" => new xmlrpcval(clean_special_chars($row_address['entry_street_address']),"string"),
-            "street2" => new xmlrpcval(clean_special_chars($row_address['entry_suburb']),"string"),
-            "zip" => new xmlrpcval(clean_special_chars($row_address['entry_postcode']),"string"),
-            "city" => new xmlrpcval(clean_special_chars($row_address['entry_city']),"string"),
+            "name" => new xmlrpcval(utf8_encode($row_address['name']),"string"),
+            "street" => new xmlrpcval(utf8_encode($row_address['entry_street_address']),"string"),
+            "street2" => new xmlrpcval(utf8_encode($row_address['entry_suburb']),"string"),
+            "zip" => new xmlrpcval(utf8_encode($row_address['entry_postcode']),"string"),
+            "city" => new xmlrpcval(utf8_encode($row_address['entry_city']),"string"),
             "state" => $state_data,
             "country" => $country_data,
-            "email" => new xmlrpcval(clean_special_chars($email),"string"),
-            "phone" => new xmlrpcval(clean_special_chars($phone),"string"),
-            "fax" => new xmlrpcval(clean_special_chars($fax),"string")
+            "email" => new xmlrpcval(utf8_encode($email),"string"),
+            "phone" => new xmlrpcval(utf8_encode($phone),"string"),
+            "fax" => new xmlrpcval(utf8_encode($fax),"string")
         );
         $addresses[] = new xmlrpcval($ret_address,"struct");
     }
@@ -781,52 +718,22 @@
 
 function get_customer($cust_id) {
     $ret_partners = array();
-    $condition = '';
-    $file="../../temp/logsynchrophp.txt";
-    $f=fopen($file,"a");
-
-    $query = "SELECT customers_id, CONCAT(customers_firstname,' ',customers_lastname) as name, customers_email_address, customers_default_address_id, customers_telephone, customers_fax from customers";
-
-    if ($cust_id != 0) {
-        $condition = " where customers_id=".$cust_id;
-    }
-    $result = mysql_query($query.$condition.';');
+    $query = "SELECT customers_id, CONCAT(customers_firstname,' ',customers_lastname) as name, customers_email_address, customers_default_address_id, customers_telephone, customers_fax from ".TABLE_CUSTOMERS.($cust_id != 0?" where customers_id=".$cust_id:"");
+    $result = mysql_query($query);
+
     if ($result) while ($row_cust=mysql_fetch_array($result, MYSQL_ASSOC)) {
         $addresses = get_partner_address(array('customers_id'=>$row_cust['customers_id']));
+        $query_company = "select IF(isnull(entry_nif) OR entry_nif='','23232323T',entry_nif) entry_nif,IF(isnull(entry_company) OR entry_company='','NO_COMPANY',entry_company) entry_company from ".TABLE_ADDRESS_BOOK." where customers_id = " .$row_cust['customers_id'];
+        $result_company = mysql_fetch_array(mysql_query($query_company), MYSQL_ASSOC);
         $partner = array();
+        //$partner['nif']            = $result_company[0];
+        //$partner['company']        = new xmlrpcval($result_company['entry_company'], "string");
         $partner['esale_oscom_id'] = new xmlrpcval($row_cust['customers_id'],"int");
-		$partner['name'] = new xmlrpcval(clean_special_chars($row_cust['name']),"string");
-
-//!!!!!!!!!!! BE CAREFULL, ENTRY_NIF is VAT NUMBER IN SPAIN, if you obtain
-///// response error when executing sales order download, remove the field or addecuate the name
-        $query_company = "select a.entry_nif, a.entry_company 
-                            from address_book a, customers c  
-                            where c.customers_id = " . $row_cust['customers_id'] . " and a.address_book_id = c.customers_default_address_id;";
-        $result_company = mysql_query($query_company);
-            if ($result_company) while ($row_nif=mysql_fetch_array($result_company, MYSQL_ASSOC)) {                        
-                $cif_nif = str_replace(' ', '',str_replace('-', '',strtoupper($row_nif['entry_nif'])));
-                fwrite($f, "TRATANDO NIF: " .  $cif_nif . " -- Longitud: " . strlen($cif_nif) );        
-
-            if (strlen($cif_nif)== 9) {
-                $partner['vat'] = new xmlrpcval("ES" . clean_special_chars($cif_nif), "string");
-                fwrite($f, " -- NIF CORRECTO: " . "ES" . $cif_nif);        
-                                fwrite($f, " -- Nombre: " . $row_cust['name']);        
-                fwrite($f, " -- Compania: " . $row_nif['entry_company'].  " -- IDCliente: " . $row_cust['customers_id'] . "\n");
-            }else {
-                $cif_nif = "01234567L";
-                $partner['vat'] = new xmlrpcval("ES" . clean_special_chars($cif_nif), "string");
-                fwrite($f, " -- ERROR EN NIF: " . "ES" . $cif_nif);        
-                                fwrite($f, " -- Nombre: " . $row_cust['name']);        
-                fwrite($f, " -- Compania " . $row_nif['entry_company'].  " -- IDCliente " . $row_cust['customers_id'] . "\n");
-                    }
-
-            if ($row_nif['entry_company']!= '' ) {
-                $partner['name'] = new xmlrpcval(clean_special_chars($row_nif['entry_company']),"string");
-                fwrite($f, "existe compania " . $row_nif['entry_company'] . "\n");
-            }else{
-                $partner['name'] = new xmlrpcval(clean_special_chars($row_cust['name']),"string");
-                fwrite($f, "NO existe compania " . $partner['company'] . "\n");
-            }
+        $partner['vat']            = new xmlrpcval("ES" . $result_company['entry_nif'], "string");
+        if ($partner['company']<> 'NO_COMPANY' ) {
+            $partner['name'] = new xmlrpcval(utf8_encode($row_cust['name']),"string");
+        }else {
+            $partner['name'] = new xmlrpcval(utf8_encode($partner['company']),"string");
         }
         $partner['addresses'] = $addresses;
         $ret_partners[] = new xmlrpcval($partner,"struct");
@@ -836,8 +743,7 @@
 
 
 function get_country_detail($country_name) {
-    $query = "select countries_id, countries_name, countries_iso_code_2, countries_iso_code_3 from countries";
-    $ret_country = '0';
+    $query = "select countries_id, countries_name, countries_iso_code_2, countries_iso_code_3 from ".TABLE_COUNTRIES;
 
     if (!is_numeric($country_name)) {
         if($country_name != '') {
@@ -849,19 +755,24 @@
     if ($result && $row=mysql_fetch_row($result)) {
         $ret_country = new xmlrpcval( array (
             "esale_oscom_id" => new xmlrpcval($row[0],"int"),
-            "name" => new xmlrpcval(clean_special_chars($row[1]),"string"),
-            "code" => new xmlrpcval(clean_special_chars($row[2]),"string"),
-            "code3" => new xmlrpcval(clean_special_chars($row[3]),"string")
+            "name" => new xmlrpcval(utf8_encode($row[1]),"string"),
+            "code" => new xmlrpcval(utf8_encode($row[2]),"string"),
+            "code3" => new xmlrpcval(utf8_encode($row[3]),"string")
         ),"struct");
         return $ret_country;
     }
-    return new xmlrpcval($ret_country,'string');
+    return new xmlrpcval( array (
+            "esale_oscom_id" => new xmlrpcval(0,"int"),
+            "name" => new xmlrpcval("UNKNOWN","string"),
+            "code" => new xmlrpcval("UN","string"),
+            "code3" => new xmlrpcval("UNK","string")
+        ),"struct");
 }
 
 
 function get_state_detail($country_id,$state_name) {
     $ret_state = '0';
-    $query = "select zone_id, zone_code, zone_name from zones";
+    $query = "select zone_id, zone_code, zone_name from ".TABLE_ZONES;
     $condition = '';
 
     if (!is_numeric($state_name)) {
@@ -875,42 +786,49 @@
     if ($result && $row=mysql_fetch_row($result)) {
         $ret_state = new xmlrpcval( array (
             "esale_oscom_id" => new xmlrpcval($row[0],"int"),
-            "name" => new xmlrpcval(clean_special_chars($row[2]),"string"),
-            "code" => new xmlrpcval(clean_special_chars($row[1]),"string")
+            "name" => new xmlrpcval(utf8_encode($row[2]),"string"),
+            "code" => new xmlrpcval(utf8_encode($row[1]),"string")
         ),"struct");
         return $ret_state;
     }
     $ret_state = new xmlrpcval( array (
         "esale_oscom_id" => new xmlrpcval(0,"int"),
-        "name" => new xmlrpcval(clean_special_chars($state_name),"string"),
+  "name" => new xmlrpcval(utf8_encode($state_name),"string"),
         "code" => new xmlrpcval('',"string")
     ),"struct");
     return $ret_state;
 }
 
 
-function get_saleorders($last_so, $statuses_ids) {
+function get_saleorders($last_so, $statuses_ids, $block_size=100) {
     $saleorders = array();
     $status_ids = implode(", ", $statuses_ids);
 
-
-   debug("SELECT `orders_id` , `customers_name` , `customers_street_address` , `customers_city` , `customers_postcode` , `customers_state` , `customers_country` , `customers_telephone` , `customers_email_address` , `delivery_name` , `delivery_street_address` , `delivery_city` , `delivery_postcode` , `delivery_state` , `delivery_country` , `billing_name` , `billing_street_address` , `billing_city` , `billing_postcode` , `billing_state` , `billing_country` , `date_purchased` , `orders_status`, `customers_id`, `payment_method`, `customers_id`,`customers_company`,`delivery_company`,`billing_company` 
-                FROM `orders` where (orders_id > ".$last_so." and orders_status in (" . $status_ids . ")) order by orders_id limit 1;");
-
-    $result = mysql_query("SELECT `orders_id` , `customers_name` , `customers_street_address` , `customers_city` , `customers_postcode` , `customers_state` , `customers_country` , `customers_telephone` , `customers_email_address` , `delivery_name` , `delivery_street_address` , `delivery_city` , `delivery_postcode` , `delivery_state` , `delivery_country` , `billing_name` , `billing_street_address` , `billing_city` , `billing_postcode` , `billing_state` , `billing_country` , `date_purchased` , `orders_status`, `customers_id`, `payment_method`, `customers_id`,`customers_company`,`delivery_company`,`billing_company` 
-                FROM `orders` where (orders_id > ".$last_so." and orders_status in (" . $status_ids . "))  order by orders_id limit 1;");
+    $result = mysql_query("SELECT `orders_id` , `customers_name` , `customers_street_address` , `customers_city` , `customers_postcode` , `customers_state` , `customers_country` , `customers_email_address`, `customers_telephone`  , `delivery_name` , `delivery_street_address` , `delivery_city` , `delivery_postcode` , `delivery_state` , `delivery_country` , `billing_name` , `billing_street_address` , `billing_city` , `billing_postcode` , `billing_state` , `billing_country` , `date_purchased` , `orders_status`, `customers_id`, `payment_method`, `customers_id`,`customers_company`,`delivery_company`,`billing_company`
+                FROM ".TABLE_ORDERS." where (orders_id > ".$last_so." and orders_status in (" . $status_ids . "))  order by orders_id limit ".$block_size.";");
 
     if ($result){
         while ($row = mysql_fetch_row($result)) {
-            debug("En pedido while: " .  $row[0]);
             $shopping_price = 0;
-            $result_shopping = mysql_query("SELECT value, title from orders_total where class='ot_shipping' and orders_id=".$row[0].";");
+            $result_shopping = mysql_query("SELECT value, title from ".TABLE_ORDERS_TOTAL."  where class='ot_shipping' and orders_id=".$row[0].";");
             if ($result_shopping && $row_shopping=mysql_fetch_row($result_shopping)) {
                 $shopping_price = $row_shopping[0];
                 $shipping_title = $row_shopping[1];
             }
+            $dcoupon_price = 0;
+            $result_coupon = mysql_query("SELECT value, title from ".TABLE_ORDERS_TOTAL."  where class='ot_discount_coupon' and orders_id=".$row[0].";");
+            if ($result_coupon && $row_coupon=mysql_fetch_row($result_coupon)) {
+                $dcoupon_price = $row_coupon[0];
+                $dcoupon_title = $row_coupon[1];
+            }
+            $cash_price = 0;
+            $result_cash = mysql_query("SELECT value, title from ".TABLE_ORDERS_TOTAL." where class='ot_fixed_payment_chg' and orders_id=".$row[0].";");
+            if ($result_cash && $row_cash=mysql_fetch_row($result_cash)) {
+                $cash_price = $row_cash[0];
+                $cash_title = $row_cash[1];
+            }
 
-            $result_customer = mysql_query("SELECT customers_email_address, customers_telephone, customers_fax FROM customers WHERE customers_id=".$row[25].";");
+            $result_customer = mysql_query("SELECT customers_email_address, customers_telephone, customers_fax FROM ".TABLE_CUSTOMERS." WHERE customers_id=".$row[25].";");
             if ($result_customer && $row_customer=mysql_fetch_row($result_customer)) {
                 $email = $row_customer[0];
                 $phone = $row_customer[1];
@@ -922,7 +840,7 @@
                         "entry_street_address"=>$row[2],
                         "entry_city"=>$row[3],
                         "entry_postcode"=>$row[4]
-                        );
+            );
             $oscom_id = 9990;
             $name= $row[1];
             $street = $row[2];
@@ -944,7 +862,7 @@
                         "entry_street_address"=>$row[10],
                         "entry_city"=>$row[11],
                         "entry_postcode"=>$row[12]
-                        );
+            );
             $oscom_id = 9991;
             $name= $row[9];
             $street = $row[10];
@@ -963,7 +881,7 @@
                         "entry_street_address"=>$row[16],
                         "entry_city"=>$row[17],
                         "entry_postcode"=>$row[18]
-                        );
+            );
             $oscom_id = 9992;
             $name= $row[15];
             $street = $row[16];
@@ -976,63 +894,62 @@
             $billing_address  =get_order_address($billing_condition, $oscom_id, $name, $street, $street2, $zip, $city, $state, $zone, $country, $email, $phone, $fax);
             //$billing_address = get_partner_address($billing_condition, $email, $phone, $fax);
 
-            $result_status = mysql_query("select orders_status_name from orders_status where orders_status_id = " . $row[22].";");
+            $result_status = mysql_query("select orders_status_name from ".TABLE_ORDER_STATUS." where orders_status_id = " . $row[22].";");
             if ($result_status && $row_status=mysql_fetch_row($result_status)) {
-                            $status = $row_status[0];
+                $status = $row_status[0];
             }
             $orderlines = array();
-            $resultb = mysql_query("select products_id, products_quantity, products_price, products_tax, products_name, orders_products_id, products_model  from orders_products where orders_id=".$row[0]." UNION select 999999, 1, value, '16.0000', title, 0,'' from orders_total where class not in('ot_subtotal', 'ot_total', 'ot_tax') and orders_id=".$row[0].";");
-            debug("query lineas pedidos:". $resultb); 
+            $resultb = mysql_query("select products_id, products_quantity, products_price, products_tax, products_name, orders_products_id from ".TABLE_ORDERS_PRODUCTS." where orders_id=".$row[0].";");
             if ($resultb){
                 while ($rowb = mysql_fetch_row($resultb)) {
                     $values_array = array("product_id" => new xmlrpcval($rowb[0], "int"),
                         "product_qty" => new xmlrpcval($rowb[1], "int"),
                         "price" => new xmlrpcval($rowb[2], "double"),
                         "tax_rate" => new xmlrpcval($rowb[3],"double"),
-                        "products_model" => new xmlrpcval(html_entity_decode(clean_special_chars($rowb[6])),"string"),
-                        "name" => new xmlrpcval(html_entity_decode(clean_special_chars($rowb[4])),"string"));
-                    $result_orders_product_attributes = mysql_query("select products_options, products_options_values, options_values_price, price_prefix from orders_products_attributes where orders_id=".$row[0]." and orders_products_id=".$rowb[5].";");
+                        "products_model" => new xmlrpcval(trim(utf8_encode(html_entity_decode($rowb[6]))),"string"),
+                        "name" => new xmlrpcval(utf8_encode(html_entity_decode($rowb[4])),"string"));
+                    $result_orders_product_attributes = mysql_query("select products_options, products_options_values, options_values_price, if(isnull(price_prefix) OR price_prefix='','+',price_prefix) price_prefix from ".TABLE_ORDERS_PRODUCTS_ATTRIBUTES." where orders_id=".$row[0]." and orders_products_id=".$rowb[5].";");
                     if($result_orders_product_attributes && $row_orders_product_attributes= mysql_fetch_row($result_orders_product_attributes)) {
-                        //debug("En atributos línea:" . $row_orders_product_attributes[0]); 
-                    if ($row_orders_product_attributes[3] !== '+' and $row_orders_product_attributes[3] !== '-'){$row_orders_product_attributes[3]='+';}
-
-                        //debug("En atributos línea prefijo :" . $row_orders_product_attributes[3]); 
-                        $num_atrib =  explode("-", clean_special_chars($row_orders_product_attributes[1])); 
-                        $auxi_model = clean_special_chars($rowb[6]) . '-' . $num_atrib[0];
+                        $num_atrib =  explode("-", utf8_encode($row_orders_product_attributes[1]));
+                        $auxi_model = utf8_encode($rowb[6]) . '-' . $num_atrib[0];
 
                         $orders_product_attributes = new xmlrpcval( array(
-                            "products_options" => new xmlrpcval(clean_special_chars($row_orders_product_attributes[0]),"string"),
-                            "products_options_values" => new xmlrpcval(clean_special_chars($row_orders_product_attributes[1]),"string"),
+                            "products_options" => new xmlrpcval(utf8_encode($row_orders_product_attributes[0]),"string"),
+                            "products_options_values" => new xmlrpcval(utf8_encode($row_orders_product_attributes[1]),"string"),
                             "options_values_price" => new xmlrpcval($row_orders_product_attributes[2],"double"),
                             "composed_code" => new xmlrpcval($auxi_model,"string"),
-                            "price_prefix" => new xmlrpcval(clean_special_chars($row_orders_product_attributes[3]),"string")), "struct");
+                            "price_prefix" => new xmlrpcval(utf8_encode($row_orders_product_attributes[3]),"string")), "struct");
                         $values_array["attributes"] = $orders_product_attributes;
                     }
                     $orderlines[] = new xmlrpcval($values_array, "struct");
                 }
             }
             $note = "";
-            $result_comments = mysql_query("select comments FROM orders_status_history where (orders_id = ".$row[0]." and orders_status_id = 1);");
+            $result_comments = mysql_query("select comments FROM ".TABLE_ORDERS_STATUS_HISTORY." where (orders_id = ".$row[0]." and orders_status_id = 1);");
             if ($result_comments && $row_comments=mysql_fetch_row($result_comments)) {
                 $note=$row_comments[0];
             }
-//                $result_price_with_tax = mysql_query("SELECT configuration_value FROM configuration where (configuration_key = 'DISPLAY_PRICE_WITH_TAX');");
-//                if ($result_price_with_tax && $row_price_with_tax=mysql_fetch_row($result_price_with_tax)) {
-//                    if ($row_price_with_tax[0] == 'false') {
-                    $price_type="tax_excluded";
-//                    } else {
-//                        $price_type="tax_included";
-//                    }
-//                }
+            //                $result_price_with_tax = mysql_query("SELECT configuration_value FROM configuration where (configuration_key = 'DISPLAY_PRICE_WITH_TAX');");
+            //                if ($result_price_with_tax && $row_price_with_tax=mysql_fetch_row($result_price_with_tax)) {
+            //                    if ($row_price_with_tax[0] == 'false') {
+            $price_type="tax_excluded";
+            //                    } else {
+            //                        $price_type="tax_included";
+            //                    }
+            //                }
             $saleorders[] = new xmlrpcval( array("id" => new xmlrpcval( $row[0], "int"),
-                "price_type" => new xmlrpcval( clean_special_chars($price_type), "string" ),
-                "note" => new xmlrpcval(clean_special_chars($note), "string" ),
+                "price_type" => new xmlrpcval( utf8_encode($price_type), "string" ),
+                "note" => new xmlrpcval(utf8_encode($note), "string" ),
                 "lines" => new xmlrpcval( $orderlines, "array"),
-                "pay_met" => new xmlrpcval( search_payment_method($row[24]), "int"),
-                "pay_met_title" => new xmlrpcval( clean_special_chars($row[24]), "string"),
+                "pay_met" => new xmlrpcval(search_payment_method($row[24]), "int"),
+                "pay_met_title" => new xmlrpcval( trim(utf8_encode(html_entity_decode(strip_tags($row[24])))), "string"),
                 "shipping_price" => new xmlrpcval( $shopping_price, "double"),
-                "shipping_title" => new xmlrpcval(html_entity_decode(clean_special_chars($shipping_title)), "string"),
-                "orders_status" => new xmlrpcval( clean_special_chars($status), "string"),
+                "shipping_title" => new xmlrpcval(utf8_encode($shipping_title), "string"),
+                "dcoupon_price" => new xmlrpcval( $dcoupon_price, "double"),
+                "dcoupon_title" => new xmlrpcval(utf8_encode($dcoupon_title), "string"),
+                "cash_price" => new xmlrpcval( $cash_price, "double"),
+                "cash_title" => new xmlrpcval(utf8_encode($cash_title), "string"),
+                "orders_status" => new xmlrpcval( utf8_encode($status), "string"),
                 "partner" => get_customer($row[25]),
                 "date" => new xmlrpcval( $row[21], "string"),
                 "address" => $default_address,
@@ -1046,79 +963,77 @@
 
 
 function get_min_open_orders($last_so) {
-    $result = mysql_query("SELECT min(`orders_id`) as min FROM `orders` where (orders_id <= ".$last_so.") and (orders_status = 2);");
+    $result = mysql_query("SELECT min(`orders_id`) as min FROM ".TABLE_ORDERS." where (orders_id <= ".$last_so.") and (orders_status = 2);");
     if ($result) {
         $min = mysql_fetch_row($result);
         return new xmlrpcresp( new xmlrpcval($min[0], "int"));
     } else
-            return new xmlrpcresp( new xmlrpcval(-1, "int"));
+    return new xmlrpcresp( new xmlrpcval(-1, "int"));
 }
 
 
 
 function get_max_products_id() {
-    $result = mysql_query("SELECT max(`products_id`) as max FROM `products`;");
+    $result = mysql_query("SELECT max(`products_id`) as max FROM ".TABLE_PRODUCTS);
     if ($result) {
         $max = mysql_fetch_row($result);
         return new xmlrpcresp( new xmlrpcval($max[0], "int"));
     } else
-            return new xmlrpcresp( new xmlrpcval(-1, "int"));
+    return new xmlrpcresp( new xmlrpcval(-1, "int"));
 }
 
 function get_min_products_id() {
-    $result = mysql_query("SELECT min(`products_id`) as min FROM `products`;");
+    $result = mysql_query("SELECT min(`products_id`) as min FROM ".TABLE_PRODUCTS);
     if ($result) {
         $min = mysql_fetch_row($result);
         return new xmlrpcresp( new xmlrpcval($min[0], "int"));
     } else
-        return new xmlrpcresp( new xmlrpcval(-1, "int"));
+    return new xmlrpcresp( new xmlrpcval(-1, "int"));
 }
 
 
 function close_open_orders($order_id, $order_status_id) {
-    mysql_query("update orders set orders_status= " . $order_status_id . " where orders_id=".$order_id.";");
+    mysql_query("update ".TABLE_ORDERS." set orders_status=3 where orders_id=".$order_id.";");
     return new xmlrpcresp(new xmlrpcval(0, "int"));
 }
 
 
 function process_order($order_id, $order_status_id) {
-          debug("ONPROCESS: update orders set orders_status = " . $order_status_id . " where orders_id = ".$order_id.";");
-
-    mysql_query("update orders set orders_status= " . $order_status_id . "  where orders_id=".$order_id.";");
+    mysql_query("update ".TABLE_ORDERS." set orders_status= " . $order_status_id . "  where orders_id=".$order_id.";");
     return new xmlrpcresp(new xmlrpcval(0, "int"));
 }
 
 
 function update_order_status($order_id, $order_status_id, $status_comment, $update_comment, $send_web_email) {
      
-      $oID = $order_id;
-    
-      mysql_query("update orders set orders_status = '" . $order_status_id . "', last_modified = now() where orders_id = '" . (int)$oID . "'");
-      $customer_notified = $send_web_email;
+    $oID = $order_id;
+
+    mysql_query("update ".TABLE_ORDERS." set orders_status = '" . $order_status_id . "', last_modified = now() where orders_id = '" . (int)$oID . "'");
+    $customer_notified = $send_web_email;
 
     if ($update_comment){
-          debug("ACTUALIZAR COMENTARIOS insert into orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '1', '" . $status_comment  . "')");
-          mysql_query("insert into orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '". $customer_notified . "', '" . $status_comment  . "')");
+        debug("ACTUALIZAR COMENTARIOS insert into orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '1', '" . $status_comment  . "')");
+        mysql_query("insert into ".TABLE_ORDERS_STATUS_HISTORY." (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '". $customer_notified . "', '" . $status_comment  . "')");
     }else {
-          debug("NO ACTUALIZAR COMENTARIOS insert into orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '1', '')");
-         mysql_query("insert into orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '". $customer_notified . "', '')");
+        debug("NO ACTUALIZAR COMENTARIOS insert into orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '1', '')");
+        mysql_query("insert into ".TABLE_ORDERS_STATUS_HISTORY." (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . $order_status_id . "', now(), '". $customer_notified . "', '')");
     }
 
     if ($send_web_email) {
-          $check_status_query = mysql_query("select customers_name, customers_email_address, orders_status, date_purchased 
-                                             from orders where orders_id = '" . (int)$oID . "'");
-
-    if ($check_status_query && $check_status=mysql_fetch_row($check_status_query)) {
-        debug("ONCHANGEORDER1: en envio e-mail;");
-        $email = $status_comment ;
-
-        debug("ONCHANGEORDER2: " . $email);
-    //    $headers = "From: \r\n";
-    //  mail($check_status['customers_email_address'],'Subject', $email, $headers );
- 
-
-        debug("ONCHANGEORDER: en envio e-mail;");
-      }
+        $check_status_query = mysql_query("select customers_name, customers_email_address, orders_status, date_purchased
+                                             from ".TABLE_ORDER." where orders_id = '" . (int)$oID . "'");
+
+        if ($check_status_query && $check_status=mysql_fetch_row($check_status_query)) {
+            debug("ONCHANGEORDER1: en envio e-mail;");
+            $email = $status_comment ;
+
+            debug("ONCHANGEORDER2: " . $email);
+            //    $headers = "From: \r\n";
+            //  mail($check_status['customers_email_address'],'Subject', $email, $headers );
+
+
+            debug("ONCHANGEORDER: en envio e-mail;");
+        }
     } else {
         debug("ONCHANGEORDER: en NO envio e-mail;");
     }
@@ -1127,99 +1042,34 @@
     return new xmlrpcresp(new xmlrpcval(0, "int"));
 }
 
-$server = new xmlrpc_server( array(    "get_taxes" => array(        "function" => "get_taxes",
-                                                                "signature" => array(    array($xmlrpcArray)
-                                                                                    )
-                                                                ),
-                                       "get_statuses" => array(        "function" => "get_statuses",
-                                                                "signature" => array(    array($xmlrpcArray)
-                                                                                    )
-                                                                ),
-
-                                    "get_languages" => array(    "function" =>    "get_languages",
-                                                                "signature" => array(    array($xmlrpcArray)
-                                                                                    )
-                                                                ),
-                                    "get_categories" => array(    "function" =>    "get_categories",
-                                                                "signature" =>    array(    array($xmlrpcArray)
-                                                                                    )
-                                                                ),
-                                    "get_categories_parent" => array(    "function" =>    "get_categories_parent",
-                                                                "signature" =>    array(    array($xmlrpcArray, $xmlrpcArray)
-                                                                                    )
-                                                                ),
-                                    "get_products" => array(    "function" =>    "get_products",
-                                                                "signature" =>    array(    array($xmlrpcArray, $xmlrpcArray, $xmlrpcInt, $xmlrpcInt, $xmlrpcString)
-                                                                                    )
-                                                                ),                                                                                                                        
-                                    "get_payment_methods" => array(    "function" =>    "get_payment_methods",
-                                                                    "signature" =>    array(    array($xmlrpcArray)
-                                                                                    )
-                                                                ),
-                                    "get_saleorders" => array(    "function" =>    "get_saleorders",
-                                                                "signature" =>    array(    array($xmlrpcArray, $xmlrpcInt ,$xmlrpcArray)
-                                                                                    )
-                                                                ),
-                                    "get_min_products_id" => array( "function" =>    "get_min_products_id",
-                                                                "signature" => array( array($xmlrpcInt)
-                                                                                    )
-                                                                ),
-                                    "get_max_products_id" => array( "function" =>    "get_max_products_id",
-                                                                "signature" => array( array($xmlrpcInt)
-                                                                                    )
-                                                                ),
-                                    "get_min_open_orders" => array(    "function" =>    "get_min_open_orders",
-                                                                "signature" =>    array(    array($xmlrpcInt, $xmlrpcInt)
-                                                                                    )
-                                                                ),
-                                    "set_product_spe" => array(        "function" =>    "set_product_spe",
-                                                                "signature" =>    array(    array($xmlrpcInt, $xmlrpcStruct)
-                                                                                    )
-                                                                ),
-                                    "set_product_classical" => array(        "function" =>    "set_product_classical",
-                                                                "signature" =>    array(    array($xmlrpcInt, $xmlrpcStruct)
-                                                                                    )
-                                                                ),
-                                    "remove_product" => array(        "function" =>    "remove_product",
-                                                                "signature" =>    array(    array($xmlrpcInt, $xmlrpcStruct)
-                                                                                    )
-                                                                ),
-                                    "del_spe_price" => array(        "function" =>    "del_spe_price",
-                                                                "signature" =>    array(    array($xmlrpcInt, $xmlrpcInt)
-                                                                                    )
-                                                                ),
-                                    "update_order_status" => array(        "function" =>    "update_order_status",
-                                                                "signature" =>    array(    array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt, $xmlrpcString, $xmlrpcInt, $xmlrpcInt)
-                                                                                    )
-                                                                ),
-
-                                        "isTransactional" => array(	"function" =>	"isTransactional",
-                                                                        "signature" =>	array(	array($xmlrpcBoolean)
-            )
-        ),
-                                        "setSyncronizedFlag" => array(	"function" =>	"setSyncronizedFlag",
-                                                                        "signature" =>	array(	array($xmlrpcBoolean, $xmlrpcInt)
-            )
-        ),
-                                    "set_product_stock" => array(    "function" =>    "set_product_stock",
-                                                                    "signature" =>    array(    array($xmlrpcInt, $xmlrpcStruct)
-                                                                                    )
-                                                                ),
-                                    "process_order" => array(        "function" =>    "process_order",
-                                                                    "signature" =>    array(    array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt)
-                                                                                    )
-                                                                ),
-                                    "close_open_orders" => array(    "function" =>    "close_open_orders",
-                                                                    "signature" =>    array(    array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt)
-                                                                                    )
-                                                                ),
-                                    "get_customer" => array(    "function" =>    "get_customer",
-                                                                    "signature" =>    array(    array($xmlrpcArray, $xmlrpcInt)
-                                                                                    )
-                                                                )
-
-                                    ), false);
+$server = new xmlrpc_server(array(
+    "init"                  => array("function" => "init"                 ,"signature" => array(array($xmlrpcArray))),
+    "get_taxes"             => array("function" => "get_taxes"            ,"signature" => array(array($xmlrpcArray))),
+    "get_statuses"          => array("function" => "get_statuses"         ,"signature" => array(array($xmlrpcArray))),
+    "get_languages"         => array("function" => "get_languages"        ,"signature" => array(array($xmlrpcArray))),
+    "get_categories"        => array("function" => "get_categories"       ,"signature" => array(array($xmlrpcArray))),
+    "get_categories_parent" => array("function" => "get_categories_parent","signature" => array(array($xmlrpcArray, $xmlrpcArray))),
+    "get_products"          => array("function" => "get_products"         ,"signature" => array(array($xmlrpcArray, $xmlrpcArray, $xmlrpcInt, $xmlrpcInt, $xmlrpcString))),
+    "get_payment_methods"   => array("function" => "get_payment_methods"  ,"signature" => array(array($xmlrpcArray))),
+    "get_saleorders"        => array("function" => "get_saleorders"       ,"signature" => array(array($xmlrpcArray, $xmlrpcInt ,$xmlrpcArray, $xmlrpcInt))),
+    "get_min_products_id"   => array("function" => "get_min_products_id"  ,"signature" => array(array($xmlrpcInt))),
+    "get_max_products_id"   => array("function" => "get_max_products_id"  ,"signature" => array(array($xmlrpcInt))),
+    "get_min_open_orders"   => array("function" => "get_min_open_orders"  ,"signature" => array(array($xmlrpcInt, $xmlrpcInt))),
+    "set_product_spe"       => array("function" => "set_product_spe"      ,"signature" => array(array($xmlrpcInt, $xmlrpcStruct))),
+    "set_product_classical" => array("function" => "set_product_classical","signature" => array(array($xmlrpcInt, $xmlrpcStruct))),
+    "remove_product"        => array("function" => "remove_product"       ,"signature" => array(array($xmlrpcInt, $xmlrpcStruct))),
+    "del_spe_price"         => array("function" => "del_spe_price"        ,"signature" => array(array($xmlrpcInt, $xmlrpcInt))),
+    "update_order_status"   => array("function" => "update_order_status"  ,"signature" => array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt, $xmlrpcString, $xmlrpcInt, $xmlrpcInt))),
+    "isTransactional"       => array("function" => "isTransactional"      ,"signature" => array(array($xmlrpcBoolean))),
+    "setSyncronizedFlag"    => array("function" => "setSyncronizedFlag"   ,"signature" => array(array($xmlrpcBoolean, $xmlrpcInt))),
+    "set_product_stock"     => array("function" => "set_product_stock"    ,"signature" => array(array($xmlrpcInt, $xmlrpcStruct))),
+    "process_order"         => array("function" => "process_order"        ,"signature" => array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt))),
+    "close_open_orders"     => array("function" => "close_open_orders"    ,"signature" => array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt))),
+    "get_customer"          => array("function" => "get_customer"         ,"signature" => array(array($xmlrpcArray, $xmlrpcInt)))
+
+), false);
 $server->functions_parameters_type = 'phpvals';
-$server->response_charset_encoding = RESPONSE_ENCODING;
+//$server->response_charset_encoding = RESPONSE_ENCODING;
 $server->service();
-?>
+include(DIR_WS_INCLUDES."application_bottom.php");
+?>
 \ No newline at end of file
 
=== added file 'esale_osc/connector/openerp_login.php'
--- esale_osc/connector/openerp_login.php	1970-01-01 00:00:00 +0000
+++ esale_osc/connector/openerp_login.php	2010-07-21 10:31:39 +0000
@@ -0,0 +1,41 @@
+<?php
+function login($url,$user,$pass){
+  //GET SESSION COOKIE AND SECURITY TOKEN FOR ZENCART
+  $ch = curl_init();
+  curl_setopt($ch, CURLOPT_URL, $url."login.php");
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+  curl_setopt($ch, CURLOPT_HEADER, 1);
+  curl_setopt($ch, CURLOPT_POST, 0);
+  curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+  curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+  $res = curl_exec ($ch);
+  preg_match("/Set-Cookie\: ([^;]*);/",$res,$cookie);
+  preg_match("/name=\"securityToken\" value=\"([^\"]*)\"/",$res,$sec_token);
+  if($sec_token[1]){
+    $post_fields="admin_name=".$user."&admin_pass=".$pass."&securityToken=".$sec_token[1]."&submit=Login";
+  }else{
+    $post_fields="username=".$user."&password=".$pass;
+  }
+  //LOGIN INTO ADMINISTRATION
+  $header[] = "Content-type: application/x-www-form-urlencoded"; //Important header, won't work if any other content type set
+  $header[] = "Content-length: ".strlen($post_fields);
+  $header[] = "Cookie: ".$cookie[1];
+  $ch = curl_init();
+  curl_setopt($ch, CURLOPT_URL, $url."login.php?action=process&".$cookie[1]);
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+  curl_setopt($ch, CURLOPT_HEADER, 1);
+  curl_setopt($ch, CURLOPT_POST, 1);
+  curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+  curl_setopt($ch, CURLOPT_HTTPHEADER,$header);
+  curl_setopt($ch, CURLOPT_POSTFIELDS,$post_fields);
+  curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+  $res = curl_exec ($ch);
+  preg_match("/Set-Cookie\: ([^;]*);/",$res,$new_cookie);
+  if($new_cookie[1])$cookie[1]=$new_cookie[1];
+  list($ses_name,$sessid)=split('=',$cookie[1]);
+  session_id($sessid);
+  //echo $res;
+}
+?>
 \ No newline at end of file
 
=== added file 'esale_osc/connector/openerp_runonce.php'
--- esale_osc/connector/openerp_runonce.php	1970-01-01 00:00:00 +0000
+++ esale_osc/connector/openerp_runonce.php	2010-07-21 10:31:39 +0000
@@ -0,0 +1,10 @@
+<?php
+if(tep_db_num_rows(tep_db_query('describe '.TABLE_ADDRESS_BOOK.' entry_nif'))==0){
+    tep_db_query('ALTER TABLE '.TABLE_ADDRESS_BOOK.' ADD entry_nif VARCHAR( 32 )');
+}
+if(tep_db_num_rows(tep_db_query('describe '.TABLE_PRODUCTS.' products_syncronized'))==0){
+    tep_db_query('ALTER TABLE '.TABLE_PRODUCTS.' ADD products_syncronized int(1)');
+    tep_db_query('ALTER TABLE '.TABLE_PRODUCTS.' ADD products_last_syncronized datetime');
+}
+unlink(__FILE__);
+?>
 \ No newline at end of file
 
=== modified file 'esale_osc/esale_oscom.py'
--- esale_osc/esale_oscom.py	2010-06-04 15:39:08 +0000
+++ esale_osc/esale_oscom.py	2010-07-21 10:31:39 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -5,6 +6,7 @@
 #    Copyright (c) 2008 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
 #                       Jordi Esteve <[e-mail]>
 #                       Ana Juaristi <[e-mail]>
+#    Copyright (c) 2010 ZhenIT Software (http://ZhenIT.com/).
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -30,24 +32,6 @@
 from mx import DateTime
 from tools.translate import _
 
-
-class esale_oscom_web(osv.osv):
-    _name = 'esale.oscom.web'
-esale_oscom_web()
-
-
-class esale_oscom_tax(osv.osv):
-    _name = "esale.oscom.tax"
-    _description = "esale_oscom Tax"
-    _columns = {
-        'name': fields.char('Tax name', size=32, required=True, readonly=True),
-        'esale_oscom_id': fields.integer('OScommerce Id'),
-        'web_id': fields.many2one('esale.oscom.web', 'Website'),
-        'tax_id': fields.many2one('account.tax', 'OpenERP tax'),
-    }
-esale_oscom_tax()
-
-
 class esale_oscom_status(osv.osv):
     _name = "esale.oscom.status"
     _description = "esale_oscom Status"
@@ -60,86 +44,16 @@
     }
 esale_oscom_status()
 
-
-class esale_oscom_category(osv.osv):
-    _name = "esale.oscom.category"
-    _description = "esale_oscom Category"
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, readonly=True),
-        'esale_oscom_id': fields.integer('OScommerce Id', required=True),
-        'web_id': fields.many2one('esale.oscom.web', 'Website'),
-        'category_id': fields.many2one('product.category', 'OpenERP category'),
-    }
-esale_oscom_category()
-
-
-class esale_oscom_paytype(osv.osv):
-    _name = "esale.oscom.paytype"
-    _description = "esale_oscom PayType"
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, readonly=True),
-        'esale_oscom_id': fields.integer('OScommerce Id', required=True),
-        'web_id': fields.many2one('esale.oscom.web', 'Website'),
-        'payment_id': fields.many2one('payment.type', 'OpenERP payment'),
-        'paytyp': fields.selection([('type1','SO in State Draft'),('type2','SO Confirmed'),('type3','Invoice Draft'),('type4','Invoice Confirmed'),('type5','Invoice Payed')], 'Payment type'),
-        'journal_id': fields.many2one('account.journal', 'OpenERP payment journal'),
-    }
-esale_oscom_paytype()
-
-
-class esale_oscom_language(osv.osv):
-    _name = "esale.oscom.lang"
-    _description = "esale_oscom Language"
-    _columns = {
-        'name': fields.char('Name', size=32, required=True, readonly=True),
-        'esale_oscom_id': fields.integer('OScommerce Id', required=True),
-        'web_id': fields.many2one('esale.oscom.web', 'Website'),
-        'language_id': fields.many2one('res.lang', 'OpenERP language'),
-    }
-esale_oscom_language()
-
-
-class esale_oscom_product(osv.osv):
-    _name = "esale.oscom.product"
-    _description = "esale_oscom Product"
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, readonly=True),
-        'esale_oscom_id': fields.integer('OScommerce product Id'),
-        'web_id': fields.many2one('esale.oscom.web', 'Website'),
-        'product_id': fields.many2one('product.product', 'OpenERP product'),
-    }
-
-    def onchange_product_id(self, cr, uid, ids, product_id, web_id):
-        value = {}
-        if (product_id):
-            product = self.pool.get('product.product').browse(cr, uid, product_id)
-            value['name'] = product.name
-        return {'value': value}
-
-    def unlink(self, cr, uid, ids, context=None):
-        websites = {}
-        for esale_product in self.browse(cr, uid, ids):
-            web_product_ids = websites.get(esale_product.web_id and esale_product.web_id.id)
-            if web_product_ids and len(web_product_ids):
-                web_product_ids.append(esale_product.esale_oscom_id)
-            else:
-                websites[esale_product.web_id and esale_product.web_id.id] = [esale_product.esale_oscom_id]
-        websites_objs = self.pool.get('esale.oscom.web').browse(cr, uid, [x for x in websites.keys() if type(x) is int])
-        for website in websites_objs:
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
-            server.remove_product({'oscom_product_ids':websites.get(website.id)})
-        return super(esale_oscom_product,self).unlink(cr, uid, ids, context)
-esale_oscom_product()
-
-
 class esale_oscom_web(osv.osv):
     _name = "esale.oscom.web"
     _description = "OScommerce Website"
     _columns = {
         'name': fields.char('Name',size=64, required=True),
         'url': fields.char('URL', size=128, required=True),
+        'admin_user': fields.char('Admin User', size=128, required=True),
+        'admin_pass': fields.char('Admin Pass', size=128, required=True),
         'shop_id': fields.many2one('sale.shop', 'Sale shop', required=True),
-#        'partner_anonymous_id': fields.many2one('res.partner', 'Anonymous', required=True),
+        'default_partner_category': fields.many2one('res.partner.category', 'Customers partner category', required=False),        
         'active': fields.boolean('Active'),
         'product_ids': fields.one2many('esale.oscom.product', 'web_id', 'Web products'),
         'language_ids': fields.one2many('esale.oscom.lang', 'web_id', 'Languages'),
@@ -152,13 +66,22 @@
         'date_download_from':fields.date('Date Download From', help="Specify date since you want to download modified or new products"),
         'intermediate': fields.many2one('esale.oscom.status', 'Intermediate Status', help="Select intermediate status for Osc downloaded Orders"), 
         'download_number': fields.integer('Download number', help="Osc product number to download by block. You should find the optimum block to download for your shop"),
+        'override_products_data': fields.boolean('Override Products Data', help="Click if you want to Update products data on the shop with changes made in openerp."),
+        'plataforma': fields.char('Plataforma', size=16),
     }
     _defaults = {
         'active': lambda *a: 1,
-        'price_type': lambda *a:'0',  
+        'plataforma': lambda *a:'osc',
+        'price_type': lambda *a:'0',
+        'override_products_data': lambda *a:True,  
         'download_number': lambda *a:30,
     }
-
+    def create(self, cr, uid, vals, context=None):
+        server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (vals['url'],vals['admin_user'],vals['admin_pass']))
+        init_vals = server.init()
+        vals["plataforma"] = init_vals[0]
+        return super(esale_oscom_web, self).create(cr, uid, vals, context=context)
+    
     def add_all_products(self, cr, uid, ids, *args):
         esale_product_obj = self.pool.get('esale.oscom.product')
         for id in ids:
@@ -176,7 +99,7 @@
     def tax_import(self, cr, uid, ids, *args):
         esale_tax_obj = self.pool.get('esale.oscom.tax')
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             taxes = server.get_taxes()
             for tax in taxes:
                 update_taxes_ids = esale_tax_obj.search(cr, uid, [('web_id','=',website.id), ('esale_oscom_id','=',tax[0])])
@@ -194,7 +117,7 @@
     def status_import(self, cr, uid, ids, *args):
         esale_status_obj = self.pool.get('esale.oscom.status')
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             statuses = server.get_statuses()
             for status in statuses:
                 update_statuses_ids = esale_status_obj.search(cr, uid, [('web_id','=',website.id), ('esale_oscom_id','=',status[0])])
@@ -215,7 +138,7 @@
     def lang_import(self, cr, uid, ids, *args):
         esale_lang_obj = self.pool.get('esale.oscom.lang')
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             languages = server.get_languages()
             for language in languages:
                 update_language_ids = esale_lang_obj.search(cr, uid, [('web_id','=',website.id), ('esale_oscom_id','=',language[0])])
@@ -234,7 +157,7 @@
     def get_payment_methods(self, cr, uid, ids, *args):
         esale_paytype_obj = self.pool.get('esale.oscom.paytype')
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             payment_methods = server.get_payment_methods()
             for payment_method in payment_methods:
                 value={
@@ -254,7 +177,7 @@
         """Imports product categories from OSCommerce"""
         esale_category_obj = self.pool.get('esale.oscom.category')
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             categories = server.get_categories()
             for category in categories:
                 value = {
@@ -277,7 +200,7 @@
 
         created, updated = 0,0
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
 
             # Search OScommerce languages mapped to OpenERP
             osc_langs = [lang.esale_oscom_id for lang in website.language_ids if lang.language_id and lang.language_id.translatable]
@@ -356,6 +279,17 @@
         """If you want create additonal information in OpenERP objects related to product you can redefine this method in your own module"""
         return True
 
+    def get_products_oscom_url(self, cr, uid, website, prod_id,cat_id):
+        website_url = website.url.split("/")
+        prod_url = website_url[0] + "//" + website_url[2] + "/"
+        for x in range(3,len(website_url)-1):
+            prod_url += website_url[x] + "/"
+        if(website.plataforma=='zen'):
+            prod_url += "index.php?page=product_info&cPath=" + cat_id + "&products_id=" + prod_id
+        else:
+            prod_url += "product_info.php?cPath=" + cat_id + "&products_id=" + prod_id
+        return prod_url
+                
 
     def product_import_create(self, cr, uid, ids, *args):
         """Imports products from OSCommerce and creates/updates OpenERP products"""
@@ -367,8 +301,7 @@
 
         created, updated = 0,0
         for website in self.browse(cr, uid, ids):
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
-            website_url = website.url.split("/")
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))         
 
             # Search esale languages mapped to OpenERP
             osc_langs = [lang.esale_oscom_id for lang in website.language_ids if lang.language_id and lang.language_id.translatable]
@@ -457,7 +390,7 @@
                         'spe_price_status': 'status' in spec_prod and str(spec_prod['status']) or False,
                         'spe_price': 'specials_new_products_price' in spec_prod and spec_prod['specials_new_products_price'] or False,
                         'exp_date': 'expires_date' in spec_prod and spec_prod['expires_date']!='0000-00-00 00:00:00' and spec_prod['expires_date'] or False,
-                        'oscom_url': website_url[0] + "//" + website_url[2] + "/" +"product_info.php?cPath=" + str(info_prod['categ_id']) + "&products_id=" + str(info_prod['products_id']),
+                        'oscom_url': self.get_products_oscom_url(cr, uid, website, str(info_prod['products_id']),str(info_prod['categ_id'])),
                         'manufacturer_id': manuf_id or False,
                         #'ean13': info_prod['products_model'],
                         #'type': 'Stockable product',
@@ -560,6 +493,8 @@
                     oscom_id = info_prod['products_id']
                 else:
                     raise osv.except_osv(_('Product import done'),_('New or updated products are not found'))
+            #website.date_download_from = lambda *a:time.strftime('%Y-%m-%d')
+            #website.write(cr, uid, website.id, {'date_download_from':time.strftime('%Y-%m-%d')})
             raise osv.except_osv(_('Product import done'), _('Created: %d products\nUpdated: %d products\n\nRefresh screen to see updates') % (created, updated))
         return True
 
@@ -632,241 +567,328 @@
         website = self.pool.get('esale.oscom.web').browse(cr, uid, website_id)
         osc_int = esale_status_obj.read(cr, uid, website.intermediate.id, ['esale_oscom_id'])
         intermediate = osc_int['esale_oscom_id']
-        #print "intermediate before import", intermediate
-
-        server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
-        cr.execute("select max(esale_oscom_id) from sale_order where esale_oscom_web=%s;" % str(website.id))
-        max_web_id = cr.fetchone()[0]
-
-        min_openorder=-1
-        if max_web_id:
-            saleorders = server.get_saleorders(max_web_id, statuses_ids)
-            min_openorder = server.get_min_open_orders(max_web_id)
-        else:
-            saleorders = server.get_saleorders(0, statuses_ids)
+
+        server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
+        exists_more_packages = True
         no_of_so = 0
-        for saleorder in saleorders:
+        while exists_more_packages:
+            cr.execute("select max(esale_oscom_id) from sale_order where esale_oscom_web=%s;" % str(website.id))
+            max_web_id = cr.fetchone()[0]
+
+            min_openorder=-1
+            if max_web_id:
+                saleorders = server.get_saleorders(max_web_id, statuses_ids,website.download_number)
+                min_openorder = server.get_min_open_orders(max_web_id)
+            else:
+                saleorders = server.get_saleorders(0, statuses_ids,website.download_number)
+            if len(saleorders) != website.download_number:
+                exists_more_packages = False
+            for saleorder in saleorders:
             #print "==========*********NEW**************==========="
             #print "== Oscommerce Sale Order Number :", saleorder['id']
             #print "PEDIDO VENTA: " , saleorder
-            if len(saleorder['partner']) > 0 :
-                oscom_partner = saleorder['partner'][0]
-                #print "== Sale order partner:", saleorder['partner'][0]
-            partner_ids = partner_obj.search(cr, uid, [('esale_oscom_id','=',oscom_partner['esale_oscom_id'])])
-            if len(partner_ids):
-                partner_id = partner_ids[0]
-                #print "partner: ", partner_ids
-                partner_obj.write(cr, uid, partner_ids, {'name':oscom_partner['name']})
-            else:
-                del oscom_partner['addresses']
-                partner_id = partner_obj.create(cr, uid, oscom_partner)
-                partner_obj.write(cr, uid, partner_ids, {'ref':oscom_partner['esale_oscom_id']})
-
-            self.customer_extra_info(cr, uid, website, partner_id, oscom_partner['esale_oscom_id']) # Creates additonal information in OpenERP objects related to customer
-
-            # Default address is right on Website so we create the order.
-            if len(saleorder['address']) > 0 :
-                #print ""
-                #print "===Sale order default address:",saleorder['address'][0]
-                default_address = saleorder['address'][0]
-                del saleorder['address']
-                default_address['type'] = 'default'
-                default_address_id = _add_address(self, cr, uid, default_address.copy(), partner_id, context)
-                shipping_address = []
-                if len(saleorder['delivery']) > 0 :
-                    #print ""
-                    #print "===Sale order Delivery:",saleorder['delivery'][0]
-                    shipping_address = saleorder['delivery'][0]
-                    del saleorder['delivery']
-                    shipping_address['type'] = 'delivery'
-                    shipping_address_id = _add_address(self, cr, uid, shipping_address.copy(), partner_id, context)
-                billing_address = []
-                if len(saleorder['billing']) > 0 :
-                    #print ""
-                    #print "===Sale order Billing:",saleorder['billing'][0]
-                    billing_address = saleorder['billing'][0]
-                    del saleorder['billing']
-                    billing_address['type'] = 'invoice'
-                    billing_address_id = _add_address(self, cr, uid, billing_address.copy(),partner_id, context)
-
-                value={ 'esale_oscom_web': website.id,
-                        'esale_oscom_id' : saleorder['id'],
-                        'shop_id'        : website.shop_id.id,
-                        'partner_id'     : partner_id,
-                        'note'           : saleorder['note'],
-                        'pay_met_title'  : saleorder['pay_met_title'],
-                        'shipping_title' : saleorder['shipping_title'],
-                        'orders_status'  : saleorder['orders_status'],
-                        'date_order'     : saleorder['date'],
-                        #'price_type'    : saleorder['price_type']
-                    }
-
-                value.update(saleorder_obj.onchange_shop_id(cr, uid, [], value['shop_id'])['value'])
-                value.update(saleorder_obj.onchange_partner_id(cr, uid, [], value['partner_id'])['value'])
-        #        address_obj = self.pool.get('res.partner.address')
-        #        for address in [('address','order'), ('billing', 'invoice'), ('delivery', 'shipping')]:
-        #            criteria = [('partner_id', '=', website.partner_anonymous_id.id)]
-        #            insert = {'partner_id': website.partner_anonymous_id.id}
-        #            for criterium in [('city', 'city'), ('name', 'name'), ('zip','zip'), ('address', 'street') ]:
-        #                criteria.append((criterium[1], 'like', saleorder[address[0]][criterium[0]]))
-        #                insert[criterium[1]] = saleorder[address[0]][criterium[0]]
-        #            address_ids = address_obj.search(cr, uid, criteria)
-        #            if len(address_ids):
-        #                id = address_ids[0]
-        #            else:
-        #                country_ids = self.pool.get('res.country').search(cr, uid, [('name', 'ilike', saleorder[address[0]]['country'])])
-        #                if len(country_ids):
-        #                    country_id = country_ids[0]
-        #                else:
-        #                    country_id = self.pool.get('res.country').create(cr, uid, { 'name' : saleorder[address[0]]['country'],
-        #                                                                              'code' : saleorder[address[0]]['country'][0:2].lower()})
-        #                insert['country_id'] = country_id
-        #                if address[0] == 'address':
-        #                    insert['email'] = saleorder['address']['email']
-        #                id = address_obj.create(cr, uid, insert)
-        #
-        #            value.update({'partner_%s_id' % address[1]: id})
-                value['partner_order_id'] = default_address_id
-                if len(shipping_address) > 0 :
-                    value['partner_shipping_id'] = shipping_address_id
-                else:
-                    value['partner_shipping_id'] =  default_address_id
-
-                if len(billing_address) > 0 :
-                    value['partner_invoice_id'] = billing_address_id
-                else:
-                    value['partner_invoice_id'] =  default_address_id
-                order_id = saleorder_obj.create(cr, uid, value)
-                order_id_obj = saleorder_obj.browse(cr, uid, order_id)
-                concat_cod = self.sale_order_code(order_id_obj)
-                saleorder_obj.write(cr, uid, order_id, {'name':concat_cod})
- 
-                for orderline in saleorder['lines']:
-                    ids = esale_product_obj.search(cr, uid, [('esale_oscom_id', '=', orderline['product_id']), ('web_id', '=', website.id)])
-                    if len(ids):
-                        oscom_product_id = ids[0]
-                        oscom_product = esale_product_obj.browse(cr, uid, oscom_product_id)
-                        product_id = oscom_product.product_id.id                        
-                        #print "producto oscommerce encontrado:", product_id
-                    else:
-                        product_id = product_obj.search(cr, uid, [('name','=','Shipping Cost')])[0]                            
-                    # if product comes with attributes, we will try to find the exact product variant
-                    #print "tratando linea" , orderline
-                    attributes = (orderline.has_key('attributes') and orderline['attributes']) or False
-                    if attributes:
-                        #print orderline['attributes']
-                        #print "codigo producto", attributes['composed_code']
-                        ids = product_obj.search(cr, uid, [('default_code', '=', attributes['composed_code']),('variants', '=', attributes['products_options_values'])])
+                if len(saleorder['partner']) > 0 :
+                    oscom_partner = saleorder['partner'][0]
+                    #print "== Sale order partner:", saleorder['partner'][0]
+                partner_ids = partner_obj.search(cr, uid, [('esale_oscom_id','=',oscom_partner['esale_oscom_id'])])
+                if len(partner_ids):
+                    partner_id = partner_ids[0]
+                    #print "partner: ", partner_ids
+                    partner_obj.write(cr, uid, partner_ids, {'name':oscom_partner['name']})
+                else:
+                    del oscom_partner['addresses']
+                    partner_id = partner_obj.create(cr, uid, oscom_partner)
+                    partner_obj.write(cr, uid, partner_ids, {'ref':oscom_partner['esale_oscom_id']})
+                    cr.execute("INSERT INTO res_partner_category_rel(partner_id, category_id) VALUES (%d,%d);" % (partner_id,(website.default_partner_category)['id']))
+    
+                self.customer_extra_info(cr, uid, website, partner_id, oscom_partner['esale_oscom_id']) # Creates additonal information in OpenERP objects related to customer
+    
+                # Default address is right on Website so we create the order.
+                if len(saleorder['address']) > 0 :
+                    #print ""
+                    #print "===Sale order default address:",saleorder['address'][0]
+                    default_address = saleorder['address'][0]
+                    del saleorder['address']
+                    default_address['type'] = 'default'
+                    default_address_id = _add_address(self, cr, uid, default_address.copy(), partner_id, context)
+                    shipping_address = []
+                    if len(saleorder['delivery']) > 0 :
+                        #print ""
+                        #print "===Sale order Delivery:",saleorder['delivery'][0]
+                        shipping_address = saleorder['delivery'][0]
+                        del saleorder['delivery']
+                        shipping_address['type'] = 'delivery'
+                        shipping_address_id = _add_address(self, cr, uid, shipping_address.copy(), partner_id, context)
+                    billing_address = []
+                    if len(saleorder['billing']) > 0 :
+                        #print ""
+                        #print "===Sale order Billing:",saleorder['billing'][0]
+                        billing_address = saleorder['billing'][0]
+                        del saleorder['billing']
+                        billing_address['type'] = 'invoice'
+                        billing_address_id = _add_address(self, cr, uid, billing_address.copy(),partner_id, context)
+    
+                    value={ 'esale_oscom_web': website.id,
+                            'esale_oscom_id' : saleorder['id'],
+                            'shop_id'        : website.shop_id.id,
+                            'partner_id'     : partner_id,
+                            'note'           : saleorder['note'],
+                            'pay_met_title'  : saleorder['pay_met_title'],
+                            'shipping_title' : saleorder['shipping_title'],
+                            'orders_status'  : saleorder['orders_status'],
+                            'date_order'     : saleorder['date'],
+                            #'price_type'    : saleorder['price_type']
+                        }
+    
+                    value.update(saleorder_obj.onchange_shop_id(cr, uid, [], value['shop_id'])['value'])
+                    value.update(saleorder_obj.onchange_partner_id(cr, uid, [], value['partner_id'])['value'])
+            #        address_obj = self.pool.get('res.partner.address')
+            #        for address in [('address','order'), ('billing', 'invoice'), ('delivery', 'shipping')]:
+            #            criteria = [('partner_id', '=', website.partner_anonymous_id.id)]
+            #            insert = {'partner_id': website.partner_anonymous_id.id}
+            #            for criterium in [('city', 'city'), ('name', 'name'), ('zip','zip'), ('address', 'street') ]:
+            #                criteria.append((criterium[1], 'like', saleorder[address[0]][criterium[0]]))
+            #                insert[criterium[1]] = saleorder[address[0]][criterium[0]]
+            #            address_ids = address_obj.search(cr, uid, criteria)
+            #            if len(address_ids):
+            #                id = address_ids[0]
+            #            else:
+            #                country_ids = self.pool.get('res.country').search(cr, uid, [('name', 'ilike', saleorder[address[0]]['country'])])
+            #                if len(country_ids):
+            #                    country_id = country_ids[0]
+            #                else:
+            #                    country_id = self.pool.get('res.country').create(cr, uid, { 'name' : saleorder[address[0]]['country'],
+            #                                                                              'code' : saleorder[address[0]]['country'][0:2].lower()})
+            #                insert['country_id'] = country_id
+            #                if address[0] == 'address':
+            #                    insert['email'] = saleorder['address']['email']
+            #                id = address_obj.create(cr, uid, insert)
+            #
+            #            value.update({'partner_%s_id' % address[1]: id})
+                    value['partner_order_id'] = default_address_id
+                    if len(shipping_address) > 0 :
+                        value['partner_shipping_id'] = shipping_address_id
+                    else:
+                        value['partner_shipping_id'] =  default_address_id
+    
+                    if len(billing_address) > 0 :
+                        value['partner_invoice_id'] = billing_address_id
+                    else:
+                        value['partner_invoice_id'] =  default_address_id
+                    order_id = saleorder_obj.create(cr, uid, value)
+                    order_id_obj = saleorder_obj.browse(cr, uid, order_id)
+                    concat_cod = self.sale_order_code(order_id_obj)
+                    saleorder_obj.write(cr, uid, order_id, {'name':concat_cod})
+     
+                    for orderline in saleorder['lines']:
+                        ids = esale_product_obj.search(cr, uid, [('esale_oscom_id', '=', orderline['product_id']), ('web_id', '=', website.id)])
                         if len(ids):
-                            #print "producto con atributos encontrado:", ids
-                            product_id = ids[0]
-
-                    linevalue = {
-                        'product_id'     : product_id,
-                        'product_uom_qty': orderline['product_qty'],
-                        'order_id'       : order_id,
-                    }
-                    onchange_product_sol = saleorder_line_obj.product_id_change(cr, uid, [], value['pricelist_id'], linevalue['product_id'], linevalue['product_uom_qty'],False, 0, False, '', value['partner_id'])['value']
-                    onchange_product_sol['tax_id'] = False
-                    if orderline['tax_rate'] > 0.0000:
-                        tax_rate_search_ids = tax_obj.search(cr, uid, [('tax_group','=','vat'),('amount','=',orderline['tax_rate']/100), ('type_tax_use', '=','sale')])
-                    else:
-                        tax_rate_search_ids = tax_obj.search(cr, uid, [('tax_group','=','vat'),('amount','=',0), ('type_tax_use', '=','sale')])
-                    if tax_rate_search_ids:
-                        onchange_product_sol['tax_id'] = tax_rate_search_ids
-                    price = orderline['price']
-                    name = orderline['name']                      
-                    if saleorder['price_type'] == 'tax_excluded' and attributes:
-                        # print "EVALUANDO PRECIOS ATRIBUTOS: ", str(price)
-                        # print "prefix: ", attributes['price_prefix']
-                        # print "EVALUANDO PRECIOS ATRIBUTOS2: ", str(attributes['options_values_price'])
-                        price = eval(str(price) + attributes['price_prefix'] + str(attributes['options_values_price']))
-                        name = name + ' ' + attributes['products_options'] + ' + ' + attributes['products_options_values']
-                    elif saleorder['price_type'] == 'tax_included':
-                        price = price * (1+orderline['tax_rate']/100)
+                            oscom_product_id = ids[0]
+                            oscom_product = esale_product_obj.browse(cr, uid, oscom_product_id)
+                            product_id = oscom_product.product_id.id                        
+                            #print "producto oscommerce encontrado:", product_id
+                        else:
+                            #raise osv.except_osv(_('Ordered product not found in OpenErp'), _('Default product named \'Shipping Cost\' will be used.\nIn case it doesn\'t exist, please create it'))
+                            product_id = product_obj.search(cr, uid, [('name','=','Shipping Cost')])[0]                            
+                        # if product comes with attributes, we will try to find the exact product variant
+                        #print "tratando linea" , orderline
+                        attributes = (orderline.has_key('attributes') and orderline['attributes']) or False
                         if attributes:
-                            options_value_price = attributes['options_values_price']
-                            cal_options_value_price = options_value_price * (1+orderline['tax_rate']/100)
-                            price = eval(str(price) + attributes['price_prefix'] + str(cal_options_value_price))
+                            #print orderline['attributes']
+                            #print "codigo producto", attributes['composed_code']
+                            ids = product_obj.search(cr, uid, [('default_code', '=', attributes['composed_code']),('variants', '=', attributes['products_options_values'])])
+                            if len(ids):
+                                #print "producto con atributos encontrado:", ids
+                                product_id = ids[0]
+    
+                        linevalue = {
+                            'product_id'     : product_id,
+                            'product_uom_qty': orderline['product_qty'],
+                            'order_id'       : order_id,
+                        }
+                        onchange_product_sol = saleorder_line_obj.product_id_change(cr, uid, [], value['pricelist_id'], linevalue['product_id'], linevalue['product_uom_qty'],False, 0, False, '', value['partner_id'])['value']
+                        onchange_product_sol['tax_id'] = False
+                        if orderline['tax_rate'] > 0.0000:
+                            tax_rate_search_ids = tax_obj.search(cr, uid, [('tax_group','=','vat'),('amount','=',orderline['tax_rate']/100), ('type_tax_use', '=','sale')])
+                        else:
+                            tax_rate_search_ids = tax_obj.search(cr, uid, [('tax_group','=','vat'),('amount','=',0), ('type_tax_use', '=','sale')])
+                        if tax_rate_search_ids:
+                            onchange_product_sol['tax_id'] = tax_rate_search_ids
+                        price = orderline['price']
+                        name = orderline['name']                      
+                        if saleorder['price_type'] == 'tax_excluded' and attributes:
+                            # print "EVALUANDO PRECIOS ATRIBUTOS: ", str(price)
+                            # print "prefix: ", attributes['price_prefix']
+                            # print "EVALUANDO PRECIOS ATRIBUTOS2: ", str(attributes['options_values_price'])
+                            price = eval(str(price) + attributes['price_prefix'] + str(attributes['options_values_price']))
                             name = name + ' ' + attributes['products_options'] + ' + ' + attributes['products_options_values']
-                    onchange_product_sol['price_unit'] = round(price,2)
-                    linevalue.update(onchange_product_sol)
-                    linevalue.update(saleorder_line_obj.default_get(cr, uid, ['sequence', 'invoiced', 'state', 'product_packaging']))
-                    linevalue['name'] = name
-                    if linevalue.get('weight',False):
-                        del linevalue['weight']
-                    linevalue["product_uos"] = linevalue['product_uos'] and linevalue['product_uos'][0]
-                    tax_id = linevalue['tax_id'] and linevalue['tax_id'][0]
-                    del linevalue['tax_id']
-                    ptax_id = [tax_id]
-                    id_orderline = saleorder_line_obj.create(cr, uid, linevalue)
-                    saleorder_line_obj.write(cr, uid, [id_orderline], {'tax_id':[(6, 0, ptax_id)]})
-                no_of_so +=1
-
-                ######################################################################################
-                oscom_pay_met = saleorder['pay_met']
-                typ_ids = esale_paytype_obj.search(cr, uid, [('esale_oscom_id', '=', oscom_pay_met), ('web_id', '=', website.id)])
-                saleorder = saleorder_obj.browse(cr, uid, order_id)
-                if typ_ids:
-                    typ_data = esale_paytype_obj.browse(cr, uid, typ_ids)[0]
-                    paytype = typ_data.paytyp
-                    cr.execute('select * from ir_module_module where name=%s and state=%s', ('sale_payment','installed'))
-                    if cr.fetchone():
-                        saleorder_obj.write(cr, uid, [order_id], {'payment_type': typ_data.payment_id.id})
-                else:
-                    paytype = 'type1'
-                wf_service = netsvc.LocalService("workflow")
-                if paytype == 'type1':
-                    #SO in state draft so nothing
-                    pass
-                elif paytype == 'type2':
-                    #SO in state confirmed
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
-                elif paytype == 'type3':
-                    #INVOICE draft
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
-                elif paytype == 'type4':
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
-                    inv_ids = inv_obj.search(cr, uid, [('origin','=',saleorder.name)])
-                    inv_obj.button_compute(cr, uid, inv_ids)
-                    wf_service.trg_validate(uid, 'account.invoice',inv_ids[0], 'invoice_open', cr)
-                elif paytype == 'type5':
-                    #INVOICE payed
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
-                    wf_service.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
-                    pay_account_id = (website.esale_account_id)['id']
-                    pay_journal_id = typ_data.journal_id.id
-                    inv_ids = inv_obj.search(cr, uid, [('origin','=',saleorder.name)])
-                    inv_obj.button_compute(cr, uid, inv_ids)
-                    wf_service.trg_validate(uid, 'account.invoice',inv_ids[0], 'invoice_open', cr)
-                    ids = self.pool.get('account.period').find(cr, uid, context=context)
-                    period_id = False
-                    if len(ids):
-                        period_id = ids[0]
-
-                    invoice = inv_obj.browse(cr, uid,inv_ids[0],{})
-                    company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
-                    if invoice.currency_id.id != company_currency:
-                        amount = round(self.pool.get('res.currency').compute(cr, uid, invoice.currency_id.id, company_currency, invoice.amount_total), 2)
-                    else:
-                        amount = invoice.amount_total
-
-                    inv_obj.pay_and_reconcile(cr, uid, inv_ids, amount, pay_account_id, period_id, pay_journal_id, False, False, False, context={})
-                else:
-                    #The payment method hasn't been mapped
-                    pass
-            cr.commit()
-        for saleorder in saleorders:
-            #print "website.intermediate: " , intermediate
-            server.update_order_status(saleorder['id'], intermediate, '',0,0)
+                        elif saleorder['price_type'] == 'tax_included':
+                            price = price * (1+orderline['tax_rate']/100)
+                            if attributes:
+                                options_value_price = attributes['options_values_price']
+                                cal_options_value_price = options_value_price * (1+orderline['tax_rate']/100)
+                                price = eval(str(price) + attributes['price_prefix'] + str(cal_options_value_price))
+                                name = name + ' ' + attributes['products_options'] + ' + ' + attributes['products_options_values']
+                        onchange_product_sol['price_unit'] = round(price,2)
+                        linevalue.update(onchange_product_sol)
+                        linevalue.update(saleorder_line_obj.default_get(cr, uid, ['sequence', 'invoiced', 'state', 'product_packaging']))
+                        linevalue['name'] = name
+                        if linevalue.get('weight',False):
+                            del linevalue['weight']
+                        linevalue["product_uos"] = linevalue['product_uos'] and linevalue['product_uos'][0]
+                        tax_id = linevalue['tax_id'] and linevalue['tax_id'][0]
+                        del linevalue['tax_id']
+                        if tax_id:
+                          ptax_id = [tax_id]
+                          id_orderline = saleorder_line_obj.create(cr, uid, linevalue)
+                          saleorder_line_obj.write(cr, uid, [id_orderline], {'tax_id':[(6, 0, ptax_id)]})
+                    no_of_so +=1
+    
+                    ######################################################################################
+                    oscom_pay_met = saleorder['pay_met']
+                    typ_ids = esale_paytype_obj.search(cr, uid, [('esale_oscom_id', '=', oscom_pay_met), ('web_id', '=', website.id)])
+                    saleorder = saleorder_obj.browse(cr, uid, order_id)
+                    if typ_ids:
+                        typ_data = esale_paytype_obj.browse(cr, uid, typ_ids)[0]
+                        paytype = typ_data.paytyp
+                        cr.execute('select * from ir_module_module where name=%s and state=%s', ('sale_payment','installed'))
+                        if cr.fetchone():
+                            saleorder_obj.write(cr, uid, [order_id], {'payment_type': typ_data.payment_id.id})
+                    else:
+                        paytype = 'type1'
+                    wf_service = netsvc.LocalService("workflow")
+                    if paytype == 'type1':
+                        #SO in state draft so nothing
+                        pass
+                    elif paytype == 'type2':
+                        #SO in state confirmed
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
+                    elif paytype == 'type3':
+                        #INVOICE draft
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
+                    elif paytype == 'type4':
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
+                        inv_ids = inv_obj.search(cr, uid, [('origin','=',saleorder.name)])
+                        inv_obj.button_compute(cr, uid, inv_ids)
+                        wf_service.trg_validate(uid, 'account.invoice',inv_ids[0], 'invoice_open', cr)
+                    elif paytype == 'type5':
+                        #INVOICE payed
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
+                        wf_service.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
+                        pay_account_id = (website.esale_account_id)['id']
+                        pay_journal_id = typ_data.journal_id.id
+                        inv_ids = inv_obj.search(cr, uid, [('origin','=',saleorder.name)])
+                        inv_obj.button_compute(cr, uid, inv_ids)
+                        wf_service.trg_validate(uid, 'account.invoice',inv_ids[0], 'invoice_open', cr)
+                        ids = self.pool.get('account.period').find(cr, uid, context=context)
+                        period_id = False
+                        if len(ids):
+                            period_id = ids[0]
+    
+                        invoice = inv_obj.browse(cr, uid,inv_ids[0],{})
+                        company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+                        if invoice.currency_id.id != company_currency:
+                            amount = round(self.pool.get('res.currency').compute(cr, uid, invoice.currency_id.id, company_currency, invoice.amount_total), 2)
+                        else:
+                            amount = invoice.amount_total
+    
+                        inv_obj.pay_and_reconcile(cr, uid, inv_ids, amount, pay_account_id, period_id, pay_journal_id, False, False, False, context={})
+                    else:
+                        #The payment method hasn't been mapped
+                        pass
+                cr.commit()
+            for saleorder in saleorders:
+                #print "website.intermediate: " , intermediate
+                server.update_order_status(saleorder['id'], intermediate, '',0,0)
+            
 
         ###################### look for open orders in site that are 'done' in TinyERP ###################
         ######################                and close them                           ###################
         return no_of_so
 esale_oscom_web()
 
+class esale_oscom_tax(osv.osv):
+    _name = "esale.oscom.tax"
+    _description = "esale_oscom Tax"
+    _columns = {
+        'name': fields.char('Tax name', size=32, required=True, readonly=True),
+        'esale_oscom_id': fields.integer('OScommerce Id'),
+        'web_id': fields.many2one('esale.oscom.web', 'Website'),
+        'tax_id': fields.many2one('account.tax', 'OpenERP tax'),
+    }
+esale_oscom_tax()
+
+class esale_oscom_category(osv.osv):
+    _name = "esale.oscom.category"
+    _description = "esale_oscom Category"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, readonly=True),
+        'esale_oscom_id': fields.integer('OScommerce Id', required=True),
+        'web_id': fields.many2one('esale.oscom.web', 'Website'),
+        'category_id': fields.many2one('product.category', 'OpenERP category'),
+    }
+esale_oscom_category()
+
+class esale_oscom_paytype(osv.osv):
+    _name = "esale.oscom.paytype"
+    _description = "esale_oscom PayType"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, readonly=True),
+        'esale_oscom_id': fields.integer('OScommerce Id', required=True),
+        'web_id': fields.many2one('esale.oscom.web', 'Website'),
+        'payment_id': fields.many2one('payment.type', 'OpenERP payment'),
+        'paytyp': fields.selection([('type1','SO in State Draft'),('type2','SO Confirmed'),('type3','Invoice Draft'),('type4','Invoice Confirmed'),('type5','Invoice Payed')], 'Payment type'),
+        'journal_id': fields.many2one('account.journal', 'OpenERP payment journal'),
+    }
+esale_oscom_paytype()
+
+
+class esale_oscom_language(osv.osv):
+    _name = "esale.oscom.lang"
+    _description = "esale_oscom Language"
+    _columns = {
+        'name': fields.char('Name', size=32, required=True, readonly=True),
+        'esale_oscom_id': fields.integer('OScommerce Id', required=True),
+        'web_id': fields.many2one('esale.oscom.web', 'Website'),
+        'language_id': fields.many2one('res.lang', 'OpenERP language'),
+    }
+esale_oscom_language()
+
+
+class esale_oscom_product(osv.osv):
+    _name = "esale.oscom.product"
+    _description = "esale_oscom Product"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, readonly=True),
+        'esale_oscom_id': fields.integer('OScommerce product Id'),
+        'web_id': fields.many2one('esale.oscom.web', 'Website'),
+        'product_id': fields.many2one('product.product', 'OpenERP product'),
+    }
+
+    def onchange_product_id(self, cr, uid, ids, product_id, web_id):
+        value = {}
+        if (product_id):
+            product = self.pool.get('product.product').browse(cr, uid, product_id)
+            value['name'] = product.name
+        return {'value': value}
+
+    def unlink(self, cr, uid, ids, context=None):
+        websites = {}
+        for esale_product in self.browse(cr, uid, ids):
+            web_product_ids = websites.get(esale_product.web_id and esale_product.web_id.id)
+            if web_product_ids and len(web_product_ids):
+                web_product_ids.append(esale_product.esale_oscom_id)
+            else:
+                websites[esale_product.web_id and esale_product.web_id.id] = [esale_product.esale_oscom_id]
+        websites_objs = self.pool.get('esale.oscom.web').browse(cr, uid, [x for x in websites.keys() if type(x) is int])
+        for website in websites_objs:
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
+            server.remove_product({'oscom_product_ids':websites.get(website.id)})
+        return super(esale_oscom_product,self).unlink(cr, uid, ids, context)
+esale_oscom_product()
+
 
 class esale_oscom_saleorder_line(osv.osv):
     def _amount_line_net(self, cr, uid, ids, field_name, arg, context):
@@ -925,7 +947,7 @@
         value={}
         if esale_oscom_web:
             website = self.pool.get('esale.oscom.web').browse(cr, uid, esale_oscom_web)
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             esale_status_obj = self.pool.get('esale.oscom.status')
             osc_int = esale_status_obj.read(cr, uid, orders_status_id, ['esale_oscom_id'])
             ostatus_id = osc_int['esale_oscom_id'] 
@@ -1022,4 +1044,4 @@
     _columns = {
         'esale_oscom_id': fields.integer('OScommerce Id'),
     }
-esale_oscom_partner_address()
+esale_oscom_partner_address()
 \ No newline at end of file
 
=== modified file 'esale_osc/esale_oscom_product.py'
--- esale_osc/esale_oscom_product.py	2010-02-02 20:22:20 +0000
+++ esale_osc/esale_oscom_product.py	2010-07-21 10:31:39 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -18,9 +19,9 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
+#
+##############################################################################
+
 from osv import fields,osv,orm
 import xmlrpclib
 from tools.translate import _
@@ -203,8 +204,10 @@
         websites_objs = esale_web_obj.browse(cr, uid, websites.keys())
         #print websites_objs
         for website in websites_objs:
+            if not website.override_products_data:
+                continue
             # print "%s/openerp-synchro.php" % website.url
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             website_url = website.url.split("/")
 
             # Pricelist of the web shop
@@ -351,7 +354,7 @@
                 esale_prod_ids = esale_product_obj.search(cr, uid, [('esale_oscom_id','=',oscom_id)])
                 esale_prod = esale_product_obj.browse(cr, uid, esale_prod_ids[0])
                 #print "ESALE PROD DATA (id, web, product, category):",esale_prod.id, esale_prod.web_id.id, esale_prod.product_id.id, esale_prod.product_id.categ_id.id
-                prod_url = website_url[0] + "//" + website_url[2] + "/" +"product_info.php?cPath=" + str(category_id) + "&products_id=" + str(oscom_id)
+                prod_url = website.get_products_oscom_url(cr, uid, website, str(oscom_id),str(category_id)),
                 super(esale_oscom_product_inherit, self).write(cr, uid, esale_prod.product_id.id, {'oscom_url': prod_url})
 
             # Remove delete products
@@ -382,7 +385,7 @@
         else:
             websites_objs.append(website)
         for website in websites_objs:
-            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php" % website.url)
+            server = xmlrpclib.ServerProxy("%s/openerp-synchro.php?admin_user=%s&admin_pass=%s" % (website.url,website.admin_user,website.admin_pass))
             if not product_ids:
                 esale_products = website.product_ids
             else:
@@ -394,7 +397,10 @@
                     'quantity': product_obj._product_available(cr, uid, [esale_product.product_id.id], ['virtual_available'], False, {'shop':website.shop_id.id})[esale_product.product_id.id]['virtual_available']
                 }
                 oscom_id = server.set_product_stock(webproduct)
-
+                if(int(webproduct['quantity'])>0):
+                    product_obj.write(cr, uid, [esale_product.product_id.id], {'in_out_stock':'1'})
+                else:
+                    product_obj.write(cr, uid, [esale_product.product_id.id], {'in_out_stock':'0'})
         return {}
 
 ##    def on_change_gross_price(self, cr, uid, ids, list_price):
 
=== modified file 'esale_osc/esale_oscom_view.xml'
--- esale_osc/esale_oscom_view.xml	2010-02-20 13:12:01 +0000
+++ esale_osc/esale_oscom_view.xml	2010-07-21 10:31:39 +0000
@@ -1,385 +1,388 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-	<menuitem name="Sales Management/Internet Sales" id="menu_esale_oscom_root"/>
-
-	<record model="ir.ui.view" id="view_esale_oscom_form">
-		<field name="name">esale.oscom.web.form</field>
-		<field name="model">esale.oscom.web</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="OScommerce Web Shop">
-				<notebook>
-					<page string="General Informations">
-						<separator string="esale_oscom Shop Info" colspan="4"/>
-						<field name="name" select="1" colspan="4"/>
-						<field name="url" widget="url" required="1"/>
-						<field name="active" select="1"/>
-						<field name="shop_id" select="1" required="1"/>
-						<!--<field name="partner_anonymous_id" required="1"/>-->
-						<field name="price_type"/>
-						<field name="esale_account_id"/>
-						<newline/>
-						<label string="Proceed with the mappings before adding products!" colspan="2"/>
-						<field name="date_download_from"/>
-						<field name="download_number"/>
-						<button name="product_import_create" string="Import all products from OSCommerce" colspan="2" type="object"/>
-						<separator string="Active Products" colspan="4"/>
-						<field name="product_ids" colspan="4" widget="one2many_list" nolabel="1" readonly="1"/>
-					</page>
-					<page string="Taxes Mapping">
-						<button type="object" string="Import Taxes" name="tax_import"/>
-						<field colspan="4" name="tax_ids" widget="one2many_list" nolabel="1"/>
-					</page>
-					<page string="Languages Mapping">
-						<button type="object" string="Import Languages" name="lang_import"/>
-						<field colspan="4" name="language_ids" widget="one2many_list" nolabel="1"/>
-					</page>
-					<page string="Categories Mapping">
-						<button type="object" string="Import Categories" name="category_import"/>
-						<button type="object" string="Import and create/update Categories" name="category_import_create"/>
-						<field colspan="4" name="category_ids" widget="one2many_list" nolabel="1"/>
-					</page>
-					<page string="Payment types Mapping">
-						<button type="object" string="Import Payment Methods" name="get_payment_methods"/>
-						<field colspan="4" name="pay_typ_ids" widget="one2many_list" nolabel="1"/>
-					</page>
-					<page string="Oscommerce Status Mapping">
-						<button type="object" string="Import Oscommerce Status" name="status_import" colspan="4"/>
-						<separator string="Status" colspan="4"/>
-						<field name="intermediate"/>
-						<field colspan="4" name="status_ids" widget="one2many_list" nolabel="1"/>
-					</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_esale_oscom_tree">
-		<field name="name">esale.oscom.web.form</field>
-		<field name="model">esale.oscom.web</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="OScommerce Web Shop">
-				<field name="name"/>
-				<field name="url"/>
-				<field name="active"/>
-				<field name="shop_id"/>
-				<field name="price_type"/>
-				<field name="esale_account_id"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_esale_oscom_form">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">esale.oscom.web</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="view_esale_oscom_tree"/>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Websites" id="menu_action_esale_oscom_web" action="action_esale_oscom_form" groups="group_esale_oscom_user"/>
-
-	<record model="ir.ui.view" id="esale_oscom_language_web_form">
-		<field name="name">esale.oscom.language.web.form</field>
-		<field name="model">esale.oscom.lang</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Language">
-				<separator colspan="4" string="Language mapping"/>
-				<field colspan="4" name="name" select="1" required="1"/>
-				<field name="language_id" select="1"/>
-				<field name="esale_oscom_id" readonly="1" select="1"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_language_web_tree">
-		<field name="name">esale.oscom.language.web.tree</field>
-		<field name="model">esale.oscom.lang</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Language">
-				<field name="name" />
-				<field name="language_id" />
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_tax_web_form">
-		<field name="name">esale.oscom.tax.web.form</field>
-		<field name="model">esale.oscom.tax</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Taxes">
-				<separator colspan="4" string="Taxes mapping"/>
-				<field colspan="4" name="name" select="1" required="1"/>
-				<field name="tax_id" select="1"/>
-				<field name="esale_oscom_id" readonly="1" select="1"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_tax_web_tree">
-		<field name="name">esale.oscom.tax.web.tree</field>
-		<field name="model">esale.oscom.tax</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Taxes">
-				<field name="name" />
-				<field name="tax_id" />
-			</tree>
-		</field>
-	</record>
-
-<!-- ####################################################################################### -->
-	<record model="ir.ui.view" id="esale_oscom_pay_typ_form">
-		<field name="name">esale.oscom.pay.typ.form</field>
-		<field name="model">esale.oscom.paytype</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Payment types">
-				<separator colspan="4" string="Payment types mapping"/>
-				<field colspan="4" name="name" select="1" required="1"/>
-				<field name="payment_id" select="1"/>
-				<field name="esale_oscom_id" readonly="1" select="1"/>
-				<field name="paytyp" select="1"/>
-				<field name="journal_id" select="2" attrs="{'required':[('paytyp','=','type5')]}"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_pay_typ_tree">
-		<field name="name">esale.oscom.pay.typ.tree</field>
-		<field name="model">esale.oscom.paytype</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Payment types">
-				<field name="name" />
-				<field name="payment_id" />
-				<field name="paytyp" />
-				<field name="journal_id" />
-			</tree>
-		</field>
-	</record>
-<!-- ####################################################################################### -->
-	<record model="ir.ui.view" id="esale_oscom_status_form">
-		<field name="name">esale.oscom.status.form</field>
-		<field name="model">esale.oscom.status</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Osc status">
-				<separator colspan="4" string="Oscommerce Status mapping"/>
-				<field colspan="4" name="name" select="1" required="1"/>
-				<field name="language_id" select="1"/>
-				<field name="esale_oscom_id" readonly="1" select="1"/>
-				<field name="download" select="1"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_status_tree">
-		<field name="name">esale.oscom.status.tree</field>
-		<field name="model">esale.oscom.status</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Payment types">
-				<field name="name" />
-				<field name="language_id" />
-				<field name="esale_oscom_id" />
-				<field name="download" />
- 			</tree>
-		</field>
-	</record>
-
-
-<!-- ####################################################################################### -->
-	<record model="ir.ui.view" id="esale_oscom_category_web_form">
-		<field name="name">esale.oscom.category.web.form</field>
-		<field name="model">esale.oscom.category</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Categories">
-				<separator colspan="4" string="taxes"/>
-				<field name="name" select="1" colspan="4" required="1"/>
-				<field name="category_id" select="1"/>
-				<field name="esale_oscom_id" select="1" readonly="1"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_category_web_tree">
-		<field name="name">esale.oscom.category.web.v</field>
-		<field name="model">esale.oscom.category</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Categories">
-				<field name="name" />
-				<field name="category_id" />
-			</tree>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="esale_oscom_product_web_form">
-		<field name="name">esale.oscom.product.web.form</field>
-		<field name="model">esale.oscom.product</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Product">
-				<separator colspan="4" string="Product Information"/>
-				<field name="name" colspan="4" select="1" required="1"/>
-				<field name="product_id" on_change="onchange_product_id(product_id, web_id)" select="1" required="1"/>
-				<field name="esale_oscom_id" readonly="1" select="1"/>
-			</form>
-		</field>
-	</record>
+    <menuitem name="Sales Management/Internet Sales" id="menu_esale_oscom_root"/>
+
+    <record model="ir.ui.view" id="view_esale_oscom_form">
+        <field name="name">esale.oscom.web.form</field>
+        <field name="model">esale.oscom.web</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="OScommerce Web Shop">
+                <notebook>
+                    <page string="General Informations">
+                        <separator string="esale_oscom Shop Info" colspan="4"/>
+                        <field name="name" select="1"/>
+                        <field name="admin_user" required="1"/>
+                        <field name="url" widget="url" required="1"/>
+                        <field name="admin_pass" required="1" password="True"/>
+                        <newline/>                        
+                        <field name="active" select="1"/>
+                        <field name="shop_id" select="1" required="1"/>
+                        <field name="default_partner_category" required="False"/>
+                        <field name="price_type"/>
+                        <field name="esale_account_id"/>
+                        <newline/>
+                        <label string="Proceed with the mappings before adding products!" colspan="2"/>
+                        <field name="date_download_from" required="1"/>
+                        <field name="download_number"/>
+                        <field name="override_products_data"/>
+                        <button name="product_import_create" string="Import all products from OSCommerce" colspan="2" type="object"/>
+                        <separator string="Active Products" colspan="4"/>
+                        <field name="product_ids" colspan="4" widget="one2many_list" nolabel="1" readonly="1"/>
+                    </page>
+                    <page string="Taxes Mapping">
+                        <button type="object" string="Import Taxes" name="tax_import"/>
+                        <field colspan="4" name="tax_ids" widget="one2many_list" nolabel="1"/>
+                    </page>
+                    <page string="Languages Mapping">
+                        <button type="object" string="Import Languages" name="lang_import"/>
+                        <field colspan="4" name="language_ids" widget="one2many_list" nolabel="1"/>
+                    </page>
+                    <page string="Categories Mapping">
+                        <button type="object" string="Import Categories" name="category_import"/>
+                        <button type="object" string="Import and create/update Categories" name="category_import_create"/>
+                        <field colspan="4" name="category_ids" widget="one2many_list" nolabel="1"/>
+                    </page>
+                    <page string="Payment types Mapping">
+                        <button type="object" string="Import Payment Methods" name="get_payment_methods"/>
+                        <field colspan="4" name="pay_typ_ids" widget="one2many_list" nolabel="1"/>
+                    </page>
+                    <page string="Oscommerce Status Mapping">
+                        <button type="object" string="Import Oscommerce Status" name="status_import" colspan="4"/>
+                        <separator string="Status" colspan="4"/>
+                        <field name="intermediate"/>
+                        <field colspan="4" name="status_ids" widget="one2many_list" nolabel="1"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_esale_oscom_tree">
+        <field name="name">esale.oscom.web.form</field>
+        <field name="model">esale.oscom.web</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="OScommerce Web Shop">
+                <field name="name"/>
+                <field name="url"/>
+                <field name="active"/>
+                <field name="shop_id"/>
+                <field name="price_type"/>
+                <field name="esale_account_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_esale_oscom_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">esale.oscom.web</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_esale_oscom_tree"/>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Websites" id="menu_action_esale_oscom_web" action="action_esale_oscom_form" groups="group_esale_oscom_user"/>
+
+    <record model="ir.ui.view" id="esale_oscom_language_web_form">
+        <field name="name">esale.oscom.language.web.form</field>
+        <field name="model">esale.oscom.lang</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Language">
+                <separator colspan="4" string="Language mapping"/>
+                <field colspan="4" name="name" select="1" required="1"/>
+                <field name="language_id" select="1"/>
+                <field name="esale_oscom_id" readonly="1" select="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_language_web_tree">
+        <field name="name">esale.oscom.language.web.tree</field>
+        <field name="model">esale.oscom.lang</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Language">
+                <field name="name" />
+                <field name="language_id" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_tax_web_form">
+        <field name="name">esale.oscom.tax.web.form</field>
+        <field name="model">esale.oscom.tax</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Taxes">
+                <separator colspan="4" string="Taxes mapping"/>
+                <field colspan="4" name="name" select="1" required="1"/>
+                <field name="tax_id" select="1"/>
+                <field name="esale_oscom_id" readonly="1" select="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_tax_web_tree">
+        <field name="name">esale.oscom.tax.web.tree</field>
+        <field name="model">esale.oscom.tax</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Taxes">
+                <field name="name" />
+                <field name="tax_id" />
+            </tree>
+        </field>
+    </record>
+
+<!-- ####################################################################################### -->
+    <record model="ir.ui.view" id="esale_oscom_pay_typ_form">
+        <field name="name">esale.oscom.pay.typ.form</field>
+        <field name="model">esale.oscom.paytype</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Payment types">
+                <separator colspan="4" string="Payment types mapping"/>
+                <field colspan="4" name="name" select="1" required="1"/>
+                <field name="payment_id" select="1"/>
+                <field name="esale_oscom_id" readonly="1" select="1"/>
+                <field name="paytyp" select="1"/>
+                <field name="journal_id" select="2" attrs="{'required':[('paytyp','=','type5')]}"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_pay_typ_tree">
+        <field name="name">esale.oscom.pay.typ.tree</field>
+        <field name="model">esale.oscom.paytype</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Payment types">
+                <field name="name" />
+                <field name="payment_id" />
+                <field name="paytyp" />
+                <field name="journal_id" />
+            </tree>
+        </field>
+    </record>
+<!-- ####################################################################################### -->
+    <record model="ir.ui.view" id="esale_oscom_status_form">
+        <field name="name">esale.oscom.status.form</field>
+        <field name="model">esale.oscom.status</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Osc status">
+                <separator colspan="4" string="Oscommerce Status mapping"/>
+                <field colspan="4" name="name" select="1" required="1"/>
+                <field name="language_id" select="1"/>
+                <field name="esale_oscom_id" readonly="1" select="1"/>
+                <field name="download" select="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_status_tree">
+        <field name="name">esale.oscom.status.tree</field>
+        <field name="model">esale.oscom.status</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Payment types">
+                <field name="name" />
+                <field name="language_id" />
+                <field name="esale_oscom_id" />
+                <field name="download" />
+             </tree>
+        </field>
+    </record>
+
+
+<!-- ####################################################################################### -->
+    <record model="ir.ui.view" id="esale_oscom_category_web_form">
+        <field name="name">esale.oscom.category.web.form</field>
+        <field name="model">esale.oscom.category</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Categories">
+                <separator colspan="4" string="taxes"/>
+                <field name="name" select="1" colspan="4" required="1"/>
+                <field name="category_id" select="1"/>
+                <field name="esale_oscom_id" select="1" readonly="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_category_web_tree">
+        <field name="name">esale.oscom.category.web.v</field>
+        <field name="model">esale.oscom.category</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Categories">
+                <field name="name" />
+                <field name="category_id" />
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="esale_oscom_product_web_form">
+        <field name="name">esale.oscom.product.web.form</field>
+        <field name="model">esale.oscom.product</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Product">
+                <separator colspan="4" string="Product Information"/>
+                <field name="name" colspan="4" select="1" required="1"/>
+                <field name="product_id" on_change="onchange_product_id(product_id, web_id)" select="1" required="1"/>
+                <field name="esale_oscom_id" readonly="1" select="1"/>
+            </form>
+        </field>
+    </record>
 
 
 <!-- Web sale orders -->
-	<record model="ir.ui.view" id="esale_oscom_saleorder_tree">
-		<field name="name">esale.oscom.saleorder.tree</field>
-		<field name="model">sale.order</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Sales Orders">
+    <record model="ir.ui.view" id="esale_oscom_saleorder_tree">
+        <field name="name">esale.oscom.saleorder.tree</field>
+        <field name="model">sale.order</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sales Orders">
                 <field name="date_order"/>
                 <field name="name" string="Reference"/>
-				<field name="state"/>
-				<field name="partner_id"/>
-				<field name="partner_shipping_id"/>
-				<field name="esale_oscom_web"/>
-				<field name="esale_oscom_id"/>
-				<field name="shipped"/>
-				<field name="invoiced"/>
-				<field name="orders_status"/>
-				<field name="amount_untaxed"/>
-				<field name="shipping_title"/>
-				<field name="pay_met_title"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="esale_oscom_saleorder_form">
-		<field name="name">esale.oscom.saleorder.form</field>
-		<field name="model">sale.order</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="sale.view_order_form" />
-		<field name="arch" type="xml">
-		<notebook>
-			<page string="Os Commerce Information" position="inside">
-				<separator string="OsCommerce" colspan="4"/>
-					<group col="2" colspan="2">
-						<field name="esale_oscom_id" readonly="1" select="1"/>
-						<field name="esale_oscom_web" on_change="onchange_esale_oscom_web(esale_oscom_web)" select="1"/>
-					</group>
-					<group col="2" colspan="2">
-						<field name="pay_met_title" readonly="1"/>
-						<field name="shipping_title" readonly="1"/>
-					</group>
-					<field name="orders_status" readonly="1"/>
-					<field name="shipping_agency"/>
-					<field name="tracking_number"/>
-					<field name="number_of_packages"/>
-					<field name="volume"/>
-				<separator string="Options selected will be applied on changing osc order status" colspan="4"/>
-					<group col="2" colspan="2">
-						<field name="update_comment"/>
-						<field name="send_web_email"/>
-					</group>
-				<field colspan="4" name="status_comment"/>
-			    <field name="orders_status_id" on_change="onchange_esale_oscom_status(esale_oscom_web, esale_oscom_id, orders_status_id, status_comment, update_comment, send_web_email,tracking_number )" select="1"/>
-				<field colspan="4" name="additional_info"/>
-			</page>
-		</notebook>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_saleorder_tree">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">sale.order</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="esale_oscom_saleorder_tree"/>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_id','!=', 0)]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Web sale orders" id="menu_action_esale_oscom_saleorder" action="action_saleorder_tree" groups="group_esale_oscom_user"/>
-
-	<record model="ir.actions.act_window" id="action_saleorder_form">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">sale.order</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="esale_oscom_saleorder_form"/>
-		<field name="domain">[('esale_oscom_id','!=', 0)]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Web sale orders/New order" id="menu_action_esale_oscom_saleorder_new" action="action_saleorder_form"/>
-
-	<record model="ir.actions.act_window" id="action_saleorder_tree_draft">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">sale.order</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="esale_oscom_saleorder_tree"/>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=', ''),('state','=','draft'),('user_id','=',uid)]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Web sale orders/Request for quotation" id="menu_action_saleorder_tree_draft" action="action_saleorder_tree_draft"/>
-
-	<record model="ir.actions.act_window" id="action_saleorder_tree_manual">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">sale.order</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="esale_oscom_saleorder_tree"/>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=', ''),('state','=','manual'),('user_id','=',uid)]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Web sale orders/Waiting invoice" id="menu_action_saleorder_tree_manual" action="action_saleorder_tree_manual"/>
-
-	<record model="ir.actions.act_window" id="action_saleorder_tree_progress">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">sale.order</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="esale_oscom_saleorder_tree"/>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=', ''),('state','=','progress'),('user_id','=',uid)]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Web sale orders/In progress" id="menu_action_saleorder_tree_progress" action="action_saleorder_tree_progress"/>
+                <field name="state"/>
+                <field name="partner_id"/>
+                <field name="partner_shipping_id"/>
+                <field name="esale_oscom_web"/>
+                <field name="esale_oscom_id"/>
+                <field name="shipped"/>
+                <field name="invoiced"/>
+                <field name="orders_status"/>
+                <field name="amount_untaxed"/>
+                <field name="shipping_title"/>
+                <field name="pay_met_title"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="esale_oscom_saleorder_form">
+        <field name="name">esale.oscom.saleorder.form</field>
+        <field name="model">sale.order</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="arch" type="xml">
+        <notebook>
+            <page string="Os Commerce Information" position="inside">
+                <separator string="OsCommerce" colspan="4"/>
+                    <group col="2" colspan="2">
+                        <field name="esale_oscom_id" readonly="1" select="1"/>
+                        <field name="esale_oscom_web" on_change="onchange_esale_oscom_web(esale_oscom_web)" select="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <field name="pay_met_title" readonly="1"/>
+                        <field name="shipping_title" readonly="1"/>
+                    </group>
+                    <field name="orders_status" readonly="1"/>
+                    <field name="shipping_agency"/>
+                    <field name="tracking_number"/>
+                    <field name="number_of_packages"/>
+                    <field name="volume"/>
+                <separator string="Options selected will be applied on changing osc order status" colspan="4"/>
+                    <group col="2" colspan="2">
+                        <field name="update_comment"/>
+                        <field name="send_web_email"/>
+                    </group>
+                <field colspan="4" name="status_comment"/>
+                <field name="orders_status_id" on_change="onchange_esale_oscom_status(esale_oscom_web, esale_oscom_id, orders_status_id, status_comment, update_comment, send_web_email,tracking_number )" select="1"/>
+                <field colspan="4" name="additional_info"/>
+            </page>
+        </notebook>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_saleorder_tree">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="esale_oscom_saleorder_tree"/>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_id','!=', 0)]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Web sale orders" id="menu_action_esale_oscom_saleorder" action="action_saleorder_tree" groups="group_esale_oscom_user"/>
+
+    <record model="ir.actions.act_window" id="action_saleorder_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="esale_oscom_saleorder_form"/>
+        <field name="domain">[('esale_oscom_id','!=', 0)]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Web sale orders/New order" id="menu_action_esale_oscom_saleorder_new" action="action_saleorder_form"/>
+
+    <record model="ir.actions.act_window" id="action_saleorder_tree_draft">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="esale_oscom_saleorder_tree"/>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=', ''),('state','=','draft'),('user_id','=',uid)]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Web sale orders/Request for quotation" id="menu_action_saleorder_tree_draft" action="action_saleorder_tree_draft"/>
+
+    <record model="ir.actions.act_window" id="action_saleorder_tree_manual">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="esale_oscom_saleorder_tree"/>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=', ''),('state','=','manual'),('user_id','=',uid)]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Web sale orders/Waiting invoice" id="menu_action_saleorder_tree_manual" action="action_saleorder_tree_manual"/>
+
+    <record model="ir.actions.act_window" id="action_saleorder_tree_progress">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="esale_oscom_saleorder_tree"/>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=', ''),('state','=','progress'),('user_id','=',uid)]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Web sale orders/In progress" id="menu_action_saleorder_tree_progress" action="action_saleorder_tree_progress"/>
 
 
 <!-- Web sale invoices -->
-	<record model="ir.actions.act_window" id="action_oscom_invoice_tree">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.invoice</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=', False)]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Invoices" id="menu_action_esale_oscom_invoices" action="action_oscom_invoice_tree" groups="group_esale_oscom_user"/>
-
-	<record model="ir.actions.act_window" id="action_oscom_invoice_draft_tree">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.invoice</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=', False),('state','=','draft')]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Invoices/Draft" id="menu_action_oscom_invoice_draft_tree" action="action_oscom_invoice_draft_tree"/>
-
-	<record model="ir.actions.act_window" id="action_oscom_invoice_proforma">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.invoice</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=',False),('state','=','proforma')]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Invoices/PRO-FORMA" id="menu_action_oscom_invoice_proforma_tree" action="action_oscom_invoice_proforma"/>
-
-	<record model="ir.actions.act_window" id="action_oscom_invoice_open">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.invoice</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('esale_oscom_web','!=', False),('state','=','open')]</field>
-	</record>
-
-	<menuitem name="Sales Management/Internet Sales/Invoices/Opened" id="menu_action_oscom_invoice_open_tree" action="action_oscom_invoice_open"/>
+    <record model="ir.actions.act_window" id="action_oscom_invoice_tree">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=', False)]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Invoices" id="menu_action_esale_oscom_invoices" action="action_oscom_invoice_tree" groups="group_esale_oscom_user"/>
+
+    <record model="ir.actions.act_window" id="action_oscom_invoice_draft_tree">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=', False),('state','=','draft')]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Invoices/Draft" id="menu_action_oscom_invoice_draft_tree" action="action_oscom_invoice_draft_tree"/>
+
+    <record model="ir.actions.act_window" id="action_oscom_invoice_proforma">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=',False),('state','=','proforma')]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Invoices/PRO-FORMA" id="menu_action_oscom_invoice_proforma_tree" action="action_oscom_invoice_proforma"/>
+
+    <record model="ir.actions.act_window" id="action_oscom_invoice_open">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('esale_oscom_web','!=', False),('state','=','open')]</field>
+    </record>
+
+    <menuitem name="Sales Management/Internet Sales/Invoices/Opened" id="menu_action_oscom_invoice_open_tree" action="action_oscom_invoice_open"/>
 
 </data>
-</openerp>
-
+</openerp>
 \ No newline at end of file
 
=== removed file 'esale_osc/esale_oscom_workflow.xml'
--- esale_osc/esale_oscom_workflow.xml	2009-03-23 14:47:31 +0000
+++ esale_osc/esale_oscom_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-	<record model="workflow" id="wkf_oscom_sale">
-		<field name="name">esale_oscom.saleorder.basic</field>
-		<field name="osv">esale_oscom.saleorder</field>
-		<field name="on_create">True</field>
-	</record>
-
-		#----------------------------------------------
-		# Activity
-		#----------------------------------------------
-		<record model="workflow.activity" id="act_draft">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="flow_start">True</field>
-			<field name="name">draft</field>
-		</record>
-		<record model="workflow.activity" id="act_router">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">router</field>
-			<field name="kind">function</field>
-			<field name="action">action_wait()</field>
-			<field name="split_mode">OR</field>
-		</record>
-		<record model="workflow.activity" id="act_wait_invoice">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">wait_invoice</field>
-		</record>
-		<record model="workflow.activity" id="act_wait_ship">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">wait_ship</field>
-		</record>
-
-		<record model="workflow.activity" id="act_done">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">done</field>
-			<field name="flow_stop">True</field>
-			<field name="kind">function</field>
-			<field name="action">write({'state':'done'})</field>
-			<field name="join_mode">AND</field>
-		</record>
-		<record model="workflow.activity" id="act_cancel">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">cancel</field>
-			<field name="flow_stop">True</field>
-			<field name="kind">stopall</field>
-			<field name="action">action_cancel()</field>
-		</record>
-		<record model="workflow.activity" id="act_cancel2">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">cancel2</field>
-			<field name="flow_stop">True</field>
-			<field name="kind">stopall</field>
-			<field name="action">action_cancel()</field>
-		</record>
-		<record model="workflow.activity" id="act_cancel3">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">cancel3</field>
-			<field name="flow_stop">True</field>
-			<field name="kind">stopall</field>
-			<field name="action">action_cancel()</field>
-		</record>
-
-		<record model="workflow.activity" id="act_invoice">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">invoice</field>
-			<field name="kind">subflow</field>
-			<field name="subflow_id" search="[('name','=','account.invoice.basic')]"/>
-			<field name="action">action_invoice_create()</field>
-		</record>
-		<record model="workflow.activity" id="act_invoice_except">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">invoice_except</field>
-			<field name="kind">function</field>
-			<field name="action">write({'state':'invoice_except', 'invoice_id':False})</field>
-		</record>
-		<record model="workflow.activity" id="act_invoice_end">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">invoice_end</field>
-			<field name="kind">function</field>
-			<field name="action">write({'invoiced':1})</field>
-		</record>
-		<record model="workflow.activity" id="act_invoice_cancel">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">invoice_cancel</field>
-			<field name="flow_stop">True</field>
-			<field name="kind">stopall</field>
-			<field name="action">action_cancel()</field>
-		</record>
-
-		<record model="workflow.activity" id="act_ship">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">ship</field>
-			<field name="kind">function</field>
-			<!--
-			<field name="kind">subflow</field>
-			<field name="subflow_id" search="[('osv','=','stock.picking')]"/>
-			-->
-			<field name="action">action_ship_create()</field>
-		</record>
-		<record model="workflow.activity" id="act_ship_except">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">ship_except</field>
-			<field name="kind">function</field>
-			<field name="action">write({'state':'shipping_except'})</field>
-		</record>
-		<record model="workflow.activity" id="act_ship_end">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">ship_end</field>
-			<field name="kind">function</field>
-			<field name="action">action_ship_end()</field>
-		</record>
-		<record model="workflow.activity" id="act_ship_cancel">
-			<field name="wkf_id" ref="wkf_oscom_sale"/>
-			<field name="name">ship_cancel</field>
-			<field name="flow_stop">True</field>
-			<field name="kind">stopall</field>
-			<field name="action">action_cancel()</field>
-		</record>
-
-		#----------------------------------------------
-		# Transistion
-		#----------------------------------------------
-
-		<record model="workflow.transition" id="trans_invoice_end_done">
-			<field name="act_from" ref="act_invoice_end"/>
-			<field name="act_to" ref="act_done"/>
-		</record>
-		<record model="workflow.transition" id="trans_draft_router">
-			<field name="act_from" ref="act_draft"/>
-			<field name="act_to" ref="act_router"/>
-			<field name="signal">order_confirm</field>
-		</record>
-		<record model="workflow.transition" id="trans_draft_cancel">
-			<field name="act_from" ref="act_draft"/>
-			<field name="act_to" ref="act_cancel"/>
-			<field name="signal">cancel</field>
-		</record>
-		<record model="workflow.transition" id="trans_router_wait_invoice">
-			<field name="act_from" ref="act_router"/>
-			<field name="act_to" ref="act_wait_invoice"/>
-		</record>
-		<record model="workflow.transition" id="trans_router_wait_ship">
-			<field name="act_from" ref="act_router"/>
-			<field name="act_to" ref="act_wait_ship"/>
-		</record>
-		<record model="workflow.transition" id="trans_wait_invoice_cancel2">
-			<field name="act_from" ref="act_wait_invoice"/>
-			<field name="act_to" ref="act_cancel2"/>
-			<field name="signal">cancel</field>
-		</record>
-		<record model="workflow.transition" id="trans_wait_ship_cancel3">
-			<field name="act_from" ref="act_wait_ship"/>
-			<field name="act_to" ref="act_cancel3"/>
-			<field name="signal">cancel</field>
-		</record>
-		<record model="workflow.transition" id="trans_wait_ship_ship">
-			<field name="act_from" ref="act_wait_ship"/>
-			<field name="act_to" ref="act_ship"/>
-			<field name="condition">(order_policy!='prepaid') or invoiced</field>
-		</record>
-		<record model="workflow.transition" id="trans_wait_invoice_invoice">
-			<field name="act_from" ref="act_wait_invoice"/>
-			<field name="act_to" ref="act_invoice"/>
-			<field name="condition">(order_policy=='prepaid') or ((order_policy=='postpaid') and shipped)</field>
-		</record>
-		<record model="workflow.transition" id="trans_wait_invoice_invoice_manual">
-			<field name="act_from" ref="act_wait_invoice"/>
-			<field name="act_to" ref="act_invoice"/>
-			<field name="signal">manual_invoice</field>
-		</record>
-		<record model="workflow.transition" id="trans_invoice_invoice_end">
-			<field name="act_from" ref="act_invoice"/>
-			<field name="act_to" ref="act_invoice_end"/>
-			<field name="signal">subflow.paid</field>
-		</record>
-		<record model="workflow.transition" id="trans_invoice_invoice_except">
-			<field name="act_from" ref="act_invoice"/>
-			<field name="act_to" ref="act_invoice_except"/>
-			<field name="signal">subflow.cancel</field>
-		</record>
-		<record model="workflow.transition" id="trans_invoice_except_invoice">
-			<field name="act_from" ref="act_invoice_except"/>
-			<field name="act_to" ref="act_invoice"/>
-			<field name="signal">invoice_recreate</field>
-		</record>
-		<record model="workflow.transition" id="trans_invoice_except_invoice_end">
-			<field name="act_from" ref="act_invoice_except"/>
-			<field name="act_to" ref="act_invoice_end"/>
-			<field name="signal">invoice_corrected</field>
-		</record>
-		<record model="workflow.transition" id="trans_invoice_except_invoice_cancel">
-			<field name="act_from" ref="act_invoice_except"/>
-			<field name="act_to" ref="act_invoice_cancel"/>
-			<field name="signal">invoice_cancel</field>
-		</record>
-		<record model="workflow.transition" id="trans_ship_end_done">
-			<field name="act_from" ref="act_ship_end"/>
-			<field name="act_to" ref="act_done"/>
-		</record>
-		<record model="workflow.transition" id="trans_ship_ship_end">
-			<field name="act_from" ref="act_ship"/>
-			<field name="act_to" ref="act_ship_end"/>
-			<field name="trigger_model">mrp.procurement</field>
-			<field name="trigger_expr_id">procurement_lines_get()</field>
-			<field name="condition">test_procurement_finnished()</field>
-		</record>
-		<record model="workflow.transition" id="trans_ship_ship_except">
-			<field name="act_from" ref="act_ship"/>
-			<field name="act_to" ref="act_ship_except"/>
-			<field name="condition">test_procurement_finnished('cancel')</field>
-		</record>
-		<record model="workflow.transition" id="trans_ship_except_ship">
-			<field name="act_from" ref="act_ship_except"/>
-			<field name="act_to" ref="act_ship"/>
-			<field name="signal">ship_recreate</field>
-		</record>
-		<record model="workflow.transition" id="trans_">
-			<field name="act_from" ref="act_ship_except"/>
-			<field name="act_to" ref="act_ship_end"/>
-			<field name="signal">ship_corrected</field>
-		</record>
-		<record model="workflow.transition" id="trans_ship_except_ship_cancel">
-			<field name="act_from" ref="act_ship_except"/>
-			<field name="act_to" ref="act_ship_cancel"/>
-			<field name="signal">ship_cancel</field>
-		</record>
-
-</data>
-</openerp>
 
=== renamed file 'esale_osc/i18n/es.po' => 'esale_osc/i18n/es.po.THIS'
=== modified file 'esale_osc/i18n/es_ES.po' (properties changed: -x to +x)
--- esale_osc/i18n/es_ES.po	2010-02-02 20:22:20 +0000
+++ esale_osc/i18n/es_ES.po	2010-07-21 10:31:39 +0000
@@ -6,14 +6,15 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-12-30 02:38:48+0000\n"
-"PO-Revision-Date: 2009-12-30 03:47+0100\n"
-"Last-Translator: Ana Juaristi <[e-mail]>\n"
+"POT-Creation-Date: 2009-12-30 02:49+0000\n"
+"PO-Revision-Date: 2010-04-21 14:57+0100\n"
+"Last-Translator: ZhenIT Software <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
+"X-Launchpad-Export-Date: 2010-02-15 15:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: esale_osc
 #: view:esale.oscom.web:0
@@ -58,7 +59,7 @@
 #. module: esale_osc
 #: field:product.product,manufacturer_id:0
 msgid " Manufacturer"
-msgstr "Fabricante"
+msgstr " Fabricante"
 
 #. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_esale_oscom_products
@@ -520,7 +521,7 @@
 #. module: esale_osc
 #: help:sale.order,shipping_agency:0
 msgid " Include Carrier to delivery order with"
-msgstr "Incluya al transportista con el que enviará el pedido"
+msgstr " Incluya al transportista con el que enviará el pedido"
 
 #. module: esale_osc
 #: help:sale.order,orders_status_id:0
@@ -862,3 +863,32 @@
 msgid "In/Out Stock"
 msgstr "Disponible/Agotado"
 
+#. module: esale_osc
+#: field:esale.oscom.web,admin_user:0
+msgid "Admin User"
+msgstr "Usuario admin"
+
+#. module: esale_osc
+#: field:esale.oscom.web,admin_pass:0
+msgid "Admin Pass"
+msgstr "Clave admin"
+
+#. module: esale_osc
+#: field:esale.oscom.web,default_partner_category:0
+msgid "Customers partner category"
+msgstr "Categoría clientes"
+
+#. module: esale_osc
+#: field:esale.oscom.web,download_number:30
+msgid "Download number"
+msgstr "Descarga en bloques de"
+
+#. module: esale_osc
+#: field:esale.oscom.web,override_products_data:0
+msgid "Override Products Data"
+msgstr "Sobreescribir datos de productos"
+
+#. module: esale_osc
+#: help:esale.oscom.web,override_products_data:0
+msgid "Click if you want to Update products data on the shop with changes made in openerp."
+msgstr "Marca para actualizar los datos de los productos de la tienda cuando se modifiquen en openERP"
 \ No newline at end of file
 
=== modified file 'esale_osc/i18n/esale_osc.pot' (properties changed: -x to +x)
--- esale_osc/i18n/esale_osc.pot	2010-02-02 20:22:20 +0000
+++ esale_osc/i18n/esale_osc.pot	2010-07-21 10:31:39 +0000
@@ -1,252 +1,247 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* esale_osc
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-12-30 02:49:33+0000\n"
-"PO-Revision-Date: 2009-12-30 02:49:33+0000\n"
-"Last-Translator: <>\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: ZhenIT Software <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Taxes Mapping"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_paytype
+#. module: esale_osc
 msgid "esale_oscom PayType"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.tax,name:0
+#. module: esale_osc
 msgid "Tax name"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.status,download:0
+#. module: esale_osc
 msgid "Download Orders on Status"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_web
+#. module: esale_osc
 msgid "esale.oscom.web"
 msgstr ""
 
-#. module: esale_osc
 #: constraint:ir.actions.act_window:0
+#. module: esale_osc
 msgid "Invalid model name in the action definition."
 msgstr ""
 
+#: view:esale.oscom.status:0
 #. module: esale_osc
-#: view:esale.oscom.status:0
 msgid "Oscommerce Status mapping"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import Languages"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,manufacturer_id:0
+#. module: esale_osc
 msgid " Manufacturer"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_esale_oscom_products
+#. module: esale_osc
 msgid "Synchronize products and stocks to all OScommerce web shops"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,orders_status_id:0
+#. module: esale_osc
 msgid "Osc Status Actual"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.actions.wizard,name:esale_osc.wizard_esale_oscom_select_stocks
 #: model:ir.actions.wizard,name:esale_osc.wizard_esale_oscom_stocks
+#. module: esale_osc
 msgid "Update stocks"
 msgstr ""
 
+#: view:product.product:0
 #. module: esale_osc
-#: view:product.product:0
 msgid "E-Sale Information"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Oscommerce Status Mapping"
 msgstr ""
 
+#: constraint:product.product:0
 #. module: esale_osc
-#: constraint:product.product:0
 msgid "You can not give other value in Special Price! Please enter number with % or decimal value"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_esale_oscom_product_manufacturer
+#. module: esale_osc
 msgid "Manufacturers"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.actions.wizard,name:esale_osc.wizard_esale_oscom_products
 #: model:ir.actions.wizard,name:esale_osc.wizard_esale_oscom_select_products
+#. module: esale_osc
 msgid "Sync. products and stocks"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_product
+#. module: esale_osc
 msgid "esale_oscom Product"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,oscom_url:0
+#. module: esale_osc
 msgid "URL to OScommerce"
 msgstr ""
 
+#: selection:product.product,spe_price_status:0
 #. module: esale_osc
-#: selection:product.product,spe_price_status:0
 msgid "On"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,url:0
 #: field:product.manufacturer,manufacturer_url:0
 #: field:product.product,product_url:0
+#. module: esale_osc
 msgid "URL"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_esale_oscom_stocks
+#. module: esale_osc
 msgid "Update stocks to all OScommerce web shops"
 msgstr ""
 
+#: selection:product.product,in_out_stock:0
 #. module: esale_osc
-#: selection:product.product,in_out_stock:0
 msgid "In Stock"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.actions.wizard,name:esale_osc.wizard_esale_oscom_saleorders
+#. module: esale_osc
 msgid "Import sale orders"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,shipping_title:0
+#. module: esale_osc
 msgid "Shipping"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import Oscommerce Status"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,send_web_email:0
+#. module: esale_osc
 msgid "Click if you want Sending comments to customer from web. Requires modifying .php procedure"
 msgstr ""
 
-#. module: esale_osc
 #: help:esale.oscom.web,intermediate:0
+#. module: esale_osc
 msgid "Select intermediate status for Osc downloaded Orders"
 msgstr ""
 
+#: view:sale.order:0
 #. module: esale_osc
-#: view:sale.order:0
 msgid "Reference"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,additional_info:0
+#. module: esale_osc
 msgid "Include any additional info you need internaly include on order"
 msgstr ""
 
-#. module: esale_osc
 #: constraint:product.category:0
+#. module: esale_osc
 msgid "Error ! You can not create recursive categories."
 msgstr ""
 
+#: view:esale.oscom.category:0
 #. module: esale_osc
-#: view:esale.oscom.category:0
 msgid "taxes"
 msgstr ""
 
+#: view:esale.oscom.paytype:0
 #. module: esale_osc
-#: view:esale.oscom.paytype:0
 msgid "Payment types mapping"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_esale_oscom_root
+#. module: esale_osc
 msgid "Internet Sales"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_product_manufacturer
+#. module: esale_osc
 msgid "Product Manufacturer that produces the product"
 msgstr ""
 
+#: view:sale.order:0
 #. module: esale_osc
-#: view:sale.order:0
 msgid "OsCommerce"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.status,language_id:0
+#. module: esale_osc
 msgid "Language Id"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_button:esale.oscom.products,init,end:0
 #: wizard_button:esale.oscom.saleorders,init,end:0
 #: wizard_button:esale.oscom.select.products,init,end:0
 #: wizard_button:esale.oscom.select.stocks,init,end:0
 #: wizard_button:esale.oscom.stocks,init,end:0
+#. module: esale_osc
 msgid "End"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.module.module,shortdesc:esale_osc.module_meta_information
+#. module: esale_osc
 msgid "OScommerce Interface / ZenCart"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_view:esale.oscom.products,init:0
 #: wizard_view:esale.oscom.select.products,init:0
+#. module: esale_osc
 msgid "Products exported"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.lang,language_id:0
+#. module: esale_osc
 msgid "OpenERP language"
 msgstr ""
 
+#: view:product.product:0
 #. module: esale_osc
-#: view:product.product:0
 msgid "Special price information"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,tracking_number:0
+#. module: esale_osc
 msgid "Num tracking"
 msgstr ""
 
+#: selection:product.product,spe_price_status:0
 #. module: esale_osc
-#: selection:product.product,spe_price_status:0
 msgid "Off"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.module.module,description:esale_osc.module_meta_information
-msgid "OSCommerce (Zencart) eCommerce interface synchronisation.\n"
+#. module: esale_osc
+msgid ""
+"OSCommerce (Zencart) eCommerce interface synchronisation.\n"
 "\n"
 "Syncro Oscommerce to Openerp\n"
 " 1. Import/upgrade categories.\n"
@@ -261,462 +256,461 @@
 "Developed by Tiny, Axelor, Zikzakmedia and Ana Juaristi"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_view:esale.oscom.saleorders,init:0
+#. module: esale_osc
 msgid "Sale orders succesfully imported"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_field:esale.oscom.products,init,prod_update:0
 #: wizard_field:esale.oscom.select.products,init,prod_update:0
+#. module: esale_osc
 msgid "Updated products"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,volume:0
+#. module: esale_osc
 msgid "Include volume of packages to send"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_field:esale.oscom.products,init,prod_new:0
 #: wizard_field:esale.oscom.select.products,init,prod_new:0
+#. module: esale_osc
 msgid "New products"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Active Products"
 msgstr ""
 
+#: selection:esale.oscom.paytype,paytyp:0
 #. module: esale_osc
-#: selection:esale.oscom.paytype,paytyp:0
 msgid "SO in State Draft"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,date_download_from:0
+#. module: esale_osc
 msgid "Date Download From"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,status_comment:0
+#. module: esale_osc
 msgid "Write a comment to include on Osc order. It will be uploaded to Osc Web on changing actual osc status"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "General Informations"
 msgstr ""
 
-#. module: esale_osc
 #: constraint:ir.ui.view:0
+#. module: esale_osc
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
+#: constraint:product.template:0
 #. module: esale_osc
-#: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Proceed with the mappings before adding products!"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_tax
+#. module: esale_osc
 msgid "esale_oscom Tax"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,esale_oscom_id:0
+#. module: esale_osc
 msgid "esale_oscom Id"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,tracking_number:0
+#. module: esale_osc
 msgid "Include order trucking number given by carrier"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,update_comment:0
+#. module: esale_osc
 msgid "Update Comment"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_esale_oscom_saleorder_new
+#. module: esale_osc
 msgid "New order"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Payment types Mapping"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "OScommerce Web Shop"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_saleorder_tree_progress
+#. module: esale_osc
 msgid "In progress"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_esale_oscom_saleorders
+#. module: esale_osc
 msgid "Import sale orders from all OScommerce web shops"
 msgstr ""
 
-#. module: esale_osc
 #: help:esale.oscom.web,esale_account_id:0
+#. module: esale_osc
 msgid "Payment account for web invoices."
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_esale_oscom_invoices
+#. module: esale_osc
 msgid "Invoices"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_esale_oscom_saleorder
+#. module: esale_osc
 msgid "Web sale orders"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,product_ids:0
+#. module: esale_osc
 msgid "Web products"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,update_comment:0
+#. module: esale_osc
 msgid "Click if you want to Update comments on order"
 msgstr ""
 
+#: selection:esale.oscom.web,price_type:0
 #. module: esale_osc
-#: selection:esale.oscom.web,price_type:0
 msgid "Taxed price"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_category
+#. module: esale_osc
 msgid "esale_oscom Category"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_status
+#. module: esale_osc
 msgid "esale_oscom Status"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Languages Mapping"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,volume:0
+#. module: esale_osc
 msgid "Volum"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,number_of_packages:0
+#. module: esale_osc
 msgid "Num pack"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Categories Mapping"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_oscom_invoice_open_tree
+#. module: esale_osc
 msgid "Opened"
 msgstr ""
 
+#: selection:esale.oscom.paytype,paytyp:0
 #. module: esale_osc
-#: selection:esale.oscom.paytype,paytyp:0
 msgid "Invoice Payed"
 msgstr ""
 
+#: constraint:product.template:0
 #. module: esale_osc
-#: constraint:product.template:0
 msgid "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,language_ids:0
+#. module: esale_osc
 msgid "Languages"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_oscom_invoice_draft_tree
+#. module: esale_osc
 msgid "Draft"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_view:esale.oscom.products,init:0
 #: wizard_view:esale.oscom.select.products,init:0
+#. module: esale_osc
 msgid "Product Export"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,esale_account_id:0
+#. module: esale_osc
 msgid "Dest. account"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.tax,tax_id:0
+#. module: esale_osc
 msgid "OpenERP tax"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_oscom_invoice_proforma_tree
+#. module: esale_osc
 msgid "PRO-FORMA"
 msgstr ""
 
+#: selection:esale.oscom.paytype,paytyp:0
 #. module: esale_osc
-#: selection:esale.oscom.paytype,paytyp:0
 msgid "Invoice Draft"
 msgstr ""
 
-#. module: esale_osc
 #: view:esale.oscom.web:0
 #: field:product.product,spe_price_status:0
+#. module: esale_osc
 msgid "Status"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,date_available:0
+#. module: esale_osc
 msgid "Available Date"
 msgstr ""
 
+#: selection:esale.oscom.paytype,paytyp:0
 #. module: esale_osc
-#: selection:esale.oscom.paytype,paytyp:0
 msgid "SO Confirmed"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.paytype,journal_id:0
+#. module: esale_osc
 msgid "OpenERP payment journal"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_field:esale.oscom.products,init,prod_delete:0
 #: wizard_field:esale.oscom.select.products,init,prod_delete:0
+#. module: esale_osc
 msgid "Deleted products"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,shipping_agency:0
+#. module: esale_osc
 msgid " Include Carrier to delivery order with"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,orders_status_id:0
+#. module: esale_osc
 msgid "Indicates the actual status of order on Osc Web"
 msgstr ""
 
+#: view:esale.oscom.lang:0
 #. module: esale_osc
-#: view:esale.oscom.lang:0
 msgid "Language mapping"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import Taxes"
 msgstr ""
 
-#. module: esale_osc
 #: view:esale.oscom.paytype:0
 #: view:esale.oscom.status:0
 #: field:esale.oscom.web,pay_typ_ids:0
+#. module: esale_osc
 msgid "Payment types"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,active:0
+#. module: esale_osc
 msgid "Active"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,product_picture:0
+#. module: esale_osc
 msgid "Product Picture"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,status_ids:0
+#. module: esale_osc
 msgid "Osc Status"
 msgstr ""
 
-#. module: esale_osc
 #: view:product.manufacturer:0
+#. module: esale_osc
 msgid "Manufacturer"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,exp_date:0
+#. module: esale_osc
 msgid "Expiry date"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "esale_oscom Shop Info"
 msgstr ""
 
+#: view:esale.oscom.lang:0
 #. module: esale_osc
-#: view:esale.oscom.lang:0
 msgid "Language"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import Payment Methods"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.product,product_id:0
+#. module: esale_osc
 msgid "OpenERP product"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_esale_oscom_web
+#. module: esale_osc
 msgid "Websites"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.product,esale_oscom_id:0
+#. module: esale_osc
 msgid "OScommerce product Id"
 msgstr ""
 
-#. module: esale_osc
 #: help:esale.oscom.web,date_download_from:0
+#. module: esale_osc
 msgid "Specify date since you want to download modified or new products"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import Categories"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.category,category_id:0
+#. module: esale_osc
 msgid "OpenERP category"
 msgstr ""
 
+#: view:product.product:0
 #. module: esale_osc
-#: view:product.product:0
 msgid "Link to Oscommerce"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.paytype,payment_id:0
+#. module: esale_osc
 msgid "OpenERP payment"
 msgstr ""
 
-#. module: esale_osc
 #: model:product.template,name:esale_osc.product_product_discount_coupon_product_template
+#. module: esale_osc
 msgid "Discount Coupon"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,intermediate:0
+#. module: esale_osc
 msgid "Intermediate Status"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_saleorder_tree_draft
+#. module: esale_osc
 msgid "Request for quotation"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.ui.menu,name:esale_osc.menu_action_saleorder_tree_manual
+#. module: esale_osc
 msgid "Waiting invoice"
 msgstr ""
 
-#. module: esale_osc
 #: model:product.template,name:esale_osc.product_product_cash_delivery_product_template
+#. module: esale_osc
 msgid "Cash On Delivery"
 msgstr ""
 
+#: selection:product.product,in_out_stock:0
 #. module: esale_osc
-#: selection:product.product,in_out_stock:0
 msgid "Out Stock"
 msgstr ""
 
-#. module: esale_osc
 #: model:product.category,name:esale_osc.cat_shipping_cost
 #: model:product.template,name:esale_osc.product_product_shipping_Cost_product_template
+#. module: esale_osc
 msgid "Shipping Cost"
 msgstr ""
 
-#. module: esale_osc
 #: model:ir.model,name:esale_osc.model_esale_oscom_lang
+#. module: esale_osc
 msgid "esale_oscom Language"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,spe_price:0
+#. module: esale_osc
 msgid "Special price"
 msgstr ""
 
+#: view:sale.order:0
 #. module: esale_osc
-#: view:sale.order:0
 msgid "Sales Orders"
 msgstr ""
 
-#. module: esale_osc
 #: constraint:ir.model:0
+#. module: esale_osc
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,shipping_agency:0
+#. module: esale_osc
 msgid "Carrier Partner"
 msgstr ""
 
+#: view:esale.oscom.product:0
 #. module: esale_osc
-#: view:esale.oscom.product:0
 msgid "Product Information"
 msgstr ""
 
-#. module: esale_osc
 #: view:esale.oscom.category:0
 #: field:esale.oscom.web,category_ids:0
+#. module: esale_osc
 msgid "Categories"
 msgstr ""
 
+#: view:product.product:0
 #. module: esale_osc
-#: view:product.product:0
 msgid "Other information"
 msgstr ""
 
+#: view:esale.oscom.status:0
 #. module: esale_osc
-#: view:esale.oscom.status:0
 msgid "Osc status"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,price_type:0
+#. module: esale_osc
 msgid "Price type"
 msgstr ""
 
+#: view:esale.oscom.product:0
 #. module: esale_osc
-#: view:esale.oscom.product:0
 msgid "Product"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,pay_met_title:0
+#. module: esale_osc
 msgid "Payment Method"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_view:esale.oscom.select.stocks,init:0
 #: wizard_view:esale.oscom.stocks,init:0
+#. module: esale_osc
 msgid "Stock Update"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.category,esale_oscom_id:0
 #: field:esale.oscom.lang,esale_oscom_id:0
 #: field:esale.oscom.paytype,esale_oscom_id:0
@@ -724,76 +718,76 @@
 #: field:esale.oscom.tax,esale_oscom_id:0
 #: field:res.partner,esale_oscom_id:0
 #: field:res.partner.address,esale_oscom_id:0
+#. module: esale_osc
 msgid "OScommerce Id"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,orders_status:0
+#. module: esale_osc
 msgid "Osc Status Inic"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import and create/update Categories"
 msgstr ""
 
+#: view:esale.oscom.web:0
 #. module: esale_osc
-#: view:esale.oscom.web:0
 msgid "Import all products from OSCommerce"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,send_web_email:0
+#. module: esale_osc
 msgid "Send web E-mail"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,additional_info:0
+#. module: esale_osc
 msgid "Aditional Info"
 msgstr ""
 
+#: view:sale.order:0
 #. module: esale_osc
-#: view:sale.order:0
 msgid "Options selected will be applied on changing osc order status"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,number_of_packages:0
+#. module: esale_osc
 msgid "Include number of packages to send"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.category,name:0
 #: field:esale.oscom.lang,name:0
 #: field:esale.oscom.paytype,name:0
 #: field:esale.oscom.product,name:0
 #: field:esale.oscom.web,name:0
 #: field:product.manufacturer,name:0
+#. module: esale_osc
 msgid "Name"
 msgstr ""
 
+#: selection:esale.oscom.paytype,paytyp:0
 #. module: esale_osc
-#: selection:esale.oscom.paytype,paytyp:0
 msgid "Invoice Confirmed"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.paytype,paytyp:0
+#. module: esale_osc
 msgid "Payment type"
 msgstr ""
 
-#. module: esale_osc
 #: view:esale.oscom.tax:0
 #: field:esale.oscom.web,tax_ids:0
+#. module: esale_osc
 msgid "Taxes"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.web,shop_id:0
+#. module: esale_osc
 msgid "Sale shop"
 msgstr ""
 
-#. module: esale_osc
 #: field:account.invoice,esale_oscom_web:0
 #: field:esale.oscom.category,web_id:0
 #: field:esale.oscom.lang,web_id:0
@@ -802,52 +796,88 @@
 #: field:esale.oscom.status,web_id:0
 #: field:esale.oscom.tax,web_id:0
 #: field:sale.order,esale_oscom_web:0
+#. module: esale_osc
 msgid "Website"
 msgstr ""
 
+#: view:sale.order:0
 #. module: esale_osc
-#: view:sale.order:0
 msgid "Os Commerce Information"
 msgstr ""
 
-#. module: esale_osc
 #: wizard_view:esale.oscom.select.stocks,init:0
 #: wizard_view:esale.oscom.stocks,init:0
+#. module: esale_osc
 msgid "Stock succesfully updated"
 msgstr ""
 
+#: view:esale.oscom.tax:0
 #. module: esale_osc
-#: view:esale.oscom.tax:0
 msgid "Taxes mapping"
 msgstr ""
 
-#. module: esale_osc
 #: field:esale.oscom.status,name:0
+#. module: esale_osc
 msgid "Status name"
 msgstr ""
 
+#: selection:esale.oscom.web,price_type:0
 #. module: esale_osc
-#: selection:esale.oscom.web,price_type:0
 msgid "Untaxed price"
 msgstr ""
 
-#. module: esale_osc
 #: help:sale.order,orders_status:0
+#. module: esale_osc
 msgid "Indicates the initial status of order on Osc Web"
 msgstr ""
 
+#: constraint:product.product:0
 #. module: esale_osc
-#: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr ""
 
-#. module: esale_osc
 #: field:sale.order,status_comment:0
+#. module: esale_osc
 msgid "Status Comment"
 msgstr ""
 
-#. module: esale_osc
 #: field:product.product,in_out_stock:0
+#. module: esale_osc
 msgid "In/Out Stock"
 msgstr ""
 
+#. module: esale_osc
+msgid ""
+"Default product named \'Shipping Cost\' will be used.\n"
+"In case it doesn\'t exist, please create it"
+msgstr ""
+
+#. module: esale_osc
+#: field:esale.oscom.web,admin_user:0
+msgid "Admin User"
+msgstr ""
+
+#. module: esale_osc
+#: field:esale.oscom.web,admin_pass:0
+msgid "Admin Pass"
+msgstr ""
+
+#. module: esale_osc
+#: field:esale.oscom.web,default_partner_category:0
+msgid "Customers partner category"
+msgstr ""
+
+#. module: esale_osc
+#: field:esale.oscom.web,download_number:30
+msgid "Download number"
+msgstr ""
+
+#. module: esale_osc
+#: field:esale.oscom.web,override_products_data:0
+msgid "Override Products Data"
+msgstr ""
+
+#. module: esale_osc
+#: help:esale.oscom.web,override_products_data:0
+msgid "Click if you want to Update products data on the shop with changes made in openerp."
+msgstr ""
 \ No newline at end of file
 
=== modified file 'esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py'
--- esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py	2010-01-21 09:33:17 +0000
+++ esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py	2010-07-21 10:31:39 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #