 daimrod
|
df7da50c33
Merge branch 'fix-manage_py-warnings' of daimrod/coin into master
|
7 years ago |
 Grégoire Jadi
|
9277b03b21
Set upper bound to django-autocomplete-light's version instead of fixing it
|
7 years ago |
|
Grégoire Jadi
|
bafefc478e
Fix Django19Warning : The django.contrib.admin.util module has been renamed
|
7 years ago |
|
Grégoire Jadi
|
172e5c45bf
Bump to django-autocomplete-light to fix taggit warnings in manage.py
|
7 years ago |
|
daimrod
|
e3d38a5d16
Merge branch 'spelling' of Sim/coin into master
|
7 years ago |
|
SimonBoulier
|
f18aa84f69
Fix #14 (and a bit more) : Correct several spelling/translation errors in the admin interface
|
7 years ago |
|
daimrod
|
dba388f984
Merge branch 'mac_serial_new_loan' of Sim/coin into master
|
7 years ago |
|
SimonBoulier
|
a7d7eb977a
Fix #69 Display mac or ref when creating a new loan in the admin interface
|
7 years ago |
|
daimrod
|
78c7ebc114
Merge branch 'deloyed_status_for_hardware' of Sim/coin into master
|
7 years ago |
|
SimonBoulier
|
570303b770
Ajout du status 'deployed' pour un objet. Fix #72 Inventaire : pouvoir indiquer un matos déployé mais pas chez un adhérent
|
7 years ago |
|
daimrod
|
697bb03c67
Merge branch 'mac_serial_loan' of Sim/coin into master
|
7 years ago |
|
SimonBoulier
|
61d54fed30
Fix #118: display mac address and serial number in loan listing
|
7 years ago |
|
Grégoire Jadi
|
b8b2be6798
Use new option to display a change link instead of previous hack (Django<1.8)
|
7 years ago |
|
Grégoire Jadi
|
bbce7d255d
Do not show the comments field in OfferSubscritionInline from the Member admin view
|
7 years ago |
|
Grégoire Jadi
|
40c6839bd8
Add missing migration file from previous merge
|
7 years ago |
 jocelyn
|
b746cf1059
Merge branch 'payment_delay' of dam35/coin into master
|
7 years ago |
|
dam
|
cd5dd267c3
change Invoice.due_date computation logic
|
7 years ago |
|
Jocelyn Delalande
|
4468f903c6
billing: mention payment date on bill
|
7 years ago |
|
daimrod
|
cc069117fe
Merge branch 'correction_of_description_of_amount_before_tax' of dam35/coin into master
|
8 years ago |
|
dam
|
404299c536
Correction of amout before tax description (not "Montant HT")
|
8 years ago |
|
Jocelyn Delalande
|
919b9be8fa
Switch default dev env to vagrant VM
|
8 years ago |
|
Jocelyn Delalande
|
c9a6a9ae8f
Add a vagrant VM running a PostgreSQL database
|
8 years ago |
|
Jocelyn Delalande
|
bf73e2c16c
Fix conflicting migrations
|
8 years ago |
|
Jocelyn Delalande
|
088b36ea29
Add forgotten migration
|
8 years ago |
|
jocelyn
|
43d3f0156f
Merge branch 'fix-108-membershipfree-mandatory-date-fields' of daimrod/coin into master
|
8 years ago |
|
daimrod
|
ada390f6e0
Do not crash if there is no start_date (fix #108)
|
8 years ago |
|
jocelyn
|
63b7492dfe
Merge branch 'optional_buy_date' of dam35/coin into master
|
8 years ago |
|
jocelyn
|
c72ca8534e
Merge branch 'fix_95_close_invoice_if_completely_paid' of arlo/coin into master
|
8 years ago |
|
Jérémie Pierson
|
c58fa7a808
Close invoice only if amount_paid >= amount
|
8 years ago |
|
dam
|
73f168f54c
Make optional Item.buy_date for hardware provisioning
|
8 years ago |
