2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-06 07:18:48 +00:00

639 Commits

Author SHA1 Message Date
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
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04:00
eeintech
d072187bf8 Fixed exception for quantity check 2021-04-28 16:46:42 -04:00
eeintech
a63d5012f0 Purchase order fixes 2021-04-28 13:16:40 -04:00
8f40b57121 improvements after code-review by @eeintech 2021-04-27 16:32:43 +02:00
a11fff0269 man those tests take long 2021-04-22 23:17:27 +02:00
83764d5e6c added PO in the fixtures so that should be higher 2021-04-22 22:57:48 +02:00
a1237b4a49 always adjust pruchase price if one exists 2021-04-22 22:17:54 +02:00
7cb858546e tests for new methods in #1509 2021-04-22 22:16:56 +02:00
c14478ed1f automato fill purchase price #1509 2021-04-22 19:31:04 +02:00
07d68f7fde Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-21 11:12:48 +02:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title
Instance name in title
2021-04-18 21:48:37 +10:00
6c3a66f7d6 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 12:58:19 +02:00
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
46822017c6 FIX: multiline trans not possible 2021-04-17 23:52:55 +02:00
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
3598c36043 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-17 09:59:05 +02:00
Nigel
6f00c662a1
fix: don't link manufacturer part if it doesn't have one 2021-04-15 16:28:50 -06:00
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
75381cbb7b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-14 21:18:21 +02:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
2db6af2af6 PO table and stock item template improvements 2021-04-07 10:33:31 -04:00
32eaf48c12 fixed styling 2021-04-06 18:33:57 +02:00
f647120cd1 initial showcase implementation 2021-04-06 18:17:09 +02:00
2c053eae4c added translations 2021-04-04 22:49:47 +02:00