diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index e8f25d84ad4..7c0ac20d005 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -50,9 +50,9 @@
"account_unit_test.xml",
],
"update_xml" : [
- "account_menuitem.xml",
"security/account_security.xml",
"security/ir.model.access.csv",
+ "account_menuitem.xml",
"account_wizard.xml",
"account_view.xml",
"account_end_fy.xml",
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e9aae3c76d3..d356810e31c 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -2,483 +2,6 @@
-
-
-
- Helpdesk and Support
- support
-
-
- Sales opportunities
- sale
-
-
- Supplier complaints
- purchase
-
-
-
-
-
- Computer Crashed
-
-
-
- Unknown
-
-
-
- Bad Program Utilisation
-
-
-
- Website Opportunity
-
-
-
- ERP Opportunity
-
-
-
- Furnitures
-
-
-
-
-
-
-
-
-
-
- Think about Tiny ERP
- 3
- Fabien think about a new EC website
- Send them a price.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Need a new eCommerce Website
- 4
- Fabien think about a new EC website
- Send them a price.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hdd Crashed unexpectedly
- 3
- HDD Crashed
- Linux turned it readonly.
- The CPU Cooler is down.
-
-
-
-
-
-
-
-
-
-
-
- Need a new eCommerce Website
- 3
- Fabien think about a new EC website
- Send them a price.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Need a new eCommerce Website
- 3
- Fabien think about a new EC website
- Send them a price.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Bug in program
- 3
- There is a bug in the program
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Server is down
- 3
- The web server is down
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Have been rebooted
-
-
-
-
-
-
- Disk failure
- 2
- The new disk doesn't work
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Missing hardware
- 3
- Missing some hardwares in the packing
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Need a new eCommerce Website
- 4
- Fabien think about a new EC website
- Send them a price.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Need a new module
- 3
- Need a new module
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Module delivries
-
-
-
-
-
-
- Need support on module
- 1
- Need some information on module ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Bad packing
- 2
- We receive bad package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Need quotation
- 3
- Need quotation for new development
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Not interested
-
-
-
-
-
-
- New server
- 1
- We need a new server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Formation
- 4
- Provide a formation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Information sended
-
-
-
-
-
-
- Need new specific reports
- 3
- Need some specific reports
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Server down
- 3
- Server is down, doesn't answser to pingz
- Should check if still running, and if network still up (need to be in front of the server)
-
- Very very very high priority, as I cannot svn up/ci/st without the server
-
- (btw : this is only demo data. no stress dear sysadmin :))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 6b4835e5600..810b46e4d43 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -3,10 +3,6 @@
-
- Bug Tracking
- BugSup
-
Bugs
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index fe7d9e8c4c9..6c421648ebe 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -134,7 +134,7 @@
-
+
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index 7551d208b8b..f1cc0435ab9 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -82,13 +82,13 @@ class crm_menu_config_wizard(osv.osv_memory):
_columns = {
'name':fields.char('Name', size=64),
'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
- 'lead' : fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests, the very first contact with a customer request."),
+ 'lead' : fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"),
+ 'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
- 'helpdesk' : fields.boolean('Help Desk Operations', help="This may help your Help Desk."),
}
_defaults = {
'meeting': lambda *args: True,
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 2bb17dbe7b2..d4263281824 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -18,8 +18,8 @@
-
+
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 70fcb2bc1c0..25a06d8364a 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -2,6 +2,14 @@
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_fund_data.xml b/addons/crm_configuration/crm_fund_data.xml
index d62df40d66e..159d202ac2a 100644
--- a/addons/crm_configuration/crm_fund_data.xml
+++ b/addons/crm_configuration/crm_fund_data.xml
@@ -1,54 +1,54 @@
-
- Fund Raising
- funds
-
+
+ Fund Raising
+ funds
+
-
-
-
- Social Rehabilitation And Rural Upliftment
-
-
-
-
- Learning And Education
-
-
-
-
- Healthcare
-
-
-
-
- Arts And Culture
-
-
+
+
+
+ Social Rehabilitation And Rural Upliftment
+
+
+
+
+ Learning And Education
+
+
+
+
+ Healthcare
+
+
+
+
+ Arts And Culture
+
+
-
-
-
- Cash
-
-
-
-
- Cheque
-
-
+
+
+
+ Cash
+
+
+
+
+ Cheque
+
+
-
- Credit Card
-
-
-
-
- Demand Draft
-
-
+
+ Credit Card
+
+
+
+
+ Demand Draft
+
+
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index a911bbb91bf..eab89efa08a 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -1,199 +1,194 @@
-
-
- Fund Raising
- funds
-
-
-
-
- All Funds
- crm.case
- tree,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
+
+
+
+ All Funds
+ crm.case
+ tree,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
-
-
-
-
- My Funds
- crm.case
- tree,form
-
-
-
-
-
- tree
-
-
-
-
-
- graph
-
-
-
-
-
- form
-
-
-
-
+
+
+
+
+ My Funds
+ crm.case
+ tree,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ graph
+
+
+
+
+
+ form
+
+
+
+
-
- Funds
- crm.case
- form,graph
-
-
-
-
-
- graph
-
-
-
-
-
- form
-
-
-
-
+
+ Funds
+ crm.case
+ form,graph
+
+
+
+
+
+ graph
+
+
+
+
+
+ form
+
+
+
+
-
- My Funds Waiting Validation
- crm.case
- tree,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ My Funds Waiting Validation
+ crm.case
+ tree,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- My Funds To Be Processed
- crm.case
- tree,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ My Funds To Be Processed
+ crm.case
+ tree,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
-
+
+
-
- All Funds Waiting Validation
- crm.case
- tree,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ All Funds Waiting Validation
+ crm.case
+ tree,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- All Funds To Be Processed
- crm.case
- tree,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ All Funds To Be Processed
+ crm.case
+ tree,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 070a39f55bd..51cf92d9bd1 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -129,7 +129,7 @@
-
+
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 9413bc08496..2abda5c89fa 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -2,10 +2,7 @@
-
- Helpdesk and Support
- support
-
+
######################## Help Desk (menu) ###########################
All Helpdesk Requests
diff --git a/addons/crm_configuration/crm_jobs_data.xml b/addons/crm_configuration/crm_jobs_data.xml
index 8fdbbea6c17..8bee7e2d89d 100644
--- a/addons/crm_configuration/crm_jobs_data.xml
+++ b/addons/crm_configuration/crm_jobs_data.xml
@@ -1,67 +1,67 @@
-
- Jobs
- jobs
-
+
+ Jobs
+ jobs
+
-
-
-
- Salesman
-
-
-
-
- Junior Developer
-
-
-
-
-
-
- Graduate
-
-
-
- Licenced
-
-
-
- > Bac +5
-
-
-
-
+
+
+
+ Salesman
+
+
+
+
+ Junior Developer
+
+
+
+
+
+
+ Graduate
+
+
+
+ Licenced
+
+
+
+ > Bac +5
+
+
+
+
-
- Initial Jobs Demand
-
-
-
- First Interview
-
-
-
- Second Interview
-
-
-
- Contract Proposed
-
-
-
- Contract Signed
-
-
-
- Refused by Employee
-
-
-
- Refused by Company
-
-
+
+ Initial Jobs Demand
+
+
+
+ First Interview
+
+
+
+ Second Interview
+
+
+
+ Contract Proposed
+
+
+
+ Contract Signed
+
+
+
+ Refused by Employee
+
+
+
+ Refused by Company
+
+
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 974e0960c31..4ad83b0e2b2 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -3,11 +3,6 @@
-
- Jobs
- jobs
-
-
######################## JOB OPPORTUNITIES (menu) ###########################
All Jobs Requests
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
index b7ea4c05c98..521ba37377c 100644
--- a/addons/crm_configuration/crm_lead_data.xml
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -1,101 +1,101 @@
-
-
- Leads
- leads
-
+
+
+ Leads
+ leads
+
-
-
- Existing Customer
-
-
-
- Self Generated
-
-
-
- Employee
-
-
-
- Partner
-
-
-
- Website
-
-
-
- Word of mouth
-
-
-
- Other
-
-
+
+
+ Existing Customer
+
+
+
+ Self Generated
+
+
+
+ Employee
+
+
+
+ Partner
+
+
+
+ Website
+
+
+
+ Word of mouth
+
+
+
+ Other
+
+
-
-
- New
-
-
-
- Assigned
-
-
-
- In Process
-
-
-
- Converted
-
-
-
- Recycled
-
-
-
- Dead
-
-
+
+
+ New
+
+
+
+ Assigned
+
+
+
+ In Process
+
+
+
+ Converted
+
+
+
+ Recycled
+
+
+
+ Dead
+
+
-
-
- Telesales
-
-
-
- Mail
-
-
-
- Email
-
-
-
- Print
-
-
-
- Web
-
-
-
- Radio
-
-
-
- Television
-
-
-
- Newsletter
-
-
-
+
+
+ Telesales
+
+
+
+ Mail
+
+
+
+ Email
+
+
+
+ Print
+
+
+
+ Web
+
+
+
+ Radio
+
+
+
+ Television
+
+
+
+ Newsletter
+
+
+
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index 2711c8ef84b..a2840e5f3e3 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -1,143 +1,128 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index d0be061dd06..4bf87297658 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -3,11 +3,6 @@
-
- Leads
- leads
-
-
@@ -253,33 +248,6 @@
-
- My Draft Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
My Open Leads
crm.case
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 30b60344728..81eded15237 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -16,11 +16,11 @@
-
+
-
+
diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
index 55101c62b17..97529d16602 100644
--- a/addons/crm_configuration/crm_meeting_data.xml
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -2,62 +2,62 @@
-
- Meetings
- Mtngs
-
-
-
-
- Sales Meeting
-
-
-
- Internal Meeting
-
-
-
- Training
-
-
-
-
+
+ Meetings
+ Mtngs
+
+
+
+
+ Sales Meeting
+
+
+
+ Internal Meeting
+
+
+
+ Training
+
+
+
+
-
- Office
-
-
-
- Home
-
-
-
- Customer Office
-
-
-
-
+
+ Office
+
+
+
+ Home
+
+
+
+ Customer Office
+
+
+
+
-
- Fixed
-
-
-
- Not fixed
-
-
-
- Invalid
-
-
-
- Awaiting Response
-
-
-
- Future
-
-
+
+ Fixed
+
+
+
+ Not fixed
+
+
+
+ Invalid
+
+
+
+ Awaiting Response
+
+
+
+ Future
+
+
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 7a165e096d7..cc945080752 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -1,11 +1,6 @@
-
- Calendar
- Mtngs
-
-
######################## MEETINGS (menu) ###########################
crm.case
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index b9fbc98016b..12c554e209c 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -132,6 +132,7 @@
+
diff --git a/addons/crm_configuration/crm_opportunity_data.xml b/addons/crm_configuration/crm_opportunity_data.xml
index f2addebb408..44c45e0cc16 100644
--- a/addons/crm_configuration/crm_opportunity_data.xml
+++ b/addons/crm_configuration/crm_opportunity_data.xml
@@ -1,84 +1,83 @@
-
- Opportunities
- oppor
-
+
+ Opportunities
+ oppor
+
-
-
- Existing Customer
-
-
-
- Self Generated
-
-
-
- Employee
-
-
-
- Partner
-
-
-
- Campaign
-
-
-
- Website
-
-
-
- Word of mouth
-
-
-
- Other
-
-
+
+ Existing Customer
+
+
+
+ Self Generated
+
+
+
+ Employee
+
+
+
+ Partner
+
+
+
+ Campaign
+
+
+
+ Website
+
+
+
+ Word of mouth
+
+
+
+ Other
+
+
-
-
- Prospecting
-
-
-
- Needs Analysis
-
-
-
- Value Proposition
-
-
-
- Proposal/Price Quote
-
-
-
- Negotiation/Review
-
-
-
- Closed Won
-
-
-
- Closed Lost
-
-
+
+
+ Prospecting
+
+
+
+ Needs Analysis
+
+
+
+ Value Proposition
+
+
+
+ Proposal/Price Quote
+
+
+
+ Negotiation/Review
+
+
+
+ Closed Won
+
+
+
+ Closed Lost
+
+
-
-
- Existing Business
-
-
-
- New Business
-
-
+
+
+ Existing Business
+
+
+
+ New Business
+
+
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 1104de1e78d..4e8bf0c1ce8 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -3,11 +3,6 @@
-
- Opportunities
- oppor
-
-
All Opportunities
crm.case
diff --git a/addons/crm_configuration/wizard/__init__.py b/addons/crm_configuration/wizard/__init__.py
index 56dd8d4f9b5..44b222bdc56 100644
--- a/addons/crm_configuration/wizard/__init__.py
+++ b/addons/crm_configuration/wizard/__init__.py
@@ -29,3 +29,5 @@
##############################################################################
import meeting_planify
+import wizard_partner_create
+import wizard_opportunity_set
diff --git a/addons/crm_configuration/wizard/meeting_planify.py b/addons/crm_configuration/wizard/meeting_planify.py
index 23fef34de4b..8c3c3298933 100644
--- a/addons/crm_configuration/wizard/meeting_planify.py
+++ b/addons/crm_configuration/wizard/meeting_planify.py
@@ -39,6 +39,7 @@ case_form = """
"""
case_fields = {
@@ -51,7 +52,7 @@ class make_meeting(wizard.interface):
def _selectPartner(self, cr, uid, data, context):
case_obj = pooler.get_pool(cr.dbname).get('crm.case')
case = case_obj.browse(cr, uid, data['id'])
- return {'date': case.date, 'duration': case.duration}
+ return {'date': case.date, 'duration': case.duration or 2.0}
def _makeOrder(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
diff --git a/addons/document/document.py b/addons/document/document.py
index a8963e71347..507d7568843 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -709,7 +709,7 @@ class document_configuration_wizard(osv.osv_memory):
'ressource_type_id': mid[0],
'domain': '[]',
'ressource_tree': 1
- })
+ })
return {
'view_type': 'form',
@@ -717,6 +717,5 @@ class document_configuration_wizard(osv.osv_memory):
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
- }
-
+ }
document_configuration_wizard()
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 19098a6d1d2..e88f0e8d771 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -41,7 +41,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
),
'sale_margin':fields.boolean('Margins on Sales Order',
help="Display margins on the sale order form."),
- 'crm_configuration':fields.boolean('CRM and Calendars',
+ 'sale_crm':fields.boolean('CRM and Calendars',
help="This installs the customer relationship features like: "\
"leads and opportunities tracking, shared calendar, jobs "\
"tracking, bug tracker, and so on."),
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index 118e106652d..a118f95d4a4 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py
index c66bd1f2e6e..125e3df65d5 100644
--- a/addons/sale_crm/__terp__.py
+++ b/addons/sale_crm/__terp__.py
@@ -4,23 +4,28 @@
"version" : "1.0",
"author" : "Tiny",
"website" : "http://tinyerp.com/module_sale.html",
- "depends" : ["sale", "crm_configuration", "product", "account"],
+ "depends" : ["sale", "crm_configuration"],
"category" : "Generic Modules/Sales & Purchases",
"description": """
- This module adds a shortcut on one or several cases in the CRM.
- This shortcut allows you to generate a sale order based the selected case.
- If different cases are open (a list), it generates one sale order by
- case.
- The case is then closed and linked to the generated sale order.
+This module adds a shortcut on one or several cases in the CRM.
+This shortcut allows you to generate a sale order based the selected case.
+If different cases are open (a list), it generates one sale order by
+case.
+The case is then closed and linked to the generated sale order.
- It also add a shortcut on one or several partners.
- This shorcut allows you to generate a CRM case for the partners.
+It also add a shortcut on one or several partners.
+This shorcut allows you to generate a CRM case for the partners.
+
+We sugest you to install this module if you installed both the sale and the
+crm_configuration modules.
""",
"init_xml" : [],
"demo_xml" : [],
- "update_xml" : ["sale_crm_wizard.xml",
- "process/sale_crm_process.xml"
- ],
+ "update_xml" : [
+ "sale_crm_wizard.xml",
+ "sale_crm_view.xml",
+ "process/sale_crm_process.xml"
+ ],
"active": False,
"installable": True
}
diff --git a/addons/sale_crm/sale_crm_wizard.xml b/addons/sale_crm/sale_crm_wizard.xml
index ea93b9b94d3..d54f7d13cd0 100644
--- a/addons/sale_crm/sale_crm_wizard.xml
+++ b/addons/sale_crm/sale_crm_wizard.xml
@@ -1,19 +1,20 @@
-
+
-
+
-
-
+
+
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 0cfd65a5dfe..abb99d0b5d9 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -36,32 +36,29 @@ import ir
import pooler
sale_form = """
-"""
sale_fields = {
- 'name': {'string': 'Order name', 'type': 'char',
- 'help': 'Keep empty for default value'},
'shop_id': {'string': 'Shop', 'type': 'many2one', 'relation': 'sale.shop'},
- 'partner_id': {'string': 'Default partner', 'type': 'many2one',
+ 'partner_id': {'string': 'Customer', 'type': 'many2one',
'relation': 'res.partner',
'help': 'Use this partner if there is no partner on the case'},
- 'picking_policy': {'string': 'Packing policy', 'type': 'selection',
+ 'picking_policy': {'string': 'Packing Policy', 'type': 'selection',
'selection': [('direct','Direct Delivery'),('one','All at once')]},
'products': {'string': 'Products', 'type': 'many2many',
'relation': 'product.product'},
- 'analytic_account': {'string': 'Analytic account', 'type': 'many2one',
+ 'analytic_account': {'string': 'Analytic Account', 'type': 'many2one',
'relation': 'account.analytic.account'},
- 'close': {'string': 'Close', 'type': 'boolean', 'default': lambda *a: 1,
- 'help': 'Select to close the case'},
+ 'close': {'string': 'Close Case', 'type': 'boolean', 'default': lambda *a: 1,
+ 'help': 'Check this to close the case after having created the sale order.'},
}
@@ -110,8 +107,6 @@ class make_sale(wizard.interface):
'order_policy': 'manual',
'date_order': now(),
}
- if data['form']['name']:
- vals['name'] = data['form']['name']
if data['form']['analytic_account']:
vals['project_id'] = data['form']['analytic_account']
new_id = sale_obj.create(cr, uid, vals)
@@ -143,7 +138,7 @@ class make_sale(wizard.interface):
'init': {
'actions': [_selectPartner],
'result': {'type': 'form', 'arch': sale_form, 'fields': sale_fields,
- 'state' : [('end', 'Cancel'),('order', 'Make Sale Order')]}
+ 'state' : [('end', 'Cancel', 'gtk-cancel'),('order', 'Create Quote', 'gtk-go-forward')]}
},
'order': {
'actions': [],
@@ -152,5 +147,4 @@ class make_sale(wizard.interface):
}
make_sale('crm.case.make_order')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
index 30edbbca7ad..86a36a02981 100644
--- a/addons/stock/wizard/inventory_merge.py
+++ b/addons/stock/wizard/inventory_merge.py
@@ -48,14 +48,14 @@ def do_merge(self, cr, uid, data, context):
if len(data['ids']) < 2:
raise wizard.except_wizard("Warning",
- "Please select at least two inventories.")
+ _("Please select at least two inventories."))
for inventory in invent_obj.browse(cr, uid, data['ids'], context=context):
if inventory.state == "done":
raise wizard.except_wizard("Warning",
- "Merging is only allowed on draft inventories.")
+ _("Merging is only allowed on draft inventories."))
for line in inventory.inventory_line_id:
key = (line.location_id.id, line.product_id.id, line.product_uom.id)