Commit Graph

1937 Commits

Author SHA1 Message Date
Oliver Walters
153dde4129 Merge remote-tracking branch 'inventree/master' 2019-09-04 11:02:27 +10:00
Oliver
c96c4d16a3
Merge pull request #469 from SchrodingersGat/update-docs
Add documentation on perfoming system upgrades
2019-09-04 10:56:57 +10:00
Oliver Walters
7ef2932f38 Add documentation on perfoming system upgrades 2019-09-04 10:54:15 +10:00
Oliver Walters
8f3a022b3c Merge remote-tracking branch 'inventree/master' 2019-09-04 08:57:24 +10:00
Oliver
ecd1681585
Merge pull request #468 from SchrodingersGat/currency-quote
Currency quote
2019-09-03 23:16:12 +10:00
Oliver Walters
e903c1858f PEP 2019-09-03 22:45:45 +10:00
Oliver Walters
20b37a2d11 Test fixes 2019-09-03 22:45:11 +10:00
Oliver Walters
41806089e3 Select the default currency if one is not specifically selected 2019-09-03 22:33:50 +10:00
Oliver Walters
3682e9b5fb Display currency selection in part pricing dialog 2019-09-03 22:28:53 +10:00
Oliver Walters
7314f33d6d Add currency selection field for price calculation form 2019-09-03 22:00:43 +10:00
Oliver Walters
017bf187f9 Merge remote-tracking branch 'inventree/master' 2019-09-03 10:42:14 +10:00
Oliver
8ae19cb095
Merge pull request #467 from SchrodingersGat/version
Bump version number
2019-09-03 10:41:49 +10:00
Oliver Walters
0325f042b5 Bump version number 2019-09-03 09:59:14 +10:00
Oliver
a6ee3a59a0
Merge pull request #466 from SchrodingersGat/currency
Currency
2019-09-03 09:58:22 +10:00
Oliver Walters
af8a96e080 Add option to edit currency 2019-09-03 09:55:15 +10:00
Oliver Walters
09cb82cdc0 Fix converted_cost
- Incompatibility between float and decimal
2019-09-03 09:46:32 +10:00
Oliver Walters
c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters
9f91797f42 Simple test case for currency 2019-09-03 09:19:37 +10:00
Oliver Walters
32d09d2d37 Add default value for currency 2019-09-03 09:10:36 +10:00
Oliver Walters
7824b8561d Create a currency model 2019-09-03 09:07:03 +10:00
Oliver Walters
aeb25e4c34 startapp common 2019-09-03 08:30:14 +10:00
Oliver
9f87963fa9
Merge pull request #465 from SchrodingersGat/bug-squashin
Squashin' some bugs
2019-09-02 22:21:44 +10:00
Oliver Walters
273412b63d Add 'bug report' button 2019-09-02 22:14:50 +10:00
Oliver Walters
f3e161564d Fix for serialization of company images 2019-09-02 22:06:42 +10:00
Oliver
64278523f0
Merge pull request #463 from SchrodingersGat/install-reqs
Install reqs
2019-09-02 18:03:47 +10:00
Oliver Walters
c988f9486e Re-order docs index 2019-09-02 17:59:10 +10:00
Oliver Walters
90254d1572 add a note about file encoding 2019-09-02 17:46:42 +10:00
Oliver Walters
37507f2b43 More cleanup of docs 2019-09-02 17:43:20 +10:00
Oliver Walters
47e9c44c43 Prefix correct directory in docs 2019-09-02 17:04:44 +10:00
Oliver Walters
b0c420858b Comments for settings.py 2019-09-02 16:44:01 +10:00
Oliver Walters
92940f1333 Update makefile docs 2019-09-02 16:05:26 +10:00
Oliver Walters
d30cad2341 Emphasis on config.yaml 2019-09-02 16:05:19 +10:00
Oliver Walters
31f3ead5dc Andrew's eagle eyes 2019-09-02 15:52:19 +10:00
Oliver Walters
4de12033bb Change pip3 to python3-pip 2019-09-02 15:51:58 +10:00
Oliver Walters
7b8d7c9fe0 Merge remote-tracking branch 'upstream/master' 2019-09-01 23:33:39 +10:00
Oliver
0be54a762f
Merge pull request #459 from SchrodingersGat/build-tracking
Add a reference to a build for a stock item
2019-09-01 23:31:08 +10:00
Oliver Walters
906766cc0e Bug fix - ensure pk is set to None 2019-09-01 23:28:28 +10:00
Oliver Walters
7db938eda0 Show the build item on the stock-item page (if applicable) 2019-09-01 23:24:27 +10:00
Oliver Walters
c45c4e236e Point new stockitem to the correct build 2019-09-01 23:18:28 +10:00
Oliver Walters
3cef5c93ce Improve stock item splitting 2019-09-01 23:18:08 +10:00
Oliver Walters
90a342fad8 Add a reference to a build for a stock item 2019-09-01 23:09:40 +10:00
Oliver
c63d40bd88
Merge pull request #456 from SchrodingersGat/install-docs
Improve installation documentation
2019-09-01 22:59:24 +10:00
Oliver Walters
e9efac403c Tweak install docs 2019-09-01 22:55:18 +10:00
Oliver Walters
e32048d3c6 Add documentation for data migration 2019-09-01 22:55:02 +10:00
Oliver Walters
0480925186 Simplify makefile again
- Remove setup target
- Fix travis
2019-09-01 22:54:48 +10:00
Oliver Walters
10ca3b1b93 Remove defunct line 2019-09-01 22:35:21 +10:00
Oliver Walters
6212c2aeda Fix travis steps 2019-09-01 22:31:21 +10:00
Oliver Walters
d9cc03c5ca Improve installation documentation 2019-09-01 22:16:58 +10:00
Oliver Walters
fae9a92a82 Improvements for makefile
- Comments
- Cleanup
2019-09-01 21:57:17 +10:00
Oliver Walters
32538c8c3d Fixes for doc building
- Separate doc build from doc requirements
- Fix command which doesn't work properly on *nix
2019-09-01 21:46:08 +10:00