Merge lp:~nicolariolini/micronaet-fashion/nicola into lp:micronaet-fashion

[Nicola Riolini - Micronaet]

Ultime modifiche per problemi ed errori vari

=== modified file 'fashion/__init__.py'
--- fashion/__init__.py	2014-02-17 08:20:34 +0000
+++ fashion/__init__.py	2014-03-18 14:06:54 +0000
@@ -22,6 +22,7 @@
 import fashion
 import wizard
 import report
+import errata_corrige # only for startup phase
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'fashion/errata_corrige.py'
--- fashion/errata_corrige.py	1970-01-01 00:00:00 +0000
+++ fashion/errata_corrige.py	2014-03-18 14:06:54 +0000
@@ -0,0 +1,189 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import os
+import sys
+import csv
+import base64
+from osv import osv, fields
+from datetime import datetime
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
+from openerp import tools
+import pdb
+from openerp.tools.translate import _
+
+
+# Utility:
+def Prepare(valore):
+    # For problems: input win output ubuntu; trim extra spaces
+    #valore=valore.decode('ISO-8859-1')
+    valore=valore.decode('cp1252')
+    valore=valore.encode('utf-8')
+    return valore.strip()
+
+def format_date(valore,date=True):
+    ''' Formatta nella data di PG
+    '''
+    try:
+        if date:
+            gma = valore.split(' ')[0].split('/')
+            return '%s-%02d-%02d' % (gma[2], int(gma[1]), int(gma[0]))
+    except:
+        return False
+
+def format_currency(valore):
+    ''' Formatta nel float per i valori currency
+    '''
+    try:
+        return float(valore.split(' ')[-1].replace(',','.'))
+    except:
+        return 0.0
+
+class fashion_form_utility(osv.osv):
+    ''' Utility procedure for errata corrige
+    '''
+    _name = 'fashion.form'
+    _inherit = 'fashion.form'
+
+    def correct_supplier_code(self, cr, uid, context=None):
+        ''' test partner and find access_id + 1000 
+        '''
+        partner_pool = self.pool.get('res.partner')
+        accessory_pool = self.pool.get('fashion.form.accessory.rel')
+        accessory_ids = accessory_pool.search(cr, uid, [], context=context)
+        for item in accessory_pool.browse(cr, uid, accessory_ids, context=context):        
+            if item.supplier_id:
+                access_id = item.supplier_id.access_id
+                if access_id < 1000: # wrong supplier
+                    partner_ids = partner_pool.search(cr, uid, [('access_id', '=', access_id + 1000)], context=context)
+                    if partner_ids and len(partner_ids) == 1:
+                        accessory_pool.write(cr, uid, item.id, {'supplier_id': partner_ids[0], }, context=context)                          
+                        print "[INFO] Rel [%s] Update supplier_id %s with %s" % (item.id, item.supplier_id.id, partner_ids[0])
+                    else:
+                        print "[ERR] find partner_ids", partner_ids    
+        return True
+        
+    def set_customer_code_in_form(self, cr, uid, context=None):
+        ''' Read all customer code in customer and set if correct and present 
+            in form if there's the same customer
+        '''
+        codes = {}
+        form_pool = self.pool.get('fashion.form')
+        form_ids = form_pool.search(cr, uid, [], context=context)
+        form_proxy = form_pool.browse(cr, uid, form_ids, context=context)
+        for item in form_proxy:
+            partner_id = False
+            code = False
+            update = True
+            for customer in item.partner_rel_ids:
+                if customer.partner_id:
+                    if not partner_id:
+                        partner_id = customer.partner_id.id
+                    if partner_id != customer.partner_id.id:
+                        update = False
+                        break
+                    if customer.code: # take if present
+                        code = customer.code    
+            if update and code:
+                codes[item.id] = code
+        for key in codes:
+            form_pool.write(cr, uid, key, {'customer_code': codes[key], }, context=context)                
+        return True
+
+    def set_correct_accessory_price(self, cr, uid, context=None):
+        ''' Read files with price in rel and update only price
+        '''
+        #form_converter={}
+        #form_pool = self.pool.get('fashion.form')
+        #form_ids = form_pool.search(cr, uid, [], context = context)
+        #form_proxy = form_pool.browse(cr, uid, form_ids, context = context)
+        #for item in form_proxy:
+        #    if item.access_id:
+        #        form_converter[item.access_id] = item.id
+        
+        #accessory_converter={}
+        #accessory_pool = self.pool.get('fashion.form.accessory')
+        #accessory_ids = accessory_pool.search(cr, uid, [], context = context)
+        #accessory_proxy = accessory_pool.browse(cr, uid, accessory_ids, context = context)
+        #for item in accessory_proxy:
+        #    if item.access_id:
+        #        accessory_converter[item.access_id] = item.id
+        
+        print "Start import fashion.form.accessory.rel"
+        file_input = os.path.expanduser('~/etl/fashion/SchXacc.txt')
+        separator = '\t'
+        lines = csv.reader(open(file_input,'rU'),delimiter=separator)
+        max_col = False
+        tot = 0
+        accessory_pool = self.pool.get('fashion.form.accessory.rel')
+        try:
+            for line in lines:
+                tot += 1
+                if not max_col:
+                    max_col = len(line)
+
+                if len(line)!=max_col:
+                    print "[ERROR]", tot, "Column error! "
+                    continue
+
+                access_id = line[0]
+                #form = Prepare(line[1])
+                #accessory = Prepare(line[2])
+                #name = Prepare(line[3])
+                #um = Prepare(line[4])
+                quantity = format_currency(Prepare(line[5]))        
+                #supplier = Prepare(line[6])
+                currency = format_currency(Prepare(line[7]))
+                #note = Prepare(line[8]) # TODO mettere nel database
+                #gerber_name = Prepare(line[9])
+                #gerber_desc = Prepare(line[10])
+                #gerber_h = Prepare(line[11])
+                #gerber_l = Prepare(line[12])
+                tot_cost = currency * quantity if currency and quantity else 0.0
+                
+                #form_id = form_converter.get(form, False)
+                #accessory_id = accessory_converter.get(form, False)
+                #if not form_id or not accessory_id:
+                #    print "[WARN] %s: Form %s (%s) or Accessory %s (%s) not found!!" % (
+                #        tot, form, form_id, accessory, accessory_id)
+                #    continue
+                    
+                accessory_ids = accessory_pool.search(cr, uid, [('access_id', '=', access_id)], context=context)
+                if accessory_ids and (quantity or currency):
+                    if len(accessory_ids) != 1:
+                        print "Errore accessory must be 1"
+                        continue
+                    accessory_pool.write(cr, uid, accessory_ids[0], {
+                        'quantity': quantity,
+                        'currency': currency,
+                        'tot_cost': tot_cost,
+                    #'supplier_id': supplier_id,                            
+                    }, context=context)
+                    print "[INFO] Line %s Update %s {%s}!" % (tot, access_id, line)
+                else:
+                    #print "[WARN] Line %s Jumped Access_id %s!" % (tot, access_id)
+                    pass
+        except:
+            print '[ERROR] Error importing data!'
+        return True
+        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'fashion/etl/errata_corrige.py'
--- fashion/etl/errata_corrige.py	1970-01-01 00:00:00 +0000
+++ fashion/etl/errata_corrige.py	2014-03-18 14:06:54 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+# Modules used for ETL - Create User
+
+# Modules required:
+import os
+import xmlrpclib, sys, csv, ConfigParser
+from datetime import datetime
+
+
+# Set up parameters (for connection to Open ERP Database) *********************
+config = ConfigParser.ConfigParser()
+file_config = os.path.expanduser('~/etl/fashion/openerp.cfg')
+config.read([file_config])
+dbname = config.get('dbaccess','dbname')
+user = config.get('dbaccess','user')
+pwd = config.get('dbaccess','pwd')
+server = config.get('dbaccess','server')
+port = config.get('dbaccess','port')   # verify if it's necessary: getint
+separator = eval(config.get('dbaccess','separator')) # test
+
+# XMLRPC connection for autentication (UID) and proxy
+sock = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/common' % (server, port), allow_none=True)
+uid = sock.login(dbname ,user ,pwd)
+sock = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/object' % (server, port), allow_none=True)
+
+if len(sys.argv) != 2: 
+    print "Use: errata_corrige parameters\n parameters: supplier, code, price"
+    sys.exit()
+if sys.argv[1] == 'supplier':
+    result = sock.execute(dbname, uid, pwd, "fashion.form" , "correct_supplier_code")
+    print "Supplier updated"
+
+elif sys.argv[1] == 'code':
+    result = sock.execute(dbname, uid, pwd, "fashion.form" , "set_customer_code_in_form")
+    print "Code updated"
+
+elif sys.argv[1] == 'price':
+    result = sock.execute(dbname, uid, pwd, "fashion.form" , "set_correct_accessory_price")
+    print "Price updated"
+

=== modified file 'fashion/etl/import.py'
--- fashion/etl/import.py	2014-03-18 07:47:02 +0000
+++ fashion/etl/import.py	2014-03-18 14:06:54 +0000
@@ -1397,7 +1397,7 @@
 
         access_id = line[0]
         form = Prepare(line[1])
-        accessory_id = Prepare(line[2])
+        accessory = Prepare(line[2])
         name = Prepare(line[3])
         um = Prepare(line[4])
         quantity = format_currency(Prepare(line[5]))        
@@ -1420,7 +1420,7 @@
             log_event("[WARNING] Line jumped, no form ID, Access ID:", access_id , "Access Form ID:", form)
             continue
             
-        accessory_id = fashion_form_accessory.get(accessory_id, 0)
+        accessory_id = fashion_form_accessory.get(accessory, 0)
         if supplier:
             supplier = str(extra_id + int(supplier))
             supplier_id = res_partner.get(supplier, False)

=== renamed file 'fashion/report/form_A.odt' => 'fashion/report/form_A.odt.OTHER'
Binary files fashion/report/form_A.odt	2014-03-17 16:47:36 +0000 and fashion/report/form_A.odt.OTHER	2014-03-18 14:06:54 +0000 differ
=== added file 'fashion/report/form_Aa.odt'
Binary files fashion/report/form_Aa.odt	1970-01-01 00:00:00 +0000 and fashion/report/form_Aa.odt	2014-03-18 14:06:54 +0000 differ
=== renamed file 'fashion/report/form_C.odt' => 'fashion/report/form_C.odt.OTHER'
Binary files fashion/report/form_C.odt	2014-03-17 16:47:36 +0000 and fashion/report/form_C.odt.OTHER	2014-03-18 14:06:54 +0000 differ
=== renamed file 'fashion/report/form_D.odt' => 'fashion/report/form_D.odt.OTHER'
Binary files fashion/report/form_D.odt	2014-03-17 16:47:36 +0000 and fashion/report/form_D.odt.OTHER	2014-03-18 14:06:54 +0000 differ
=== modified file 'fashion/report/form_E.odt'
Binary files fashion/report/form_E.odt	2014-03-17 13:05:45 +0000 and fashion/report/form_E.odt	2014-03-18 14:06:54 +0000 differ
=== modified file 'fashion/wizard/duplication_fashion.py'
--- fashion/wizard/duplication_fashion.py	2014-03-17 19:23:40 +0000
+++ fashion/wizard/duplication_fashion.py	2014-03-18 14:06:54 +0000
@@ -30,16 +30,42 @@
     _name = 'fashion.duplication'
     _description = 'Duplication'
 
+    def _get_error(self, cr, uid, context=None):
+        ''' 
+        '''
+        if context is None:
+            context = {}
+
+        res = False
+        form_id = context.get('active_id')
+        if form_id:
+            form_proxy = self.pool.get('fashion.form').browse(cr, uid, form_id, context=context)            
+            start = int(form_proxy.start or '0')
+            size_base = int(form_proxy.size_base or '0')
+            if not start: # default start
+                start = 40
+            col_ref = 1 + (size_base - start) / 2
+            if col_ref != form_proxy.col_ref:
+                res = "Non conforme la gestione colonne:\nColonna base: %s\nColonna di partenza: %s\nColonna di riferimento: %s\nValore corretto %s (reimpostarlo e poi duplicare)\n" % (
+                    size_base,
+                    start,
+                    form_proxy.col_ref,
+                    col_ref,
+                )
+        return res
+        
     _columns = {
          'duplication': fields.selection([
              ('version', 'New Revision'),
              ('form', 'New Form'),
          ], 'Duplication', select=True),
          'code': fields.char('New code', size=10),
+         'error': fields.text('Error'),
     }
 
     _defaults = {
          'duplication': lambda *a: 'version',
+         'error': lambda s, cr, uid, ctx: s._get_error(cr, uid, ctx),
     }
 
     def duplication (self, cr, uid, ids, context=None):

=== modified file 'fashion/wizard/duplication_fashion_view.xml'
--- fashion/wizard/duplication_fashion_view.xml	2013-12-12 14:25:25 +0000
+++ fashion/wizard/duplication_fashion_view.xml	2014-03-18 14:06:54 +0000
@@ -10,9 +10,13 @@
         <field name="arch" type="xml">
             <form string="Season" version="7.0">
             <sheet>
-                <group col='4'>
+                <group colspan="4" col='4'>
                     <field name="duplication"/>
                     <field name="code" attrs="{'invisible':[('duplication','=','version')], 'required':[('duplication','=','form')]}"/>
+                    <group colspan="4" col='4' name="error" attrs="{'invisible': [('error','=',False)]}">
+                        <separator string="Error" colspan="4"/>
+                        <field name="error" nolabel="1" colspan="4"/>
+                    </group>
                     <button string='Create' name='duplication' type='object' icon='STOCK_APPLY'/>
                     <button string="Cancel" special="cancel" icon='STOCK_CANCEL'/>
                 </group>