Changeset bf189bb7 in tailbone


Ignore:
Timestamp:
04/01/19 13:32:43 (6 months ago)
Author:
Lance Edgar <ledgar@…>
Branches:
master
Children:
511ba61
Parents:
49017fd
Message:

Use shipped instead of ordered, for receiving authority

i.e. compare receiving quantities to shipped quantities instead of ordered

Location:
tailbone
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tailbone/templates/mobile/receiving/receive_row.mako

    r49017fd rbf189bb7  
    3131    % if batch.order_quantities_known:
    3232        <tr>
    33           <td>ordered</td>
     33          <td>shipped</td>
    3434          <td>
    3535            % if allow_cases:
    36                 ${h.pretty_quantity(row.cases_ordered or 0)} /
     36                ${h.pretty_quantity(row.cases_shipped or 0)} /
    3737            % endif
    38             ${h.pretty_quantity(row.units_ordered or 0)}
     38            ${h.pretty_quantity(row.units_shipped or 0)}
    3939          </td>
    4040        </tr>
  • tailbone/views/purchasing/batch.py

    r49017fd rbf189bb7  
    614614        g.set_type('cases_ordered', 'quantity')
    615615        g.set_type('units_ordered', 'quantity')
     616        g.set_type('cases_shipped', 'quantity')
     617        g.set_type('units_shipped', 'quantity')
    616618        g.set_type('cases_received', 'quantity')
    617619        g.set_type('units_received', 'quantity')
     
    625627        g.set_label('units_ordered', "Units Ord.")
    626628        g.filters['units_ordered'].label = "Units Ordered"
     629        g.set_label('cases_shipped', "Cases Shp.")
     630        g.filters['cases_shipped'].label = "Cases Shipped"
     631        g.set_label('units_shipped', "Units Shp.")
     632        g.filters['units_shipped'].label = "Units Shipped"
    627633        g.set_label('cases_received', "Cases Rec.")
    628634        g.filters['cases_received'].label = "Cases Received"
     
    671677        f.set_type('cases_ordered', 'quantity')
    672678        f.set_type('units_ordered', 'quantity')
     679        f.set_type('cases_shipped', 'quantity')
     680        f.set_type('units_shipped', 'quantity')
    673681        f.set_type('cases_received', 'quantity')
    674682        f.set_type('units_received', 'quantity')
  • tailbone/views/purchasing/receiving.py

    r49017fd rbf189bb7  
    220220        'size',
    221221        'department_name',
    222         'cases_ordered',
    223         'units_ordered',
     222        'cases_shipped',
     223        'units_shipped',
    224224        'cases_received',
    225225        'units_received',
     
    242242        'cases_ordered',
    243243        'units_ordered',
     244        'cases_shipped',
     245        'units_shipped',
    244246        'cases_received',
    245247        'units_received',
Note: See TracChangeset for help on using the changeset viewer.