5827 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Francois	6857964c17	Merge pull request #1 from matmair/fix-eeintech ... Looks good, thanks @matmair !	2021-05-10 07:55:29 -05:00
Oliver Walters	6aab704144	Trim content when copying to clipboard	2021-05-10 19:40:54 +10:00
github-actions[bot]	0b5d757470	updated translation base	2021-05-10 07:26:04 +00:00
Oliver	c7d625f23e	Merge pull request #1565 from matmair/clipboard-ui ... Clipboard UI	2021-05-10 17:24:31 +10:00
Matthias	fc83458bdb	changes as suggested by @SchrodingersGat	2021-05-10 07:53:58 +02:00
Oliver	765ecc443c	New Crowdin updates (#1568) ... * 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-10 15:33:17 +10:00
github-actions[bot]	3be7cf3b38	updated translation base	2021-05-10 02:57:40 +00:00
Oliver	fb1dce1357	Merge pull request #1567 from SchrodingersGat/login-redirect ... Login redirect	2021-05-10 12:56:30 +10:00
github-actions[bot]	b29b668fe5	updated translation base	2021-05-10 02:35:46 +00:00
Oliver Walters	7e55e343e2	PEP fix	2021-05-10 12:35:19 +10:00
Oliver	6a08191595	Merge pull request #1564 from matmair/fix-css ... inventree.css cleanup	2021-05-10 12:34:25 +10:00
Oliver Walters	be31154a44	Cleaner implementation	2021-05-10 12:33:49 +10:00
Oliver Walters	d9f621c922	Login redirect fix	2021-05-10 12:29:51 +10:00
Matthias	b0a8477a54	removes unallowed char	2021-05-09 14:35:33 +02:00
Matthias	c148ab9f8e	fixed css-comments	2021-05-09 14:34:52 +02:00
Matthias	d38c1f6c0b	sample implementation	2021-05-09 14:30:39 +02:00
Matthias	9f6f69a815	rename for shorter inclusion str	2021-05-09 14:29:35 +02:00
Matthias	783b039eb1	initial functionality for #997	2021-05-09 14:28:46 +02:00
github-actions[bot]	30ec056dd6	updated translation base	2021-05-09 00:18:25 +00:00
Oliver	1f1b0547b0	Merge pull request #1563 from matmair/smal-trans ... just a small translation	2021-05-09 10:16:57 +10:00
Matthias	a210b331ce	just a small translation	2021-05-09 00:27:00 +02:00
Matthias	f931ba405b	style fixes	2021-05-08 21:08:12 +02:00
Matthias	89e0856824	fix for deleting items ... in step 2 not working in step 3	2021-05-08 21:05:02 +02:00
Matthias	5622468209	better readable structure	2021-05-08 20:55:01 +02:00
Matthias	e6372fd600	added translations	2021-05-08 20:54:23 +02:00
Matthias	a0d9bf692e	simpler code - same function	2021-05-08 20:53:26 +02:00
github-actions[bot]	79904308a5	updated translation base	2021-05-08 10:55:51 +00:00
Oliver	e683912561	Merge pull request #1556 from matmair/spaces! ... removes all lines consisting only of spaces	2021-05-08 20:54:36 +10:00
Matthias	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
Matthias	63cf75eefc	styling again	2021-05-07 15:37:15 +02:00
Matthias	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
Matthias	9e59d41f12	style improvments	2021-05-07 07:46:35 +02:00
Matthias	ae01503a9e	handeling data in an inheritable way	2021-05-07 07:20:43 +02:00
Matthias	c775c4611f	adding custom action button ... save the changes to the db and return success-json	2021-05-07 07:19:43 +02:00
Matthias	f73863ea51	adding in cstm action buttons function	2021-05-07 07:18:13 +02:00
Matthias	09fe9ccf11	sales order item tracking	2021-05-07 07:15:33 +02:00
Matthias	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