|
|
4156b71c4b
|
Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
|
2021-05-11 13:32:14 +02:00 |
|
Oliver Walters
|
0020e85397
|
Refactor add_tracking_entry
|
2021-05-11 20:56:20 +10:00 |
|
Oliver Walters
|
70ad0ba0de
|
Improve reporting in stock history API
|
2021-05-11 17:41:17 +10:00 |
|
Oliver Walters
|
af53b341f0
|
Replace "addTrasactionNote" function with "add_tracking_entry"
- Does not add translated strings to the database
|
2021-05-11 17:17:48 +10:00 |
|
eeintech
|
c9e77edf04
|
Almost there?
|
2021-05-10 17:31:29 -04:00 |
|
eeintech
|
6d8f94619b
|
Improved template render, raised bar for automatic field matching
|
2021-05-10 12:52:34 -04:00 |
|
eeintech
|
f0932040ee
|
Fixed form validation for previous step, hide tab depending on order status, added purchase_price field
|
2021-05-10 11:42:22 -04:00 |
|
|
|
a210b331ce
|
just a small translation
|
2021-05-09 00:27:00 +02:00 |
|
|
|
5622468209
|
better readable structure
|
2021-05-08 20:55:01 +02:00 |
|
|
|
e6372fd600
|
added translations
|
2021-05-08 20:54:23 +02:00 |
|
Matthias Mair
|
e59f467c79
|
Merge branch 'master' into spaces!
|
2021-05-08 12:27:19 +02:00 |
|
eeintech
|
9b69980a6c
|
Oopsy forgot to merge PurchaseOrderUpload view
|
2021-05-07 18:08:11 -04:00 |
|
eeintech
|
88000200b3
|
Merged master and resolved conflicts
|
2021-05-07 18:02:40 -04:00 |
|
eeintech
|
ceccdf3909
|
Now creating PurchaseOrderLineItem instances!
|
2021-05-07 18:00:30 -04:00 |
|
eeintech
|
fbf24621f3
|
Getting there...
|
2021-05-07 16:46:10 -04:00 |
|
eeintech
|
6e269ae41a
|
Now displaying item match table
|
2021-05-07 13:23:10 -04:00 |
|
Oliver
|
e47a8d6d5e
|
Merge pull request #1545 from matmair/issue1425
adds sales order line item price
|
2021-05-07 23:54:45 +10:00 |
|
|
|
63cf75eefc
|
styling again
|
2021-05-07 15:37:15 +02:00 |
|
|
|
b6043af7c0
|
auto-set price if sales-order line is added
|
2021-05-07 15:35:35 +02:00 |
|
|
|
9e59d41f12
|
style improvments
|
2021-05-07 07:46:35 +02:00 |
|
|
|
c775c4611f
|
adding custom action button
save the changes to the db and return success-json
|
2021-05-07 07:19:43 +02:00 |
|
|
|
09fe9ccf11
|
sales order item tracking
|
2021-05-07 07:15:33 +02:00 |
|
|
|
985967fccb
|
save return of part.id
|
2021-05-07 07:13:23 +02:00 |
|
eeintech
|
4f942fd9f7
|
Working towards item match form
|
2021-05-06 17:07:22 -04:00 |
|
eeintech
|
e31452a6ad
|
Match field step is now managed through form
|
2021-05-06 16:05:58 -04:00 |
|
eeintech
|
f79382d96f
|
Handling part match form but still not creating purchase order items
|
2021-05-06 12:35:52 -04:00 |
|
eeintech
|
005063aad6
|
Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms
|
2021-05-06 11:30:08 -04:00 |
|
|
|
aac05db6bf
|
style fixing
|
2021-05-06 17:15:10 +02:00 |
|
|
|
90c207b935
|
keeping part id in inherited form
|
2021-05-06 16:45:39 +02:00 |
|
|
|
c2a5e1fd23
|
moved the special stuff into the inherited view
|
2021-05-06 16:29:03 +02:00 |
|
Matthias Mair
|
3a1c233bff
|
Bug/calender (#1558)
* fixes calendar not rendering when toggling view
* same for po
* and builds
|
2021-05-07 00:11:08 +10:00 |
|
|
|
b09f49aaa5
|
Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425
|
2021-05-06 14:54:26 +02:00 |
|
|
|
a77d9d9de7
|
same treatment for html
|
2021-05-06 14:33:03 +02:00 |
|
Matthias Mair
|
39d4129157
|
chery picked all fixed trans str from #1438 (#1554)
|
2021-05-06 20:29:58 +10:00 |
|
|
|
f2b0717d10
|
removes all lines consisting only of spaces
this really bothers me for some reason - nothing technical
|
2021-05-06 12:11:38 +02:00 |
|
|
|
c4d0865f06
|
Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425
|
2021-05-06 00:14:33 +02:00 |
|
eeintech
|
40e8ed9e5b
|
Match parts view is now populated correctly
|
2021-05-05 15:28:04 -04:00 |
|
|
|
2cfb9c60a3
|
space cleanup
|
2021-05-05 20:57:00 +02:00 |
|
|
|
b392586a08
|
quantity also for modal
|
2021-05-05 20:55:37 +02:00 |
|
|
|
dc4fb64987
|
add in price modal in table
|
2021-05-05 20:53:53 +02:00 |
|
eeintech
|
2cd1df691b
|
Working towards part matching
|
2021-05-05 13:16:40 -04:00 |
|
eeintech
|
9773fee50b
|
Validation of matching fields is working
|
2021-05-05 12:40:48 -04:00 |
|
eeintech
|
b4342d6203
|
Fixed templates, not sure why can't keep FileManager across forms... and also need to save form data
|
2021-05-04 17:35:27 -04:00 |
|
|
|
7fa235282b
|
sale price in ui
|
2021-05-04 22:50:04 +02:00 |
|
|
|
294e86cc38
|
Add in sale price model
|
2021-05-04 21:56:25 +02:00 |
|
|
|
55cdeef30e
|
adds price-calc to purchase order Fixes #1513
|
2021-05-04 21:33:00 +02:00 |
|
eeintech
|
64fb492b97
|
Added match parts step, need to process fields data
|
2021-05-04 14:45:52 -04:00 |
|
eeintech
|
7cdf0af04a
|
Added upload file step
|
2021-05-04 12:20:57 -04:00 |
|
eeintech
|
373898d43e
|
Added step description and crispy form tag
|
2021-05-04 10:28:00 -04:00 |
|
|
|
75f487aee9
|
Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
|
2021-05-04 00:02:15 +02:00 |
|
