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

[Nicola Riolini - Micronaet]

=== modified file 'fashion/__openerp__.py'
--- fashion/__openerp__.py	2014-03-13 17:26:45 +0000
+++ fashion/__openerp__.py	2014-09-17 15:12:42 +0000
@@ -37,16 +37,18 @@
     'author': 'Micronaet s.r.l.',
     'website': 'http://www.micronaet.it',
     'license': 'AGPL-3',
-    'depends': ['base',
-                'product',
-                'knowledge',
-                'report_aeroo',
-                'report_aeroo_ooo',
-                'l10n_it',
-                'fashion-kanban',
-                'fashion_sheet_wide',
-                'web_washing_symbol',
-               ],
+    'depends': [
+        'base',
+        'product',
+        'knowledge',
+        'report_aeroo',
+        'report_aeroo_ooo',
+        'l10n_it',
+        'fashion-kanban',
+        'fashion_sheet_wide',
+        'web_washing_symbol',
+        'web_m2x_options', # lock create in m2o
+        ],
     'init_xml': [],
     'demo_xml': [],
     'data': [

=== modified file 'fashion/errata_corrige.py'
--- fashion/errata_corrige.py	2014-09-17 14:31:39 +0000
+++ fashion/errata_corrige.py	2014-09-17 15:12:42 +0000
@@ -286,5 +286,86 @@
                 print "[INFO] %s record updated" % (i)
             self.create_update_header(cr, uid, [form.id], context=context)
         return True
-        
+
+    def set_colors(self, cr, uid, context=None):
+        ''' Read files with price in rel and update only price
+        '''
+        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]
+                note = Prepare(line[8]) # colore
+                if not note:
+                    continue
+                    
+                accessory_ids = accessory_pool.search(cr, uid, [('access_id', '=', access_id)], context=context)
+                if not accessory_ids or not note:
+                    continue
+                    
+                if len(accessory_ids) != 1:
+                    print "Errore accessory must be 1"
+                    continue
+                    
+                accessory_pool.write(cr, uid, accessory_ids[0], {
+                    'note': note,
+                }, context=context)
+                
+                print "[INFO] Line %s Update %s Note/Colore: %s!" % (tot, access_id, note)
+        except:
+            print '[ERROR] Error importing data!'
+        return True
+
+    def explode_model(self, cr, uid, context=None):
+        ''' Explode all model correctly
+        '''
+        print "Start exploding model in part of code"
+        form_ids = self.search(cr, uid, [], context=context)
+        i = 0
+        for item in self.browse(cr, uid, form_ids, context=context):
+            i += 1
+            if i % 100 == 0:
+                print "Record aggiornati: %s" % (i)
+                
+            # Force rewrite of model for raise write recalculatin of explosion:
+            self.write(cr, uid, [item.id], {
+                'model': item.model}, context=context)
+        return True
+
+    def explode_model_partner(self, cr, uid, context=None):
+        ''' Explode all model correctly for partner
+        '''
+        print "Start exploding model in part of code"
+        partner_pool = self.pool.get('fashion.form.partner.rel')
+        partner_ids = partner_pool.search(cr, uid, [], context=context)
+        i = 0
+        for item in partner_pool.browse(cr, uid, partner_ids, context=context):
+            i += 1
+            if i % 100 == 0:
+                print "Record aggiornati: %s" % (i)
+                
+            # Force rewrite of model for raise write recalculatin of explosion:
+            partner_pool.write(cr, uid, [item.id], {
+                #'model': item.model
+                'model_customer': item.form_id.model_customer,
+                'model_article': item.form_id.model_article,
+                'model_number': item.form_id.model_number,
+                'model_revision': item.form_id.model_revision,
+                'review': item.form_id.review,                
+            }, context=context)
+            #print item.model, ">", item.form_id.model_customer, item.form_id.model_article, item.form_id.model_number, item.form_id.model_revision, item.form_id.review
+        return True
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'fashion/etl/errata_corrige.py'
--- fashion/etl/errata_corrige.py	2014-03-23 21:47:48 +0000
+++ fashion/etl/errata_corrige.py	2014-09-17 15:12:42 +0000
@@ -25,7 +25,7 @@
 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"
+    print "Use: errata_corrige parameters\n parameters: supplier, code, price, user, mt, header, colors, model, model_partner"
     sys.exit()
 if sys.argv[1] == 'supplier':
     result = sock.execute(dbname, uid, pwd, "fashion.form" , "correct_supplier_code")
@@ -51,3 +51,14 @@
     result = sock.execute(dbname, uid, pwd, "fashion.form" , "set_header")
     print "Header updated"
 
+elif sys.argv[1] == 'colors':
+    result = sock.execute(dbname, uid, pwd, "fashion.form" , "set_colors")
+    print "Colors updated"
+
+elif sys.argv[1] == 'model':
+    result = sock.execute(dbname, uid, pwd, "fashion.form", "explode_model")
+    print "Model explosion updated"
+
+elif sys.argv[1] == 'model_partner':
+    result = sock.execute(dbname, uid, pwd, "fashion.form", "explode_model_partner")
+    print "Model partner explosion updated"    

=== modified file 'fashion/etl/import.py'
--- fashion/etl/import.py	2014-03-24 15:44:29 +0000
+++ fashion/etl/import.py	2014-09-17 15:12:42 +0000
@@ -1705,6 +1705,266 @@
     
 log_event("[INFO]","Total line: ",counter['tot']," (imported: ",counter['new'],") (updated: ", counter['upd'], ")")
 
+
+
+
+
+#===========================================#
+# Importazione Relazione clienti parte costi#
+#===========================================#
+only_create = False
+jump_because_imported = False
+import pdb; pdb.set_trace()
+log_event("Start import fashion.form.partner.rel second stes")
+file_input = os.path.expanduser('~/etl/fashion/SchXtes.txt')
+openerp_object = 'fashion.form.partner.rel'
+#fashion_form_partner_rel = {}
+lines = csv.reader(open(file_input,'rU'),delimiter=separator)
+counter = {'tot':0, 'new':0, 'upd':0}
+tot_col = 0
+max_col = False
+active_cost_list = []
+try:
+    for line in lines:
+        if jump_because_imported:
+            break
+
+        if not max_col:
+            max_col = len(line)
+
+        #TODO errore creating data, current record:
+        if counter['tot']<0:
+            counter['tot'] += 1
+            continue
+        
+        if len(line) != max_col:
+            log_event('[ERROR]', counter['tot'], "Column error! ")
+            continue
+                
+        access_2_id = line[0]
+        form = Prepare(line[1])
+        fabric = Prepare(line[2])
+        #name = Prepare(line[4])
+        #h = Prepare(line[4])
+        #mt = Prepare(line[5])
+        cost = format_currency(Prepare(line[6]))
+        ric1 = format_currency(Prepare(line[7]))
+        ric2 = format_currency(Prepare(line[8]))
+        sale = format_currency(Prepare(line[9])) # Price for GM
+        partner = Prepare(line[10])
+        note = Prepare(line[11])
+    
+        try:
+            access_2_id = int(access_2_id)
+            form = int(form)
+            partner = int(partner)
+            fabric = int(fabric)
+            if not(form and partner and fabric):
+                log_event("[ERR] Manca uno dei 3 elementi necessari!")    
+                continue           
+        except:
+            log_event("[ERR] Jump record for empty form_id!")
+            continue
+
+        form_id = sock.execute(dbname, uid, pwd, 'fashion.form', 'search', [
+            ('access_id', '=', form)])
+        if not form_id:
+            log_event("[WARNING] Jump record for empty form_id!")
+            continue
+        form_id = form_id[0]
+        if form_id not in active_cost_list:
+            active_cost_list.append(form_id)
+               
+        partner_id = sock.execute(dbname, uid, pwd, 'res.partner', 'search', [
+            ('access_id', '=', partner)])
+        if not partner_id:
+            log_event("[ERROR] Partner non trovato")
+            continue
+        partner_id = partner_id[0]    
+            
+        fabric_id = sock.execute(dbname, uid, pwd, 'fashion.form.fabric', 'search', [
+            ('access_id', '=', fabric)])        
+        if not fabric_id:
+            log_event("[ERROR] Tessuto non trovato")
+            continue
+        fabric_id = fabric_id[0]    
+
+        # Start of importation:
+        counter['tot'] += 1
+
+        # test if record exists (basing on Ref. as code of Partner)
+        item = sock.execute(dbname, uid, pwd, openerp_object , 'search', [
+            ('access_2_id', '=', access_2_id)])
+
+        if not item:
+            # try to link to partner-fabric id
+            item = sock.execute(dbname, uid, pwd, openerp_object , 'search', [
+                ('form_id', '=', form_id),
+                ('partner_id', '=', partner_id),
+                ('fabric_id', '=', fabric_id),
+            ])
+
+        if len(item) > 1 :
+            log_event("[ERROR] More than one key found!")
+            continue
+            
+        data = {
+            'form_id': form_id,
+            'fabric_id': fabric_id,
+            'partner_id': partner_id,
+            #'h_fabric': h_fabric,
+            #'mt_fabric': mt_fabric,
+            'cost': cost,
+            'retail': ric1,
+            'wholesale': ric2,
+            'sale': sale,
+            'note_cost': note,
+            'access_2_id': access_2_id,
+        }
+
+        if item: # already exist
+           counter['upd'] += 1
+           try:
+               if only_create: 
+                   log_event("[INFO]", counter['tot'], "Write", openerp_object, "(jumped only_create clause)")
+               else:    
+                   item_mod = sock.execute(dbname, uid, pwd, openerp_object, 'write', item, data)
+                   log_event("[INFO]", counter['tot'], "Write", openerp_object)
+           except:
+               log_event("[ERROR] Modifing data, current record:", data, sys.exc_info())
+
+        else:
+           counter['new'] += 1
+           try:
+               openerp_id=sock.execute(dbname, uid, pwd, openerp_object, 'create', data)
+               log_event("[INFO]", counter['tot'], "Create", openerp_object)
+           except:
+               log_event("[ERROR] Error creating data, current record: ", data, sys.exc_info())
+except:
+    log_event('>>> [ERROR] Error importing data!')
+    raise #Exception("Errore di importazione!") # Scrivo l'errore per debug
+
+log_event("[INFO]","Total line: ",counter['tot']," (imported: ",counter['new'],") (updated: ", counter['upd'], ")")
+
+# Write model_for_cost
+sock.execute(dbname, uid, pwd, "fashion.form", 'write', active_cost_list, {'model_for_cost': True})
+
+#=============================================#
+# Importazione Relazione clienti listino costi#
+#=============================================#
+only_create = False
+jump_because_imported = False
+log_event("Start import fashion.form.cost.rel.pricelist")
+file_input = os.path.expanduser('~/etl/fashion/FornitoriXCosto.txt')
+openerp_object = 'fashion.form.cost.rel.pricelist'
+import pdb; pdb.set_trace()
+lines = csv.reader(open(file_input,'rU'),delimiter=separator)
+counter = {'tot':0, 'new':0, 'upd':0}
+tot_col = 0
+max_col = False
+try:
+    for line in lines:
+        if jump_because_imported:
+            break
+
+        if not max_col:
+            max_col = len(line)
+
+        if counter['tot']<0:
+            counter['tot'] += 1
+            continue
+        
+        if len(line) != max_col:
+            log_event('[ERROR]', counter['tot'], "Column error! ")
+            continue
+                
+        access_id = line[0]
+        cost = Prepare(line[1])    # rel
+        partner = Prepare(line[2]) # supplier
+        value = format_currency(Prepare(line[3]))
+        note = Prepare(line[4])
+        current = Prepare(line[5]) == '1'
+    
+        try:
+            access_id = int(access_id)
+            cost = int(cost)
+            partner = 1000 + int(partner)
+            if not(cost and partner):
+                log_event("[ERR] Manca uno dei 2 elementi necessari!")    
+                continue           
+        except:
+            log_event("[ERR] Jump record for empty form_id!")
+            continue
+
+        cost_id = sock.execute(dbname, uid, pwd, 'fashion.form.cost.rel', 'search', [
+            ('access_id', '=', cost)])
+        if not cost_id:
+            log_event("[WARNING] Jump record for empty cost_id!")
+            continue
+        cost_id = cost_id[0]
+               
+        partner_id = sock.execute(dbname, uid, pwd, 'res.partner', 'search', [
+            ('access_id', '=', partner)])
+        if not partner_id:
+            log_event("[ERROR] Partner non trovato")
+            continue
+        partner_id = partner_id[0]    
+            
+        # Start of importation:
+        counter['tot'] += 1
+
+        # test if record exists (basing on Ref. as code of Partner)
+        item = sock.execute(dbname, uid, pwd, openerp_object , 'search', [
+            ('access_id', '=', access_id)])
+
+        if not item:
+            # try to link to partner-fabric id
+            item = sock.execute(dbname, uid, pwd, openerp_object , 'search', [
+                ('cost_rel_id', '=', cost_id),
+                ('supplier_id', '=', partner_id),
+            ])
+
+        if len(item) > 1 :
+            log_event("[ERROR] More than one key found!")
+            continue
+            
+        data = {
+            'cost_rel_id': cost_id,
+            'supplier_id': partner_id,
+            'value': value,
+            'note': note,
+            'current': current,
+            'access_id': access_id,
+        }
+
+        if item: # already exist
+           counter['upd'] += 1
+           try:
+               if only_create: 
+                   log_event("[INFO]", counter['tot'], "Write", openerp_object, "(jumped only_create clause)")
+               else:    
+                   item_mod = sock.execute(dbname, uid, pwd, openerp_object, 'write', item, data)
+                   log_event("[INFO]", counter['tot'], "Write", openerp_object)
+           except:
+               log_event("[ERROR] Modifing data, current record:", data, sys.exc_info())
+
+        else:
+           counter['new'] += 1
+           try:
+               openerp_id=sock.execute(dbname, uid, pwd, openerp_object, 'create', data)
+               log_event("[INFO]", counter['tot'], "Create", openerp_object)
+           except:
+               log_event("[ERROR] Error creating data, current record: ", data, sys.exc_info())
+except:
+    log_event('>>> [ERROR] Error importing data!')
+    raise #Exception("Errore di importazione!") # Scrivo l'errore per debug
+
+log_event("[INFO]","Total line: ",counter['tot']," (imported: ",counter['new'],") (updated: ", counter['upd'], ")")
+
+
+
+
+
 #===============================#
 # Importazione Relazione Misure #
 #===============================#

