First step toward the long road to django 1.5.

Fix imports paths
Update to new standard source tree

actionset/admin.py

@@ -8,7 +8,7 @@
 from django.contrib import admin
 from django.utils.translation import ugettext
 
-from pydici.actionset.models import ActionSet, Action, ActionState
+from actionset.models import ActionSet, Action, ActionState
 
 
 class ActionInlineAdmin(admin.TabularInline):

actionset/utils.py

@@ -4,10 +4,10 @@
 @author: Sébastien Renard (sebastien.renard@digitalfox.org)
 @license: AGPL v3 or newer (http://www.gnu.org/licenses/agpl-3.0.html)
 """
-from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 
-from pydici.actionset.models import ActionSet
+from actionset.models import ActionSet
+
 
 def launchTrigger(trigger, targetUsers, targetObject=None):
     """Launch actionset about targetObject for given trigger to targeted users"""

actionset/views.py

@@ -13,8 +13,8 @@
 from django.template import RequestContext
 from django.contrib.auth.models import User
 
-from pydici.actionset.models import ActionSet, Action, ActionState
-from pydici.core.decorator import pydici_non_public
+from actionset.models import ActionSet, Action, ActionState
+from core.decorator import pydici_non_public
 
 
 def update_action_state(request, action_state_id, state):

batch/timesheet_check.py

@@ -31,8 +31,8 @@
 from django.template import Context
 
 # Pydici imports
-from pydici.people.models import Consultant
-from pydici.staffing.utils import gatherTimesheetData
+from people.models import Consultant
+from staffing.utils import gatherTimesheetData
 
 
 def warnForImcompleteTimesheet(warnSurbooking=False, days=None, month=None):

billing/admin.py

@@ -10,9 +10,9 @@
 
 from ajax_select.admin import AjaxSelectAdmin
 
-from pydici.billing.models import ClientBill, SupplierBill
-from pydici.billing.forms import ClientBillForm, SupplierBillForm
-from pydici.core.admin import ReturnToAppAdmin
+from billing.models import ClientBill, SupplierBill
+from billing.forms import ClientBillForm, SupplierBillForm
+from core.admin import ReturnToAppAdmin
 
 
 class BillAdmin(AjaxSelectAdmin, ReturnToAppAdmin):

billing/forms.py

@@ -10,7 +10,7 @@
 
 from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultipleField
 
-from pydici.billing.models import ClientBill, SupplierBill
+from billing.models import ClientBill, SupplierBill
 
 
 class BillForm(models.ModelForm):

billing/models.py

@@ -15,10 +15,10 @@
 from django.core.files.storage import FileSystemStorage
 from django.core.urlresolvers import reverse
 
-from pydici.leads.models import Lead
-from pydici.expense.models import Expense
-from pydici.crm.models import Supplier
-from pydici.core.utils import sanitizeName
+from leads.models import Lead
+from expense.models import Expense
+from crm.models import Supplier
+from core.utils import sanitizeName
 import pydici.settings
 
 

billing/views.py

@@ -20,13 +20,13 @@
 from django.utils.translation import ugettext as _
 from django.views.decorators.cache import cache_page
 
-from pydici.billing.models import ClientBill, SupplierBill
-from pydici.leads.models import Lead
-from pydici.people.models import Consultant
-from pydici.staffing.models import Timesheet, FinancialCondition, Staffing, Mission
-from pydici.crm.models import Company
-from pydici.core.utils import print_png, COLORS, sortedValues, nextMonth, previousMonth, to_int_or_round
-from pydici.core.decorator import pydici_non_public
+from billing.models import ClientBill, SupplierBill
+from leads.models import Lead
+from people.models import Consultant
+from staffing.models import Timesheet, FinancialCondition, Staffing, Mission
+from crm.models import Company
+from core.utils import print_png, COLORS, sortedValues, nextMonth, previousMonth, to_int_or_round
+from core.decorator import pydici_non_public
 
 
 @pydici_non_public

core/templatetags/pydici_filters.py

@@ -14,8 +14,8 @@
 from django.utils.translation import ugettext as _
 from django.contrib.auth.models import User
 
-from pydici.people.models import Consultant
-from pydici.leads.models import Lead
+from people.models import Consultant
+from leads.models import Lead
 import pydici.settings
 
 register = template.Library()

core/tests.py

@@ -16,13 +16,13 @@
 from workflows.models import Transition
 
 # Pydici modules
-from pydici.core.utils import monthWeekNumber, previousWeek, nextWeek
-from pydici.leads.models import Lead
-from pydici.people.models import Consultant, ConsultantProfile
-from pydici.crm.models import Client, Subsidiary
-from pydici.staffing.models import Mission
-from pydici.expense.models import Expense, ExpenseCategory
-from pydici.expense.default_workflows import install_expense_workflow
+from core.utils import monthWeekNumber, previousWeek, nextWeek
+from leads.models import Lead
+from people.models import Consultant, ConsultantProfile
+from crm.models import Client, Subsidiary
+from staffing.models import Mission
+from expense.models import Expense, ExpenseCategory
+from expense.default_workflows import install_expense_workflow
 import pydici.settings
 
 # Python modules used by tests

core/views.py

@@ -10,13 +10,13 @@
 from django.db.models import Q
 from django.contrib.auth.decorators import login_required
 
-from pydici.core.decorator import pydici_non_public
-from pydici.leads.models import Lead
-from pydici.people.models import Consultant
-from pydici.crm.models import Company, Contact
-from pydici.staffing.models import Mission
-from pydici.billing.models import ClientBill
-from pydici.people.views import consultant_home
+from core.decorator import pydici_non_public
+from leads.models import Lead
+from people.models import Consultant
+from crm.models import Company, Contact
+from staffing.models import Mission
+from billing.models import ClientBill
+from people.views import consultant_home
 import pydici.settings
 
 

crm/admin.py

@@ -7,11 +7,11 @@
 
 from django.contrib import admin
 
-from pydici.crm.models import Client, ClientOrganisation, Company, \
+from crm.models import Client, ClientOrganisation, Company, \
                               Contact, BusinessBroker, Subsidiary, \
                               Supplier, AdministrativeFunction, AdministrativeContact, \
                               MissionContact
-from pydici.core.admin import ReturnToAppAdmin
+from core.admin import ReturnToAppAdmin
 
 
 class SubsidiaryAdmin(ReturnToAppAdmin):

crm/lookups.py

@@ -5,7 +5,7 @@
 @license: AGPL v3 or newer (http://www.gnu.org/licenses/agpl-3.0.html)
 """
 
-from pydici.crm.models import Client, BusinessBroker, Supplier, MissionContact
+from crm.models import Client, BusinessBroker, Supplier, MissionContact
 from django.db.models import Q
 
 

crm/models.py

@@ -11,7 +11,7 @@
 from django.db.models import Sum, Q
 from django.utils.translation import ugettext_lazy as _
 
-from pydici.core.utils import capitalize
+from core.utils import capitalize
 
 
 SHORT_DATETIME_FORMAT = "%d/%m/%y %H:%M"
@@ -43,7 +43,7 @@ class Company(AbstractCompany):
 
     def sales(self, onlyLastYear=False):
         """Sales billed for this company in keuros"""
-        from pydici.billing.models import ClientBill
+        from billing.models import ClientBill
         data = ClientBill.objects.filter(lead__client__organisation__company=self)
         if onlyLastYear:
             data = data.filter(creation_date__gt=(date.today() - timedelta(365)))
@@ -160,11 +160,11 @@ def __unicode__(self):
     def getFinancialConditions(self):
         """Get financial condition for this client by profil
         @return: ((profil1, avgrate1), (profil2, avgrate2)...)"""
-        from pydici.staffing.models import FinancialCondition
+        from staffing.models import FinancialCondition
         data = {}
         for fc in FinancialCondition.objects.filter(mission__lead__client=self,
-                                               consultant__timesheet__charge__gt=0, # exclude null charge
-                                               consultant__timesheet=models.F("mission__timesheet") # Join to avoid duplicate entries
+                                               consultant__timesheet__charge__gt=0,  # exclude null charge
+                                               consultant__timesheet=models.F("mission__timesheet")  # Join to avoid duplicate entries
                                                ).select_related():
             profil = fc.consultant.profil
             if not profil in data:

crm/views.py

@@ -13,12 +13,12 @@
 from django.db.models import Sum, Min
 from django.views.decorators.cache import cache_page
 
-from pydici.crm.models import Company, Client, Contact, AdministrativeContact
-from pydici.staffing.models import Timesheet
-from pydici.leads.models import Lead
-from pydici.core.decorator import pydici_non_public
-from pydici.core.utils import sortedValues, previousMonth, COLORS
-from pydici.billing.models import ClientBill
+from crm.models import Company, Client, Contact, AdministrativeContact
+from staffing.models import Timesheet
+from leads.models import Lead
+from core.decorator import pydici_non_public
+from core.utils import sortedValues, previousMonth, COLORS
+from billing.models import ClientBill
 
 
 @pydici_non_public

expense/admin.py

@@ -7,7 +7,7 @@
 
 from django.contrib import admin
 
-from pydici.expense.models import Expense, ExpenseCategory
+from expense.models import Expense, ExpenseCategory
 
 
 class ExpenseAdmin(admin.ModelAdmin):

expense/forms.py

@@ -16,7 +16,7 @@
 
 from ajax_select.fields import AutoCompleteSelectField
 
-from pydici.expense.models import Expense
+from expense.models import Expense
 
 
 class ExpenseForm(forms.ModelForm):

expense/lookups.py

@@ -7,7 +7,7 @@
 
 from django.utils import formats
 
-from pydici.expense.models import Expense
+from expense.models import Expense
 from django.db.models import Q
 
 

expense/models.py

@@ -10,14 +10,14 @@
 
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext
 from django.contrib.auth.models import User
 import workflows.utils as wf
 
-from pydici.leads.models import Lead
-from pydici.core.utils import sanitizeName
+from leads.models import Lead
+from core.utils import sanitizeName
 import pydici.settings
 
+
 # This utils function is here and not in utils module
 # to avoid circular import loop, as utils module import Expense models
 def expense_receipt_path(instance, filename):

expense/views.py

@@ -20,11 +20,11 @@
 from django.db.models import Q
 from django.views.generic import date_based
 
-from pydici.expense.forms import ExpenseForm
-from pydici.expense.models import Expense
-from pydici.people.models import Consultant
-from pydici.staffing.models import Mission
-from pydici.core.decorator import pydici_non_public
+from expense.forms import ExpenseForm
+from expense.models import Expense
+from people.models import Consultant
+from staffing.models import Mission
+from core.decorator import pydici_non_public
 
 
 @pydici_non_public

leads/admin.py

@@ -11,11 +11,11 @@
 
 from ajax_select.admin import AjaxSelectAdmin
 
-from pydici.leads.models import Lead
-from pydici.staffing.models import Mission
-from pydici.leads.forms import LeadForm
-from pydici.core.utils import send_lead_mail
-from pydici.core.admin import ReturnToAppAdmin
+from leads.models import Lead
+from staffing.models import Mission
+from leads.forms import LeadForm
+from core.utils import send_lead_mail
+from core.admin import ReturnToAppAdmin
 
 
 class LeadAdmin(AjaxSelectAdmin, ReturnToAppAdmin):

leads/feeds.py

@@ -4,13 +4,14 @@
 @license: AGPL v3 or newer (http://www.gnu.org/licenses/agpl-3.0.html)
 """
 
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from django.utils.translation import ugettext as _
 
-from pydici.leads.models import Consultant, Lead
+from leads.models import Consultant, Lead
 from django.core import urlresolvers
 
+
 class LeadFeed(Feed):
     feed_type = Atom1Feed
     description_template = "leads/lead_mail.html"
@@ -32,6 +33,7 @@ def item_guid(self, item):
     def item_author_name(self, item):
         return item.responsible
 
+
 class LatestLeads(LeadFeed):
     title = _("Latest leads")
     description = _("Last modified or created leads")

leads/forms.py

@@ -11,7 +11,7 @@
 
 from ajax_select.fields import AutoCompleteSelectField
 
-from pydici.leads.models import Lead
+from leads.models import Lead
 
 class LeadForm(models.ModelForm):
     class Meta:

leads/lookups.py

@@ -5,7 +5,7 @@
 @license: AGPL v3 or newer (http://www.gnu.org/licenses/agpl-3.0.html)
 """
 
-from pydici.leads.models import Lead
+from leads.models import Lead
 from django.db.models import Q
 
 

leads/models.py

@@ -16,13 +16,13 @@
 
 from taggit.managers import TaggableManager
 
-from pydici.core.utils import compact_text
+from core.utils import compact_text
 
-from pydici.crm.models import Client, BusinessBroker
-from pydici.people.models import Consultant, SalesMan
-from pydici.actionset.models import ActionState
-from pydici.actionset.utils import launchTrigger
-from pydici.core.utils import createProjectTree
+from crm.models import Client, BusinessBroker
+from people.models import Consultant, SalesMan
+from actionset.models import ActionState
+from actionset.utils import launchTrigger
+from core.utils import createProjectTree
 
 
 SHORT_DATETIME_FORMAT = "%d/%m/%y %H:%M"

leads/views.py

@@ -25,11 +25,11 @@
 from taggit.models import Tag
 from taggit_suggest.utils import suggest_tags
 
-from pydici.core.utils import send_lead_mail, sortedValues, COLORS
-from pydici.leads.models import Lead
+from core.utils import send_lead_mail, sortedValues, COLORS
+from leads.models import Lead
 import pydici.settings
-from pydici.core.utils import capitalize, getLeadDirs, getLeadDocURL, createProjectTree
-from pydici.core.decorator import pydici_non_public
+from core.utils import capitalize, getLeadDirs, getLeadDocURL, createProjectTree
+from core.decorator import pydici_non_public
 
 
 @pydici_non_public