Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
chris
repanier
Commits
6a82d10d
Commit
6a82d10d
authored
Jun 19, 2017
by
chris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix imports (1/2)
parent
006ca70e
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
60 additions
and
60 deletions
+60
-60
repanier/admin/__init__.py
repanier/admin/__init__.py
+14
-14
repanier/admin/staff.py
repanier/admin/staff.py
+1
-1
repanier/models/__init__.py
repanier/models/__init__.py
+18
-18
repanier/models/configuration.py
repanier/models/configuration.py
+1
-1
repanier/models/customer.py
repanier/models/customer.py
+4
-4
repanier/models/deliveryboard.py
repanier/models/deliveryboard.py
+2
-2
repanier/models/invoice.py
repanier/models/invoice.py
+3
-3
repanier/models/offeritem.py
repanier/models/offeritem.py
+1
-1
repanier/models/permanence.py
repanier/models/permanence.py
+7
-7
repanier/models/producer.py
repanier/models/producer.py
+5
-5
repanier/models/purchase.py
repanier/models/purchase.py
+4
-4
No files found.
repanier/admin/__init__.py
View file @
6a82d10d
...
...
@@ -2,47 +2,47 @@
from
django.contrib
import
admin
from
repanier.models
import
BankAccount
from
bankaccount
import
BankAccountAdmin
from
.
bankaccount
import
BankAccountAdmin
admin
.
site
.
register
(
BankAccount
,
BankAccountAdmin
)
from
repanier.models
import
Configuration
from
configuration
import
ConfigurationAdmin
from
.
configuration
import
ConfigurationAdmin
admin
.
site
.
register
(
Configuration
,
ConfigurationAdmin
)
from
repanier.models
import
Customer
from
customer
import
CustomerWithUserDataAdmin
from
.
customer
import
CustomerWithUserDataAdmin
admin
.
site
.
register
(
Customer
,
CustomerWithUserDataAdmin
)
from
repanier.models
import
Purchase
from
purchase
import
PurchaseAdmin
from
.
purchase
import
PurchaseAdmin
admin
.
site
.
register
(
Purchase
,
PurchaseAdmin
)
from
repanier.models
import
LUT_ProductionMode
,
LUT_DeliveryPoint
,
LUT_DepartmentForCustomer
,
LUT_PermanenceRole
from
lut
import
LUTProductionModeAdmin
,
LUTPermanenceRoleAdmin
,
LUTDepartmentForCustomerAdmin
,
LUTDeliveryPointAdmin
from
.
lut
import
LUTProductionModeAdmin
,
LUTPermanenceRoleAdmin
,
LUTDepartmentForCustomerAdmin
,
LUTDeliveryPointAdmin
admin
.
site
.
register
(
LUT_ProductionMode
,
LUTProductionModeAdmin
)
admin
.
site
.
register
(
LUT_PermanenceRole
,
LUTPermanenceRoleAdmin
)
admin
.
site
.
register
(
LUT_DepartmentForCustomer
,
LUTDepartmentForCustomerAdmin
)
admin
.
site
.
register
(
LUT_DeliveryPoint
,
LUTDeliveryPointAdmin
)
from
repanier.models
import
OfferItemClosed
from
offeritem
import
OfferItemClosedAdmin
from
.
offeritem
import
OfferItemClosedAdmin
admin
.
site
.
register
(
OfferItemClosed
,
OfferItemClosedAdmin
)
from
repanier.models
import
OfferItemSend
from
rule_of_3_per_product
import
OfferItemSendAdmin
from
.
rule_of_3_per_product
import
OfferItemSendAdmin
admin
.
site
.
register
(
OfferItemSend
,
OfferItemSendAdmin
)
from
repanier.models
import
CustomerSend
from
rule_of_3_per_customer
import
CustomerSendAdmin
from
.
rule_of_3_per_customer
import
CustomerSendAdmin
admin
.
site
.
register
(
CustomerSend
,
CustomerSendAdmin
)
from
repanier.models
import
PermanenceInPreparation
from
permanence_in_preparation
import
PermanenceInPreparationAdmin
from
.
permanence_in_preparation
import
PermanenceInPreparationAdmin
admin
.
site
.
register
(
PermanenceInPreparation
,
PermanenceInPreparationAdmin
)
from
repanier.models
import
PermanenceDone
from
permanence_done
import
PermanenceDoneAdmin
from
.
permanence_done
import
PermanenceDoneAdmin
admin
.
site
.
register
(
PermanenceDone
,
PermanenceDoneAdmin
)
from
repanier.models
import
Producer
from
producer
import
ProducerAdmin
from
.
producer
import
ProducerAdmin
admin
.
site
.
register
(
Producer
,
ProducerAdmin
)
from
repanier.models
import
Product
from
product
import
ProductAdmin
from
.
product
import
ProductAdmin
admin
.
site
.
register
(
Product
,
ProductAdmin
)
from
repanier.models.box
import
Box
from
box
import
BoxAdmin
from
.
box
import
BoxAdmin
admin
.
site
.
register
(
Box
,
BoxAdmin
)
from
repanier.models
import
Staff
from
staff
import
StaffWithUserDataAdmin
from
.
staff
import
StaffWithUserDataAdmin
admin
.
site
.
register
(
Staff
,
StaffWithUserDataAdmin
)
repanier/admin/staff.py
View file @
6a82d10d
...
...
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
from
easy_select2
import
apply_select2
from
parler.forms
import
TranslatableModelForm
from
lut
import
LUTAdmin
from
.
lut
import
LUTAdmin
from
repanier.const
import
EMPTY_STRING
,
\
COORDINATION_GROUP
,
ORDER_GROUP
,
INVOICE_GROUP
,
ONE_LEVEL_DEPTH
from
repanier.models
import
Customer
,
Staff
...
...
repanier/models/__init__.py
View file @
6a82d10d
# -*- coding: utf-8
# non proxies
from
bankaccount
import
BankAccount
from
configuration
import
Configuration
from
customer
import
Customer
from
deliveryboard
import
DeliveryBoard
from
invoice
import
CustomerInvoice
,
ProducerInvoice
,
CustomerProducerInvoice
from
lut
import
LUT_ProductionMode
,
LUT_DeliveryPoint
,
LUT_DepartmentForCustomer
,
LUT_PermanenceRole
from
offeritem
import
OfferItem
from
permanence
import
Permanence
from
permanenceboard
import
PermanenceBoard
from
producer
import
Producer
from
product
import
Product
,
Product_Translation
from
purchase
import
Purchase
from
staff
import
Staff
from
.
bankaccount
import
BankAccount
from
.
configuration
import
Configuration
from
.
customer
import
Customer
from
.
deliveryboard
import
DeliveryBoard
from
.
invoice
import
CustomerInvoice
,
ProducerInvoice
,
CustomerProducerInvoice
from
.
lut
import
LUT_ProductionMode
,
LUT_DeliveryPoint
,
LUT_DepartmentForCustomer
,
LUT_PermanenceRole
from
.
offeritem
import
OfferItem
from
.
permanence
import
Permanence
from
.
permanenceboard
import
PermanenceBoard
from
.
producer
import
Producer
from
.
product
import
Product
,
Product_Translation
from
.
purchase
import
Purchase
from
.
staff
import
Staff
# after Producer and Product
from
box
import
BoxContent
from
.
box
import
BoxContent
# proxies
from
box
import
Box
from
invoice
import
CustomerSend
from
offeritem
import
OfferItemSend
,
OfferItemClosed
,
OfferItemWoReceiver
from
permanence
import
PermanenceInPreparation
,
PermanenceDone
\ No newline at end of file
from
.box
import
Box
from
.invoice
import
CustomerSend
from
.offeritem
import
OfferItemSend
,
OfferItemClosed
,
OfferItemWoReceiver
from
.permanence
import
PermanenceInPreparation
,
PermanenceDone
repanier/models/configuration.py
View file @
6a82d10d
...
...
@@ -23,7 +23,7 @@ from djangocms_text_ckeditor.fields import HTMLField
from
menus.menu_pool
import
menu_pool
from
parler.models
import
TranslatableModel
,
TranslatedFields
import
product
from
repanier.models
import
product
from
repanier.const
import
*
from
repanier.fields.RepanierMoneyField
import
ModelMoneyField
...
...
repanier/models/customer.py
View file @
6a82d10d
...
...
@@ -15,10 +15,10 @@ from django.utils.encoding import python_2_unicode_compatible
from
django.utils.safestring
import
mark_safe
from
django.utils.translation
import
ugettext_lazy
as
_
import
bankaccount
import
invoice
import
permanenceboard
import
purchase
from
repanier.models
import
bankaccount
from
repanier.models
import
invoice
from
repanier.models
import
permanenceboard
from
repanier.models
import
purchase
from
repanier.const
import
*
from
repanier.fields.RepanierMoneyField
import
ModelMoneyField
,
RepanierMoney
from
repanier.picture.const
import
SIZE_S
...
...
repanier/models/deliveryboard.py
View file @
6a82d10d
...
...
@@ -11,8 +11,8 @@ from django.utils.translation import ugettext_lazy as _
from
menus.menu_pool
import
menu_pool
from
parler.models
import
TranslatableModel
,
TranslatedFields
import
invoice
import
purchase
from
repanier.models
import
invoice
from
repanier.models
import
purchase
from
repanier.apps
import
REPANIER_SETTINGS_PERMANENCE_NAME
from
repanier.const
import
LUT_PERMANENCE_STATUS
,
PERMANENCE_PLANNED
,
PERMANENCE_SEND
,
EMPTY_STRING
...
...
repanier/models/invoice.py
View file @
6a82d10d
...
...
@@ -12,9 +12,9 @@ from django.utils.formats import number_format
from
django.utils.text
import
slugify
from
django.utils.translation
import
ugettext_lazy
as
_
import
producer
import
purchase
import
deliveryboard
from
repanier.models
import
producer
from
repanier.models
import
purchase
from
repanier.models
import
deliveryboard
from
repanier.apps
import
DJANGO_IS_MIGRATION_RUNNING
from
repanier.const
import
*
from
repanier.fields.RepanierMoneyField
import
ModelMoneyField
...
...
repanier/models/offeritem.py
View file @
6a82d10d
...
...
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
from
djangocms_text_ckeditor.fields
import
HTMLField
from
parler.models
import
TranslatedFields
import
invoice
from
repanier.models
import
invoice
from
repanier.models.item
import
Item
from
repanier.apps
import
REPANIER_SETTINGS_PERMANENCE_NAME
from
repanier.const
import
*
...
...
repanier/models/permanence.py
View file @
6a82d10d
...
...
@@ -17,13 +17,13 @@ from djangocms_text_ckeditor.fields import HTMLField
from
menus.menu_pool
import
menu_pool
from
parler.models
import
TranslatableModel
,
TranslatedFields
,
TranslationDoesNotExist
import
customer
import
deliveryboard
import
invoice
import
offeritem
import
permanenceboard
import
producer
import
purchase
from
repanier.models
import
customer
from
repanier.models
import
deliveryboard
from
repanier.models
import
invoice
from
repanier.models
import
offeritem
from
repanier.models
import
permanenceboard
from
repanier.models
import
producer
from
repanier.models
import
purchase
import
repanier.apps
from
repanier.picture.const
import
SIZE_L
from
repanier.picture.fields
import
AjaxPictureField
...
...
repanier/models/producer.py
View file @
6a82d10d
...
...
@@ -19,10 +19,10 @@ from django.utils.formats import number_format
from
django.utils.safestring
import
mark_safe
from
django.utils.translation
import
ugettext_lazy
as
_
import
bankaccount
import
invoice
import
offeritem
import
product
from
repanier.models
import
bankaccount
from
repanier.models
import
invoice
from
repanier.models
import
offeritem
from
repanier.models
import
product
from
repanier.const
import
*
from
repanier.fields.RepanierMoneyField
import
ModelMoneyField
,
RepanierMoney
from
repanier.tools
import
update_offer_item
...
...
@@ -372,4 +372,4 @@ def producer_post_save(sender, **kwargs):
producer
=
kwargs
[
"instance"
]
for
a_product
in
product
.
Product
.
objects
.
filter
(
producer_id
=
producer
.
id
).
order_by
(
'?'
):
a_product
.
save
()
update_offer_item
(
producer_id
=
producer
.
id
)
\ No newline at end of file
update_offer_item
(
producer_id
=
producer
.
id
)
repanier/models/purchase.py
View file @
6a82d10d
...
...
@@ -11,10 +11,10 @@ from django.dispatch import receiver
from
django.utils.encoding
import
python_2_unicode_compatible
from
django.utils.translation
import
ugettext_lazy
as
_
import
invoice
import
offeritem
import
permanence
import
producer
from
repanier.models
import
invoice
from
repanier.models
import
offeritem
from
repanier.models
import
permanence
from
repanier.models
import
producer
import
repanier.apps
from
repanier.const
import
*
from
repanier.fields.RepanierMoneyField
import
ModelMoneyField
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment