summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-07-07Merge branch 'stable'Étienne Loks
2015-07-07Fix bad check of twon attachment on parcel post_saveÉtienne Loks
2015-07-07Merge branch 'stable'Étienne Loks
2015-07-07Fix parcel management: merge parcels from operation and from file when ↵Étienne Loks
needed (refs #1612)
2015-06-25Merge branch 'stable'Étienne Loks
2015-06-25Import: fix MCC find imports + testsÉtienne Loks
2015-06-25Merge branch 'stable'Étienne Loks
2015-06-25Import: fix unit import on MCC context recordÉtienne Loks
2015-06-25Merge branch 'stable'Étienne Loks
2015-06-25Import: add test for MCC context record importÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
2015-06-18Import: really delete associated object when deleting an importÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
2015-06-18Import: really prevent from associating not created object to an importÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
Conflicts: ishtar_common/data_importer.py
2015-06-18Import: prevent associating not created item to an importÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
2015-06-18Parcels: automatically create external id for parcelsÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
2015-06-18Import: try different encoding if the specified doesn't workÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
2015-06-18Import MCC Operation: duplicate in charge nameÉtienne Loks
2015-06-18Merge migrationsÉtienne Loks
2015-06-18Update french translationÉtienne Loks
2015-06-18Merge branch 'stable'Étienne Loks
Conflicts: ishtar_common/data_importer.py
2015-06-18Import: manage different encoding for source fileÉtienne Loks
2015-06-17Import: fix bad targetkey creationÉtienne Loks
Conflicts: ishtar_common/data_importer.py
2015-06-17Import: fix bad targetkey creationÉtienne Loks
2015-06-17Merge branch 'stable'Étienne Loks
2015-06-17Parcel: a new associated town can be add to associated operation AND ↵Étienne Loks
associated file
2015-06-17Merge branch 'stable'Étienne Loks
2015-06-17Parcel: when associating a new town report it to operation and filesÉtienne Loks
2015-06-16Merge branch 'stable'Étienne Loks
2015-06-16Import: fix MCC-ParcelÉtienne Loks
2015-06-16Merge branch 'stable'Étienne Loks
2015-06-16Import: update MCC parcel import testsÉtienne Loks
2015-06-16Fix migration after mergeÉtienne Loks
2015-06-16Merge branch 'stable'Étienne Loks
2015-06-16Import: specialize targetkey (refs #2533)Étienne Loks
Model: a targetkey connection can now be applied to on particular import (associated_import), one particular user (associated_user) or to all imports (associated_import and associated_user are empty). To be done: change import and forms to fully use this mechanism.
2015-06-16Merge branch 'stable'Étienne Loks
2015-06-16Imports: fix many to many import when many value from one field (refs #2613)Étienne Loks
2015-06-11Imports: fix StrToBoolean target key creationÉtienne Loks
2015-06-11Merge branch 'stable'Étienne Loks
2015-06-11Fixtures: add duplicate fields to import fixturesÉtienne Loks
2015-06-11Merge branch 'stable'Étienne Loks
2015-06-11Imports: fix for finds importÉtienne Loks
2015-06-11Work on find importerÉtienne Loks
2015-06-10Fix town listing on parcel form (refs #2534)Étienne Loks
2015-06-10Fix migration after mergeÉtienne Loks
2015-06-10Merge branch 'stable'Étienne Loks
Conflicts: archaeological_operations/models.py