almet/copanier
1
0
Fork 0
mirror of https://github.com/almet/copanier.git synced 2025-04-28 19:42:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
107 commits 3 branches 0 tags 1.4 MiB
Commit graph

107 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexis Metaireau
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
Alexis Metaireau
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
Alexis Metaireau
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
Alexis Metaireau
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
Alexis Metaireau
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
Yohan Boniface
4704211b55 Manage staff through env var 2019-04-07 09:34:28 +02:00
Yohan Boniface
abc5fd019d Wording 2019-04-07 08:56:27 +02:00
Yohan Boniface
7ce15a79e9 Add xlsx import 2019-04-06 20:06:22 +02:00
Yohan Boniface
f7b90a392f Add Response.xlsx 2019-04-06 18:45:16 +02:00
Yohan Boniface
be5275053b Add products export endpoint 2019-04-06 18:28:12 +02:00
Yohan Boniface
d73386a58a Always print traceback 2019-04-03 19:54:21 +02:00
Yohan Boniface
f06eb52d58 Add link to modify order in summary email 2019-04-03 16:26:47 +02:00
Yohan Boniface
db08ef7a68 Deal with empty quantities in place order 
A user may add a value in place of the "0" and then delete it,
so it will send an empty string to the server.
 2019-04-03 16:08:09 +02:00
Yohan Boniface
69b5b6cf0b Bcc all emails for now 2019-04-03 15:46:54 +02:00
Yohan Boniface
5aeeb5f3b8 Fix email called without being defined 2019-04-02 22:22:33 +02:00