diff --git a/addons/account/account.py b/addons/account/account.py index 35723d082aa..94086e86742 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1486,8 +1486,8 @@ class account_config_wizard(osv.osv_memory): res.sort(lambda x,y: cmp(x[1],y[1])) return res _columns = { - 'name':fields.char('Name', required=True,size=64), - 'code':fields.char('Code', required=True,size=64), + 'name':fields.char('Name', required=True, size=64, help="Name of the fiscal year as displayed on screens."), + 'code':fields.char('Code', required=True, size=64, help="Name of the fiscal year as displayed in reports."), 'date1': fields.date('Starting Date', required=True), 'date2': fields.date('Ending Date', required=True), 'period':fields.selection([('month','Month'),('3months','3 Months')], 'Periods', required=True), @@ -1495,6 +1495,7 @@ class account_config_wizard(osv.osv_memory): } _defaults = { 'code': lambda *a: time.strftime('%Y'), + 'name': lambda *a: time.strftime('%Y'), 'date1': lambda *a: time.strftime('%Y-01-01'), 'date2': lambda *a: time.strftime('%Y-12-31'), 'period':lambda *a:'month' diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml index 6c882fd0ef4..e9aae3c76d3 100644 --- a/addons/crm/crm_demo.xml +++ b/addons/crm/crm_demo.xml @@ -4,12 +4,12 @@ - + Helpdesk and Support support - --> + Sales opportunities sale @@ -21,20 +21,20 @@ Computer Crashed - + Unknown - + Bad Program Utilisation - - --> + + Website Opportunity @@ -48,6 +48,19 @@ + + + + @@ -91,6 +104,22 @@ + + Hdd Crashed unexpectedly + 3 + HDD Crashed + Linux turned it readonly. + The CPU Cooler is down. + + + + + + + + + + Need a new eCommerce Website 3 @@ -139,7 +168,53 @@ - + + 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 @@ -162,6 +237,27 @@ + + Missing hardware + 3 + Missing some hardwares in the packing + + + + + + + + + + + + + + + + + Need a new eCommerce Website @@ -259,7 +355,32 @@ - + + Need quotation + 3 + Need quotation for new development + + + + + + + + + + + + + + + + + + Not interested + + + + New server @@ -309,5 +430,55 @@ + + 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/__terp__.py b/addons/crm_configuration/__terp__.py index 4b61410cd43..45503709487 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -17,22 +17,25 @@ "crm_lead_view.xml", "crm_meeting_view.xml", "crm_opportunity_view.xml", - "crm_fund_view.xml" + "crm_fund_view.xml", + "crm_report_view.xml" ], "demo_xml" : [ -# "crm_bugs_data.xml", -# "crm_jobs_data.xml", -# "crm_meeting_data.xml", -# "crm_lead_data.xml", -# "crm_opportunity_data.xml" + "crm_bugs_demo.xml", + "crm_fund_demo.xml", + "crm_jobs_demo.xml", + "crm_meeting_demo.xml", + "crm_lead_demo.xml", + "crm_opportunity_demo.xml", ], "update_xml" : [ -# "crm_bugs_demo.xml", -# "crm_jobs_demo.xml", -# "crm_lead_demo.xml", -# "crm_meeting_demo.xml", -# "crm_opportunity_demo.xml", -# "crm_report_view.xml" + "crm_bugs_data.xml", + "crm_fund_data.xml", + "crm_jobs_data.xml", + "crm_meeting_data.xml", + "crm_lead_data.xml", + "crm_opportunity_data.xml", + ], "active": False, "installable": True diff --git a/addons/crm_configuration/crm_bugs_data.xml b/addons/crm_configuration/crm_bugs_data.xml index c618447703a..bc03ac1f4b1 100644 --- a/addons/crm_configuration/crm_bugs_data.xml +++ b/addons/crm_configuration/crm_bugs_data.xml @@ -1,276 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + Bug Tracking + BugSup - - - - - - - - - - - - - - + + + + + Bugs + + + + Patches + + + + Feature Requests + - - - - - - - - - - - - - - + + + + Version 4.2 + + + + Version 4.4 + - - - - - - - - - - - - - - - + + + + + Accepted as Bug + + + + Fixed + + + + Won't fix + + + + Invalid + + + + Awaiting Response + + + + Works For Me + + + + Future + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/crm_configuration/crm_bugs_demo.xml b/addons/crm_configuration/crm_bugs_demo.xml index 66467393e66..c618447703a 100644 --- a/addons/crm_configuration/crm_bugs_demo.xml +++ b/addons/crm_configuration/crm_bugs_demo.xml @@ -1,694 +1,276 @@ - - - - Bug Tracking - BugSup - - - - - - - Bugs - - - - Patches - - - - Feature Requests - - - - - - - Version 4.2 - - - - Version 4.4 - - - - - - - - Accepted as Bug - - - - Fixed - - - - Won't fix - - - - Invalid - - - - Awaiting Response - - - - Works For Me - - - - Future - - - - ######################## BUG TRACKING (menu) ########################### - - All Bugs - crm.case - form - tree,calendar - - + + + + + + + + + + + + + + + + - - - tree - - - - - - calendar - - + + + + + + - - - form - - - - - - - New Bug - crm.case - form - form,tree - - + + + + + + + + + + + + + + - - - form - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - tree - - - - - - Bugs Waiting Approval - crm.case - form - tree,calendar - - + + + + + + + + + + + + + + - - - tree - - - - - - calendar - - - - - - form - - - - - - - Open Bugs - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Bugs With Patches Waiting Approval - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Bugs Not Fixed - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Pending Bugs - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Planned For Future Release - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - Waiting For Reporter Response - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - Old Bugs - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - My Bugs - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - My Open Bugs - crm.case - form - tree,calendar - - + + + + + + + + + + + + + + - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Bugs With Patches - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Bugs Not Fixed - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - All Feature Request - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - New Feature Request - crm.case - form - form,tree - - + + + + + + + + + + + + + + - - - form - - + + + + + + + + + + + + + + + + - - - tree - - + + + + + + + + + + + + + + + + - - - - - Feature Requests Waiting Approval - crm.case - form - tree,calendar - - + + + + + + + + + + + + + + + + + - - - tree - - + + + + + + + + + + + + + + + - - - calendar - - + + + + + + + + + + + + + + + - - - form - - - - - - Open Feature Requests - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Pending Feature Requests - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Planned For Future Release - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Waiting For Reporter Response - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Old Feature Requests - crm.case - form - tree,calendar - - - - - - tree - - - - - - calendar - - - - - - form - - - - diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml new file mode 100644 index 00000000000..4f24f096b47 --- /dev/null +++ b/addons/crm_configuration/crm_bugs_menu.xml @@ -0,0 +1,650 @@ + + + + + Bug Tracking + BugSup + + + Bugs + + + + Patches + + + + Feature Requests + + + + Fixed + + + + Awaiting Response + + + + Future + + + + + ######################## BUG TRACKING (menu) ########################### + + + All Bugs + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + New Bug + crm.case + form + form,tree + + + + + + form + + + + + + tree + + + + + + + Bugs Waiting Approval + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Open Bugs + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Bugs With Patches Waiting Approval + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Bugs Not Fixed + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Pending Bugs + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Planned For Future Release + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + Waiting For Reporter Response + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + Old Bugs + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + My Bugs + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Open Bugs + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Bugs With Patches + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Bugs Not Fixed + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + All Feature Request + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + New Feature Request + crm.case + form + form,tree + + + + + + form + + + + + + tree + + + + + + + + Feature Requests Waiting Approval + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + Open Feature Requests + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Pending Feature Requests + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Planned For Future Release + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Waiting For Reporter Response + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Old Feature Requests + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py index 1e82f135839..c89d49af7ba 100644 --- a/addons/crm_configuration/crm_config.py +++ b/addons/crm_configuration/crm_config.py @@ -1,4 +1,33 @@ # -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id$ +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + import time import tools from osv import fields,osv,orm @@ -59,6 +88,7 @@ class crm_menu_config_wizard(osv.osv_memory): 'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), 'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"), '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, @@ -71,7 +101,7 @@ class crm_menu_config_wizard(osv.osv_memory): # 'update' for section in res : if res[section]: - file_name = 'crm_'+section+'_demo.xml' + file_name = 'crm_'+section+'_menu.xml' try: tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_configuration',file_name )), {}, 'init', *args) except Exception, e: diff --git a/addons/crm_configuration/crm_fund_data.xml b/addons/crm_configuration/crm_fund_data.xml index c6965852c6e..d62df40d66e 100644 --- a/addons/crm_configuration/crm_fund_data.xml +++ b/addons/crm_configuration/crm_fund_data.xml @@ -1,146 +1,54 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Fund Raising + funds + + + + + + Social Rehabilitation And Rural Upliftment + + + + + Learning And Education + + + + + Healthcare + + + + + Arts And Culture + + + + + + + Cash + + + + + Cheque + + + + + Credit Card + + + + + Demand Draft + + + + diff --git a/addons/crm_configuration/crm_fund_demo.xml b/addons/crm_configuration/crm_fund_demo.xml index e5f1a83e6ae..e7b6cd2bde5 100644 --- a/addons/crm_configuration/crm_fund_demo.xml +++ b/addons/crm_configuration/crm_fund_demo.xml @@ -1,243 +1,146 @@ - + - - - - Fund Raising - funds - - - - - - Social Rehabilitation And Rural Upliftment - - - - - Learning And Education - - - - - Healthcare - - - - - Arts And Culture - - - - - - - Cash - - - - - Cheque - - - - - Credit Card - - - - - Demand Draft - - - - - - - - Funds - crm.case - form,graph - - - - - - graph - - - - - - form - - - - - - - - My Funds - crm.case - tree,form - - - - - - tree - - - - - - graph - - - - - - form - - - - - - - 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 - - - - - - - - All Funds - 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 - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml new file mode 100644 index 00000000000..40c3e9fdee7 --- /dev/null +++ b/addons/crm_configuration/crm_fund_menu.xml @@ -0,0 +1,198 @@ + + + + + Fund Raising + funds + + + + + + + Funds + crm.case + form,graph + + + + + + graph + + + + + + form + + + + + + + + My Funds + crm.case + tree,form + + + + + + tree + + + + + + graph + + + + + + form + + + + + + + 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 + + + + + + + + All Funds + 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 + + + + + + + diff --git a/addons/crm_configuration/crm_helpdesk_data.xml b/addons/crm_configuration/crm_helpdesk_data.xml deleted file mode 100644 index 228e52e1bab..00000000000 --- a/addons/crm_configuration/crm_helpdesk_data.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Helpdesk and Support - support - - - - - - Computer Crashed - - - - Unknown - - - - Bad Program Utilisation - - - - - \ No newline at end of file diff --git a/addons/crm_configuration/crm_helpdesk_demo.xml b/addons/crm_configuration/crm_helpdesk_demo.xml deleted file mode 100644 index f3a957c7ed9..00000000000 --- a/addons/crm_configuration/crm_helpdesk_demo.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - Hdd Crashed unexpectedly - 3 - HDD Crashed - Linux turned it readonly. - The CPU Cooler is down. - - - - - - - - - - - - - Bug in program - 3 - There is a bug in the program - - - - - - - - - - - - - - - - - Server is down - 3 - The web server is down - - - - - - - - - - - - - - - - - - - - Have been rebooted - - - - - - - Missing hardware - 3 - Missing some hardwares in the packing - - - - - - - - - - - - - - - - - - - - Need quotation - 3 - Need quotation for new development - - - - - - - - - - - - - - - - - - Not interested - - - - - - - Need new specific reports - 3 - Need some specific reports - - - - - - - - - - - - - - - - - - - - Need new specific reports - 3 - Need some specific reports - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml index 5c411804ab2..9d40a9b700f 100644 --- a/addons/crm_configuration/crm_helpdesk_menu.xml +++ b/addons/crm_configuration/crm_helpdesk_menu.xml @@ -1,7 +1,7 @@ - + Helpdesk and Support support @@ -14,7 +14,7 @@ crm.case tree,calendar,form - + @@ -42,7 +42,7 @@ crm.case tree,calendar,form - + @@ -73,7 +73,7 @@ crm.case tree,calendar,form - + @@ -100,7 +100,7 @@ crm.case tree,calendar,form - + @@ -127,7 +127,7 @@ crm.case tree,calendar,form - + @@ -155,7 +155,7 @@ crm.case calendar,tree,form - + @@ -185,7 +185,7 @@ crm.case tree,calendar,form - + @@ -213,7 +213,7 @@ crm.case tree,calendar,form - + @@ -240,7 +240,7 @@ crm.case tree,calendar,form - + @@ -267,7 +267,7 @@ crm.case tree,calendar,form - + @@ -295,7 +295,7 @@ crm.case tree,calendar,form - + @@ -322,7 +322,7 @@ crm.case calendar,tree,form - + diff --git a/addons/crm_configuration/crm_jobs_data.xml b/addons/crm_configuration/crm_jobs_data.xml index 9366486e483..8fdbbea6c17 100644 --- a/addons/crm_configuration/crm_jobs_data.xml +++ b/addons/crm_configuration/crm_jobs_data.xml @@ -1,149 +1,67 @@ - + + Jobs + jobs + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Salesman + + + Junior Developer + + + + + + + Graduate + + + + Licenced + + + + > Bac +5 + + + + + + + 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_demo.xml b/addons/crm_configuration/crm_jobs_demo.xml index d2aebb803a6..9366486e483 100644 --- a/addons/crm_configuration/crm_jobs_demo.xml +++ b/addons/crm_configuration/crm_jobs_demo.xml @@ -1,411 +1,149 @@ - - - Jobs - jobs - - - - - - Salesman - - - - - Junior Developer - - - - - - - Graduate - - - - Licenced - - - - > Bac +5 - - - - - - - Initial Jobs Demand - - - - First Interview - - - - Second Interview - - - - Contract Proposed - - - - Contract Signed - - - - Refused by Employee - - - - Refused by Company - - - - ######################## JOB OPPORTUNITIES (menu) ########################### - - - - My Jobs Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - My Unclosed Requests - crm.case - tree,calendar,form - - + + + + + + + + + + + + + + + + + + + - - - tree - - + + + + + + + + + + + + + + + + + + + + + - - - calendar - - + + + + + + + + + + + + + + + + + + + - - - form - - + + + + + + + + + + + + + + + + - - - - My Jobs Propositions to Review - crm.case - tree,calendar,form - - + + + + + + + + + + + + + + + + + + - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Pending Jobs Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Open Jobs Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - Calendar Of Jobs Meetings - crm.case - calendar,tree,form - - - - - - calendar - - - - - - tree - - - - - - form - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - - All Jobs Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - All Unclosed Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Jobs Propositions - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Pending Jobs Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - All Open Jobs Requests - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Calendar Of Jobs Meetings - crm.case - calendar,tree,form - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - - - - diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml new file mode 100644 index 00000000000..44ac99da6de --- /dev/null +++ b/addons/crm_configuration/crm_jobs_menu.xml @@ -0,0 +1,346 @@ + + + + + Jobs + jobs + + + ######################## JOB OPPORTUNITIES (menu) ########################### + + + + + My Jobs Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Unclosed Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Jobs Propositions to Review + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Pending Jobs Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Open Jobs Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + Calendar Of Jobs Meetings + crm.case + calendar,tree,form + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + All Jobs Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + All Unclosed Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Jobs Propositions + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Pending Jobs Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + All Open Jobs Requests + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Calendar Of Jobs Meetings + crm.case + calendar,tree,form + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml index c53098b6518..a761961968c 100644 --- a/addons/crm_configuration/crm_lead_data.xml +++ b/addons/crm_configuration/crm_lead_data.xml @@ -1,143 +1,105 @@ - + + + Leads + leads + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Existing Customer + + + + Self Generated + + + + Employee + + + + Partner + + + + Campaign + + + + Website + + + + Word of mouth + + + + Other + + + + + + New + + + + Assigned + + + + In Process + + + + Converted + + + + Recycled + + + + Dead + + + + + + 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 17acce86078..c53098b6518 100644 --- a/addons/crm_configuration/crm_lead_demo.xml +++ b/addons/crm_configuration/crm_lead_demo.xml @@ -1,562 +1,143 @@ - - - Leads - leads - + - - - Existing Customer - - - - Self Generated - - - - Employee - - - - Partner - - - - Campaign - - - - Website - - - - Word of mouth - - - - Other - - - - - - New - - - - Assigned - - - - In Process - - - - Converted - - - - Recycled - - - - Dead - - - - - - Telesales - - - - Mail - - - - Email - - - - Print - - - - Web - - - - Radio - - - - Television - - - - Newsletter - - - - - - - Leads - crm.case - form - form,tree - - - - - - tree - - - - - - form - - - - - - - - All Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Unclosed Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Draft Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Open Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Pending Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - All Cancelled Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Calendar Of All Leads Meetings - crm.case - calendar,tree,form - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - My Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Unclosed Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Draft Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Open Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Pending Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Cancelled Leads - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - Calendar Of My Leads Meetings - crm.case - calendar,tree,form - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - - - - - report.crm.case.user - form - graph,tree - - - - - - - report.crm.case.section.categ2 - form - graph,tree - - - - - - report.crm.case.section.stage - form - graph,tree - - - - - - report.crm.case.section.categ.stage - form - tree - - - - - - report.crm.case.section.categ.categ2 - form - tree - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml new file mode 100644 index 00000000000..277b0dd2fa0 --- /dev/null +++ b/addons/crm_configuration/crm_lead_menu.xml @@ -0,0 +1,460 @@ + + + + + Leads + leads + + + + + Leads + crm.case + form + form,tree + + + + + + tree + + + + + + form + + + + + + + + All Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Unclosed Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Draft Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Open Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Pending Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Cancelled Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Calendar Of All Leads Meetings + crm.case + calendar,tree,form + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + My Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Unclosed Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Draft Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Open Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Pending Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Cancelled Leads + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Calendar Of My Leads Meetings + crm.case + calendar,tree,form + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + + + + + report.crm.case.user + form + graph,tree + + + + + + + report.crm.case.section.categ2 + form + graph,tree + + + + + + report.crm.case.section.stage + form + graph,tree + + + + + + report.crm.case.section.categ.stage + form + tree + + + + + + report.crm.case.section.categ.categ2 + form + tree + + + + + + + diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml index 4444573e9b7..55101c62b17 100644 --- a/addons/crm_configuration/crm_meeting_data.xml +++ b/addons/crm_configuration/crm_meeting_data.xml @@ -1,114 +1,63 @@ - - - - - - - - - - - - - - - - - - + + Meetings + Mtngs + + - - - - - - - - - - - - - - - - - + + Sales Meeting + + + + Internal Meeting + + + + Training + + - - - - - - - - - - - - - - - - - + + + + Office + + + + Home + + + + Customer Office + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Fixed + + + + Not fixed + + + + Invalid + + + + Awaiting Response + + + + Future + + + + diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml index f931633e4c6..4444573e9b7 100644 --- a/addons/crm_configuration/crm_meeting_demo.xml +++ b/addons/crm_configuration/crm_meeting_demo.xml @@ -1,288 +1,114 @@ - - - Meetings - Mtngs - - - - - Sales Meeting - - - - Internal Meeting - - - - Training - - - - - - - Office - - - - Home - - - - Customer Office - - - - - - - Fixed - - - - Not fixed - - - - Invalid - - - - Awaiting Response - - - - Future - - - - ######################## MEETINGS (menu) ########################### - - Meetings - crm.case - form - form,tree - - - - - form - - - - - - tree - - - - - - - crm.case - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - Draft Meetings - crm.case - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - Confirmed Meetings - crm.case - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - - crm.case - tree,form,calendar - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - Draft Meetings - crm.case - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - Confirmed Meetings - crm.case - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - Next Deadlines - crm.case - form - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml new file mode 100644 index 00000000000..4611cbb1763 --- /dev/null +++ b/addons/crm_configuration/crm_meeting_menu.xml @@ -0,0 +1,229 @@ + + + + + Meetings + Mtngs + + + ######################## MEETINGS (menu) ########################### + + Meetings + crm.case + form + form,tree + + + + + form + + + + + + tree + + + + + + + + crm.case + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + Draft Meetings + crm.case + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + Confirmed Meetings + crm.case + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + + crm.case + tree,form,calendar + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + Draft Meetings + crm.case + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + Confirmed Meetings + crm.case + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + Next Deadlines + crm.case + form + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + diff --git a/addons/crm_configuration/crm_opportunity_data.xml b/addons/crm_configuration/crm_opportunity_data.xml index c20cb450468..41ef8714aa5 100644 --- a/addons/crm_configuration/crm_opportunity_data.xml +++ b/addons/crm_configuration/crm_opportunity_data.xml @@ -1,98 +1,84 @@ - + + Opportunities + oppor + - + + + 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 + + + + + + Existing Business + + + + New Business + + + + diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml index 964da43ba5f..c20cb450468 100644 --- a/addons/crm_configuration/crm_opportunity_demo.xml +++ b/addons/crm_configuration/crm_opportunity_demo.xml @@ -1,325 +1,98 @@ - - Opportunities - oppor - + - - - 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 - - - - - - Existing Business - - - - New Business - - - - - - - - - All Opportunities - crm.case - tree,form,calendar - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - Opportunity - crm.case - form - form,tree - - - - - - form - - - - - - tree - - - - - - - All Open Opportunities - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - All Pending Opportunities - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - - My Opportunities - crm.case - tree,calendar,form - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - - - My Open Opportunities - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - My Pending Opportunities - crm.case - tree,calendar,form - - - - - - tree - - - - - - calendar - - - - - - form - - - - - - - - report.crm.case.user - form - graph,tree - - - - - - - report.crm.case.section.categ2 - form - graph,tree - - - - - - report.crm.case.section.stage - form - graph,tree - - - - - - report.crm.case.section.categ.stage - form - tree - - - - - - report.crm.case.section.categ.categ2 - form - tree - - - - - - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml new file mode 100644 index 00000000000..2104d39f415 --- /dev/null +++ b/addons/crm_configuration/crm_opportunity_menu.xml @@ -0,0 +1,244 @@ + + + + + Opportunities + oppor + + + + + + + All Opportunities + crm.case + tree,form,calendar + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + Opportunity + crm.case + form + form,tree + + + + + + form + + + + + + tree + + + + + + + All Open Opportunities + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + All Pending Opportunities + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + + My Opportunities + crm.case + tree,calendar,form + + + + + + calendar + + + + + + tree + + + + + + form + + + + + + + + My Open Opportunities + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Pending Opportunities + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + report.crm.case.user + form + graph,tree + + + + + + + report.crm.case.section.categ2 + form + graph,tree + + + + + + report.crm.case.section.stage + form + graph,tree + + + + + + report.crm.case.section.categ.stage + form + tree + + + + + + report.crm.case.section.categ.categ2 + form + tree + + + + + + + diff --git a/addons/crm_vertical/__init__.py b/addons/crm_vertical/__init__.py index cd9c7c0a27c..a820153d64e 100644 --- a/addons/crm_vertical/__init__.py +++ b/addons/crm_vertical/__init__.py @@ -3,4 +3,4 @@ # Generated by the Tiny ERP module recorder ! # # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +#import crm_vertical diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py index d30dae92963..889ba7fd67f 100644 --- a/addons/crm_vertical/__terp__.py +++ b/addons/crm_vertical/__terp__.py @@ -9,7 +9,7 @@ "depends" : ["crm_configuration"], "init_xml" : [ ], "demo_xml" : [ ], - "update_xml" : ["crm_vertical_view.xml"], + "update_xml" : [], "installable": True } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_vertical/crm_bugs_vertical_view.xml b/addons/crm_vertical/crm_bugs_vertical_view.xml new file mode 100644 index 00000000000..75dbffc9559 --- /dev/null +++ b/addons/crm_vertical/crm_bugs_vertical_view.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/addons/crm_vertical/crm_fund_vertical_view.xml b/addons/crm_vertical/crm_fund_vertical_view.xml new file mode 100644 index 00000000000..0a611753ec2 --- /dev/null +++ b/addons/crm_vertical/crm_fund_vertical_view.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/crm_vertical/crm_jobs_vertical_view.xml b/addons/crm_vertical/crm_jobs_vertical_view.xml new file mode 100644 index 00000000000..2a3abb7fe42 --- /dev/null +++ b/addons/crm_vertical/crm_jobs_vertical_view.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/addons/crm_vertical/crm_lead_vertical_view.xml b/addons/crm_vertical/crm_lead_vertical_view.xml new file mode 100644 index 00000000000..be658f099de --- /dev/null +++ b/addons/crm_vertical/crm_lead_vertical_view.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/addons/crm_vertical/crm_meeting_vertical_view.xml b/addons/crm_vertical/crm_meeting_vertical_view.xml new file mode 100644 index 00000000000..fe638b8abab --- /dev/null +++ b/addons/crm_vertical/crm_meeting_vertical_view.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/addons/crm_vertical/crm_opportunity_vertical_view.xml b/addons/crm_vertical/crm_opportunity_vertical_view.xml new file mode 100644 index 00000000000..f7c4dd5f8d6 --- /dev/null +++ b/addons/crm_vertical/crm_opportunity_vertical_view.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/addons/crm_vertical/crm_vertical.py b/addons/crm_vertical/crm_vertical.py new file mode 100644 index 00000000000..c8ae2e23554 --- /dev/null +++ b/addons/crm_vertical/crm_vertical.py @@ -0,0 +1,54 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id$ +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +import time +import tools +from osv import fields,osv,orm +import os +import mx.DateTime +import base64 + +# here need to implement inheritance on osv_memory object. after that, it will work well. +class crm_menu_config_wizard(osv.osv_memory): + _inherit='crm.menu.config_wizard' + def action_create(self, cr, uid, ids, *args): + res=super(crm_menu_config_wizard, self).action_create(cr, uid, ids, *args) + for res in self.read(cr,uid,ids): + res.__delitem__('id') + for section in res : + if res[section]: + file_name = 'crm_'+section+'_vertical_view.xml' + try: + tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_vertical',file_name )), {}, 'init', *args) + except Exception, e: + raise osv.except_osv('Error !', e) + return res + +crm_menu_config_wizard() diff --git a/addons/crm_vertical/crm_vertical_view.xml b/addons/crm_vertical/crm_vertical_view.xml deleted file mode 100644 index 57d4c1eeb69..00000000000 --- a/addons/crm_vertical/crm_vertical_view.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index da4bd854b10..e4b0cd88837 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -27,19 +27,34 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################## - +import time import netsvc from osv import fields,osv,orm from tools.translate import _ class delivery_carrier(osv.osv): _name = "delivery.carrier" - _description = "Carrier and delivery grids" + _description = "Carrier and delivery grids" + + def get_price(self, cr, uid, ids, field_name, arg=None, context={}): + res={} + sale_obj=self.pool.get('sale.order') + grid_obj=self.pool.get('delivery.grid') + for carrier in self.browse(cr,uid,ids,context): + order_id=context.get('order_id',False) + price=False + if order_id: + order = sale_obj.browse(cr, uid, [order_id])[0] + carrier_grid=self.grid_get(cr,uid,[carrier.id],order.partner_shipping_id.id,context) + price=grid_obj.get_price(cr, uid, carrier_grid, order, time.strftime('%Y-%m-%d'), context) + res[carrier.id]=price + return res _columns = { 'name': fields.char('Carrier', size=64, required=True), 'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True), 'product_id': fields.many2one('product.product', 'Delivery Product', required=True), 'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'), + 'price' : fields.function(get_price, method=True,string='Price'), 'active': fields.boolean('Active') } _defaults = { @@ -89,9 +104,8 @@ class delivery_grid(osv.osv): total = 0 weight = 0 - volume = 0 - - for line in order.order_line: + volume = 0 + for line in order.order_line: if not line.product_id: continue total += line.price_subtotal or 0.0 @@ -151,6 +165,5 @@ class delivery_grid_line(osv.osv): delivery_grid_line() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 282c33b8921..307f9128ed0 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -12,6 +12,7 @@ + @@ -125,7 +126,7 @@ - + @@ -176,7 +177,7 @@ stock.picking ir.actions.act_window form - tree,form + tree,form [('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')] diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py index 4a8dcaa6d38..8b56145639c 100644 --- a/addons/delivery/wizard/delivery_sale_order.py +++ b/addons/delivery/wizard/delivery_sale_order.py @@ -37,7 +37,7 @@ from tools.translate import _ delivery_form = """
- + """ @@ -48,9 +48,11 @@ delivery_fields = { def _delivery_default(self, cr, uid, data, context): order_obj = pooler.get_pool(cr.dbname).get('sale.order') order = order_obj.browse(cr, uid, data['ids'])[0] + if not order.state in ('draft'): raise wizard.except_wizard(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.')) + carrier_id = order.partner_id.property_delivery_carrier.id return {'carrier_id': carrier_id} diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 3776668cb8c..50cfd1881c6 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -439,7 +439,7 @@ - + @@ -678,7 +678,7 @@ form - + Draft procurements @@ -707,7 +707,7 @@ tree,form [('state','=','exception')] - + Exceptions procurements to fix @@ -736,7 +736,7 @@ form form,tree - + diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index cc8edbe5848..f8cbf4ad927 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -10,10 +10,10 @@ This module allows you to manage your process for the end-users. """, "depends" : ["base", "sale"], "init_xml" : [], - "demo_xml" : [], + "demo_xml" : ['process_demo.xml'], "update_xml" : [ "security/ir.model.access.csv", - 'process_view.xml' + 'process_view.xml', ], "active": False, "installable": True diff --git a/addons/process/process.py b/addons/process/process.py index ac85fc8a15b..f2d64499667 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -54,9 +54,9 @@ class process_process(osv.osv): _name = "process.process" _description = "Process" _columns = { - 'name': fields.char('Name', size=30,required=True), + 'name': fields.char('Name', size=30,required=True, translate=True), 'active': fields.boolean('Active'), - 'note': fields.text('Notes'), + 'note': fields.text('Notes', translate=True), 'node_ids': fields.one2many('process.node', 'process_id', 'Nodes') } _defaults = { @@ -98,11 +98,11 @@ class process_process(osv.osv): if not data['active']: try: - gray = False + gray = True for cond in node.condition_ids: if cond.model_id and cond.model_id.model == res_model: - gray = gray or eval(cond.model_states, expr_context) - data['gray'] = gray + gray = gray and eval(cond.model_states, expr_context) + data['gray'] = not gray except: pass @@ -158,11 +158,11 @@ class process_node(osv.osv): _name = 'process.node' _description ='Process Nodes' _columns = { - 'name': fields.char('Name', size=30,required=True), - 'process_id': fields.many2one('process.process', 'Process', required=True), + 'name': fields.char('Name', size=30,required=True, translate=True), + 'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'), 'kind': fields.selection([('state','State'), ('subflow','Subflow')], 'Kind of Node', required=True), 'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'), - 'note': fields.text('Notes'), + 'note': fields.text('Notes', translate=True), 'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'), 'model_states': fields.char('States Expression', size=128), 'flow_start': fields.boolean('Starting Flow'), @@ -182,7 +182,7 @@ class process_node_condition(osv.osv): _description = 'Condition' _columns = { 'name': fields.char('Name', size=30, required=True), - 'node_id': fields.many2one('process.node', 'Node', required=True), + 'node_id': fields.many2one('process.node', 'Node', required=True, ondelete='cascade'), 'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'), 'model_states': fields.char('Expression', required=True, size=128) } @@ -192,12 +192,12 @@ class process_transition(osv.osv): _name = 'process.transition' _description ='Process Transitions' _columns = { - 'name': fields.char('Name', size=32, required=True), + 'name': fields.char('Name', size=32, required=True, translate=True), 'source_node_id': fields.many2one('process.node', 'Source Node', required=True, ondelete='cascade'), - 'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'), + 'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'), 'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'), 'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'), - 'note': fields.text('Description'), + 'note': fields.text('Description', translate=True), } process_transition() @@ -205,7 +205,7 @@ class process_transition_action(osv.osv): _name = 'process.transition.action' _description ='Process Transitions Actions' _columns = { - 'name': fields.char('Name', size=32, required=True), + 'name': fields.char('Name', size=32, required=True, translate=True), 'state': fields.selection([('dummy','Dummy'), ('object','Object Method'), ('workflow','Workflow Trigger'), diff --git a/addons/process/process_data.xml b/addons/process/process_data.xml deleted file mode 100644 index 9e87801c767..00000000000 --- a/addons/process/process_data.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml new file mode 100644 index 00000000000..0b1ae921c34 --- /dev/null +++ b/addons/process/process_demo.xml @@ -0,0 +1,158 @@ + + + + + + + + Sales Workflow + Sales flow for services companies. + + + + + + Quotation + Quotations are sale orders in draft mode + + + state + object.state == 'draft' + + + + + Sale Order + Manages the delivery in invoicing process + + + state + object.state == 'manual' + + + + + Invoice + In case you invoiced on Sale Order + + + state + + + + + + Tasks + In case you sale services on order + + + subflow + + + + + + Packing List + The workers pack the requested items + + + state + + + + + + Delivery Order + The transporter take the box and deliver it + + + state + + + + + + Invoice + In case you invoice based on deliveries + + + subflow + + + + + + + + Invoice on order + + object.order_policy != 'postpaid' + + + + + Invoice on delivery + + object.order_policy == 'postpaid' + + + + + + + Confirm Quotation + + + + + + Packing + + + + + + Invoice on order + + + + + + Create Tasks + + + + + + Deliver Goods + + + + + + Invoice or delivery + + + + + + + + Confirm + workflow + order_confirm + + + + + Cancel + workflow + cancel + + + + + + + + diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml index 46f2dec71cd..d9a4d93799f 100644 --- a/addons/process/process_view.xml +++ b/addons/process/process_view.xml @@ -90,7 +90,7 @@ - + @@ -124,6 +124,113 @@ action="action_process_form" parent="menu_process"/> + + + process.node.tree + process.node + tree + + + + + + + + + + + + + process.node.form + process.node + form + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + +
+ + + + + + Process Nodes + process.node + form + tree,form + + + + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8833f8ffb89..45783dd5978 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -214,7 +214,7 @@ class sale_order(osv.osv): 'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}), 'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3), - 'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True ), + 'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True), 'order_policy': fields.selection([ ('prepaid','Payment before delivery'), ('manual','Shipping & Manual Invoice'), @@ -241,7 +241,7 @@ class sale_order(osv.osv): 'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'), 'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'), 'amount_total': fields.function(_amount_total, method=True, string='Total'), - 'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."), + 'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.",required=True), 'payment_term' : fields.many2one('account.payment.term', 'Payment Term'), } _defaults = { @@ -479,7 +479,7 @@ class sale_order(osv.osv): for line in order.order_line: proc_id=False date_planned = DateTime.now() + DateTime.RelativeDateTime(days=line.delay or 0.0) - date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d') + date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d %H:%M:%S') if line.state == 'done': continue if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'): diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 13523bb86ed..68cf27bddf5 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -101,7 +101,6 @@ - @@ -232,6 +231,7 @@ form tree,form,calendar,graph [('user_id','=',uid)] + diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 04064fa910d..31c68c7c885 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -1,5 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_sale_shop,sale.shop,model_sale_shop,group_sale_user,1,0,0,0 -access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,1 -access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,1 +access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,0 +access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,0 access_sale_shop_admin,sale.shop,model_sale_shop,base.group_system,1,1,1,1 diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml index 4bc9493e6bd..87ef5eedea3 100644 --- a/addons/sale_journal/picking_journal_view.xml +++ b/addons/sale_journal/picking_journal_view.xml @@ -56,8 +56,8 @@ tree,form - - + + Packings by journal @@ -67,8 +67,8 @@ [] - - + + My open packing journals @@ -98,8 +98,8 @@ tree - - + + diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml index 7f956736fc0..d177673726e 100644 --- a/addons/sale_journal/picking_journal_view_report.xml +++ b/addons/sale_journal/picking_journal_view_report.xml @@ -57,7 +57,7 @@ [('name','=',time.strftime('%Y-%m-01'))] - + diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index be96302c583..7647a7b2bfb 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -1,283 +1,295 @@ - - sale_journal.invoice.type.form - sale_journal.invoice.type - form - -
- - - - - - - -
- - sale_journal.invoice.type.tree - sale_journal.invoice.type - tree - - - - - - - - - sale_journal.invoice.type - form - tree,form - - - + + sale_journal.invoice.type.form + sale_journal.invoice.type + form + +
+ + + + + + + +
+ + sale_journal.invoice.type.tree + sale_journal.invoice.type + tree + + + + + + + + + sale_journal.invoice.type + form + tree,form + + + - - sale_journal.sale.journal.form - sale_journal.sale.journal - form - -
- - - - - - - - - - - - -