diff --git a/addons/.project b/addons/.project deleted file mode 100644 index 5a28b1de850..00000000000 --- a/addons/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - addons - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/addons/.project.moved b/addons/.project.moved deleted file mode 100644 index 45b85705360..00000000000 --- a/addons/.project.moved +++ /dev/null @@ -1,17 +0,0 @@ - - - new-report-apa - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/addons/.pydevproject b/addons/.pydevproject deleted file mode 100644 index 78259a9c3db..00000000000 --- a/addons/.pydevproject +++ /dev/null @@ -1,6 +0,0 @@ - - - - -python 2.4 - diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 2051c8dc501..01d9f9e499f 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -29,7 +29,7 @@ { "name" : "Accounting and financial management", "version" : "1.0", - "depends" : ["product", "base"], + "depends" : ["product", "base", "process"], "author" : "Tiny", "description": """Financial and accounting module that covers: General accounting @@ -66,6 +66,8 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", + "process/invoice_process.xml", + "process/statement_process.xml" ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3f0ce0fde85..89c19a436d0 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -141,7 +141,7 @@ List of Accounts account.account form - tree,form + tree,form,graph @@ -166,6 +166,7 @@ Chart of Accounts account.account tree + form [('parent_id','=',False)] @@ -1629,6 +1630,17 @@ + + account.account.graph + account.account + graph + + + + + + + diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml new file mode 100644 index 00000000000..5fb1c522be1 --- /dev/null +++ b/addons/account/process/invoice_process.xml @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml new file mode 100644 index 00000000000..57cfe332531 --- /dev/null +++ b/addons/account/process/statement_process.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 45a4307a6c9..ccc8fb420e7 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -73,6 +73,7 @@ ir.actions.act_window account.analytic.account form + tree,graph @@ -84,6 +85,7 @@ account.analytic.account [('parent_id','=',False)] tree + form,graph New Analytic Account account.analytic.account form - form,tree + form,tree,graph @@ -356,5 +358,17 @@ + + analytic.accounts.graph + account.analytic.account + graph + + + + + + + + diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index 77d52c2526c..0ac4aeb9245 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -128,16 +128,16 @@ - [[ sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_debit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_credit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_balance(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ sum_quantity(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_quantity(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] @@ -153,16 +153,16 @@ [[ o.complete_name ]] - [[ move_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ move_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ move_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ move_sum_quantity(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_quantity(o.id,data['form']['date1'],data['form']['date2']) or '0.0']] @@ -174,16 +174,16 @@ [[ move_g['name'] ]] - [[ move_g['debit'] ]] + [[ move_g['debit'] or '0.0']] - [[ move_g['credit'] ]] + [[ move_g['credit'] or '0.0']] - [[ move_g['balance'] ]] + [[ move_g['balance'] or '0.0']] - [[ (move_g['quantity'] or 0.0) ]] + [[ (move_g['quantity'] or '0.0') ]] diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py index c9f87de2302..1cfd9ab54fa 100644 --- a/addons/account/project/report/analytic_check.py +++ b/addons/account/project/report/analytic_check.py @@ -49,11 +49,12 @@ class account_analytic_analytic_check(report_sxw.rml_parse): 'delta_debit': self._delta_deb, 'delta_credit': self._delta_cred, }) - def _lines_p(self, date1, date2): res = [] acc_obj = self.pool.get('account.account') - for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code', 'sign']): + # print"3333333acc_obj3333333",acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code','user_type']) + + for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code']): self.cr.execute("SELECT sum(debit), sum(credit) \ FROM account_move_line \ WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %d", (date1, date2, a['id'])) @@ -63,12 +64,12 @@ class account_analytic_analytic_check(report_sxw.rml_parse): self.cr.execute("SELECT abs(sum(amount)) AS balance \ FROM account_analytic_line \ - WHERE date>=%s AND date<=%s AND amount*%d>0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) + WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %d", (date1, date2, a['id'])) (ad,) = self.cr.fetchone() ad = ad or 0.0 self.cr.execute("SELECT abs(sum(amount)) AS balance \ FROM account_analytic_line \ - WHERE date>=%s AND date<=%s AND amount*%d<0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) + WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %d", (date1, date2, a['id'])) (ac,) = self.cr.fetchone() ac = ac or 0.0 @@ -83,8 +84,44 @@ class account_analytic_analytic_check(report_sxw.rml_parse): self.sum_gen_cred += gc self.sum_ana_deb += ad self.sum_ana_cred += ac + return res +# def _lines_p(self, date1, date2): +# res = [] +# acc_obj = self.pool.get('account.account') +# for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code','sign']): +# self.cr.execute("SELECT sum(debit), sum(credit) \ +# FROM account_move_line \ +# WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %d", (date1, date2, a['id'])) +# (gd, gc) = self.cr.fetchone() +# gd = gd or 0.0 +# gc = gc or 0.0 +# +# self.cr.execute("SELECT abs(sum(amount)) AS balance \ +# FROM account_analytic_line \ +# WHERE date>=%s AND date<=%s AND amount*%d>0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) +# (ad,) = self.cr.fetchone() +# ad = ad or 0.0 +# self.cr.execute("SELECT abs(sum(amount)) AS balance \ +# FROM account_analytic_line \ +# WHERE date>=%s AND date<=%s AND amount*%d<0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) +# (ac,) = self.cr.fetchone() +# ac = ac or 0.0 +# +# res.append({'code': a['code'], 'name': a['name'], +# 'gen_debit': gd, +# 'gen_credit': gc, +# 'ana_debit': ad, +# 'ana_credit': ac, +# 'delta_debit': gd - ad, +# 'delta_credit': gc - ac,}) +# self.sum_gen_deb += gd +# self.sum_gen_cred += gc +# self.sum_ana_deb += ad +# self.sum_ana_cred += ac +# return res + def _gen_deb(self, date1, date2): return self.sum_gen_deb @@ -99,7 +136,7 @@ class account_analytic_analytic_check(report_sxw.rml_parse): def _delta_deb(self, date1, date2): return (self._gen_deb(date1,date2)-self._ana_deb(date1,date2)) - + def _delta_cred(self, date1, date2): return (self._gen_cred(date1,date2)-self._ana_cred(date1,date2)) @@ -107,4 +144,3 @@ report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/account/project/report/analytic_check.rml b/addons/account/project/report/analytic_check.rml index f1172fd1dfd..991d8e38c55 100644 --- a/addons/account/project/report/analytic_check.rml +++ b/addons/account/project/report/analytic_check.rml @@ -3,6 +3,36 @@ @@ -10,45 +40,36 @@ - + - - - - - - + + + + + - - - - - - + - + - + + + + + + + - - - - - - - - - - - - + + + @@ -58,149 +79,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + Code - Analytic Check + Account Name - - - + General Debit + + + General Credit + + + Analytic Debit + + + Analytic Credit + + + Delta Debit + + + Delta Credit - [[ company.name ]] + [[ (lines_p(data['form']['date1'],data['form']['date2']),'acc') == False or removeParentNode('para') ]] + Total + + + + [[ '%.2f' % general_debit(data['form']['date1'],data['form']['date2']) ]] - Periods from [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] + [[ '%.2f' % general_credit(data['form']['date1'],data['form']['date2']) ]] - Currency: [[ company.currency_id.name ]] + [[ '%.2f' % analytic_debit(data['form']['date1'],data['form']['date2']) ]] + + + [[ '%.2f' % analytic_credit(data['form']['date1'],data['form']['date2']) ]] + + + [[ '%.2f' % delta_debit(data['form']['date1'],data['form']['date2']) ]] + + + [[ '%.2f' % delta_credit(data['form']['date1'],data['form']['date2']) ]] + + + + + [[ repeatIn(lines_p(data['form']['date1'],data['form']['date2']),'acc') ]] [[ acc['code'] ]] + + + [[ acc['name'] ]] + + + [[ '%.2f' % acc['gen_debit'] ]] + + + [[ '%.2f' % acc['gen_credit'] ]] + + + [[ '%.2f' % acc['ana_debit'] ]] + + + [[ '%.2f' % acc['ana_credit'] ]] + + + [[ '%.2f' % acc['delta_debit'] ]] + + + [[ '%.2f' % acc['delta_credit'] ]] - - - - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - - - - - - - Code - - - Account Name - - - - General - - Debit - - - - General - - Credit - - - - Analytic - - Debit - - - - Analytic - - Credit - - - Delta - Debit - - - Delta - Credit - - - - - - - - - - [[ repeatIn(lines_p(data['form']['date1'],data['form']['date2']),'acc') ]] - [[ acc['code'] ]] - - - [[ acc['name'] ]] - - - [[ '%.2f' % acc['gen_debit'] ]] - - - [[ '%.2f' % acc['gen_credit'] ]] - - - [[ '%.2f' % acc['ana_debit'] ]] - - - [[ '%.2f' % acc['ana_credit'] ]] - - - [[ '%.2f' % acc['delta_debit'] ]] - - - [[ '%.2f' % acc['delta_credit'] ]] - - - - - - - - - - Total - - - [[ '%.2f' % general_debit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % general_credit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % analytic_debit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % analytic_credit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % delta_debit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % delta_credit(data['form']['date1'],data['form']['date2']) ]] - - - - - - - - + \ No newline at end of file diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index c57a0cdba70..ebe0d4638bb 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,18 +1,19 @@ - + - + My managed accounts account.analytic.account form + tree,graph [('user_id','=',uid)] - + - + Uninvoiced entries of my accounts account.analytic.line @@ -20,85 +21,93 @@ tree,form [('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)] - + - + My Open Managed Accounts account.analytic.account form + tree,graph [('user_id','=',uid),('state','=','open')] - + - + My Pending Managed Accounts account.analytic.account form + tree,graph [('user_id','=',uid),('state','=','pending')] - + - - + + Overpassed accounts account.analytic.account form + tree,graph [('date','<=',time.strftime('%Y-%m-%d')),('state','=','open')] - + - + All Analytic Accounts account.analytic.account form + tree,graph [] - + - + Draft Analytic Accounts account.analytic.account form + tree,graph [('state','=','draft')] - + - + Open Analytic Accounts account.analytic.account form + tree,graph [('state','=','open')] - + - + Pending Analytic Accounts account.analytic.account form + tree,graph [('state','=','pending')] - + - + Simplified View Analytic Accounts account.analytic.account form + tree,graph [] - + - + diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml index 6efa01a7267..00104813896 100644 --- a/addons/base_contact/base_contact_demo.xml +++ b/addons/base_contact/base_contact_demo.xml @@ -1,5 +1,5 @@ - + @@ -323,4 +323,4 @@ 1 - + diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 1a623b2dbb5..3f2af50d2d7 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -172,7 +172,7 @@ class base_module_record(osv.osv): # Create the minidom document self.ids = {} doc = minidom.Document() - terp = doc.createElement("terp") + terp = doc.createElement("openerp") doc.appendChild(terp) for rec in self.recording_data: if rec[0]=='workflow': @@ -199,8 +199,7 @@ class base_module_record(osv.osv): data.appendChild(res) elif rec[0]=='assert': pass - res = doc.toprettyxml(indent="\t") - return doc.toprettyxml(indent="\t").encode('utf8') + return doc.toprettyxml(indent=" ").encode('utf8') base_module_record() def fnct_call(fnct): diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 45503709487..ae144ad04c2 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -9,7 +9,7 @@ people to intelligently and efficiently manage tasks, issues, and requests. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.""", - "depends" : ["crm","report_crm"], + "depends" : ["crm","report_crm", "process"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml", @@ -34,8 +34,12 @@ "crm_jobs_data.xml", "crm_meeting_data.xml", "crm_lead_data.xml", - "crm_opportunity_data.xml", - + "crm_opportunity_data.xml", + "crm_bugs_menu.xml", "crm_fund_menu.xml", + "crm_jobs_menu.xml", "crm_opportunity_menu.xml", + "crm_helpdesk_menu.xml", "crm_lead_menu.xml", + "crm_meeting_menu.xml", + "process/crm_configuration_process.xml" ], "active": False, "installable": True diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml index 02cf10e6a4a..ebfe70e4c50 100644 --- a/addons/document/custom_report.xml +++ b/addons/document/custom_report.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml index 4909336c498..61d95f9aa27 100644 --- a/addons/document/custom_view.xml +++ b/addons/document/custom_view.xml @@ -1,4 +1,4 @@ - + grcompta @@ -8,5 +8,5 @@ - + diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml index 98793851804..9953d07dd92 100644 --- a/addons/document/document_data.xml +++ b/addons/document/document_data.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml index 3de248ffa28..94c52923556 100644 --- a/addons/document/document_demo.xml +++ b/addons/document/document_demo.xml @@ -1,5 +1,5 @@ - + @@ -90,4 +90,4 @@ - + diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 4aaa2ece59f..dfc3cc4c85a 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -1,4 +1,4 @@ - + @@ -237,5 +237,5 @@ - + diff --git a/addons/event/event.py b/addons/event/event.py index 407c86a4d93..ffddaa8574d 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -137,7 +137,7 @@ class event(osv.osv): #change the description of the registration linked to this event if 'mail_auto_confirm' in vals: if vals['mail_auto_confirm']: - if 'mail_confirm' not in vals: + if 'mail_confirm' not in vals: for eve in self.browse(cr, uid, ids): vals['mail_confirm'] = eve.mail_confirm else: @@ -288,8 +288,9 @@ class event_registration(osv.osv): data['badge_title'] = contact_id.title if partner: partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','=',partner)]) - job_id = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])[0] - data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_id).email + job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)]) + if job_ids: + data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).email d = self.onchange_badge_name(cr, uid, ids,data['badge_name']) data.update(d['value']) diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index 02d7f2d6f43..7da1af96772 100644 --- a/addons/hr/__terp__.py +++ b/addons/hr/__terp__.py @@ -40,7 +40,7 @@ Different reports are also provided, mainly for attendance statistics. """, - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : [ "hr_demo.xml", diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py index c07e6c55a5a..a03f8140f72 100644 --- a/addons/hr_contract/__terp__.py +++ b/addons/hr_contract/__terp__.py @@ -46,7 +46,7 @@ "demo_xml" : [], "update_xml" : [ "security/hr_contract_security.xml", - "security/ir.model.access.csv", +# "security/ir.model.access.csv", "hr_contract_view.xml", ], "active": False, diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index dd4d6d796a5..6f3188d6acf 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -24,7 +24,7 @@ Administration \ Users \ Users for example, you maybe will do it for the user 'admin'. """, - "depends" : ["hr","crm_configuration"], + "depends" : ["hr","crm_configuration", "process"], "init_xml" : [], "update_xml" : [ "security/ir.model.access.csv", @@ -32,6 +32,7 @@ "hr_view.xml", "hr_holidays_report.xml", "hr_holidays_wizard.xml", +# "process/hr_holidays_process.xml" ], # "demo_xml" : ["hr_bel_holidays_2008.xml",], "demo_xml" : [], diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py index 1004f06d903..fd84f3fb051 100644 --- a/addons/hr_timesheet/__terp__.py +++ b/addons/hr_timesheet/__terp__.py @@ -43,7 +43,7 @@ Lots of reporting on time and employee tracking are provided. It is completly integrated with the cost accounting module. It allows you to set up a management by affair. """, - "depends" : ["account", "hr", "base", "hr_attendance"], + "depends" : ["account", "hr", "base", "hr_attendance", "process"], "init_xml" : ["hr_timesheet_data.xml"], "demo_xml" : ["hr_timesheet_demo.xml",], "update_xml" : [ @@ -51,6 +51,7 @@ to set up a management by affair. "hr_timesheet_view.xml", "hr_timesheet_report.xml", "hr_timesheet_wizard.xml", + "process/hr_timesheet_process.xml" ], "active": False, "installable": True diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml new file mode 100644 index 00000000000..2df39b8a78c --- /dev/null +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py index bc2db6c0d8c..06922784d56 100644 --- a/addons/hr_timesheet_project/__terp__.py +++ b/addons/hr_timesheet_project/__terp__.py @@ -33,8 +33,8 @@ "category" : "Generic Modules/Human Resources", "description": """Auto-complete timesheet based on tasks made on the project management module.""", "website" : "http://tinyerp.com/module_hr.html", - "depends" : ["project", "hr_timesheet"], - "update_xml" : ["hr_timesheet_project_view.xml"], + "depends" : ["project", "hr_timesheet_sheet"], + "update_xml" : ["hr_timesheet_project_view.xml", "process/hr_timesheet_project_process.xml"], "active": False, "installable": True } diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml new file mode 100644 index 00000000000..d514b14bf17 --- /dev/null +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 4c307a5af33..f09a7d63978 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -51,13 +51,14 @@ The validation can be configured in te company: * Period size (day, week, month, year) * Maximal difference between timesheet and attendances """, - "depends" : ["hr_timesheet", "hr_timesheet_invoice"], + "depends" : ["hr_timesheet", "hr_timesheet_invoice", "process"], "init_xml" : [], "demo_xml" : ["hr_timesheet_sheet_demo.xml",], "update_xml" : [ "security/ir.model.access.csv", "hr_timesheet_sheet_view.xml", - "hr_timesheet_workflow.xml" + "hr_timesheet_workflow.xml", + "process/hr_timesheet_sheet_process.xml", ], "active": False, "installable": True diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml new file mode 100644 index 00000000000..24374c2a810 --- /dev/null +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py index be8b9d8b776..d31ea7441e4 100644 --- a/addons/idea/__terp__.py +++ b/addons/idea/__terp__.py @@ -1,4 +1,5 @@ # -*- encoding: utf-8 -*- + { "name" : "Idea Manager", "version" : "0.1", diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index 8fa15f145fd..3f4b301fe11 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -32,7 +32,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_mrp.html", "category" : "Generic Modules/Production", - "depends" : ["stock", "hr", "purchase", "product"], + "depends" : ["stock", "hr", "purchase", "product", "process"], "description": """ This is the base module to manage the manufacturing process in Tiny ERP. @@ -70,6 +70,7 @@ "mrp_wizard.xml", "mrp_report.xml", "company_view.xml", + "process/procurement_process.xml", ], "active": False, "installable": True diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml new file mode 100644 index 00000000000..583de318410 --- /dev/null +++ b/addons/mrp/process/procurement_process.xml @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index f8cbf4ad927..ca48fada8a6 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -8,13 +8,13 @@ "description": """ This module allows you to manage your process for the end-users. """, - "depends" : ["base", "sale"], + "depends" : ["base"], "init_xml" : [], - "demo_xml" : ['process_demo.xml'], + "demo_xml" : [], "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', - ], + ], "active": False, "installable": True } diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index 34cd432b10e..0328b8d03e9 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "category" : "Generic Modules/Inventory Control", - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : ["product_demo.xml"], "description": """ @@ -57,7 +57,9 @@ "security/ir.model.access.csv", "product_data.xml","product_report.xml", "product_view.xml", "pricelist_view.xml", - "partner_view.xml", "product_wizard.xml"], + "partner_view.xml", "product_wizard.xml", + "process/product_process.xml" + ], "active": False, "installable": True } diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml new file mode 100644 index 00000000000..9b675a11a84 --- /dev/null +++ b/addons/product/process/product_process.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index cbef75ca0e3..d153de14336 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -32,7 +32,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_project.html", "category" : "Generic Modules/Projects & Services", - "depends" : ["product", "account", "hr"], + "depends" : ["product", "account", "hr", "process"], "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.", "init_xml" : [], "demo_xml" : ["project_demo.xml"], @@ -43,6 +43,7 @@ "project_wizard.xml", "project_view.xml", "project_report.xml", + "process/task_process.xml" ], "active": False, "installable": True diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml new file mode 100644 index 00000000000..6be52bd3490 --- /dev/null +++ b/addons/project/process/task_process.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py index 208b879cef7..e83b5e832db 100644 --- a/addons/project_mrp/__terp__.py +++ b/addons/project_mrp/__terp__.py @@ -5,7 +5,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_project.html", "category" : "Generic Modules/Projects & Services", - "depends" : ["project", 'mrp'], + "depends" : ["project", 'mrp', "sale"], "description": """ This module is used to automatically create tasks base on different procurements: sales order, manufacturing order, ... @@ -15,7 +15,9 @@ order on services products. """, "init_xml" : [], "demo_xml" : [], - "update_xml": ["project_workflow.xml"], + "update_xml": ["project_workflow.xml", + "process/project_mrp_process.xml" + ], "active": False, "installable": True } diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml new file mode 100644 index 00000000000..0c856b7a96d --- /dev/null +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py index d5d50f6d5f8..0c24b8df2f4 100644 --- a/addons/purchase/__terp__.py +++ b/addons/purchase/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_purchase.html", - "depends" : ["base", "account", "stock"], + "depends" : ["base", "account", "stock", "process"], "category" : "Generic Modules/Sales & Purchases", "init_xml" : [], "demo_xml" : ["purchase_demo.xml", @@ -47,7 +47,8 @@ "purchase_report.xml", "purchase_wizard.xml", "stock_view.xml", - "partner_view.xml" + "partner_view.xml", + "process/purchase_process.xml" ], "active": False, "installable": True diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml new file mode 100644 index 00000000000..d100c4a772c --- /dev/null +++ b/addons/purchase/process/purchase_process.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py index f540f33ea4b..b7965f3f316 100644 --- a/addons/sale/__terp__.py +++ b/addons/sale/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_sale.html", - "depends" : ["product", "stock", "mrp"], + "depends" : ["product", "stock", "mrp", "process"], "category" : "Generic Modules/Sales & Purchases", "init_xml" : [], "demo_xml" : ["sale_demo.xml"], @@ -62,6 +62,7 @@ "sale_report.xml", "sale_wizard.xml", "stock_view.xml", + "process/sale_process.xml", "product_view.xml", ], "active": False, diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml new file mode 100644 index 00000000000..e6b7c1a3c52 --- /dev/null +++ b/addons/sale/process/sale_process.xml @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py index 7be9cb422be..dfb466307c0 100644 --- a/addons/scrum/__terp__.py +++ b/addons/scrum/__terp__.py @@ -30,7 +30,7 @@ "name" : "Scrum, Agile Development Method", "version": "1.0", "author" : "Tiny", - "depends" : ["project"], + "depends" : ["project", "process"], "category" : "Enterprise Specific Modules/Information Technology", "init_xml" : [], "description": """ @@ -61,6 +61,7 @@ "scrum_view.xml", "scrum_report.xml", "scrum_wizard.xml", + "process/scrum_process.xml", ], "active": False, "installable": True diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml new file mode 100644 index 00000000000..344669f06c0 --- /dev/null +++ b/addons/scrum/process/scrum_process.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file