=== modified file 'fashion/fashion.py'
--- fashion/fashion.py	2014-09-17 15:07:59 +0000
+++ fashion/fashion.py	2014-09-17 15:12:42 +0000
@@ -31,9 +31,9 @@
 from openerp.tools.translate import _
 
 
-#==========#
-# Utility  #
-#==========#
+# --------
+# Utility:
+# --------
 # TODO eliminare le funzioni, non devono stare qui!
 def _get_image(self, cr, uid, ids, name, args, context=None):
     result = dict.fromkeys(ids, False)
@@ -42,7 +42,8 @@
     return result
 
 def _set_image(self, cr, uid, item_id, name, value, args, context=None):
-    return self.write(cr, uid, [item_id], {'image': tools.image_resize_image_big(value)}, context=context)
+    return self.write(cr, uid, [item_id], {
+        'image': tools.image_resize_image_big(value)}, context=context)
 
 
 class fashion_season(osv.osv):
@@ -50,9 +51,10 @@
     '''
     _name = 'fashion.season'
     _description = 'Season'
-    _order = 'name'
+    _order = 'sequence,name'
 
     _columns = {
+         'sequence': fields.integer('Sequence'),
          'code': fields.char('Cod', size = 10, required = True, help = 'Code used in fabric for join in the name'),
          'name': fields.char('Name', size = 40, required = True),
          'note': fields.text('Note'),
@@ -101,17 +103,23 @@
     '''
     _name = 'fashion.form.cost'
     _description = 'Cost'
-    _order = 'name'
+    _order = 'sequence,name'
 
     _columns = {
-         'name': fields.char('Name', size = 40, required=True),
-         'note': fields.text('Note'),
-         'sequence': fields.integer('Sequence'),
-
+        'name': fields.char('Name', size = 40, required=True),
+        'note': fields.text('Note'),
+        'sequence': fields.integer('Sequence'),
+        'cost': fields.float('Cost', digits=(12, 4)),
+        'default': fields.boolean('Default'),
+    
          # Link di importazione:
          'access_id': fields.integer('Access ID', help="ID Importazione che tiene il link"),
      }
 
+    _defaults = {
+        'default': False,
+    }
+
 class fashion_form_accessory(osv.osv):
     '''Table that manages the accessory
     '''
@@ -255,31 +263,33 @@
     _name = 'fashion.form'
     _inherits = {'product.product': 'product_id', }
     #_inherit = 'mail.thread' # link to messages
-    _order = 'model_article,model_number,model,review desc'
+    _order = 'model_article,model_number desc,model_customer,model,review desc'
 
     _default_extension = 'jpg'
     
-    #====================#
+    # --------------------
     # On change functions:
-    #====================#
+    # --------------------
     def on_change_model(self, cr, uid, ids, model, context=None):
         ''' Split model code in all the part 
         '''
-        res={}
+        res = {'value': {}}
         if not model:
             return res
-        model=model.upper()
-        res['value'] = {}
+        model = model.upper()
         res['value']['model'] = model
         if model[0:1].isalpha():
             if model[1:2].isalpha():
                 model_customer = model[0:1]
                 model_article = model[1:2]
             else:
-                model_customer = ''
+                model_customer = False
                 model_article = model[0:1]
         else:
-            res['warning']={'title':_('warning'),'message':_('Error: Model must start with letter')}
+            res['warning'] = {
+                'title': _('warning'),
+                'message': _('Error: Model must start with letter'),
+            }
         res['value']['model_customer'] = model_customer
         res['value']['model_article'] = model_article
         model_number = ''
@@ -290,15 +300,14 @@
                 model_number += c
             else:
                 break
-        #pdb.set_trace()
         res['value']['model_number'] = int(model_number) if model_number.isdigit() else 0
-        res['value']['model_revision'] = model[i:]
+        res['value']['model_revision'] = model[i:] or False
         res['value']['conformed'] = res['value']['model_revision'] == 'C'
         return res
 
-    #==================#
+    # ------------------
     # Utility functions:
-    #==================#
+    # ------------------
     # Naming function:
     def _get_form_name(self, model, review):
         ''' Return name of form element
@@ -347,9 +356,9 @@
             return False
         return True
 
-    #====================#
-    # Override functions #
-    #====================#
+    # ------------------
+    # Override function:
+    # ------------------
     def create(self, cr, uid, vals, context=None):
         """
         Create a new record for a model ModelName
@@ -360,10 +369,14 @@
         
         @return: returns a id of new record
         """
+        # Automatic create a name
         vals['name'] = self._get_form_name(
             vals.get('model', ''),
             vals.get('review', 0),
         )
+        # Explode model element
+        vals.update(self.on_change_model(cr, uid, 0, vals.get('model', False), context=context)['value'])     
+            
         return super(fashion_form, self).create(cr, uid, vals, context=context)
     
     def write(self, cr, uid, ids, vals, context=None):
@@ -379,7 +392,11 @@
         
         @return: True on success, False otherwise
         """
+        # Explore model element
+        vals.update(self.on_change_model(cr, uid, 0, vals.get('model', False), context=context)['value'])
         res = super(fashion_form, self).write(cr, uid, ids, vals, context)
+        
+        # Automatic create a name model.revision:
         if 'model' in vals or 'review' in vals:
             form_proxy = self.browse(cr, uid, ids, context = context)[0]
             vals['name'] = self._get_form_name(
@@ -389,9 +406,38 @@
             res = super(fashion_form, self).write(cr, uid, ids, vals, context)
         return res
     
-    #==============#
-    # Button event #
-    #==============#
+    # ------------
+    # Button event
+    # ------------
+    def set_not_cost_model(self, cr, uid, ids, context=None):
+        ''' Set form for no manage costs
+        '''
+        return self.write(cr, uid, ids, {'model_for_cost': False}, context=context)
+
+    def set_cost_model(self, cr, uid, ids, context=None):
+        ''' Set form for no manage costs
+        '''
+        # Set default fixed cost in list:
+        form_proxy = self.browse(cr, uid, ids, context=context)[0]
+        cost_list_ids = [item.cost_id.id for item in form_proxy.cost_rel_ids]
+        
+        cost_pool = self.pool.get('fashion.form.cost')
+        default_ids = cost_pool.search(cr, uid, [('default','=',True)], context=context)
+        for cost in cost_pool.browse(cr, uid, default_ids, context=context):
+            if cost.id not in cost_list_ids:
+                # Create cost and pricelist:
+                self.pool.get('fashion.form.cost.rel').create(cr, uid, {
+                    'form_id': ids[0],
+                    'cost_id': cost.id,
+                    'value': cost.cost or 0.0
+                }, context=context)
+        return self.write(cr, uid, ids, {'model_for_cost': True}, context=context)
+        
+    def button_refresh(self, cr, uid, ids, context=None):
+        ''' Dummy action for refresh form
+        '''
+        return True
+        
     def create_update_header(self, cr, uid, ids, context=None):
         ''' Create a particular line for header (tg. values)
             > fashion.form.measure.rel
@@ -528,9 +574,29 @@
     def form_discarded(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'discarded'}, context=context)
     
-    #==================#
-    # Fields functions #
-    #==================#
+    # ----------------
+    # Fields functions
+    # ----------------
+    def _get_sum_items(self, cr, uid, ids, name, args, context=None):
+        ''' Calculate total sum for costs (cost list and accessory)
+        '''
+        res = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            res[obj.id] = {}
+            res[obj.id]['sum_accessory'] = 0.0
+            res[obj.id]['sum_cost'] = 0.0
+            if obj.model_for_cost: # calculate only if it's a model (for speed)
+                for accessory in obj.accessory_rel_ids:
+                    res[obj.id]['sum_accessory'] += accessory.tot_cost
+                for cost in obj.cost_rel_ids:
+                    res[obj.id]['sum_cost'] += cost.value          
+                res[obj.id]['sum_extra_cost'] = res[obj.id]['sum_cost'] + res[obj.id]['sum_accessory']
+                             
+            else:
+                res[obj.id]['sum_extra_cost'] = 0.0
+
+        return res
+        
     def _get_draw_image(self, cr, uid, ids, name, args, context=None):
         ''' Read image from file according to name and version format:
             MODEL.VERSION.ext
@@ -588,12 +654,10 @@
         }
 
     def set_obsolete(self, cr, uid, ids, context=None):
-        #pdb.set_trace()
         self.write(cr, uid, ids, {'obsolete':context.get('obsolete',True)})
         return True
         
     def set_not_obsolete(self, cr, uid, ids, context=None):
-        #pdb.set_trace()
         self.set_obsolete(cr, uid, ids, {'obsolete':False})
         return True
 
@@ -627,21 +691,36 @@
          'old_model': fields.boolean('Old Model'),
          'show_old_model': fields.boolean('Show old model'),
          'washing': fields.text('Washing'),
+         'model_for_cost': fields.boolean('Model for cost', help='Indicates that this form is use for create a pricelist elements'),
          'col_ref': fields.selection([
-                (1,'col 1'),
-                (2,'col 2'),
-                (3,'col 3'),
-                (4,'col 4'),
-                (5,'col 5'),
-                (6,'col 6'),
-                (7,'col 7'),
-                (8,'col 8'),
-                (9,'col 9'),
-                (10,'col 10'),
-                (11,'col 11'),
-                (12,'col 12'),
-                ], 'Column reference', select=True, required=True),
-
+             (1,'col 1'),
+             (2,'col 2'),
+             (3,'col 3'),
+             (4,'col 4'),
+             (5,'col 5'),
+             (6,'col 6'),
+             (7,'col 7'),
+             (8,'col 8'),
+             (9,'col 9'),
+             (10,'col 10'),
+             (11,'col 11'),
+             (12,'col 12'),
+         ], 'Column reference', select=True, required=True),
+         
+         # Function for totals:
+         'sum_accessory': fields.function(_get_sum_items, string="Total accessory", 
+            type="float", digits=(10, 2), store=False, multi='totals',
+             help="Sum of the accessory list (see page Accessory for details)",
+         ),
+         'sum_cost': fields.function(_get_sum_items, string="Total cost list", 
+            type="float", digits=(10, 2), store=False, multi='totals',
+            help="Sum of costs in the list on the left",
+         ),
+         'sum_extra_cost': fields.function(_get_sum_items, string="Total extra cost", 
+            type="float", digits=(10, 2), store=False, multi='totals',
+            help="Sum of accessory cost and cost list (no fabric in this total)",
+         ),
+         
          # Image:
          'draw_image_a': fields.function(_get_draw_image, fnct_inv=_set_draw_image,
              string="Draw Image A", type="binary", #multi="_get_draw_image",
@@ -697,14 +776,14 @@
              ('sample', 'Sample'),
              ('ok', 'Ok production'),
              ('produced', 'Produced'),
-             ('discarded', 'Discarded'), ], 'State', select=True),
+             ('discarded', 'Discarded'),
+         ], 'State', select=True),
          
-         # Campi model
+         # Explosion of model
          'model_customer': fields.char('Sigla cliente', size=1), 
          'model_article': fields.char('Sigla articolo', size=1),
          'model_number': fields.integer('Numero modello'),
          'model_revision': fields.char('Revisione', size=3),
-         #'model_internal': fields.boolean('Interno'),
 
          #'description': fields.char('Description', size = 40, help = 'Description model'),
          #'supplier': fields.char('Supplier', size = 40, help = 'Supplier of the fabric', required = False),
@@ -730,6 +809,7 @@
         'old_model': lambda *x: False,
         'show_old_model': lambda *x: False,
         'col_ref': lambda *a: 3,
+        'model_for_cost': False,
     }
 
 #===================#
@@ -781,6 +861,9 @@
     _description = 'Form characteristic relation'
     _order = 'sequence,id'
 
+    # ----------------
+    # On change event:
+    # ----------------
     def on_change_upper_characteristic(self, cr, uid, ids, name, context=None):
         ''' Manages the capital of the fields in the form Characteristic
         '''
@@ -797,6 +880,28 @@
             res['value']['lenght'] = lenght.upper()
         return res
     
+    # -------------
+    # Button event:
+    # -------------    
+    def duplicate_characteristic(self, cr, uid, ids, context=None):
+        ''' Duplicate characteristic element
+        '''
+        item_proxy = self.browse(cr, uid, ids, context=context)[0]
+        return self.create(cr, uid, {
+            'name': item_proxy.name,
+            'sequence': item_proxy.sequence,
+            'form_id': item_proxy.form_id.id,
+            'characteristic_id': item_proxy.characteristic_id.id if item_proxy.characteristic_id else False,
+            'lenght': item_proxy.lenght,
+            'old_name': item_proxy.old_name,
+            'stitch_type_id': item_proxy.stitch_type_id.id if item_proxy.stitch_type_id else False,
+            'stitch_verse_id': item_proxy.stitch_verse_id.id if item_proxy.stitch_verse_id else False,
+            'stitch_cut_id': item_proxy.stitch_cut_id.id if item_proxy.stitch_cut_id else False,
+            'stitch_top_id': item_proxy.stitch_top_id.id if item_proxy.stitch_top_id else False,
+            'stitch_top_type_id': item_proxy.stitch_top_type_id.id if item_proxy.stitch_top_type_id else False,
+            'bindello': item_proxy.bindello,
+        }, context=context)
+
     _columns = {
          'sequence': fields.integer('Seq.'),    
          'form_id': fields.many2one('fashion.form', 'Form'),
@@ -823,7 +928,7 @@
     '''
     _name = 'fashion.form.characteristic.rel.specific'
     _description = 'Specific'
