OpenSource/HaitiWater
1
0 Fork 0
mirror of https://github.com/AdrienHallet/HaitiWater.git synced 2026-10-31 20:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
904 Commits 4 Branches 0 Tags
240d892abc5d261d95318ac94de66b4eee136ebf
Commit Graph
35 Commits
Author SHA1 Message Date
Sébastien Strebelle 38f027645f all edit tests 2019-04-30 17:54:34 +02:00
Sébastien Strebelle 59383a90f2 right name for indiv price 2019-04-08 18:15:32 +02:00
CelineDknp 5792d26f33 Manual merge ? 2019-04-07 16:02:58 +02:00
Sébastien Strebelle 7245a55d47 Added individual base price in back 2019-04-06 15:17:15 +02:00
Sébastien Strebelle 3729426ebe clean exports + lint authentication 2019-04-02 15:08:46 +02:00
Sébastien Strebelle 77e54bf779 Graph 2 + some opti 2019-04-01 22:38:44 +02:00
CelineDknp 2c33de87d5 Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2019-03-30 17:07:48 +01:00
CelineDknp e5a3bd8836 Don't rememeber 2019-03-30 17:06:42 +01:00
Sébastien Strebelle 4b72af620b end of API lint and secu 2019-03-29 21:00:17 +01:00
Sébastien Strebelle f5729f9599 fixed modify zone of manager 2019-03-29 14:08:07 +01:00
Sébastien Strebelle bfed9c9963 Lint edit and export + fix consumer phone 2019-03-28 13:14:39 +01:00
Sébastien Strebelle bab2603c5b checks and lint on edit table 2019-03-25 11:18:59 +01:00
CelineDknp 097efcfefd Logs are cleaned 2019-03-17 17:53:21 +01:00
CelineDknp 133b7b17ef Log of the payments 2019-03-12 11:51:01 +01:00
Sébastien Strebelle 17e67a0959 Merge branch 'financial' into integration 
# Conflicts:
#	code/haitiwater/apps/api/add_table.py
#	code/haitiwater/apps/api/edit_table.py
#	code/haitiwater/apps/api/exports.py
#	code/haitiwater/apps/api/get_table.py
#	code/haitiwater/apps/api/urls.py
#	code/haitiwater/apps/zone_management/static/zoneModalHandler.js
#	code/haitiwater/haitiwater/settings.py
#	code/haitiwater/haitiwater/urls.py
#	code/haitiwater/static-common/javascripts/tables/genericTableHandler.js
 2019-03-08 13:51:44 +01:00
Sébastien Strebelle e6cef295e1 adding and editing payments 2019-03-06 08:15:50 +01:00
Sébastien Strebelle e113e2165c fixed invoices not creating properly, now tested ! 2019-03-05 23:30:07 +01:00
CelineDknp 17b23ba43d Added managers 2019-03-04 22:32:23 +01:00
Sébastien Strebelle 67e9038d00 add price and duration information for zones 2019-03-04 00:25:59 +01:00
CelineDknp 406744687c Fix Seb's bug 2019-02-28 22:12:07 +01:00
CelineDknp afd5a6d6c1 Monthly report edit, work in progress 2019-02-27 15:55:24 +01:00
CelineDknp 179acf02fa Fix stupid bug with fountain managers 2019-02-25 11:38:03 +01:00
Sébastien Strebelle 0a170ca39d automatic creation of invoices 2019-02-24 22:18:47 +01:00
CelineDknp 279a4d2c8e Fix edition of fountain manager with multiple outlets 2019-02-24 18:24:06 +01:00
CelineDknp b7d39a2b80 Fixed issue with changing user roles 2019-02-24 18:18:54 +01:00
CelineDknp c5be136e6a Image does not reset when editing ticket 2019-02-20 18:33:26 +01:00
CelineDknp c1180ee86c Forgot a thing 2019-02-17 16:47:13 +01:00
CelineDknp 3c9ffec800 Editions that cancel each other are now deteled in the logs 2019-02-17 16:33:37 +01:00
CelineDknp 5fc87be881 tiny fix 2019-02-13 21:56:02 +01:00
CelineDknp 6aa37d43fe Finished logs 2019-01-19 15:42:26 +01:00
CelineDknp 299222cc11 manual merge 2019-01-19 15:39:24 +01:00
CelineDknp 4a291f3ef9 Ticket edition done 2019-01-19 13:38:42 +01:00
CelineDknp 3c282d103d Edit logs 2019-01-19 01:56:19 +01:00
CelineDknp 779267d794 Logging the consumers 2019-01-17 20:22:40 +01:00
CelineDknp 700362df80 refactor of edit done 2018-12-22 19:59:09 +01:00