Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
a1a9815a 30 November 2012 03:18 PM Mikaël Ates

facturation: an invoicing for services bu CMPP are created closed.

4ad7e5ae 30 November 2012 03:18 PM Mikaël Ates

facturation: Display remaining buttons in details page.

627acbe5 30 November 2012 03:18 PM Mikaël Ates

facturation: fix typo in variable name in template.

ad503195 30 November 2012 03:18 PM Mikaël Ates

facturation: View for validation button.

54038291 30 November 2012 03:18 PM Mikaël Ates

facturation: url for validation button.

b4a78ef4 30 November 2012 03:18 PM Mikaël Ates

facturation: activate validation button and display details of validated invoicing.

6184e4ad 30 November 2012 03:01 PM Jérôme Schneider

Merge branch 'master' of repos.entrouvert.org:calebasse

b3334389 30 November 2012 02:59 PM Jérôme Schneider

dossiers: improve search by state

2d114b9a 30 November 2012 01:13 PM Mikaël Ates

facturation: Add fixtures.

070e274a 30 November 2012 01:13 PM Mikaël Ates

facturation: Add PricePerAct to admin.

b958a9ad 30 November 2012 12:21 PM Mikaël Ates

facturation: New tests for invoicing.

3538ec20 30 November 2012 12:21 PM Mikaël Ates

facturation: Set context to display the details of invoicing.

3af1325c 30 November 2012 12:21 PM Mikaël Ates

facturation: Start to display stats about invoicing.

a49f011d 30 November 2012 12:21 PM Mikaël Ates

facturation: missing statement.

3ac2302c 30 November 2012 12:21 PM Mikaël Ates

[facturation] Obtain stats on invoicing and proceed to validation.

  • Add an Invoice model
  • Add a PricePerAct model and its management. The price of the acts
    can change. So a price apply on a period.
  • build_invoices_from_acts() is the function that group acts billable...
9d3ab5f7 30 November 2012 12:21 PM Mikaël Ates

facturation: A more efficient function to list acts for billing (CMPP)

0fc05fe3 30 November 2012 12:21 PM Mikaël Ates

dossiers: Add field used for temporary setting appart patients form invoicing.

ea2e8d11 30 November 2012 12:21 PM Mikaël Ates

actes: Fix typo.

36aea8a0 30 November 2012 10:02 AM Jérôme Schneider

dossiers: add errors for forms

380f5426 30 November 2012 09:45 AM Jérôme Schneider

dossiers: forms select the current tab

6c5b2d74 29 November 2012 05:08 PM Jérôme Schneider

dossiers: add update patientrecord (civil status and physiology)

  • calebasse/dossiers/forms.py: add PhysiologyForm
  • calebasse/dossiers/models.py: add physiology fields
  • calebasse/dossiers/templates/dossiers/patientrecord_update.html: add
    forms
  • calebasse/dossiers/views.py: add PhysiologyForm to PatientRecordView
96b98b15 29 November 2012 12:45 PM Jérôme Schneider

dossiers: add states history

54f8d003 29 November 2012 12:29 PM Jérôme Schneider

dossiers: manage manual state change

  • calebasse/dossiers/forms.py: StateForm manage change state management
  • calebasse/dossiers/templates/dossiers/patientrecord_update.html:
    manage change state
  • calebasse/dossiers/templates/dossiers/state.html: fix comment field...
bcbe20d1 29 November 2012 09:27 AM Jérôme Schneider

facturation: fix test (we need to reload the object from db)

1db8d2cf 28 November 2012 07:51 PM Jérôme Schneider

removing debug ...

f78e473c 28 November 2012 07:49 PM Jérôme Schneider

dossiers: begin manual state change support

afb93074 28 November 2012 07:11 PM Mikaël Ates

facturation/tests: Use the new status management.

bb8c46e4 28 November 2012 07:10 PM Mikaël Ates

dossiers/tests: remove unnecessary import.

8ef57f1f 28 November 2012 07:10 PM Mikaël Ates

actes: Use the new status management.

fc20476a 28 November 2012 07:08 PM Mikaël Ates

dossiers: Fix typos from the change of state management.

dbf80810 28 November 2012 05:33 PM Jérôme Schneider

dossiers: fix create_patient (set last_state)

8c43db8d 28 November 2012 05:03 PM Mikaël Ates

actes/tests : use existing service in db.

e24683bd 28 November 2012 12:24 PM Jérôme Schneider

dossiers: add last and next rdv

67f7a6a5 28 November 2012 11:59 AM Jérôme Schneider