-    _order = 'name'
+    _order = 'type,name'
 
     def create(self, cr, uid, vals, context=None):
         """
@@ -881,7 +986,7 @@
 
     _columns = {
         'form_id': fields.many2one('fashion.form', 'Form'),
-        'cost_id': fields.many2one('fashion.form.cost', 'Cost'),
+        'cost_id': fields.many2one('fashion.form.cost', 'Cost', required=True),
         'value': fields.float('Value'),
         'note': fields.text('Note'),
 
@@ -889,6 +994,38 @@
          'access_id': fields.integer('Access ID', help="ID Importazione che tiene il link"),
     }
 
+class fashion_form_cost_rel_pricelist(osv.osv):
+    '''Table that manage the pricelist elements for signle cost
+    '''
+    _name = 'fashion.form.cost.rel.pricelist'
+    _description = 'Pricelist'
+    _rec_name = 'value'
+
+    _columns = {
+        'current': fields.boolean('Current', required=False),
+        'cost_rel_id': fields.many2one('fashion.form.cost.rel', 'Cost'),
+        'supplier_id': fields.many2one('res.partner', 'Supplier', domain=[('supplier','=',True)]),
+        'value': fields.float('Value', required=True),
+        'note': fields.text('Note'),
+
+         # Link di importazione:
+         'access_id': fields.integer('Access ID', help="ID Importazione che tiene il link"),
+    }
+    
+    _defaults = {
+        'current': False,
+    }
+
+class fashion_form_cost_rel(osv.osv):
+    '''Table that manage the relation cost/form
+    '''
+    _name = 'fashion.form.cost.rel'
+    _inherit = 'fashion.form.cost.rel'
+    
+    _columns = {
+        'pricelist_ids':fields.one2many('fashion.form.cost.rel.pricelist', 'cost_rel_id', 'Pricelist', required=False),
+    }
+    
 class fashion_form_accessory_rel(osv.osv):
     '''Table that manage the relation accessory/form
     '''
@@ -896,6 +1033,38 @@
     _description = 'Relation accessory'
     _order = 'sequence,id'
     
+    # -------------
+    # Button event:
+    # -------------    
+    def duplicate_accessory(self, cr, uid, ids, context=None):
+        ''' Duplicate accessory element
+        '''
+        item_proxy = self.browse(cr, uid, ids, context=context)[0]
+        return self.create(cr, uid, {
+            'form_id': item_proxy.form_id.id,
+            'sequence': item_proxy.sequence,
+            'accessory_id': item_proxy.accessory_id.id if item_proxy.accessory_id else False,
+            'fabric_id': item_proxy.fabric_id.id if item_proxy.fabric_id else False,
+            'name': item_proxy.name,
+            'code': item_proxy.code,
+            'um': item_proxy.um,
+            'quantity': item_proxy.quantity,
+            'currency': item_proxy.currency,
+            'note': item_proxy.note,
+            'gerber_name': item_proxy.gerber_name,
+            'gerber_desc': item_proxy.gerber_desc,
+            'gerber_h': item_proxy.gerber_h,
+            'gerber_l': item_proxy.gerber_l,
+            'supplier_id': item_proxy.supplier_id.id if item_proxy.supplier_id else False,
+            'pricelist_id': item_proxy.pricelist_id.id if item_proxy.pricelist_id else False,
+            'tot_cost': item_proxy.tot_cost,
+            'color': item_proxy.color,
+            'h': item_proxy.h,
+        }, context=context)
+    
+    # ----------
+    # On change:
+    # ----------    
     def on_change_calcolate_cost(self, cr, uid, ids, quantity, currency, context=None):
         '''Calcolate the total cost of the accessory
         '''
@@ -965,6 +1134,7 @@
             try:
                 fabric_proxy = fabric_pool.browse(cr, uid, fabric_id, context=context)
                 res['value']['supplier_id'] = fabric_proxy.supplier_id and fabric_proxy.supplier_id.id or False
+                res['value']['currency'] = fabric_proxy.cost or 0.0
                 res['value']['name'] = "%s - %s" % (fabric_proxy.code or "",  fabric_proxy.perc_composition or "")
             except:
                 return res    
@@ -1111,8 +1281,8 @@
     _name = 'fashion.form.partner.rel'
     _description = 'Relation'
     _rec_name = 'partner_id'
-    _order = 'model_article,model_number,model,review desc'
-
+    _order = 'model_article,model_number desc,model_customer,model,review desc'
+    
     # --------------------
     # Override ORM method:
     # --------------------
@@ -1127,9 +1297,66 @@
         return res
         
     # TODO: name_search
-    #=====================#
-    # On change functions #
-    #=====================#
+
+    #--------------
+    # Button event:
+    #--------------
+    def wizard_print_a(self, cr, uid, ids, context=None):
+        ''' Print directyl report C with totals (instead of wizard)        
+        '''
+        record_proxy = self.browse(cr, uid, ids, context=context)[0]
+        datas = {}
+        datas['active_ids'] = [record_proxy.form_id.id]
+        datas['active_id'] = record_proxy.form_id.id
+        datas['partner_fabric_id'] = ids[0]
+        datas['summary'] = True
+        datas['image'] = True
+        
+        return {
+            'model': 'fashion.form',
+            'type': 'ir.actions.report.xml',
+            'report_name': "fashion_form_A",
+            'datas': datas,
+        }
+
+    def wizard_print_b(self, cr, uid, ids, context=None):
+        ''' Print directyl report C with totals (instead of wizard)        
+        '''
+        record_proxy = self.browse(cr, uid, ids, context=context)[0]
+        datas = {}
+        datas['active_ids'] = [record_proxy.form_id.id]
+        datas['active_id'] = record_proxy.form_id.id
+        datas['partner_fabric_id'] = ids[0]
+        datas['total'] = True
+        datas['image'] = True
+        
+        return {
+            'model': 'fashion.form',
+            'type': 'ir.actions.report.xml',
+            'report_name': "fashion_form_B",
+            'datas': datas,
+        }
+
+    def wizard_print_c(self, cr, uid, ids, context=None):
+        ''' Print directyl report C with totals (instead of wizard)        
+        '''
+        record_proxy = self.browse(cr, uid, ids, context=context)[0]
+        datas = {}
+        datas['active_ids'] = [record_proxy.form_id.id]
+        datas['active_id'] = record_proxy.form_id.id
+        datas['partner_fabric_id'] = ids[0]
+        datas['image'] = True
+        
+        return {
+            'model': 'fashion.form',
+            'type': 'ir.actions.report.xml',
+            'report_name': "fashion_form_C",
+            'datas': datas,
+        }
+
+    #---------------------
+    # On change functions:
+    #---------------------
     def on_change_symbol_fabric(self, cr, uid, ids, fabric_id, symbol_fabric, article_code, supplier_id, perc_fabric, context=None):
         ''' Load default wash symbol, maybe in the form are changed
         '''
@@ -1139,6 +1366,8 @@
             res['value']['article_code'] = False
             res['value']['supplier_id'] = False
             res['value']['perc_fabric'] = False
+            res['value']['cost'] = False
+            res['value']['note_fabric'] = False            
             return res
 
         fabric_proxy = self.pool.get('fashion.form.fabric').browse(cr, uid, fabric_id, context=context)
@@ -1146,155 +1375,124 @@
         res['value']['article_code'] = fabric_proxy.article_code
         res['value']['supplier_id'] = fabric_proxy.supplier_id.id
         res['value']['perc_fabric'] = fabric_proxy.perc_composition
+        res['value']['cost'] = fabric_proxy.cost
         res['value']['note_fabric'] = "%s%s %s" % (
             fabric_proxy.supplier_id.name if fabric_proxy.supplier_id else "", 
             " ART %s" % (
                 fabric_proxy.article_code) if fabric_proxy.article_code else "", 
             fabric_proxy.note or '')
         return res
-
-    #==========================#
-    # Utility: naming function #
-    #==========================#
-    #def _get_form_name(self, model, review):
-    #    ''' Return name of form element
-    #    '''
-    #    return "%s.%s" % (model, review)
-    
-    #def _get_draw_image_name(self, obj):
-    #    ''' Return name of image from browese obj passed
-    #    '''
-    #    return ("%s.%s" % (self._get_form_name(obj.model, obj.review), 'jpg')).lower()
-        
-    #=========================#
-    # Utility: image function #
-    #=========================#
-    #def _get_draw_image_type(self, field_name):
-    #    ''' Return type of image depend on draw field name
-    #    '''
-    #    if field_name == 'draw_image_a':
-    #        return 'A'
-    #    elif field_name == 'draw_image_b':
-    #        return 'B'
-    #    else: #default     # TODO photo   
-    #        return 'A'
-
-    #def _load_image(self, name, type_image):
-    #    ''' Load image from file:
-    #    '''
-    #    path = os.path.expanduser(os.path.join("~/etl/fashion/image", type_image)) # TODO parametrize
-    #    filename = os.path.join(path, name)
-    #    try:
-    #        f = open(filename, 'rb')
-    #        img = base64.encodestring(f.read())
-    #        f.close()
-    #    except:
-    #        img = False
-    #    return img
-
-    #def _unload_image(self, name, value, type_image):
-    #    ''' Unload image to file:
-    #    '''
-    #    path = os.path.expanduser(os.path.join("~/etl/fashion/image", type_image)) # TODO parametrize
-    #    filename = os.path.join(path, name)
-    #    try:
-    #        f = open(filename, 'wb')
-    #        f.write(base64.decodestring(value))
-    #        f.close()
-    #    except:
-    #        return False
-    #    return True
-
-    #==================#
-    # Fields functions #
-    #==================#
-    #def _get_draw_image(self, cr, uid, ids, name, args, context=None):
-    #    ''' Read image from file according to name and version format:
-    #        MODEL.VERSION.ext
-    #    '''
-    #    res = dict.fromkeys(ids, False)
-    #    for obj in self.browse(cr, uid, ids, context=context):
-    #        res[obj.id] = self._load_image(self._get_draw_image_name(obj.form_id), self._get_draw_image_type(name)) # TODO parametrize
+        
+    def onchange_cost_computation(self, cr, uid, ids, mt_fabric, cost, retail, wholesale, sale, sum_extra_cost, context=None):
+        ''' Master event for calculate sale price with all variables
+            mt_fabric * cost = cost_tot * (100 + retail) * (100 + wholesale) = sale
+        '''
+        res = {'value': {}}
+        res['value']['total_fabric'] = (mt_fabric or 0.0) * (cost or 0.0)
+        res['value']['sale'] = (res['value']['total_fabric'] + sum_extra_cost or 0.0) * (100.0 + (retail or 0.0)) * (100.0 + (wholesale or 0.0)) / 10000.0        
+        return res
+        
+    #def onchange_sale(self, cr, uid, sale, context=None):
+    #    ''' Find % of margin for all 
+    #    '''    
+    #    res = {}
     #    return res
 
-    #def _set_draw_image(self, cr, uid, item_id, name, value, args, context=None):
-    #    ''' Write image passed to file
-    #    '''
-    #    obj_proxy = self.browse(cr, uid, item_id, context=context)
-    #    self._unload_image(self._get_draw_image_name(obj_proxy.form_id), value, self._get_draw_image_type(name)) # TODO test return value
-
+    #------------------
+    # Fields functions:
+    #------------------
+    def _get_total_fabric(self, cr, uid, ids, name, args, context=None):
+        ''' Calculate total fabric (cost * mt)
+            Total costs (fabric, list, accessory)
+            Info for margine and recharge
+        '''
+        res = {}        
+        for obj in self.browse(cr, uid, ids, context=context):
+            res[obj.id] = {}
+            res[obj.id]['total_fabric'] = obj.cost * obj.mt_fabric
+            res[obj.id]['total_cost'] = res[obj.id]['total_fabric'] + obj.form_id.sum_extra_cost # TODO + cost list + accessory totale
+            profit = obj.sale - res[obj.id]['total_cost']
+            res[obj.id]['margin_note'] = _("%5.2f%s(Mar.)\n%5.2f%s(Ric.)\n%10.2f€(Ut.)") % (
+                (profit * 100.0 / res[obj.id]['total_cost']) if res[obj.id]['total_cost'] else 0.0,
+                "%",
+                (profit * 100.0 / obj.sale) if obj.sale else 0.0,
+                "%",
+                profit,
+            )
+            
+        return res
+        
     _columns = {
-         'form_id': fields.many2one('fashion.form', 'Form'),
-         'partner_id': fields.many2one('res.partner', 'Partner', domain=[('customer','=',True)], required=True),
-         'fabric_id': fields.many2one('fashion.form.fabric', 'Fabric',), #  required=True), <<<<<<< rimettere obbligatorio dopo!!!
-         'desc_fabric': fields.char('Description', size=80),
-         'perc_fabric': fields.char('Composition', size=40),
-         'corr_fabric': fields.char('Additional description', size=80),
-         'symbol_fabric': fields.char('Symbols', size=80),
-         'note_fabric': fields.text('Fabric note'),
-         'weight': fields.float('Weight', digits=(10, 2)),
-         'h_fabric': fields.float('Height', digits=(10, 2)),
-         'mt_fabric': fields.float('Meters', digits=(10, 2)),
-         'h_lining': fields.float('Height', digits=(10, 2)),
-         'mt_lining': fields.float('Meters', digits=(10, 2)),
-         'cost': fields.float('Cost', digits=(10, 4)),
-         'tot_cost': fields.float('Total cost', digits=(10, 4)),
-         'detail': fields.char('Detail percentage', size=40),
-         'wholesale': fields.char('Wholesale percentage', size=40),
-         'department_store': fields.float('Department stores price', digits=(10, 4)),
-         'code': fields.char('Customer Code', size=10),
-         'gerber_name': fields.char('Name', size=10),
-         'gerber_desc': fields.char('Description', size=10),
-         'gerber_h': fields.char('Height', size=10),
-         'gerber_l': fields.char('Length', size=10),
-         'cost_tot': fields.float('Total cost', digits=(10, 4)),
-         'fabric_tot': fields.float('Total fabric', digits=(10, 4)),
-         'lining_tot': fields.float('Total lining', digits=(10, 4)),
-         'perc_reload': fields.float('Reloading percentage', digits=(10, 2)),
-         'perc_margin': fields.float('Margin percentage', digits=(10, 2)),
-         'sale': fields.float('Selling price', digits=(10, 4)),
-         'season_id': fields.many2one('fashion.season', string='Season'),
-         'article_code': fields.char('Article code', size=30),
-         'supplier_id': fields.many2one('res.partner', 'Supplier', domain=[('supplier','=',True)]),
-
-         # TODO eliminare appena vengono tolte dalle viste (kanban)
-         #'image': fields.related('form_id', 'image', type='binary', string='Image', readonly=True),
-         'draw_image_a': fields.related('form_id', 'draw_image_a', type='binary', string='Image', readonly=True),
-         #'image_large': fields.related('form_id', 'image_large', type='binary', string='Image', readonly=True),
-
-         # Image:
-         #'draw_image_a': fields.function(_get_draw_image, fnct_inv=_set_draw_image,
-         #    string="Draw Image A", type="binary", #multi="_get_draw_image",
-         #    help="Image for draw side A. Usual size:"\
-         #         "1024 x 768"\
-         #         "The image is printed in report form and, in small size"\
-         #         "in kanban report views",
-         #),
-         #'draw_image_b': fields.function(_get_draw_image, fnct_inv=_set_draw_image,
-         #    string="Draw Image B", type="binary", #multi="_get_draw_image",
-         #    help="Image for draw side B. Usual size:"\
-         #         "1024 x 768"\
-         #         "The image is printed in report form and, in small size"\
-         #         "in kanban report views",
-         #),
-
-         'article_id': fields.related('form_id', 'article_id', type='many2one', relation='fashion.article', string='Article', readonly=True, store=True),
-         'cost_id': fields.many2one('fashion.form.cost', 'Cost'),
-         'value': fields.float('Value', digits = (10, 2)),
-         'note': fields.text('Note'),
-
-         # Related fields:
-         'model': fields.related('form_id', 'model', type='char', string='Modello', size=14, store=True), 
-         'model_customer': fields.related('form_id', 'model_customer', type='char', string='Sigla cliente', size=1, store=True), 
-         'model_article': fields.related('form_id', 'model_article', type='char', string='Sigla articolo', size=1, store=True),
-         'model_number': fields.related('form_id', 'model_number', type='integer', string='Numero modello', store=True),
-         'model_revision': fields.related('form_id', 'model_revision', type='char', string='Revisione', size=3, store=True),
-         'review': fields.related('form_id', 'review', type='integer', string='Revisione', store=True),
-         # conformed
-
-         # Link di importazione:
-         'access_id': fields.integer('Access ID', help="ID Importazione che tiene il link"),
-     }
+        'form_id': fields.many2one('fashion.form', 'Form'),
+        'partner_id': fields.many2one('res.partner', 'Partner', domain=[('customer','=',True)], required=True),
+        'fabric_id': fields.many2one('fashion.form.fabric', 'Fabric',), #  required=True), <<<<<<< rimettere obbligatorio dopo!!!
+        'desc_fabric': fields.char('Description', size=80),
+        'perc_fabric': fields.char('Composition', size=40),
+        'corr_fabric': fields.char('Additional description', size=80),
+        'symbol_fabric': fields.char('Symbols', size=80),
+        'note_fabric': fields.text('Fabric note'),
+        'note_cost': fields.text('Cost note'),
+        'weight': fields.float('Weight', digits=(10, 2)),
+        
+        'h_fabric': fields.float('H.', digits=(10, 2)),
+        'mt_fabric': fields.float('Mt.', digits=(10, 2)),
+        
+        'cost': fields.float('Cost', digits=(10, 4), help="Unit price for fabric"),
+        'retail': fields.float('Retail', digits=(10, 4)),
+        'wholesale': fields.float('Wholesale', digits=(10, 4)),
+        'sale': fields.float('Selling price', digits=(10, 4)),
+        
+        # Calculated fields:
+        'total_fabric': fields.function(_get_total_fabric, string="Total fabric", 
+            type="float", digits=(10, 2), store=False, multi='totals'),  # m_lining * cost
+        'total_cost': fields.function(_get_total_fabric, string="Total cost", 
+            type="float", digits=(10, 2), store=False, multi='totals'),  # total_fabric + cost list + accessory
+        'margin_note': fields.function(_get_total_fabric, string="Balance", 
+            type="char", size=100, store=False, multi='totals'),  # margin information
+
+        
+        'code': fields.char('Customer Code', size=10),
+        'gerber_name': fields.char('Name', size=10),
+        'gerber_desc': fields.char('Description', size=10),
+        'gerber_h': fields.char('Height', size=10),
+        'gerber_l': fields.char('Length', size=10),
+                
+        'season_id': fields.many2one('fashion.season', string='Season'),
+        'article_code': fields.char('Article code', size=30),
+        'supplier_id': fields.many2one('res.partner', 'Supplier', domain=[('supplier','=',True)]),
+
+        # TODO eliminare:
+        'perc_reload': fields.float('Reloading percentage', digits=(10, 2)),
+        'perc_margin': fields.float('Margin percentage', digits=(10, 2)),
+        ##'cost_tot': fields.float('Total cost', digits=(10, 4)),
+        #'tot_cost': fields.float('Total cost', digits=(10, 4)), # TODO remove (transformed in function
+        #'department_store': fields.float('Department stores price', digits=(10, 4)),
+        #'fabric_tot': fields.float('Total fabric', digits=(10, 4)),
+        #'lining_tot': fields.float('Total lining', digits=(10, 4)),  # TODO remove
+
+        # TODO eliminare appena vengono tolte dalle viste (kanban)
+        #'image': fields.related('form_id', 'image', type='binary', string='Image', readonly=True),
+        'draw_image_a': fields.related('form_id', 'draw_image_a', type='binary', string='Image', readonly=True),
+        #'image_large': fields.related('form_id', 'image_large', type='binary', string='Image', readonly=True),
+
+        'cost_id': fields.many2one('fashion.form.cost', 'Cost'),
+        'value': fields.float('Value', digits=(10, 2)),
+        'note': fields.text('Note'),
+        'article_id': fields.related('form_id', 'article_id', type='many2one', relation='fashion.article', string='Article', readonly=True, store=True),
+
+        # Related fields (for search):
+        'model': fields.related('form_id', 'model', type='char', string='Modello', size=14, store=True), 
+        'model_customer': fields.related('form_id', 'model_customer', type='char', string='Sigla cliente', size=1, store=True), 
+        'model_article': fields.related('form_id', 'model_article', type='char', string='Sigla articolo', size=1, store=True),
+        'model_number': fields.related('form_id', 'model_number', type='integer', string='Numero modello', store=True),
+        'model_revision': fields.related('form_id', 'model_revision', type='char', string='Revisione', size=3, store=True),
+        'review': fields.related('form_id', 'review', type='integer', string='Revisione', store=True),
+        # conformed
+
+        # Link di importazione:
+        'access_id': fields.integer('Access ID', help="ID Importazione che tiene il link"),
+        'access_2_id': fields.integer('Access 2 ID', help="ID Importazione che tiene il link con partner costi"),
+    }
 
 class res_partner(osv.osv):
     '''

=== modified file 'fashion/fashion_view.xml'
--- fashion/fashion_view.xml	2014-03-23 22:07:35 +0000
+++ fashion/fashion_view.xml	2014-09-17 15:12:42 +0000
@@ -9,11 +9,12 @@
         <field name="arch" type="xml">
             <form string="Season" version="7.0">
             <sheet>
-                <group colspan='4' col='4'>
+                <group colspan='4' col='6'>
+                    <field name="sequence"/>
                     <field name="code"/>
                     <field name="name"/>
-                    <separator string='Note' colspan='4'/>
-                    <field name="note" nolabel='1' colspan='4'/>
+                    <separator string='Note' colspan='6'/>
+                    <field name="note" nolabel='1' colspan='6'/>
                 </group>
             </sheet>
             </form>
@@ -25,6 +26,7 @@
         <field name="model">fashion.season</field>
         <field name="arch" type="xml">
             <tree string="Season">
+                <field name="sequence"/>
                 <field name="code"/>
                 <field name="name"/>
                 <field name="note"/>
@@ -89,6 +91,8 @@
                 <group colspan='4' col='4'>
                     <field name="sequence"/>
                     <field name="name"/>
+                    <field name="default"/>
+                    <field name="cost"/>
                     <separator string='Note' colspan='4'/>
                     <field name="note" nolabel='1' colspan='4'/>
                 </group>
@@ -103,13 +107,15 @@
         <field name="arch" type="xml">
             <tree string="Cost">
                 <field name="sequence"/>
+                <field name="default"/>
                 <field name="name"/>
+                <field name="cost"/>
                 <field name="note"/>
             </tree>
         </field>
     </record>
 
-    <record id="action_fashion_form_cost" model="ir.actions.act_window">
+    <record id="action_fashion_form_cost_fixed" model="ir.actions.act_window">
             <field name="name">Fashion cost</field>
             <field name="res_model">fashion.form.cost</field>
             <field name="view_type">form</field>
@@ -327,9 +333,17 @@
             <field name="view_id" ref="fashion_form_fabric_tree"/>
             <field name="view_id" ref="fashion_form_fabric_search"/>
     </record>
+    <record id="action_fashion_form_fabric_test" model="ir.actions.act_window">
+            <field name="name">Test fabric</field>
+            <field name="res_model">fashion.form.fabric</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="fashion_form_fabric_tree"/>
+            <field name="view_id" ref="fashion_form_fabric_search"/>
+            <field name="context">{'search_default_test':1}</field>
+    </record>
 
     <!--fashion.form.stitch-->
-
     <record id="fashion_form_stitch_form" model="ir.ui.view">
         <field name="name">fashion.form.stitch.form</field>
         <field name="model">fashion.form.stitch</field>
@@ -476,32 +490,34 @@
 
                 <button string='Draft' name='form_discarded_draft' type='workflow' states='discarded' icon='gtk-refresh'/>
                 <label string=" "/>
+                
                 <button string='Duplication' name="%(fashion.action_fashion_duplication)d" type="action" icon='STOCK_COPY'/>
-                <button string='Print' name='%(fashion.action_report_wizard_duplication)d' type="action" />
+                <button string='Print' name='%(fashion.action_report_wizard_duplication)d' type="action" icon='gtk-print-preview'/>
                 <label string=" " />
                 
-                <button string='Obsolete' name='set_obsolete' type="object" attrs="{'invisible': [('obsolete','=',True)]}" context="{'obsolete':True}"/>
-                <button string='Not obsolete' name='set_obsolete' type="object" attrs="{'invisible': [('obsolete','=',False)]}" context="{'obsolete':False}"/>
+                <button string='Obsolete' name='set_obsolete' type="object" attrs="{'invisible': [('obsolete','=',True)]}" context="{'obsolete':True}" icon='STOCK_NO'/>
+                <button string='Not obsolete' name='set_obsolete' type="object" attrs="{'invisible': [('obsolete','=',False)]}" context="{'obsolete':False}" icon='STOCK_YES'/>
+                <label string=" " />
+
+                <button string='Refresh' name='button_refresh' type="object" icon='gtk-refresh'/>
                 <field name='state' widget='statusbar' readonly='1'/>
             </header>
             <sheet>
                 <group col='4'>
-                    <!--<field name="image_medium" widget="image" class="oe_avatar oe_left" modifiers="{}" nolabel='1'/>-->
                     <div class="oe_title" colspan="4">
                         <h1>
-                            <field name="model" />
+                            <field name="model" on_change='on_change_model(model)'/>
                         </h1>
                     </div>
                     <newline/>
-                    <!--<field name="model" on_change="on_change_model(model)"/>-->
                     <field name="write_date" />
                     <field name="review"/>
-                    <field name="user_id" />
+                    <field name="user_id" options="{'create': false, 'create_edit': false}"/>
                     <field name="base_id" readonly="1"/>
-                    <field name="size_base"/> <!--class="oe_wash_symbol"/>-->
+                    <field name="size_base"/>
 
                     <field name="original" placeholder="Add a generic model that started..."/>
-                    <field name="season_id"/>
+                    <field name="season_id" options="{'create': false, 'create_edit': false}"/>
                     <field name="show_old_model" attrs="{'invisible': [('old_model','=',False)]}"/>
                     <field name="old_model" invisible='1'/>
 
@@ -535,101 +551,79 @@
                                 </group>
                             </page>
                             <page string='Client'>
-                                <group colspan='4' col='4'>
-                                    <field name="partner_rel_ids" nolabel='1' colspan='4'>
+                                <group colspan='4' col='6'>
+                                    <separator string="Fabric cost list" colspan='2' groups="fashion.group_fashion_accounting"/>
+                                    <button string='Cost model' name='set_cost_model' type="object" icon='terp-dolar' groups="fashion.group_fashion_accounting" colspan="1" attrs="{'invisible':[('model_for_cost','=',True)]}"/>
+                                    <button string='Not cost model' name='set_not_cost_model' type="object" icon='terp-stock_format-default' groups="fashion.group_fashion_accounting" colspan="1" attrs="{'invisible':[('model_for_cost','=',False)]}"/>                                    
+                                    <button string='Calculate' name='button_refresh' type="object" icon='stock_graph' groups="fashion.group_fashion_accounting" colspan="1" attrs="{'invisible':[('model_for_cost','=',False)]}"/>
+                                    <field name="model_for_cost" groups="fashion.group_fashion_accounting" invisible="1" />
+
+                                    <field name="partner_rel_ids" nolabel='1' colspan='6'>
                                         <tree string="Partner" editable="bottom">
                                             <field name='partner_id'/>
                                             <field name='fabric_id' on_change="on_change_symbol_fabric(fabric_id,symbol_fabric,article_code,supplier_id,perc_fabric)"/>
-                                            <field name='supplier_id'/>
-                                            <field name='article_code'/>
-                                            <field name='perc_fabric'/>
-                                            <field name='symbol_fabric'/>
+                                            <field name='supplier_id' groups="fashion.group_fashion_production" invisible="context.get('view_cost',False)"/>
+                                            <field name='article_code' groups="fashion.group_fashion_production" invisible="context.get('view_cost',False)"/>
+                                            <field name='perc_fabric' groups="fashion.group_fashion_production" invisible="context.get('view_cost',False)"/>
+                                            <field name='symbol_fabric' groups="fashion.group_fashion_production" invisible="context.get('view_cost',False)"/>
                                             <field name='h_fabric'/>
-                                            <field name='mt_fabric'/>
-                                            <field name='h_lining' string="H. fod." invisible="1" />
-                                            <field name='mt_lining' string="mt. fod." invisible="1" />
-                                            <field name='note_fabric'/>
-                                            <!--<field name='cost_tot' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin"/>
-                                            <field name='fabric_tot' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin"/>
-                                            <field name='lining_tot' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin"/>
-                                            <field name='tot_cost' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin"/>-->
-                                            <field name='perc_reload' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin" invisible="1"/>
-                                            <field name='perc_margin' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin" invisible="1"/>
-                                            <field name='sale' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin" invisible="1"/>
+                                            <field name='mt_fabric' on_change="onchange_cost_computation(mt_fabric,cost,retail,wholesale,sale,parent.sum_extra_cost)"/>
+                                            <field name='note_fabric' groups="fashion.group_fashion_production" invisible="context.get('view_cost',False)"/>
+                                           
+                                            <field name='cost' groups="fashion.group_fashion_accounting" on_change="onchange_cost_computation(mt_fabric,cost,retail,wholesale,sale,parent.sum_extra_cost)" />
+                                            
+                                            <field name='total_fabric' groups="fashion.group_fashion_accounting" invisible="context.get('view_production',False)"/>
+                                            <field name='total_cost' groups="fashion.group_fashion_accounting" invisible="context.get('view_production',False)"/>
+
+                                            <field name='wholesale' groups="fashion.group_fashion_accounting" on_change="onchange_cost_computation(mt_fabric,cost,retail,wholesale,sale,parent.sum_extra_cost)" invisible="context.get('view_production',False)"/>
+                                            <field name='retail' groups="fashion.group_fashion_accounting" on_change="onchange_cost_computation(mt_fabric,cost,retail,wholesale,sale,parent.sum_extra_cost)" invisible="context.get('view_production',False)"/>
+                                            <field name='sale' groups="fashion.group_fashion_accounting" />
+                                            <field name='margin_note' groups="fashion.group_fashion_accounting" invisible="context.get('view_production',False)"/>
+                                            <field name='note_cost' groups="fashion.group_fashion_accounting" invisible="context.get('view_production',False)"/>
+                                            <button string='[A]' name='wizard_print_a' type="object" groups="fashion.group_fashion_accounting"/> <!--icon='gtk-print-preview' -->
+                                            <button string='[B]' name='wizard_print_b' type="object" groups="fashion.group_fashion_accounting"/> <!--icon='gtk-print-preview' -->
+                                            <button string='[C]' name='wizard_print_c' type="object" groups="fashion.group_fashion_accounting"/>
                                         </tree>
-                                        <form string="Partner">
-                                            <group col='4'>
-                                                <field name='partner_id'/>
-                                                <!--<field name='code'/>-->
-                                                <field name='season_id' />
-                                                <field name='fabric_id' domain="[('season_id','=',season_id)]" on_change="on_change_symbol_fabric(fabric_id,symbol_fabric,article_code,supplier_id,perc_fabric)"/><!--attrs="{'invisible':[('season_id','=',False)]}"-->
-                                                <field name='symbol_fabric' /><!--attrs="{'invisible':[('season_id','=',False)]}"-->
-                                                <field name='supplier_id' />
-                                                <field name='article_code' />
-                                                <notebook colspan='4'>
-                                                    <page string='Fabric'>
-                                                        <group col='4'>
-                                                            <field name='desc_fabric'/>
-                                                            <field name='perc_fabric'/>
-                                                            <field name='corr_fabric'/>
-                                                            <field name='weight'/>
-                                                            <field name='h_fabric'/>
-                                                            <field name='mt_fabric'/>
-                                                            <field name='detail'/>
-                                                            <field name='wholesale' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin"/>
-                                                            <field name='department_store'/>
-                                                            <separator string='Note' colspan='4'/>
-                                                            <field name='note_fabric' nolabel='1' colspan='4' placeholder='Add a fabric note...'/>
-                                                        </group>
-                                                    </page>
-                                                    <page string='Lining'>
-                                                        <group col='4'>
-                                                            <field name='h_lining'/>
-                                                            <field name='mt_lining'/>
-                                                            <field name='cost' groups="fashion.group_fashion_accounting,fashion.group_fashion_admin"/>
-                                                        </group>
-                                                    </page>
-                                                    <page string='Gerber' groups="fashion.group_fashion_gerber">
-                                                        <group col='4'>
-                                                            <field name='gerber_name'/>
-                                                            <field name='gerber_desc'/>
-                                                            <field name='gerber_h'/>
-                                                            <field name='gerber_l'/>
-                                                        </group>
-                                                    </page>
-                                                    <page string='Statistics' groups='fashion.group_fashion_accounting,fashion.group_fashion_admin'>
-                                                        <group col='4'>
-                                                            <field name='cost_tot'  />
-                                                            <field name='fabric_tot'/>
-                                                            <field name='lining_tot'/>
-                                                            <field name='tot_cost'/>
-                                                            <field name='perc_reload'/>
-                                                            <field name='perc_margin'/>
-                                                            <field name='sale'/>
-                                                        </group>
-                                                    </page>
-                                                    <!--<page string='Costs'>
-                                                        <group colspan='4'>
-                                                            <field name="cost_rel_ids" nolabel='1' colspan='4'>
-                                                                <tree string="Cost" editable='bottom'>
-                                                                    <field name='cost_id'/>
-                                                                    <field name='value'/>
-                                                                    <field name='note'/>
-                                                                </tree>
-                                                            <field name="h_lining"/>
-                                                            <field name="mt_lining"/>
-                                                            <field name="cost_lining"/>
-                                                            </field>
-                                                        </group>
-                                                    </page>-->
-                                                </notebook>
-                                            </group>
-                                        </form>
                                     </field>
+                                </group>
+                                <group colspan='4' col='4' groups="fashion.group_fashion_accounting" attrs="{'invisible':[('model_for_cost','=',False)]}">
+                                    <group colspan="2" col="2">
+                                        <separator string="Cost list" colspan='2' />
+                                        <field name="cost_rel_ids" nolabel='1' colspan='2'>
+                                            <tree string="Cost">
+                                                <field name='cost_id'/>
+                                                <field name='value' sum="total" />
+                                                <field name='note'/>
+                                            </tree>                            
+                                            <form string="Cost">
+                                                <field name='cost_id'/>
+                                                <field name='value' sum="total" />
+                                                <separator string="Pricelist" colspan="4"/>
+                                                <field name='pricelist_ids' colspan="4" nolabel="1">
+                                                    <tree string="Pricelist" editable="bottom" colors="grey:current==False;green:current==True">
+                                                        <field name="current"/>
+                                                        <field name="supplier_id"/>
+                                                        <field name="value"/>
+                                                        <field name="note"/>
+                                                    </tree>
+                                                </field>
+                                                <separator string="Note" colspan="4"/>
+                                                <field name='note' colspan="4" nolabel="1"/>
+                                            </form>                            
+                                        </field>
+                                    </group>
+                                    <group colspan="2" col="2">
+                                        <separator string="Summary cost" colspan='2' />
+                                        <field name="sum_cost" />
+                                        <field name="sum_accessory"/>
+                                        <field name="sum_extra_cost" string="Totale costi"/>
+                                    </group>    
+                                </group>
+                                <group colspan='4' col='4' groups="fashion.group_fashion_production">
+                                    <separator string="Production info" colspan='4' />
                                     <field name="customer_code" />
                                     <field name="cut" placeholder="Add number of cut-out models..."/>
-                                    <newline/>
-                                    <field name="size" colspan='4' placeholder="Add sizes achieve..."/>
+                                    <field name="size" placeholder="Add sizes achieve..."/>
                                     <field name="colors" placeholder="Add colors to be cut..."/>                                    
                                 </group>
                             </page>
@@ -660,6 +654,7 @@
                                             <!--<field name='stitch_top_type_id' context="{'default_type':'5'}" />-->
                                             <field name='bindello'/>
                                             <field name='name' on_change="on_change_upper_characteristic(name)" string="Description"/>
+                                            <button name="duplicate_characteristic" type="object" string="Duplicate" icon="STOCK_COPY" />
                                         </tree>
                                     </field>
                                     <separator string='Ironing' colspan='4'/>
@@ -690,6 +685,7 @@
                                             <field name='gerber_desc' groups="fashion.group_fashion_gerber"/>
                                             <field name='gerber_h' groups="fashion.group_fashion_gerber"/>
                                             <field name='gerber_l' groups="fashion.group_fashion_gerber"/>
+                                            <button name="duplicate_accessory" type="object" string="Duplicate" icon="STOCK_COPY" />
                                         </tree>
                                     </field>
                                 </group>
@@ -791,8 +787,8 @@
 
                 <button string='Draft' name='form_discarded_draft' type='workflow' states='discarded' icon='gtk-refresh'/>
 
-                <button string='Obsolete' name='set_obsolete' type="object" attrs="{'invisible': [('obsolete','=',True)]}"/>
-                <button string='Not obsolete' name='set_not_obsolete' type="object" attrs="{'invisible': [('obsolete','=',False)]}"/>
+                <button string='Obsolete' name='set_obsolete' type="object" attrs="{'invisible': [('obsolete','=',True)]}" icon='STOCK_NO'/>
+                <button string='Not obsolete' name='set_not_obsolete' type="object" attrs="{'invisible': [('obsolete','=',False)]}" icon='STOCK_YES'/>
                 <field name='state' readonly='1'/>
             </tree>
         </field>
@@ -850,8 +846,10 @@
                 <filter name="inactive" string="Not Active" domain="['|',('state','=','discarded'),('obsolete','=',True)]"/>
 
                 <separator/>
-                <filter string="Obsolete" domain="[('obsolete','=','True')]"/>
+                <filter string="Obsolete" domain="[('obsolete','=',True)]"/>
                 <!--<filter string="My last modified" domain="[('write_uid','=',active_id),('write_date','&gt;=',(context_today() - datetime.timedelta(1)).strftime('%%Y-%%m-%%d 00:00:00')]"/>-->
+                <filter string="Company form" domain="[('model_customer','=',False)]"/>
+                <filter name="only_model_for_cost" string="Model for cost" domain="[('model_for_cost','=',True)]"/>
 
                 <separator/>
                 <filter string="Normal" domain="[('conformed','=',False)]"/>
@@ -887,8 +885,18 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,kanban,calendar</field>
             <field name="view_id" ref="fashion_form_tree" />
+            <field name="context">{'view_production':1,'default_user_id':uid}</field>
+            <field name="domain">[('obsolete','=',False),('state','!=','discarded')]</field>
+    </record>
+    <record id="action_fashion_form_cost" model="ir.actions.act_window">
+            <field name="name">Fashion form cost</field>
+            <field name="res_model">fashion.form</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,kanban,calendar</field>
+            <field name="view_id" ref="fashion_form_tree" />
             <field name="context">{'default_user_id':uid}</field>
             <field name="domain">[('obsolete','=',False),('state','!=','discarded')]</field>
+            <field name="context">{'view_cost':1,'search_default_only_model_for_cost':1}</field>
     </record>
     <record id="action_fashion_form_obsolete" model="ir.actions.act_window">
             <field name="name">Fashion form</field>
@@ -896,10 +904,25 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,kanban,calendar</field>
             <field name="view_id" ref="fashion_form_tree" />
-            <field name="context">{'search_default_inactive':True,'default_user_id':uid}</field>
+            <field name="context">{'view_production':1,'search_default_inactive':True,'default_user_id':uid}</field>
     </record>
 
     <!--fashion.form.characteristic.rel.specific-->
+    <record id="fashion_form_characteristic_rel_specific_search" model="ir.ui.view">
+        <field name="name">fashion.form.characteristic.rel.specific.search</field>
+        <field name="model">fashion.form.characteristic.rel.specific</field>
+        <field name="arch" type="xml">
+            <search string="Terms">
+                <field name="name" filter_domain="[('name','ilike',self)]"/>
+                <field name="type" filter_domain="[('type,'ilike',self)]"/>
+
+                <group expand="1" string="Group By...">
+                    <filter name='group_type' string="Type" domain="[]" context="{'group_by':'type'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
     <record id="fashion_form_characteristic_rel_specific_form" model="ir.ui.view">
         <field name="name">fashion.form.characteristic.rel.specific.form</field>
         <field name="model">fashion.form.characteristic.rel.specific</field>
@@ -926,6 +949,14 @@
         </field>
     </record>
 
+    <record id="action_fashion_form_characteristic_rel_specific" model="ir.actions.act_window">
+            <field name="name">Caracteristic terms</field>
+            <field name="res_model">fashion.form.characteristic.rel.specific</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="fashion_form_characteristic_rel_specific_tree"/>
+    </record>
+    
     <!--res.partner-->
     <!--    <record id='res_partner_fashion_form' model='ir.ui.view'>
         <field name='name'>res.partner.fashion.form</field>
@@ -939,7 +970,6 @@
     </record>-->
 
     <!--fashion.form.partner.rel-->
-
     <record id="fashion_form_partner_rel_form" model="ir.ui.view">
         <field name="name">fashion.form.partner.rel.form</field>
         <field name="model">fashion.form.partner.rel</field>
@@ -955,9 +985,9 @@
                     <newline/>
                     <field name="partner_id" readonly="1"/>
                     <field name="fabric_id" readonly="1"/>
-                    <field name="detail" groups='fashion.group_fashion_accounting' readonly="1"/>
+                    <field name="retail" groups='fashion.group_fashion_accounting' readonly="1"/>
                     <field name="wholesale" groups='fashion.group_fashion_accounting' readonly="1"/>
-                    <field name="department_store" groups='fashion.group_fashion_accounting' readonly="1"/>
+                    <!--<field name="department_store" groups='fashion.group_fashion_accounting' readonly="1"/>-->
                     <separator string="Image:"/>
                     <field name="draw_image_a" widget="image" class="oe_avatar oe_left" nolabel='1' colspan="4" readonly="1"/>
                 </group>
@@ -976,9 +1006,9 @@
                 <field name="article_id"/>
                 <field name="partner_id"/>
                 <field name="fabric_id"/>
-                <field name="detail" groups='fashion.group_fashion_accounting'/>
+                <field name="retail" groups='fashion.group_fashion_accounting'/>
                 <field name="wholesale" groups='fashion.group_fashion_accounting'/>
-                <field name="department_store" groups='fashion.group_fashion_accounting'/>
+                <!--<field name="department_store" groups='fashion.group_fashion_accounting'/>-->
                 <field name="model" invisible="1" />
                 <field name="model_article" invisible="1" />
                 <field name="model_customer" invisible="1" />
@@ -1054,20 +1084,23 @@
     </record>
 
     <!--Menuitem-->
-
-    <menuitem name="Fashion" id="menu_fashion_root" sequence="5" />    
+    <menuitem name="Fashion" id="menu_fashion_root" sequence="5" />        
         <menuitem name="Form" parent="menu_fashion_root" id="menu_fashion_form" sequence="10"/>
+            <menuitem name="Form for cost" parent="menu_fashion_form" id="menu_fashion_form_form_cost" sequence="5" action="action_fashion_form_cost" groups="fashion.group_fashion_accounting"/>
             <menuitem name="Form" parent="menu_fashion_form" id="menu_fashion_form_form" sequence="10" action="action_fashion_form"/>
                 <menuitem name="Inactive form" parent="menu_fashion_form_form" id="menu_fashion_form_inactive_form" sequence="10" action="action_fashion_form_obsolete"/>            
-            <menuitem name="Fowm with client" parent="menu_fashion_form" id="menu_fashion_form_form_client" sequence="20" action="action_fashion_form_partner_rel"/>
-        <menuitem name="Configuration" parent="menu_fashion_root" id="menu_fashion_configuration" sequence="90" groups="fashion.group_fashion_admin"/>
+            <menuitem name="Form with client" parent="menu_fashion_form" id="menu_fashion_form_form_client" sequence="20" action="action_fashion_form_partner_rel"/>
+        <menuitem name="Configuration" parent="menu_fashion_root" id="menu_fashion_configuration" sequence="90" groups="fashion.group_fashion_admin,fashion.group_fashion_accounting"/>
             <menuitem name="Season" parent="menu_fashion_configuration" id="menu_fashion_configuration_season" sequence="10" action='action_fashion_season' />
             <menuitem name="Seams" parent="menu_fashion_configuration" id="menu_fashion_configuration_characteristic" sequence="20" action='action_fashion_form_characteristic' />
-            <menuitem name="Cost" parent="menu_fashion_configuration" id="menu_fashion_configuration_cost" sequence="30" action='action_fashion_form_cost' />
+            <!--<menuitem name="Cost (var.)" parent="menu_fashion_configuration" id="menu_fashion_configuration_cost" sequence="30" action='action_fashion_form_cost_variable' />-->
+            <menuitem name="Cost (fixed)" parent="menu_fashion_configuration" id="menu_fashion_configuration_cost_fixed" sequence="35" action='action_fashion_form_cost_fixed' groups="fashion.group_fashion_admin,fashion.group_fashion_accounting"/>
             <menuitem name="Accessory" parent="menu_fashion_configuration" id="menu_fashion_configuration_accessory" sequence="40" action='action_fashion_form_accessory' />
             <menuitem name="Fabric" parent="menu_fashion_configuration" id="menu_fashion_configuration_fabric" sequence="50" action='action_fashion_form_fabric' />
+                <menuitem name="Test fabric" parent="menu_fashion_configuration_fabric" id="menu_fashion_configuration_fabric_test" sequence="10" action='action_fashion_form_fabric_test' />
             <!--<menuitem name="Seam" parent="menu_fashion_configuration" id="menu_fashion_configuration_stitch" sequence="60" action='action_fashion_form_stitch' />-->
             <menuitem name="Measure" parent="menu_fashion_configuration" id="menu_fashion_configuration_measure" sequence="70" action='action_fashion_form_measure' />
             <menuitem name="Article" parent="menu_fashion_configuration" id="menu_fashion_configuration_article" sequence="80" action='action_fashion_article' />
+            <menuitem name="Car. terms" parent="menu_fashion_configuration" id="menu_fashion_terminology" sequence="90" action='action_fashion_form_characteristic_rel_specific' />
     </data>
 </openerp>

=== modified file 'fashion/i18n/it.po'
--- fashion/i18n/it.po	2014-03-23 21:54:01 +0000
+++ fashion/i18n/it.po	2014-09-17 15:12:42 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-23 21:50+0000\n"
-"PO-Revision-Date: 2014-03-23 22:53+0100\n"
+"POT-Creation-Date: 2014-05-10 15:59+0000\n"
+"PO-Revision-Date: 2014-05-10 18:02+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. module: fashion
-#: field:fashion.form.partner.rel,wholesale:0
-msgid "Wholesale percentage"
-msgstr "% Ingrosso"
+#: selection:fashion.form,col_ref:0
+msgid "col 8"
+msgstr "col 8"
 
 #. module: fashion
 #: view:fashion.form:0 field:fashion.form.stitch.rel,stitch_id:0
@@ -45,7 +45,8 @@
 
 #. module: fashion
 #: view:fashion.form:0 view:fashion.form.accessory:0
-#: view:fashion.form.accessory.pricelist:0 view:fashion.form.fabric:0
+#: view:fashion.form.accessory.pricelist:0
+#: view:fashion.form.characteristic.rel.specific:0 view:fashion.form.fabric:0
 #: view:fashion.form.partner.rel:0
 msgid "Group By..."
 msgstr "Raggruppa per..."
@@ -60,6 +61,7 @@
 #: help:fashion.form.characteristic.rel.specific,access_id:0
 #: help:fashion.form.comment.rel,access_id:0
 #: help:fashion.form.cost,access_id:0 help:fashion.form.cost.rel,access_id:0
+#: help:fashion.form.cost.rel.pricelist,access_id:0
 #: help:fashion.form.fabric,access_id:0 help:fashion.form.measure,access_id:0
 #: help:fashion.form.measure.rel,access_id:0
 #: help:fashion.form.partner.rel,access_id:0
@@ -89,6 +91,7 @@
 #: view:fashion.form.accessory.pricelist:0
 #: field:fashion.form.accessory.pricelist,supplier_id:0
 #: field:fashion.form.accessory.rel,supplier_id:0
+#: field:fashion.form.cost.rel.pricelist,supplier_id:0
 #: field:fashion.form.partner.rel,supplier_id:0
 msgid "Supplier"
 msgstr "Fornitore"
@@ -115,9 +118,14 @@
 msgstr "Prodotto"
 
 #. module: fashion
-#: field:fashion.form.characteristic.rel,stitch_verse_id:0
-msgid "Stitch verse"
-msgstr "Cucitura inversa"
+#: view:fashion.form:0
+msgid "Cost list"
+msgstr "Lista costi"
+
+#. module: fashion
+#: selection:fashion.form,col_ref:0
+msgid "col 10"
+msgstr "col 10"
 
 #. module: fashion
 #: help:fashion.form,start:0 help:res.partner,start:0
@@ -125,7 +133,12 @@
 msgstr "Partenza per le taglie conformate"
 
 #. module: fashion
-#: code:addons/fashion/fashion.py:282
+#: model:ir.model,name:fashion.model_fashion_form
+msgid "fashion.form"
+msgstr "Schede modelli"
+
+#. module: fashion
+#: code:addons/fashion/fashion.py:290
 #, python-format
 msgid "warning"
 msgstr "attenzione"
@@ -141,14 +154,9 @@
 msgstr "Modifica"
 
 #. module: fashion
-#: view:fashion.form:0
-msgid "mt. fod."
-msgstr "mt. fod."
-
-#. module: fashion
-#: view:fashion.form:0
-msgid "Add a fabric note..."
-msgstr "Aggiunte nota tessuto..."
+#: field:fashion.form,sum_accessory:0
+msgid "Total accessory"
+msgstr "Totale accessori"
 
 #. module: fashion
 #: help:fashion.form,obsolete:0
@@ -156,6 +164,11 @@
 msgstr "Indica che la scheda è nel formato vecchio"
 
 #. module: fashion
+#: view:fashion.form:0
+msgid "Fabric cost list"
+msgstr "Lista costi tessuto"
+
+#. module: fashion
 #: selection:fashion.report.wizard,type:0
 msgid "Lanciato"
 msgstr "Lanciato"
@@ -191,14 +204,21 @@
 msgstr "Tipo di report"
 
 #. module: fashion
-#: model:ir.module.category,description:fashion.module_fashion
-msgid "Manage fashion groups."
-msgstr "Gestisci gruppi amministrazione."
-
-#. module: fashion
-#: field:fashion.form.cost.rel,value:0 field:fashion.form.partner.rel,value:0
-msgid "Value"
-msgstr "Valore"
+#: help:fashion.form,model_for_cost:0
+msgid "Indicates that this form is use for create a pricelist elements"
+msgstr ""
+"Indica che questa scheda è utilizzata per creare il prezzo di listino di "
+"riferimento"
+
+#. module: fashion
+#: view:fashion.form:0
+msgid "Refresh"
+msgstr "Ricarica"
+
+#. module: fashion
+#: field:fashion.form.characteristic.rel,stitch_verse_id:0
+msgid "Stitch verse"
+msgstr "Cucitura inversa"
 
 #. module: fashion
 #: view:fashion.form:0 selection:fashion.form,state:0
@@ -221,9 +241,14 @@
 msgstr "Wizard report"
 
 #. module: fashion
-#: field:fashion.form.partner.rel,fabric_tot:0
-msgid "Total fabric"
-msgstr "Totale tessuto"
+#: field:fashion.form,sum_extra_cost:0
+msgid "Total extra cost"
+msgstr "Totale costi"
+
+#. module: fashion
+#: field:fashion.form.measure.rel,visible:0
+msgid "Visible"
+msgstr "Visibile"
 
 #. module: fashion
 #: model:ir.actions.act_window,name:fashion.action_fashion_season
@@ -236,7 +261,8 @@
 #: field:fashion.form.accessory.pricelist,note:0
 #: view:fashion.form.characteristic:0 field:fashion.form.characteristic,note:0
 #: view:fashion.form.cost:0 field:fashion.form.cost,note:0
-#: field:fashion.form.cost.rel,note:0 view:fashion.form.fabric:0
+#: field:fashion.form.cost.rel,note:0
+#: field:fashion.form.cost.rel.pricelist,note:0 view:fashion.form.fabric:0
 #: field:fashion.form.fabric,note:0 view:fashion.form.measure:0
 #: field:fashion.form.measure,note:0 field:fashion.form.partner.rel,note:0
 #: view:fashion.form.stitch:0 field:fashion.form.stitch,note:0
@@ -309,16 +335,9 @@
 msgstr "Cliente"
 
 #. module: fashion
-#: field:fashion.form.partner.rel,department_store:0
-msgid "Department stores price"
-msgstr "Prezzo dettaglio"
-
-#. module: fashion
-#: view:fashion.form:0 view:fashion.form.partner.rel:0
-#: field:fashion.form.partner.rel,partner_id:0
-#: model:ir.model,name:fashion.model_res_partner
-msgid "Partner"
-msgstr "Cliente"
+#: field:fashion.form.partner.rel,mt_fabric:0
+msgid "Mt."
+msgstr "Mt."
 
 #. module: fashion
 #: field:fashion.form,model_number:0
@@ -327,6 +346,11 @@
 msgstr "Numero modello"
 
 #. module: fashion
+#: model:ir.ui.menu,name:fashion.menu_fashion_terminology
+msgid "Car. terms"
+msgstr "Termini caratt."
+
+#. module: fashion
 #: model:ir.actions.act_window,name:fashion.act_window_wizard_report_form
 msgid "Form Report"
 msgstr "Report scheda"
@@ -337,6 +361,11 @@
 msgstr "OK produrre"
 
 #. module: fashion
+#: field:fashion.form.fabric,symbol:0
+msgid "Wash symbol"
+msgstr "Simboli di lavaggio"
+
+#. module: fashion
 #: view:fashion.form:0
 msgid "Add description of parts for washing..."
 msgstr "Aggiunte descrizione parte per il lavaggio..."
@@ -356,9 +385,9 @@
 msgstr "Area"
 
 #. module: fashion
-#: view:fashion.form:0
-msgid "Lining"
-msgstr "Fodera"
+#: field:fashion.form.measure.rel,size_11:0
+msgid "Size 11"
+msgstr "Tg.11"
 
 #. module: fashion
 #: view:fashion.duplication:0
@@ -371,9 +400,9 @@
 msgstr "Elimina immagine"
 
 #. module: fashion
-#: field:fashion.form.fabric,symbol:0
-msgid "Wash symbol"
-msgstr "Simboli di lavaggio"
+#: model:ir.actions.act_window,name:fashion.action_fashion_form_characteristic_rel_specific
+msgid "Caracteristic terms"
+msgstr "Termini caratteristiche"
 
 #. module: fashion
 #: field:fashion.form.fabric,perc_composition:0
@@ -424,12 +453,13 @@
 #. module: fashion
 #: view:fashion.form:0 view:fashion.form.accessory:0
 #: field:fashion.form.accessory,type:0
+#: view:fashion.form.characteristic.rel.specific:0
 #: field:fashion.form.characteristic.rel.specific,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: fashion
-#: code:addons/fashion/fashion.py:282
+#: code:addons/fashion/fashion.py:291
 #, python-format
 msgid "Error: Model must start with letter"
 msgstr "Errore: il modello deve iniziare con una lettera"
@@ -495,6 +525,11 @@
 msgstr "Immagine:"
 
 #. module: fashion
+#: view:fashion.form:0
+msgid "Summary cost"
+msgstr "Riepilogo costi"
+
+#. module: fashion
 #: model:res.groups,comment:fashion.group_fashion_user
 msgid "User that can only see or consult."
 msgstr "Utente che può solo vedere o consultare"
@@ -520,8 +555,11 @@
 msgstr "Articolo"
 
 #. module: fashion
-#: view:fashion.form.accessory:0 field:fashion.form.accessory,pricelist_ids:0
+#: view:fashion.form:0 view:fashion.form.accessory:0
+#: field:fashion.form.accessory,pricelist_ids:0
 #: field:fashion.form.accessory.rel,pricelist_id:0
+#: field:fashion.form.cost.rel,pricelist_ids:0
+#: model:ir.model,name:fashion.model_fashion_form_cost_rel_pricelist
 msgid "Pricelist"
 msgstr "Listino"
 
@@ -551,6 +589,18 @@
 msgstr "Altezza (Gerber)"
 
 #. module: fashion
+#: code:addons/fashion/fashion.py:1426
+#, python-format
+msgid ""
+"Marg. %5.2f%s\n"
+"Ric. %5.2f%s\n"
+"[%10.2f]"
+msgstr ""
+"Marg. %5.2f%s\n"
+"Ric. %5.2f%s\n"
+"[%10.2f]"
+
+#. module: fashion
 #: help:fashion.form,draw_image_b:0 help:fashion.form,draw_image_c:0
 #: help:fashion.form,draw_image_d:0
 msgid ""
@@ -561,6 +611,11 @@
 "form and, in small sizein kanban report views"
 
 #. module: fashion
+#: help:fashion.form,sum_cost:0
+msgid "Sum of costs in the list on the left"
+msgstr "Somma dei costi nella lista qui a sinistra"
+
+#. module: fashion
 #: view:fashion.form:0
 msgid "Not Active"
 msgstr "Non attive"
@@ -578,9 +633,16 @@
 msgstr "Ok produrre"
 
 #. module: fashion
-#: selection:fashion.form,col_ref:0
-msgid "col 10"
-msgstr "col 10"
+#: view:fashion.form:0
+msgid "Not cost model"
+msgstr "Costi non gestiti"
+
+#. module: fashion
+#: field:fashion.form.cost.rel,value:0
+#: field:fashion.form.cost.rel.pricelist,value:0
+#: field:fashion.form.partner.rel,value:0
+msgid "Value"
+msgstr "Valore"
 
 #. module: fashion
 #: view:fashion.form:0
@@ -588,16 +650,14 @@
 msgstr "Non obsoleto"
 
 #. module: fashion
-#: help:fashion.form.fabric,test:0
-msgid "This fabric is used for a model testing, maybe it won't be produced!"
-msgstr ""
-"Questo tesstuo è utilizzato per un modello in prova, può anche non essere "
-"poi prodotto!"
+#: help:fashion.form,sum_accessory:0
+msgid "Sum of the accessory list (see page Accessory for details)"
+msgstr "Somma lista accessori (vedere la pagina accessori per il dettaglio"
 
 #. module: fashion
-#: model:ir.ui.menu,name:fashion.menu_fashion_form_form_client
-msgid "Fowm with client"
-msgstr "Scheda con cliente"
+#: field:fashion.form.partner.rel,total_fabric:0
+msgid "Total fabric"
+msgstr "Totale tessuto"
 
 #. module: fashion
 #: field:fashion.form,comment_rel_ids:0
@@ -605,9 +665,11 @@
 msgstr "Commenti"
 
 #. module: fashion
-#: field:fashion.form,draw_image_a_small:0
-msgid "Small-sized image"
-msgstr "Immagine taglio piccolo"
+#: view:fashion.form:0 view:fashion.form.partner.rel:0
+#: field:fashion.form.partner.rel,partner_id:0
+#: model:ir.model,name:fashion.model_res_partner
+msgid "Partner"
+msgstr "Cliente"
 
 #. module: fashion
 #: field:fashion.form,col_ref:0
@@ -651,6 +713,13 @@
 msgstr "Peso"
 
 #. module: fashion
+#: help:fashion.form.fabric,test:0
+msgid "This fabric is used for a model testing, maybe it won't be produced!"
+msgstr ""
+"Questo tesstuo è utilizzato per un modello in prova, può anche non essere "
+"poi prodotto!"
+
+#. module: fashion
 #: view:fashion.form:0 field:fashion.form,draw_image_c:0
 #: field:fashion.form,draw_image_d:0
 msgid "Photo"
@@ -673,9 +742,9 @@
 msgstr "Simboli"
 
 #. module: fashion
-#: field:fashion.form.measure.rel,visible:0
-msgid "Visible"
-msgstr "Visibile"
+#: view:fashion.form:0
+msgid "Company form"
+msgstr "Scheda aziendale"
 
 #. module: fashion
 #: field:fashion.form,draw_image_a_medium:0
@@ -683,10 +752,9 @@
 msgstr "Immagine taglio medio"
 
 #. module: fashion
-#: field:fashion.form.partner.rel,mt_fabric:0
-#: field:fashion.form.partner.rel,mt_lining:0
-msgid "Meters"
-msgstr "Metri"
+#: field:fashion.form.partner.rel,h_fabric:0
+msgid "H."
+msgstr "H."
 
 #. module: fashion
 #: field:fashion.form,start:0 field:res.partner,start:0
@@ -710,9 +778,9 @@
 msgstr "Vecchio nome"
 
 #. module: fashion
-#: field:fashion.form.partner.rel,lining_tot:0
-msgid "Total lining"
-msgstr "Totale fodera"
+#: help:fashion.form,sum_extra_cost:0
+msgid "Sum of accessory cost and cost list (no fabric in this total)"
+msgstr "Somma costi accessori e costi lista (il tessuto è escluso dal totale)"
 
 #. module: fashion
 #: view:fashion.form:0 field:fashion.form,customer_code:0
@@ -726,6 +794,11 @@
 msgstr "Taglio"
 
 #. module: fashion
+#: view:fashion.form:0
+msgid "Calculate"
+msgstr "Ricalcola"
+
+#. module: fashion
 #: field:fashion.form.accessory,gerber_char:0
 msgid "Gerber char"
 msgstr "Carattere (Gerber)"
@@ -777,8 +850,13 @@
 
 #. module: fashion
 #: view:fashion.form:0
-msgid "Statistics"
-msgstr "Statistiche"
+msgid "Duplicate"
+msgstr "Duplica"
+
+#. module: fashion
+#: model:ir.ui.menu,name:fashion.menu_fashion_form_form_client
+msgid "Form with client"
+msgstr "Scheda con clienti"
 
 #. module: fashion
 #: view:fashion.form:0 selection:fashion.form,state:0
@@ -846,6 +924,11 @@
 msgstr "Col3"
 
 #. module: fashion
+#: view:fashion.form:0
+msgid "Cost model"
+msgstr "Costi gestiti"
+
+#. module: fashion
 #: selection:fashion.form.characteristic.rel.specific,type:0
 msgid "Col1"
 msgstr "Col1"
@@ -877,12 +960,16 @@
 
 #. module: fashion
 #: field:fashion.form.accessory.rel,tot_cost:0
-#: field:fashion.form.partner.rel,cost_tot:0
-#: field:fashion.form.partner.rel,tot_cost:0
+#: field:fashion.form.partner.rel,total_cost:0
 msgid "Total cost"
 msgstr "Costo totale"
 
 #. module: fashion
+#: model:ir.actions.act_window,name:fashion.action_fashion_form_cost
+msgid "Fashion form cost"
+msgstr "Scheda costi"
+
+#. module: fashion
 #: selection:fashion.report.wizard,type:0
 msgid "B - Scheda Commerciale"
 msgstr "B - Scheda Commerciale"
@@ -897,6 +984,7 @@
 #: field:fashion.form.characteristic.rel.specific,access_id:0
 #: field:fashion.form.comment.rel,access_id:0
 #: field:fashion.form.cost,access_id:0 field:fashion.form.cost.rel,access_id:0
+#: field:fashion.form.cost.rel.pricelist,access_id:0
 #: field:fashion.form.fabric,access_id:0
 #: field:fashion.form.measure,access_id:0
 #: field:fashion.form.measure.rel,access_id:0
@@ -929,12 +1017,9 @@
 msgstr "Metri fodera"
 
 #. module: fashion
-#: field:fashion.form.accessory.rel,sequence:0
-#: field:fashion.form.characteristic.rel,sequence:0
-#: field:fashion.form.measure.rel,sequence:0
-#: field:fashion.form.stitch.rel,sequence:0
-msgid "Seq."
-msgstr "Seq."
+#: field:fashion.form.partner.rel,retail:0
+msgid "Retail"
+msgstr "Dettaglio"
 
 #. module: fashion
 #: model:res.groups,name:fashion.group_fashion_admin
@@ -947,9 +1032,14 @@
 msgstr "Tg.2"
 
 #. module: fashion
-#: field:fashion.form.measure.rel,size_11:0
-msgid "Size 11"
-msgstr "Tg.11"
+#: field:fashion.form.cost,default:0
+msgid "Default"
+msgstr "Predefinito"
+
+#. module: fashion
+#: view:fashion.form:0
+msgid "Production info"
+msgstr "Info produzione"
 
 #. module: fashion
 #: model:ir.actions.act_window,name:fashion.action_fashion_form_measure
@@ -969,7 +1059,7 @@
 #. module: fashion
 #: field:fashion.report.wizard,summary:0
 msgid "Summary"
-msgstr "Ripilogo"
+msgstr "Riepilogo"
 
 #. module: fashion
 #: view:fashion.form:0 field:fashion.form,date:0
@@ -999,14 +1089,14 @@
 msgstr "Errore"
 
 #. module: fashion
-#: view:fashion.form:0
-msgid "Gerber"
-msgstr "Gerber"
+#: field:fashion.form.partner.rel,margin_note:0
+msgid "Balance"
+msgstr "Balance"
 
 #. module: fashion
-#: model:ir.model,name:fashion.model_fashion_form
-msgid "fashion.form"
-msgstr "Schede modelli"
+#: model:ir.ui.menu,name:fashion.menu_fashion_configuration_cost_fixed
+msgid "Cost (fixed)"
+msgstr "Costi"
 
 #. module: fashion
 #: field:fashion.form,original:0
@@ -1070,13 +1160,17 @@
 #: field:fashion.form.accessory,sequence:0
 #: field:fashion.form.characteristic,sequence:0
 #: field:fashion.form.cost,sequence:0 field:fashion.form.stitch,sequence:0
+#: field:fashion.season,sequence:0
 msgid "Sequence"
 msgstr "Sequenza"
 
 #. module: fashion
+#: field:fashion.form,sum_cost:0
+msgid "Total cost list"
+msgstr "Totale lista costi"
+
+#. module: fashion
 #: field:fashion.form.partner.rel,gerber_h:0
-#: field:fashion.form.partner.rel,h_fabric:0
-#: field:fashion.form.partner.rel,h_lining:0
 msgid "Height"
 msgstr "Altezza"
 
@@ -1086,7 +1180,7 @@
 msgstr "Utente che ha aggiunto il commento"
 
 #. module: fashion
-#: code:addons/fashion/fashion.py:414 field:fashion.form.measure.rel,header:0
+#: code:addons/fashion/fashion.py:460 field:fashion.form.measure.rel,header:0
 #, python-format
 msgid "Header"
 msgstr "Intestazione"
@@ -1121,6 +1215,8 @@
 
 #. module: fashion
 #: view:fashion.form.fabric:0 field:fashion.form.fabric,test:0
+#: model:ir.actions.act_window,name:fashion.action_fashion_form_fabric_test
+#: model:ir.ui.menu,name:fashion.menu_fashion_configuration_fabric_test
 msgid "Test fabric"
 msgstr "Tessuto di prova"
 
@@ -1144,6 +1240,11 @@
 msgstr "Altezza fodera"
 
 #. module: fashion
+#: help:fashion.form.partner.rel,access_2_id:0
+msgid "ID Importazione che tiene il link con partner costi"
+msgstr "ID Importazione che tiene il link con partner costi"
+
+#. module: fashion
 #: model:ir.actions.act_window,name:fashion.action_fashion_form_characteristic
 msgid "Fashion characteristic"
 msgstr "Caratteristica"
@@ -1199,6 +1300,11 @@
 msgstr "Disegno lato B"
 
 #. module: fashion
+#: field:fashion.form.cost.rel.pricelist,current:0
+msgid "Current"
+msgstr "Attuale"
+
+#. module: fashion
 #: field:fashion.form,model_article:0
 #: field:fashion.form.partner.rel,model_article:0
 msgid "Sigla articolo"
@@ -1230,6 +1336,14 @@
 msgstr "Composizione"
 
 #. module: fashion
+#: field:fashion.form.accessory.rel,sequence:0
+#: field:fashion.form.characteristic.rel,sequence:0
+#: field:fashion.form.measure.rel,sequence:0
+#: field:fashion.form.stitch.rel,sequence:0
+msgid "Seq."
+msgstr "Seq."
+
+#. module: fashion
 #: field:fashion.form.measure.rel,real:0
 msgid "Real"
 msgstr "Riscontrato"
@@ -1245,6 +1359,11 @@
 msgstr "Codice cliente"
 
 #. module: fashion
+#: view:fashion.form.characteristic.rel.specific:0
+msgid "Terms"
+msgstr "Termini"
+
+#. module: fashion
 #: view:fashion.form:0 field:fashion.form.accessory.rel,name:0
 #: field:fashion.form.characteristic.rel,name:0
 #: field:fashion.form.characteristic.rel.specific,name:0
@@ -1271,6 +1390,11 @@
 "image is required."
 
 #. module: fashion
+#: help:fashion.form.partner.rel,cost:0
+msgid "Unit price for fabric"
+msgstr "Prezzo unitario per tessuto"
+
+#. module: fashion
 #: field:fashion.form,size:0
 msgid "Sizes"
 msgstr "Taglia"
@@ -1303,9 +1427,9 @@
 msgstr "col 9"
 
 #. module: fashion
-#: selection:fashion.form,col_ref:0
-msgid "col 8"
-msgstr "col 8"
+#: view:fashion.form:0 field:fashion.form,model_for_cost:0
+msgid "Model for cost"
+msgstr "Modello per listino"
 
 #. module: fashion
 #: help:fashion.form,draw_image_a:0
@@ -1322,6 +1446,11 @@
 msgstr "Riga intestazione"
 
 #. module: fashion
+#: field:fashion.form.partner.rel,wholesale:0
+msgid "Wholesale"
+msgstr "Ingrosso"
+
+#. module: fashion
 #: field:fashion.form,cost_rel_ids:0
 msgid "Cost Relation"
 msgstr "Costi"
@@ -1368,6 +1497,11 @@
 msgstr "Inserisci"
 
 #. module: fashion
+#: model:ir.ui.menu,name:fashion.menu_fashion_form_form_cost
+msgid "Form for cost"
+msgstr "Scheda costi"
+
+#. module: fashion
 #: field:fashion.article,name:0 field:fashion.form.accessory,name:0
 #: field:fashion.form.characteristic,name:0 field:fashion.form.cost,name:0
 #: field:fashion.form.partner.rel,gerber_name:0
@@ -1377,11 +1511,6 @@
 msgstr "Nome"
 
 #. module: fashion
-#: field:fashion.form.partner.rel,detail:0
-msgid "Detail percentage"
-msgstr "% Dettaglio"
-
-#. module: fashion
 #: model:ir.actions.act_window,name:fashion.action_fashion_form_fabric
 msgid "Fashion fabric"
 msgstr "Tessuto"
@@ -1399,6 +1528,11 @@
 "il nome"
 
 #. module: fashion
+#: model:ir.module.category,description:fashion.module_fashion
+msgid "Manage fashion groups."
+msgstr "Gestisci gruppi amministrazione."
+
+#. module: fashion
 #: model:ir.model,name:fashion.model_fashion_form_characteristic_rel_specific
 msgid "Specific"
 msgstr "Specifica"
@@ -1424,6 +1558,11 @@
 msgstr "Produzione"
 
 #. module: fashion
+#: field:fashion.form.partner.rel,access_2_id:0
+msgid "Access 2 ID"
+msgstr "Access 2 ID"
+
+#. module: fashion
 #: view:fashion.form:0
 msgid "Ok for Production"
 msgstr "OK produrre"
@@ -1439,6 +1578,11 @@
 msgstr "Codice articolo tessuto"
 
 #. module: fashion
+#: field:fashion.form.partner.rel,note_cost:0
+msgid "Cost note"
+msgstr "Note costo"
+
+#. module: fashion
 #: selection:fashion.duplication,duplication:0
 msgid "New Revision"
 msgstr "Nuova revisione"
@@ -1490,7 +1634,7 @@
 msgstr "Lunghezza (Gerber)"
 
 #. module: fashion
-#: model:ir.actions.act_window,name:fashion.action_fashion_form_cost
+#: model:ir.actions.act_window,name:fashion.action_fashion_form_cost_fixed
 msgid "Fashion cost"
 msgstr "Costo"
 
@@ -1500,18 +1644,13 @@
 msgstr "Scheda duplicata"
 
 #. module: fashion
-#: view:fashion.form:0
-msgid "H. fod."
-msgstr "H. fod."
-
-#. module: fashion
-#: field:fashion.form.accessory.pricelist,cost:0
+#: view:fashion.form:0 field:fashion.form.accessory.pricelist,cost:0
 #: field:fashion.form.accessory.rel,currency:0 view:fashion.form.cost:0
-#: field:fashion.form.cost.rel,cost_id:0 field:fashion.form.fabric,cost:0
-#: field:fashion.form.partner.rel,cost:0
+#: field:fashion.form.cost,cost:0 field:fashion.form.cost.rel,cost_id:0
+#: field:fashion.form.cost.rel.pricelist,cost_rel_id:0
+#: field:fashion.form.fabric,cost:0 field:fashion.form.partner.rel,cost:0
 #: field:fashion.form.partner.rel,cost_id:0
 #: model:ir.model,name:fashion.model_fashion_form_cost
-#: model:ir.ui.menu,name:fashion.menu_fashion_configuration_cost
 msgid "Cost"
 msgstr "Costo"
 
@@ -1526,6 +1665,11 @@
 msgstr "Cucitura"
 
 #. module: fashion
+#: field:fashion.form,draw_image_a_small:0
+msgid "Small-sized image"
+msgstr "Immagine taglio piccolo"
+
+#. module: fashion
 #: field:fashion.form,accessory_rel_ids:0
 msgid "Accessory Relation"
 msgstr "Accessori"

=== removed file 'fashion/report/form_Aq.odt'
Binary files fashion/report/form_Aq.odt	2014-03-21 09:20:38 +0000 and fashion/report/form_Aq.odt	1970-01-01 00:00:00 +0000 differ
=== added file 'fashion/report/form_B.odt.OTHER'
Binary files fashion/report/form_B.odt.OTHER	1970-01-01 00:00:00 +0000 and fashion/report/form_B.odt.OTHER	2014-09-17 15:12:42 +0000 differ
=== modified file 'fashion/security/ir.model.access.csv'
--- fashion/security/ir.model.access.csv	2014-03-17 16:29:06 +0000
+++ fashion/security/ir.model.access.csv	2014-09-17 15:12:42 +0000
@@ -7,7 +7,7 @@
 "access_fashion_form_characteristic_rel_user","fashion.form.characteristic.rel","model_fashion_form_characteristic_rel","base.group_user",1,1,1,1
 "access_fashion_form_characteristic_user","fashion.form.characteristic","model_fashion_form_characteristic","base.group_user",1,1,1,1
 "access_fashion_form_characteristic_rel_specific_user","fashion.form.characteristic.rel.specific","model_fashion_form_characteristic_rel_specific","base.group_user",1,1,1,1
-"access_fashion_form_comment_rel_user","fashion.form.comment.rel","model_fashion_form_comment_rel","base.group_user",1,1,1,0
+"access_fashion_form_comment_rel_user","fashion.form.comment.rel","model_fashion_form_comment_rel","base.group_user",1,1,1,1
 "access_fashion_form_cost_user","fashion.form.cost","model_fashion_form_cost","base.group_user",1,1,1,1
 "access_fashion_form_fabric_user","fashion.form.fabric","model_fashion_form_fabric","base.group_user",1,1,1,1
 "access_fashion_form_measure_user","fashion.form.measure","model_fashion_form_measure","base.group_user",1,1,1,1
@@ -18,4 +18,4 @@
 "access_fashion_form_user","fashion.form","model_fashion_form","base.group_user",1,1,1,1
 "access_fashion_measure_rel_user","fashion.measure.rel","model_fashion_measure_rel","base.group_user",1,1,1,1
 "access_fashion_form_cost_rel_user","fashion.form.cost.rel","model_fashion_form_cost_rel","base.group_user",1,1,1,1
-
+"access_fashion_form_cost_rel_pricelist_user","fashion.form.cost.rel.pricelist","model_fashion_form_cost_rel_pricelist","base.group_user",1,1,1,1

=== modified file 'fashion/wizard/duplication_fashion.py'
--- fashion/wizard/duplication_fashion.py	2014-09-17 14:31:39 +0000
+++ fashion/wizard/duplication_fashion.py	2014-09-17 15:12:42 +0000
@@ -40,18 +40,19 @@
         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,
-                )
+            if form_proxy.old_model: # test only old models
+                start = int(form_proxy.start or '0')
+                size_base = int(form_proxy.size_base or '0')
+                if not start: # default start  # TODO testare meglio l'errore se manca 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 = {
@@ -102,6 +103,7 @@
             
         data = {
              'model': model,
+             # extra model elements calculated during create / write
              'size_base': form_proxy.size_base,
              'size_measure': form_proxy.size_measure,
              'review': review,
@@ -130,7 +132,7 @@
              'col_ref': 3,
              
              'old_model': False, # New duplication became new model, problem: col_ref not 2
-             }
+             }             
         form_id = form_pool.create(cr, uid, data, context=context)
         
         # one2many fields:
@@ -148,12 +150,8 @@
                 'weight': item.weight,
                 'h_fabric': item.h_fabric,
                 'mt_fabric': item.mt_fabric,
-                'detail': item.detail,
                 'wholesale': item.wholesale,
-                'department_store': item.department_store,
                 'note_fabric': item.note_fabric,
-                'h_lining': item.h_lining,
-                'mt_lining': item.mt_lining,
                 'h_fabric': item.h_fabric,
                 'cost': item.cost,
                 'h_fabric': item.h_fabric,
@@ -161,17 +159,22 @@
                 'gerber_l': item.gerber_l,
                 'gerber_h': item.gerber_h,
                 'gerber_desc': item.gerber_desc,
-                'cost_tot': item.cost_tot,
-                'fabric_tot': item.fabric_tot,
-                'lining_tot': item.lining_tot,
-                'tot_cost': item.tot_cost,
                 'perc_reload': item.perc_reload,
                 'perc_margin': item.perc_margin,
                 'sale': item.sale,
                 'supplier_id': item.supplier_id.id,
                 'article_code': item.article_code,
-                
+
                 'form_id': form_id,
+
+                #'detail': item.detail,
+                #'department_store': item.department_store,
+                #'h_lining': item.h_lining,
+                #'mt_lining': item.mt_lining,
+                #'cost_tot': item.cost_tot,
+                #'fabric_tot': item.fabric_tot,
+                #'lining_tot': item.lining_tot,
+                #'tot_cost': item.tot_cost,                
             }, context=context)
 
         # Characteristic:
@@ -221,6 +224,7 @@
                 'currency': item.currency,
                 'tot_cost': item.tot_cost,
                 'color': item.color,
+                'note': item.note,
                 'gerber_name': item.gerber_name,
                 'gerber_desc': item.gerber_desc,
                 'gerber_h': item.gerber_h,
@@ -274,5 +278,4 @@
             'type': 'ir.actions.act_window',
             'res_id': form_id,  # IDs selected
         }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'fashion/wizard/report_wizard.py'
--- fashion/wizard/report_wizard.py	2014-09-17 14:31:39 +0000
+++ fashion/wizard/report_wizard.py	2014-09-17 15:12:42 +0000
@@ -46,7 +46,7 @@
         '''
         res = {}
         res['value'] = {}
-        res['value']['summary'] = False #report_type == 'a' 
+        res['value']['summary'] = report_type == 'a' # True only for A
         return res
     
     _columns = {
@@ -69,7 +69,7 @@
     _defaults = {
         'type': 'a',
         'form_id': lambda s,cr,uid,ctx: s.get_form_id(cr, uid, ctx),
-        'summary': False,
+        'summary': True,
         'total': False,
         'image': True,
         'partner_fabric_id': lambda s,cr,uid,ctx: s.get_partner_fabric_id(cr, uid, ctx),

=== modified file 'fashion/wizard/report_wizard.xml'
--- fashion/wizard/report_wizard.xml	2014-03-17 11:48:32 +0000
+++ fashion/wizard/report_wizard.xml	2014-09-17 15:12:42 +0000
@@ -11,7 +11,7 @@
                 <sheet>
                    <group col='4'>
                       <field name="type" on_change="onchange_type(type)"/>
-                      <field name="partner_fabric_id" attrs="{'invisible':[('type','=','c'),'&amp;',('type','=','a'),('summary','=',True)],'required':['|',('type','in',['b','e']),'&amp;',('type','=','a'),('summary','=',False)]}" domain="[('form_id','=',form_id)]"/> <!--'required':[('type','in',['b','d','e'])]-->
+                      <field name="partner_fabric_id" attrs="{'invisible':[('type','=','c'),'&amp;',('type','=','a'),('summary','=',True)],'required':['|',('type','in',['b','d','e']),'&amp;',('type','=','a'),('summary','=',False)]}" domain="[('form_id','=',form_id)]"/> <!--'required':[('type','in',['b','d','e'])]-->
                       <!--<field name="prototipe" attrs="{'invisible':[('duplication','=','version')], 'required':[('duplication','=','form')]}"/>-->
                       <field name="form_id" invisible='1'/>
                       <newline/>