← Back to branch summary

~unifield-team/unifield-wm/wm-2418-rw-fix

« back to all changes in this revision

Viewing changes to order_nomenclature/order_nomenclature.py

  • Committer: pierre-marie
  • Date: 2012-07-25 15:04:47 UTC
  • mfrom: (1038 unifield-wm)
  • mto: This revision was merged to the branch mainline in revision 1059.
  • Revision ID: pierre-marie@pierre-marie-laptop-20120725150447-namc1a6lqi455ez2
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
order_nomenclature/order_nomenclature.py
185
185
    _columns = {
186
186
        'nomenclature_code': fields.char('Nomenclature code', size=1024),
187
187
        'comment': fields.char('Comment', size=1024),
188
 
        'default_code': fields.char('Product Reference', size=1024),
189
 
        'default_name': fields.char('Product Name', size=1024),
 
188
        'default_code': fields.char('Product Code', size=1024),
 
189
        'default_name': fields.char('Product Description', size=1024),
190
190
        'name': fields.char('Comment', size=1024, required=True),
191
191
        
192
192
        ### EXACT COPY-PASTE FROM product_nomenclature -> product_template
236
236
    _columns = {
237
237
        'nomenclature_code': fields.char('Nomenclature code', size=1024),
238
238
        'comment': fields.char('Comment', size=1024),
239
 
        'default_code': fields.char('Product Reference', size=1024),
240
 
        'default_name': fields.char('Product Name', size=1024),
 
239
        'default_code': fields.char('Product Code', size=1024),
 
240
        'default_name': fields.char('Product Description', size=1024),
241
241
        'name': fields.char('Comment', size=1024, required=True),
242
242
        
243
243
        ### EXACT COPY-PASTE FROM product_nomenclature -> product_template
490
490
    _columns = {
491
491
        'nomenclature_code': fields.char('Nomenclature code', size=1024),
492
492
        'comment': fields.char('Comment', size=1024),
493
 
        'default_code': fields.char('Product Reference', size=1024),
494
 
        'default_name': fields.char('Product Name', size=1024),
 
493
        'default_code': fields.char('Product Code', size=1024),
 
494
        'default_name': fields.char('Product Description', size=1024),
495
495
        'name': fields.char('Comment', size=1024, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
496
496
        
497
497
        ### EXACT COPY-PASTE FROM product_nomenclature -> product_template