Changeset d337def in tailbone
- Timestamp:
- 03/07/19 17:05:25 (9 months ago)
- Branches:
- master
- Children:
- 15c47fb
- Parents:
- 3760c32
- Location:
- tailbone/views/purchasing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
tailbone/views/purchasing/batch.py
r3760c32 rd337def 145 145 'invoice_unit_cost', 146 146 'invoice_total', 147 'invoice_total_calculated', 147 148 'status_code', 148 149 'credits', … … 205 206 g.filters['complete'].default_active = True 206 207 g.filters['complete'].default_verb = 'is_true' 208 209 # invoice_total 210 g.set_type('invoice_total', 'currency') 211 g.set_label('invoice_total', "Total") 212 213 # invoice_total_calculated 214 g.set_type('invoice_total_calculated', 'currency') 215 g.set_label('invoice_total_calculated', "Total") 207 216 208 217 g.set_label('date_ordered', "Ordered") … … 348 357 f.set_type('invoice_total', 'currency') 349 358 359 # invoice_total_calculated 360 f.set_readonly('invoice_total_calculated') 361 f.set_type('invoice_total_calculated', 'currency') 362 350 363 # vendor_email 351 364 f.set_readonly('vendor_email') … … 604 617 g.set_type('units_received', 'quantity') 605 618 g.set_type('po_total', 'currency') 606 g.set_type('invoice_total', 'currency')607 619 g.set_type('credits', 'boolean') 608 620 … … 618 630 g.filters['units_received'].label = "Units Received" 619 631 632 # invoice_total 633 g.set_type('invoice_total', 'currency') 634 g.set_label('invoice_total', "Total") 635 636 # invoice_total_calculated 637 g.set_type('invoice_total_calculated', 'currency') 638 g.set_label('invoice_total_calculated', "Total") 639 620 640 g.set_label('po_total', "Total") 621 g.set_label('invoice_total', "Total")622 641 g.set_label('credits', "Credits?") 623 642 … … 665 684 f.set_type('po_total', 'currency') 666 685 f.set_type('invoice_unit_cost', 'currency') 667 f.set_type('invoice_total', 'currency')668 686 669 687 # upc 670 688 f.set_type('upc', 'gpc') 689 690 # invoice total 691 f.set_readonly('invoice_total') 692 f.set_type('invoice_total', 'currency') 693 f.set_label('invoice_total', "Invoice Total (Orig.)") 694 695 # invoice total_calculated 696 f.set_readonly('invoice_total_calculated') 697 f.set_type('invoice_total_calculated', 'currency') 698 f.set_label('invoice_total_calculated', "Invoice Total (Calc.)") 671 699 672 700 # credits -
tailbone/views/purchasing/receiving.py
r3760c32 rd337def 162 162 'created_by', 163 163 'rowcount', 164 'invoice_total_calculated', 164 165 'status_code', 165 166 'executed', … … 192 193 'invoice_number', 193 194 'invoice_total', 195 'invoice_total_calculated', 194 196 'notes', 195 197 'created', … … 222 224 'units_received', 223 225 # 'po_total', 224 'invoice_total ',226 'invoice_total_calculated', 225 227 'credits', 226 228 'status_code', … … 253 255 'invoice_unit_cost', 254 256 'invoice_total', 257 'invoice_total_calculated', 255 258 'status_code', 256 259 'truck_dump_status', … … 418 421 if not self.editing: 419 422 f.remove_field('order_quantities_known') 423 424 # invoice totals 425 f.set_label('invoice_total', "Invoice Total (Orig.)") 426 f.set_label('invoice_total_calculated', "Invoice Total (Calc.)") 420 427 421 428 def template_kwargs_create(self, **kwargs): … … 850 857 f.set_readonly('po_unit_cost') 851 858 f.set_readonly('po_total') 859 860 # invoice totals 852 861 f.set_readonly('invoice_total') 862 f.set_label('invoice_total', "Invoice Total (Orig.)") 863 f.set_readonly('invoice_total_calculated') 864 f.set_label('invoice_total_calculated', "Invoice Total (Calc.)") 853 865 854 866 # claims
Note: See TracChangeset
for help on using the changeset viewer.