Yohan Boniface
|
77bf047974
|
Truncate Delivery.url in delivery head
|
2019-04-23 14:46:12 +02:00 |
|
Yohan
|
2d90546775
|
Merge branch 'round-again' into 'master'
Add rounding in the generated reports
See merge request ybon/copanier!13
|
2019-04-22 23:25:11 +02:00 |
|
Yohan Boniface
|
c1ea72455c
|
Add Delivery.url to a link to an external source
|
2019-04-22 23:14:14 +02:00 |
|
Yohan Boniface
|
437a3e0c36
|
Make sure not staff is set for tests
|
2019-04-22 23:13:41 +02:00 |
|
Yohan Boniface
|
53a9f6b560
|
Wording
|
2019-04-22 22:34:19 +02:00 |
|
Alexis Métaireau
|
14ebdab7c8
|
Add rounding in the generated reports
|
2019-04-22 15:29:44 +02:00 |
|
|
|
5e933ec775
|
Merge branch 'dev-friendly' into 'master'
Make some changes to the README
See merge request ybon/copanier!12
|
2019-04-22 15:20:30 +02:00 |
|
|
|
598f61e860
|
Make some changes to the README
|
2019-04-22 15:20:30 +02:00 |
|
|
|
d62ecbf0af
|
Merge branch 'multiple-deliveries' into 'master'
Delivery edition
See merge request ybon/copanier!11
|
2019-04-22 15:11:53 +02:00 |
|
|
|
5d8f9ad512
|
Delivery edition
|
2019-04-22 15:11:52 +02:00 |
|
|
|
b3286e5d86
|
Merge branch 'delivery-contact' into 'master'
Add Delivery.contact
See merge request ybon/copanier!9
|
2019-04-21 13:02:34 +02:00 |
|
Yohan
|
f9b69f815c
|
Merge branch 'round-prices' into 'master'
Round prices to two decimals max
See merge request ybon/copanier!10
|
2019-04-21 10:12:46 +02:00 |
|
|
|
5c93a05524
|
Round prices to two decimals max
|
2019-04-21 10:12:46 +02:00 |
|
Yohan Boniface
|
34d6183ad4
|
Add delivery balance report
|
2019-04-19 16:48:11 +02:00 |
|
|
|
434d9f293e
|
Merge branch 'remove-ref' into 'master'
Remove ref from delivery page
See merge request ybon/copanier!8
|
2019-04-17 22:50:05 +02:00 |
|
|
|
2f331d981e
|
Merge branch 'skip-empty' into 'master'
Skip products without orders in order form
See merge request ybon/copanier!7
|
2019-04-17 22:49:19 +02:00 |
|
Yohan Boniface
|
b6ed2b412b
|
Add Delivery.contact
|
2019-04-17 22:12:14 +02:00 |
|
Yohan Boniface
|
97ae6daaae
|
Remove ref from delivery page
|
2019-04-17 21:36:00 +02:00 |
|
Yohan Boniface
|
a6a504d0ca
|
Skip products without orders in order form
|
2019-04-17 21:31:53 +02:00 |
|
Yohan Boniface
|
c020ec89fa
|
Display adjustement col on closed delivery if order has adjustements
|
2019-04-16 23:14:55 +02:00 |
|
Yohan Boniface
|
edc0a44857
|
Wording
|
2019-04-16 22:37:10 +02:00 |
|
Yohan Boniface
|
1bd2c93b30
|
Try to make clearer that "ajustment" completes and does not replace
|
2019-04-16 22:36:03 +02:00 |
|
Yohan Boniface
|
9f3c19ddbe
|
Add order wanted/ajustment details as cell title in delivery page
|
2019-04-16 22:11:49 +02:00 |
|
Yohan Boniface
|
4e608f9858
|
hot fix: show adjustements in place_order even when delivery is closed
|
2019-04-16 21:54:06 +02:00 |
|
Yohan Boniface
|
38272577d8
|
Allow negative ajustment
(bad copy paste and no dedicated test…)
|
2019-04-16 21:47:54 +02:00 |
|
Yohan Boniface
|
0c2e2f5444
|
Explicit "ajust" button in delivery page
|
2019-04-16 21:07:25 +02:00 |
|
Yohan Boniface
|
5deae74c9a
|
Use thead and tbody in tables
|
2019-04-16 20:58:17 +02:00 |
|
Yohan Boniface
|
d604259f57
|
Force white-space: normal on modal container
When it's included in a th it has inherti "nowrap"
|
2019-04-14 17:50:26 +02:00 |
|
Yohan
|
22da3d771c
|
Merge branch 'delivery-balance' into 'master'
Basic "manage delivery balance" page
See merge request ybon/copanier!5
|
2019-04-14 17:43:15 +02:00 |
|
Yohan Boniface
|
bf25a9c785
|
Add amount in delivery balance page
|
2019-04-14 17:31:07 +02:00 |
|
Yohan Boniface
|
815eb9543f
|
Basic "manage delivery balance" page
|
2019-04-14 17:10:48 +02:00 |
|
Yohan
|
35e68bd2ac
|
Merge branch 'packing' into 'master'
Product.packing management
See merge request ybon/copanier!1
|
2019-04-14 16:27:09 +02:00 |
|
Yohan Boniface
|
e9ec238754
|
Very basic "adjust product" page
|
2019-04-14 16:00:07 +02:00 |
|
Yohan Boniface
|
425222a0a2
|
Allow to define ProductOrder.ajustment when product needs adjustment
|
2019-04-14 09:41:55 +02:00 |
|
Yohan Boniface
|
165427bf8f
|
WIP: deal with product packing
|
2019-04-14 09:41:55 +02:00 |
|
Yohan
|
4b329b7378
|
Merge branch 'name-agnostic' into 'master'
A few changes while reading the code
See merge request ybon/copanier!2
|
2019-04-14 09:18:00 +02:00 |
|
|
|
6c2f07bc3c
|
More labels configuration
|
2019-04-14 09:18:00 +02:00 |
|
Yohan Boniface
|
2e6cedca44
|
Remove CORS
|
2019-04-14 00:31:51 +02:00 |
|
Yohan Boniface
|
dafb3d2c9b
|
Add more details about columns to import products
|
2019-04-13 11:15:26 +02:00 |
|
Yohan Boniface
|
f81b303b56
|
Add margin top to input type submit
|
2019-04-13 11:15:26 +02:00 |
|
Yohan Boniface
|
d2cb557f8a
|
Rename Product.weight to Product.unit
|
2019-04-13 11:15:26 +02:00 |
|
Yohan Boniface
|
5c12463bf7
|
Use framagit to deploy
|
2019-04-13 10:08:06 +02:00 |
|
Yohan Boniface
|
3d4aec6deb
|
Cleaner default factories
|
2019-04-12 15:45:41 +02:00 |
|
Yohan Boniface
|
8324136533
|
Use product.label in reports
|
2019-04-12 15:44:56 +02:00 |
|
Yohan Boniface
|
b190f1dd4e
|
Remove perf_counter
Copy pasted from an old project, we don't need that here
|
2019-04-09 19:09:26 +02:00 |
|
Yohan Boniface
|
6f8d9247c4
|
A bit more README
|
2019-04-09 19:05:02 +02:00 |
|
Yohan Boniface
|
8684e83880
|
Make everyone staff if not staff is on the config
|
2019-04-09 18:48:42 +02:00 |
|
Yohan Boniface
|
fa377aa290
|
Workaround static extension not marked as "unprotected"
|
2019-04-09 18:45:15 +02:00 |
|
Yohan Boniface
|
02ff34dff7
|
Do not send emails during unit tests…
|
2019-04-09 17:30:17 +02:00 |
|
Yohan Boniface
|
075f1cfbf6
|
Use Product.label in order table
|
2019-04-07 17:13:02 +02:00 |
|