dossiers: add school and comment

2d4b9891 28 November 2012 11:47 AM Jérôme Schneider

dossiers: patient record add place of life data

3cab63be 28 November 2012 09:26 AM Jérôme Schneider

dossiers: models add patient addresses and patient contacts

f142f9f7 27 November 2012 05:43 PM Jérôme Schneider

dossiers: add patientrecord_update file

066f587e 27 November 2012 05:36 PM Jérôme Schneider

dossiers: add links, add td classes and rename traitement

82c98061 27 November 2012 04:54 PM Mikaël Ates

facturation: missing file to previous commit.

cfb62e2b 27 November 2012 04:20 PM Mikaël Ates

facturation: in progress.

f3407c83 27 November 2012 04:10 PM Jérôme Schneider

dossiers: begin patient record edition

aceeeca7 26 November 2012 10:48 PM Mikaël Ates

Add Role model and fixtures (not used yet)

f0ae3034 26 November 2012 10:20 PM Mikaël Ates

actes: remove per act lock and unlock feature (fixes #2032).

d3c4373d 26 November 2012 10:04 PM Mikaël Ates

Remove logout button from login page.

586af040 26 November 2012 06:55 PM Jérôme Schneider

dossiers: fix tests

d994547b 26 November 2012 05:29 PM Jérôme Schneider

dossiers: manage states search

fe0a540c 26 November 2012 02:43 PM Mikaël Ates

French translation of billable field of ActType.

59d64d6b 26 November 2012 02:37 PM Mikaël Ates

Revert "dossiers: Fix typo"

This reverts commit 8578209c857928f97318206206018daa9912a134.

0d46dc26 26 November 2012 02:35 PM Mikaël Ates

agenda/actes : Add validation-related messages.

In daily validation, automated validation and unlocking events
are recorded and messages are displayed per day per service.
You need to reinitialize you db after this commit.
Fixes #2044.
8578209c 26 November 2012 02:35 PM Mikaël Ates

dossiers: Fix typo

7948e4a4 26 November 2012 02:21 PM Jérôme Schneider

dossiers: fix models import

13008039 26 November 2012 01:39 PM Mikaël Ates

dossiers: add missing import.

0853d495 26 November 2012 01:38 PM Mikaël Ates

agenda: validation is now per service.

2fc71f9b 26 November 2012 12:31 PM Mikaël Ates

Reorder the service buttons display.

777d5c42 26 November 2012 12:26 PM Benjamin Dauvergne

facturation: fix typo

f8f903c3 26 November 2012 12:26 PM Benjamin Dauvergne

personnes: add periodicity fields to the TimeTable model

The new fields are:
- week_offset, week_period to define a repeat pattern using a modulo
and an initial offset,
- week_parity, to define a repeat pattern based on the remainder modulo
2 of the ISO week number,...

cdb3c2c9 26 November 2012 12:26 PM Benjamin Dauvergne

models: add a WeekRankField model field to store a choice of weekrank between 0 and 5

This field maps list of small integers to their encoding as a binary
number. It allows efficient lookup for "in" filters.

82f9179f 26 November 2012 12:26 PM Benjamin Dauvergne

utils: add new module with random utility functions

16505dda 26 November 2012 12:25 PM Benjamin Dauvergne

static: new jQuery widget to replace mutually exclusive fields with a smaller footprint display

603a1b74 26 November 2012 12:25 PM Benjamin Dauvergne

static: new jQuery widget to replace list of checkboxes with a smaller footprint display

63e8433f 26 November 2012 12:20 PM Mikaël Ates

actes: Fix broken back link.

7328a577 23 November 2012 12:01 PM Jérôme Schneider

dossiers: move states mappers into db and begin states support

9f81a4a0 23 November 2012 09:48 AM Mikaël Ates

actes: An act previously in double can be validated after a re-automated validation.

42838d50 22 November 2012 12:11 AM Benjamin Dauvergne

cbv: do not take the first posted value to find the prefix, iterate to find the first one containing a dash

8ce71ef6 22 November 2012 12:10 AM Benjamin Dauvergne

personnes: fix date fields in schedule and holiday views

0839ccbe 21 November 2012 09:34 PM Benjamin Dauvergne

agenda: remove unused imports

89205083 21 November 2012 07:43 PM Jérôme Schneider

fixtures: fix dossiers social security length

9436716a 21 November 2012 07:35 PM Jérôme Schneider

agenda: fix appoinment dialog size

f60b8635 21 November 2012 07:24 PM Jérôme Schneider

agenda: disable recurrent event and appoinment

Enlarge appoinment dialog

dea98973 21 November 2012 07:06 PM Jérôme Schneider

fixtures: add people which are linked to new PatientRecord

2e9ee32b 21 November 2012 06:21 PM Benjamin Dauvergne

homepage: store current service in a cookie, when login in automatically redirect to the last used service, fixes #1978

4b8f5635 21 November 2012 05:22 PM Benjamin Dauvergne

style: remove fixed width of <select/> input fields, fixes #2002

65141e8b 21 November 2012 05:16 PM Benjamin Dauvergne

personnes: change model UserWorker by not using inheritance, it's useless there

You need to reinitialize you db after this commit.

Fixes #1999.

541c2278 21 November 2012 04:41 PM Benjamin Dauvergne

agenda: use french date formatting, fixes #2001

317c2f75 21 November 2012 04:41 PM Benjamin Dauvergne

actes: fix traceback on unicode formating

14bd6fad 21 November 2012 03:36 PM Benjamin Dauvergne

settings: set default login redirect URL to /, fixes #2000

4f32afd3 21 November 2012 03:34 PM Benjamin Dauvergne

personnes: wrong field name, fix #1999

b2285544 21 November 2012 03:33 PM Benjamin Dauvergne

personnes: remove pdb tracepoint, fixes #1998

542692b3 21 November 2012 03:33 PM Benjamin Dauvergne

actes: interpolation of unicode string in a non unicode string in eventact unicode method, fixes #1997

8e6fe119 21 November 2012 02:36 PM Jérôme Schneider

dossiers: fix last and next appoinment and add fixtures

bd24b523 21 November 2012 12:17 PM Benjamin Dauvergne

personnes: adapt fixtures to change from commit 52d3b722, also fixes #1982

1a43d77a 21 November 2012 12:16 PM Benjamin Dauvergne

personnes: add a gender field, fixes #1985

5ec84ba2 21 November 2012 12:15 PM Benjamin Dauvergne

vertically align table cell to the top line in dialogs

a39c35ec 21 November 2012 11:56 AM Benjamin Dauvergne

personnes: add a comment field to holidays usable for worker holidays, fixes #1986

It is also shown in the WorkerUpdate view in the list of holidays for
the worker.

b32fda93 21 November 2012 11:33 AM Jérôme Schneider

dossiers: add statisrics for states and improve state display

14c6ef31 21 November 2012 11:18 AM Benjamin Dauvergne

personnes: show that services, start_time, end_time and start_date are required fields in personnes/worker_update_schedule.html template, fixes #1984

f194f81f 21 November 2012 11:04 AM Benjamin Dauvergne

personnes: show that services, start_time, end_time and start_date are required fields in personnes/worker_update_schedule.html template, fixes

52d3b722 21 November 2012 11:03 AM Benjamin Dauvergne

personnes,agenda: change timetable model to make it belong to multiple services, fixes #1982

Schema was changed, you must reinit your db.

61763791 21 November 2012 11:03 AM Benjamin Dauvergne

agenda: remove unused imports

d22e9c0c 21 November 2012 10:41 AM Jérôme Schneider

dossiers: add last act into search

ca4afcae 20 November 2012 07:18 PM Jérôme Schneider

dossiers: homepage add next appoinment

3f7c000d 20 November 2012 05:45 PM Benjamin Dauvergne

personnes: add help text on worker schedule, worker holidays and service holidays update page to show the expected format for dates, fixes #1980

5bf79d21 20 November 2012 05:35 PM Benjamin Dauvergne

cbv: fix mismatch between a module and a variable, fixes #1977

65103a73 20 November 2012 05:32 PM Benjamin Dauvergne

urls: make the logout view return to the login page, fixes #1975

34029347 20 November 2012 05:26 PM Benjamin Dauvergne

personnes: in the new access form, fill the worker combobox with service workers, fixes #1973

562586fb 20 November 2012 04:47 PM Jérôme Schneider

dossiers: implement patient record search

1e4e612c 20 November 2012 04:39 PM Benjamin Dauvergne

personnes: restore datepicker in holiday and schedule update views

b478e27e 20 November 2012 04:27 PM Benjamin Dauvergne

personnes: show worker linked to a user with a link to its update page, fixes #1974

ad267a2f 20 November 2012 03:36 PM Benjamin Dauvergne

facturation: clean urls.py

fe1b46f3 20 November 2012 03:35 PM Benjamin Dauvergne

fix typo