2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-10 17:20:32 +00:00
Commit Graph

6676 Commits

Author SHA1 Message Date
68f5ec8b6a Added currency conversion 2021-05-13 17:09:52 -04:00
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
bca2f4a07b feat(sales_order): Stock Items show the PO number
Stock items show the PO number that they were purchased on when being
viewed in the sales order allocation modal and when viewing the sales
order details.
2021-05-13 14:18:25 -06:00
32d0f3039d Obviously new float fields should be read-only... 2021-05-13 16:17:45 -04:00
a64ab5956b Removed leftover print 2021-05-13 16:07:57 -04:00
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
f2e9f58f1b Added purchase price range and average to BOM items/view 2021-05-13 15:47:42 -04:00
e382f2a57e fixing bug from refactor 2021-05-13 15:46:27 +02:00
bd34a9eed2 Merge remote-tracking branch 'inventree/master' 2021-05-13 17:31:27 +10:00
aa6bbdc82c Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-05-13 17:30:58 +10:00
499bad2be8 Fix: New translations django.po from Crowdin 2021-05-13 14:17:49 +10:00
ef0a49c55a Fix: New translations django.po from Crowdin 2021-05-13 14:17:48 +10:00
6f9982b2db Fix: New translations django.po from Crowdin 2021-05-13 14:17:45 +10:00
5bd538a889 Fix: New translations django.po from Crowdin 2021-05-13 14:17:43 +10:00
26a83a45b3 Fix: New translations django.po from Crowdin 2021-05-13 14:17:42 +10:00
cfa6cbd831 Fix: New translations django.po from Crowdin 2021-05-13 14:17:41 +10:00
455cf0a0f8 Fix: New translations django.po from Crowdin 2021-05-13 14:17:39 +10:00
defdd638fc Fix: New translations django.po from Crowdin 2021-05-13 14:17:37 +10:00
68ef2ba0ac Fix: New translations django.po from Crowdin 2021-05-13 14:17:36 +10:00
ec6affa9c7 updated translation base 2021-05-13 04:04:55 +00:00
a1fa3315b1 Merge pull request #1579 from SchrodingersGat/report-naming
Adds a "filename_template" field to reports
2021-05-13 14:03:30 +10:00
82a3d9ca96 Implements custom naming for generated labels 2021-05-13 13:40:40 +10:00
6de44a5921 Adds a "filename_template" field to reports
- Allows users to define the naming scheme for generated reports
- Templated, can use any context variable already available to the report instance
- Adds some more context variables to various reports
2021-05-13 13:23:51 +10:00
d5fa4d5f66 Fix: New translations django.po from Crowdin 2021-05-13 11:07:51 +10:00
c58665fed2 Fix: New translations django.po from Crowdin 2021-05-13 11:07:49 +10:00
5a51219671 Fix: New translations django.po from Crowdin 2021-05-13 11:07:48 +10:00
1802f12325 Fix: New translations django.po from Crowdin 2021-05-13 11:07:46 +10:00
da727d3143 Fix: New translations django.po from Crowdin 2021-05-13 11:07:45 +10:00
dfd784df99 Fix: New translations django.po from Crowdin 2021-05-13 11:07:43 +10:00
7a6b269586 Fix: New translations django.po from Crowdin 2021-05-13 11:07:42 +10:00
6d66a83123 Fix: New translations django.po from Crowdin 2021-05-13 11:07:40 +10:00
66429ed545 Fix: New translations django.po from Crowdin 2021-05-13 11:07:39 +10:00
3d8b350082 updated translation base 2021-05-13 00:47:10 +00:00
8f6e14193a Merge pull request #1576 from matmair/matmair/issue1574
copy-btn in all the places
2021-05-13 10:45:51 +10:00
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
5077419b68 fewer js-functions 2021-05-13 00:20:51 +02:00
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
a9dd53d81f Fix: New translations django.po from Crowdin 2021-05-13 01:57:52 +10:00
34f7452c8a Fix: New translations django.po from Crowdin 2021-05-13 01:01:46 +10:00
705bbf519a Fix: New translations django.po from Crowdin 2021-05-13 00:04:55 +10:00
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
f9f191b5e3 Inclusion in all tamplates
#1574
2021-05-12 15:31:35 +02:00
6c2c92a6e9 Fix: New translations django.po from Crowdin 2021-05-12 23:05:38 +10:00
2175e8a4c0 Fix: New translations django.po from Crowdin 2021-05-12 23:05:36 +10:00
5bc24f9a36 Fix: New translations django.po from Crowdin 2021-05-12 23:05:34 +10:00
45ddb6231b Fix: New translations django.po from Crowdin 2021-05-12 23:05:32 +10:00
a0e7d5c731 Fix: New translations django.po from Crowdin 2021-05-12 23:05:29 +10:00