inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 15:15:42 +00:00
Code Activity
4,622 Commits 6 Branches 136 Tags
6f63b43c1cdb22368b9c7153ab82f41ed257c486
Commit Graph

4622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Kaiser
6f63b43c1c Merge branch 'master' into translation_de 2021-03-09 11:14:07 +01:00
Andreas Kaiser
ca626ead6c german translation 2021-03-09 00:45:37 +01:00
Oliver
fb096bd65b Merge pull request #1393 from matmair/german-translations 
updated german translations
 2021-03-09 10:39:39 +11:00
Matthias
a00756ec3a added all obvious translations 2021-03-08 23:50:24 +01:00
Andreas Kaiser
af0c72d338 german translation 2021-03-08 17:45:22 +01:00
Andreas Kaiser
5ae5b9c0d4 german translation 2021-03-08 16:09:36 +01:00
Andreas Kaiser
48cd227f06 german translation, HTML tags refactored 2021-03-06 21:52:57 +01:00
Andreas Kaiser
ae3a0133eb Merge branch 'master' into translation_de 2021-03-06 13:50:39 +01:00
Oliver
9ea3193ffb Merge pull request #1391 from SchrodingersGat/order-parts-fix 
Hacky fix for ordering parts form
 2021-03-06 20:20:30 +11:00
Oliver Walters
8061669c70 Hacky fix for ordering parts form 2021-03-06 19:49:49 +11:00
Andreas Kaiser
ade1d36397 updated german translation, change tags bold italics 2021-03-05 01:03:08 +01:00
Oliver
a4257ad9df Update version.py 2021-03-04 22:52:40 +11:00
Oliver
15ca35ca94 Update version.py 0.1.7 2021-03-04 22:51:32 +11:00
Oliver
c46fe354c2 Merge pull request #1390 from SchrodingersGat/CI-fixes 
Hide fields rather than pop, to reduce warnings in CI logs
 2021-03-04 22:42:17 +11:00
Oliver Walters
d43cfccfc1 Typo fix 2021-03-04 22:11:38 +11:00
Oliver Walters
5ad915a845 More fields 2021-03-04 22:09:46 +11:00
Oliver Walters
d111e7bff0 Hide fields rather than pop, to reduce warnings in CI logs 2021-03-04 21:42:49 +11:00
Oliver
249860fa76 Merge pull request #1387 from SchrodingersGat/null-fix 
Bug fix
 2021-03-03 22:16:12 +11:00
Oliver Walters
a9e3e46b8a Bug fix 
check if self.object.owner is None
 2021-03-03 21:52:02 +11:00
Oliver
fb5d7c415b Merge pull request #1385 from SchrodingersGat/order-filtering 
Order filtering
 2021-03-03 09:27:40 +11:00
Oliver Walters
979f543c3f Add build orders to search results list 2021-03-03 08:44:13 +11:00
Oliver Walters
14000517ce Fixes for build order table 2021-03-03 08:39:14 +11:00
Oliver Walters
4a28fa7fa8 Fixes for company table 2021-03-03 08:36:16 +11:00
Oliver Walters
339a02a6b2 Bug fix for sorting of sales orders 2021-03-03 08:32:57 +11:00
Oliver Walters
558ea98fa1 Add purchase order and sales order to search results 2021-03-03 08:30:20 +11:00
Oliver Walters
0b15b77140 Fix server-side ordering for purchase order table 2021-03-03 08:13:55 +11:00
Oliver
a53aadd466 Merge pull request #1384 from mosenturm/translation_ak 
updated german translation (de)
 2021-03-03 08:02:40 +11:00
Andreas Kaiser
3a6f13f259 updated german translation (de) 2021-03-02 17:44:53 +01:00
Oliver
3d4cfcf1b6 Merge pull request #1381 from SchrodingersGat/table-name-fix 
Fixes incorrect table name
 2021-03-02 22:03:51 +11:00
Oliver Walters
e7e2abf3fc Remove debug prints 2021-03-02 21:34:26 +11:00
Oliver Walters
cd01bb0ad7 Refactor HTML view permission 
- Introspect database model from View
- Automatically get the permission from the View class
 2021-03-02 21:32:32 +11:00
Oliver Walters
753483e6c2 Use app label rather than table name for permission lookup 
- For legacy reasons there are some tables that are not named according to their app_label
- Simply use the app_label instead
 2021-03-02 19:34:56 +11:00
Oliver
7f6f489463 Merge pull request #1379 from SchrodingersGat/po-bug-fix 
Pagination Bug Fix
 2021-03-02 17:15:12 +11:00
Oliver
33f195533e Merge pull request #1380 from SchrodingersGat/label-base 
Adds body styling to label base
 2021-03-02 16:53:05 +11:00
Oliver Walters
42dfda6d07 Merge remote-tracking branch 'inventree/master' into po-bug-fix 2021-03-02 16:29:12 +11:00
Oliver Walters
7cb712f422 Merge remote-tracking branch 'inventree/master' into label-base 
# Conflicts:
#	.travis.yml
 2021-03-02 16:28:58 +11:00
Oliver
a2f849d663 Merge pull request #1382 from SchrodingersGat/linter-fix 
Remove django-migration-linter which was causing strange errors
 2021-03-02 16:28:10 +11:00
Oliver Walters
9478da2ad2 Remove django-migration-linter which was causing strange errors 2021-03-02 15:53:56 +11:00
Oliver Walters
f6e982ce81 Fixes incorrect table name 2021-03-02 15:34:45 +11:00
Oliver Walters
bc25e795dd Shorten git hash 2021-03-02 14:34:20 +11:00
Oliver Walters
2cf87c1c30 Adds body styling to label base 2021-03-02 14:05:52 +11:00
Oliver Walters
628e87cb28 search field fixes 2021-03-02 13:08:12 +11:00
Oliver Walters
6f4178acdb Improve server-side pagination for POLineItem 2021-03-02 12:38:37 +11:00
Oliver Walters
1c3b017283 Improve server-side pagination of SalesOrderLineItem 2021-03-02 12:33:41 +11:00
Oliver Walters
4ff1c690cc Bug fix for paginated tables 2021-03-02 12:33:01 +11:00
Oliver
7cf1715e2b Merge pull request #1374 from eeintech/dark-reader 
Dark Reader color theme update
 2021-03-02 10:45:56 +11:00
Oliver
197682635e Merge pull request #1377 from SchrodingersGat/nav-tree-fix 
Fix incorrect javascript call
 2021-03-02 10:45:31 +11:00
eeintech
a85ac6161e Removed binary SVG images from CSS 2021-03-01 16:19:16 -05:00
Oliver Walters
478dce449d Fix incorrect javascript call 2021-03-02 08:07:18 +11:00
eeintech
36c7528aeb Removed absolute static URLs 2021-03-01 11:00:42 -05:00