Oliver
e683912561
Merge pull request #1556 from matmair/spaces!
...
removes all lines consisting only of spaces
2021-05-08 20:54:36 +10:00
5eb1a1f426
fixed styling
2021-05-08 12:32:19 +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
github-actions[bot]
f0fc21329d
updated translation base
2021-05-07 13:56:06 +00: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
github-actions[bot]
84148c3e87
updated translation base
2021-05-07 13:19:30 +00:00
Matthias Mair
bdd61fdb2c
enable live-serving of i18n_static tag in debug ( #1560 )
...
* enable live-serving of i18n_static tag in debug
* style repair
2021-05-07 23:18:06 +10:00
9e59d41f12
style improvments
2021-05-07 07:46:35 +02:00
ae01503a9e
handeling data in an inheritable way
2021-05-07 07:20:43 +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
f73863ea51
adding in cstm action buttons function
2021-05-07 07:18:13 +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
github-actions[bot]
151efdd205
updated translation base
2021-05-06 21:58:39 +00:00
Francois
5ed17022f2
Fixed stock import as it was not validating the serial properly ( #1559 )
2021-05-07 07:57:16 +10: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
053793288b
same spacing for tables
...
thanks @eeintech
2021-05-06 18:05:43 +02: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
792b2d11c0
cleanup
2021-05-06 16:46:52 +02:00
660a3f9410
cleaner get function
2021-05-06 16:46:29 +02:00
90c207b935
keeping part id in inherited form
2021-05-06 16:45:39 +02:00
4830ff28bf
new function for initials
2021-05-06 16:34:37 +02:00
c2a5e1fd23
moved the special stuff into the inherited view
2021-05-06 16:29:03 +02:00
github-actions[bot]
e61480242e
updated translation base
2021-05-06 14:15:52 +00: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
d8769748f5
config
2021-05-06 14:46:32 +02:00
c1bcc60f0a
forgot a py
2021-05-06 14:41:26 +02:00
d5b65e6e41
yaml!
2021-05-06 14:38:13 +02:00
8c63b53c16
here we go js
2021-05-06 14:35:23 +02:00
a77d9d9de7
same treatment for html
2021-05-06 14:33:03 +02:00
github-actions[bot]
c2e00586f3
updated translation base
2021-05-06 10:31:46 +00: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
Oliver
0f6515d400
New Crowdin updates ( #1552 )
...
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
2021-05-06 15:26:44 +10:00
Oliver
224d9c03d0
New Crowdin updates ( #1551 )
...
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
2021-05-06 11:39:34 +10:00
Oliver Walters
e83b62bd55
Merge remote-tracking branch 'inventree/l10_crowdin' into l10
...
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.po
2021-05-06 09:06:00 +10:00
github-actions[bot]
172ac9a06f
updated translation base
2021-05-05 22:59:50 +00:00
Oliver
3511b4adda
Merge pull request #1550 from matmair/layout-fix
...
Layout fix
2021-05-06 08:58:08 +10:00
1259374822
removes layout-shift due to typo in menubar
2021-05-06 00:37:45 +02:00
