diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f867285138a..ad7cae09133 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -7,6 +7,11 @@
+
+ Long Term Planning / User
+
+
+
Manager
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b37cf40014e..d95be7d8e38 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -100,8 +100,6 @@
states="open"/>
-
@@ -116,9 +114,12 @@
-
+
-
+
+
+
+
@@ -358,7 +359,7 @@
|
- |
+ |
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..1730ac472eb 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -99,7 +99,7 @@
|
- |
+ |
@@ -369,7 +369,7 @@
parent="base.menu_project_long_term" sequence="2"/>
+ name="Resources" parent="base.menu_custom" sequence="3"/>
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 299a74f52aa..ae89e44d5da 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -73,6 +73,7 @@ class procurement_order(osv.osv):
'date_deadline': procurement.date_planned,
'planned_hours': planned_hours,
'remaining_hours': planned_hours,
+ 'partner_id':procurement.sale_line_id.order_id.partner_id.id,
'user_id': procurement.product_id.product_manager.id,
'notes': procurement.note,
'procurement_id': procurement.id,
From 7bb38ca8a5a56c633083bacfc8820f6e57f66187 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)"
Date: Tue, 28 Aug 2012 17:02:41 +0530
Subject: [PATCH 034/165] [IMP] made some improvements
bzr revid: bde@tinyerp.com-20120828113241-ttauphl06kvt62n4
---
addons/base_calendar/crm_meeting_view.xml | 6 +-
addons/crm/crm.py | 3 +-
addons/crm/crm_lead.py | 2 +-
addons/crm/crm_phonecall_view.xml | 83 ++++++++++----------
addons/crm/res_partner_view.xml | 4 +-
addons/purchase/board_purchase_view.xml | 1 +
addons/purchase/security/ir.model.access.csv | 1 +
addons/sale/security/ir.model.access.csv | 1 +
8 files changed, 53 insertions(+), 48 deletions(-)
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 6009251a460..84385f9d2b7 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -111,8 +111,10 @@
- (
- )
+
+ (
+ )
+
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index b45b8ea8712..e79aeb26d75 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -90,9 +90,10 @@ class crm_case_stage(osv.osv):
_defaults = {
'sequence': lambda *args: 1,
'probability': lambda *args: 0.0,
- 'state': 'draft',
+ 'state': 'open',
'fold': False,
'type': 'both',
+ 'case_default': True,
}
class crm_case_section(osv.osv):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 25a47ecbadc..1ab60408864 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -267,7 +267,7 @@ class crm_lead(base_stage, osv.osv):
_defaults = {
'active': 1,
'type': 'lead',
- 'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
+ 'user_id': lambda self, cr, uid, context: uid,
'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3b5162288a4..287b8da8ad2 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -106,56 +106,55 @@
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index a3c60d4421c..f98e7a70db5 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -130,10 +130,10 @@
-
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 3c8d072c536..014d8615f4a 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -65,3 +65,4 @@ access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_sto
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order_partner_manager,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 617678eccbe..46c021eccab 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -60,3 +60,4 @@ access_product_pricelist_version_sale_manager,product.pricelist.version sale_man
access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
+access_sale_order_partner_manager,sale.order,model_sale_order,base.group_partner_manager,1,0,0,0
From 49d894508a8acc3e7bb189247c129c504b5895a7 Mon Sep 17 00:00:00 2001
From: Saurang Suthar
Date: Wed, 29 Aug 2012 15:24:44 +0530
Subject: [PATCH 035/165] [IMP]stock:fix error at the time of reverse a product
bzr revid: ssu@tinyerp.com-20120829095444-ih2u1uqi48qgsomc
---
addons/stock/stock_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..5784362d5c3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -970,7 +970,7 @@
stock.picking.out.tree
- stock.picking
+ stock.picking.out
From f446bad20ad5e151d6d0288096651dbad35e60a7 Mon Sep 17 00:00:00 2001
From: Saurang Suthar
Date: Wed, 29 Aug 2012 15:32:32 +0530
Subject: [PATCH 036/165] [IMP]stock:put Unit as default UoM and on change
product_id the product_uom is also updated
bzr revid: ssu@tinyerp.com-20120829100232-agdj5u1io9r1njpz
---
addons/stock/wizard/stock_partial_picking.py | 16 +++++++++++++++-
.../stock/wizard/stock_partial_picking_view.xml | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index b3720b8a51b..e2fefc0a4c2 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -38,7 +38,6 @@ class stock_partial_picking_line(osv.TransientModel):
res[tracklot.id] = tracking
return res
-
_name = "stock.partial.picking.line"
_rec_name = 'product_id'
_columns = {
@@ -56,6 +55,21 @@ class stock_partial_picking_line(osv.TransientModel):
'tracking': fields.function(_tracking, string='Tracking', type='boolean'),
}
+ def onchange_method_product_id(self, cr, uid, ids, product_id, uom_id, context=None):
+ if product_id:
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+ return {'value': {'product_uom': product.uom_id.id}}
+ else:
+ return False
+
+ def _get_product_uom(self, cr, uid, context=None):
+ product_uom = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'product_uom_unit')
+ return product_uom.id
+
+ _defaults = {
+ 'product_uom': _get_product_uom,
+ }
+
class stock_partial_picking(osv.osv_memory):
_name = "stock.partial.picking"
_description = "Partial Picking Processing Wizard"
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 7de85594a26..2e9970af53c 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -19,7 +19,7 @@
-
+
From d4b44bd628e0793cf1a575f9fb2c6d22ba63e8c7 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)"
Date: Wed, 29 Aug 2012 17:10:47 +0530
Subject: [PATCH 037/165] [IMP] Improvements
bzr revid: pso@tinyerp.com-20120829114047-ltiwub2nvqjhqd18
---
addons/import_sugarcrm/import_sugarcrm.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 440a7b2b6f6..4afe7b23f90 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -444,11 +444,9 @@ class sugar_import(import_framework):
import Tasks
"""
task_state = {
- 'Completed' : 'done',
+ 'Completed' : 'open',
'Not Started':'draft',
- 'In Progress': 'open',
'Pending Input': 'draft',
- 'deferred': 'cancel'
}
def import_task(self, val):
From 23168a11f5c2c370765645981b95846c80c9cde1 Mon Sep 17 00:00:00 2001
From: Saurang Suthar
Date: Mon, 3 Sep 2012 11:05:07 +0530
Subject: [PATCH 038/165] [IMP]hr_holidays:made fields hpliday_type,
employee_id visible only for HR/Officers and remove red color of Refuse
button
bzr revid: ssu@tinyerp.com-20120903053507-ghwwdvd1ag92f9lm
---
addons/hr_holidays/hr_holidays_view.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 711d07bbfe8..8506d22a55d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -94,7 +94,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -161,8 +161,8 @@
-
-
+
+
From ff1a41d0985e8013911d83ea12bb418f4941ed45 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)"
Date: Mon, 3 Sep 2012 11:19:14 +0530
Subject: [PATCH 039/165] [IMP]change access rights of emloyee
bzr revid: pna@tinyerp.com-20120903054914-c816mv1ctphqlqwv
---
addons/hr_expense/hr_expense_view.xml | 2 +-
addons/hr_expense/security/ir.model.access.csv | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 9978490b29a..7b04f0978f3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -119,7 +119,7 @@
-
+
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 0455302319e..421bf394e61 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,6 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_expense_expense_user,hr.expense.expense.user,model_hr_expense_expense,base.group_hr_user,1,1,1,1
-access_hr_expense_expense_employee,hr.expense.expense.employee,model_hr_expense_expense,base.group_user,1,1,1,1
+access_hr_expense_expense_employee,hr.expense.expense.employee,model_hr_expense_expense,base.group_user,1,1,1,0
+access_hr_expense_expense_manager,hr.expense.expense.manager,model_hr_expense_expense,base.group_hr_manager,1,1,1,1
access_hr_expense_line_user,hr.expense.line.user,model_hr_expense_line,base.group_hr_user,1,1,1,1
access_hr_expense_line_employee,hr.expense.line.employee,model_hr_expense_line,base.group_user,1,1,1,1
access_hr_expense_report_manager,hr.expense.report.manager,model_hr_expense_report,base.group_hr_manager,1,1,1,1
@@ -12,6 +13,7 @@ access_account_journal_user,account.journal.user,account.model_account_journal,b
access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
+access_account_journal_emp,account.journal.employees,account.model_account_journal,base.group_user,1,1,1,1
access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,base.group_hr_user,1,1,1,1
access_account_period_user,account.period.user,account.model_account_period,base.group_hr_user,1,1,1,1
access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1
From d68d1942f7d9f5d5273598b626df2da263f7e59b Mon Sep 17 00:00:00 2001
From: Saurang Suthar
Date: Mon, 3 Sep 2012 11:22:08 +0530
Subject: [PATCH 040/165] [IMP]hr:remove marital status field value
automatically set to single
bzr revid: ssu@tinyerp.com-20120903055208-3epnm8i77ypg6cxs
---
addons/hr/hr.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 966c29cab07..fc47b673bfb 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -262,7 +262,6 @@ class hr_employee(osv.osv):
_defaults = {
'active': 1,
'image': _get_default_image,
- 'marital': 'single',
'color': 0,
}
From 142261ad5ea03369bd3a1f61c3648b167f9da3d3 Mon Sep 17 00:00:00 2001
From: Saurang Suthar
Date: Mon, 3 Sep 2012 12:46:13 +0530
Subject: [PATCH 041/165] [IMP]removed access denied error at the time of
clicking on Timesheets and Payslips button in employee form by HR/Employee
and created new access rules for HR/Employee
bzr revid: ssu@tinyerp.com-20120903071613-731x8686z2euy0sk
---
addons/hr/security/ir.model.access.csv | 1 +
addons/hr_payroll/security/hr_security.xml | 7 +++++++
addons/hr_payroll/security/ir.model.access.csv | 6 +++++-
.../security/hr_timesheet_sheet_security.xml | 7 +++++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 121e0f23f25..07593028028 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -7,4 +7,5 @@ access_hr_employee_resource_user,resource.resource.user,resource.model_resource_
access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1
access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0
access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1
+access_hr_employee_user,hr.employee user,model_hr_employee,base.group_user,1,1,1,1
access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index d55f1c81cce..c97c0b5a5eb 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -13,5 +13,12 @@
+
+ Employee Payslip Rule
+
+ ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+
+
+
\ No newline at end of file
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 24ca631c4d8..58d5835fb6b 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -4,8 +4,12 @@ access_hr_contribution_register,hr.contribution.register,model_hr_contribution_r
access_hr_salary_rule_category,hr.salary.rule.category,model_hr_salary_rule_category,base.group_hr_user,1,1,1,1
access_hr_payslip,hr.payslip,model_hr_payslip,base.group_hr_user,1,1,1,1
access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_hr_user,1,1,1,1
+access_hr_payslip,hr.payslip,model_hr_payslip,base.group_user,1,0,0,0
+access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_user,1,0,0,0
access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_hr_user,1,1,1,1
access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_hr_manager,1,1,1,1
+access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_user,1,0,0,0
+access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_user,1,0,0,0
access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,base.group_hr_manager,1,1,1,1
access_hr_rule_input,hr.rule.input,model_hr_rule_input,base.group_hr_manager,1,1,1,1
-access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_hr_user,1,1,1,1
+access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
index ff387a898ca..8755e319ae9 100644
--- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
+++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
@@ -9,5 +9,12 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+ Employee Timesheet Rule
+
+ ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+
+
+
From 809c0b984dbbca248f53668807a11e920b826175 Mon Sep 17 00:00:00 2001
From: Saurang Suthar
Date: Tue, 4 Sep 2012 11:58:58 +0530
Subject: [PATCH 042/165] [IMP]hr:removed Belgium Payroll with Accounting from
Human Resources config wizard
bzr revid: ssu@tinyerp.com-20120904062858-78sdkm4x25f13qwe
---
addons/hr/res_config_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ad36818e525..7afc745bd13 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -18,7 +18,7 @@
Payroll
ir.module.module
kanban,tree,form
-
+
From 487610dc0cc1510d5fa391233baa4d0adf9f0359 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)"
Date: Fri, 7 Sep 2012 13:39:51 +0530
Subject: [PATCH 043/165] [FIX] project: remaining to remove after merge
bzr revid: hmo@tinyerp.com-20120907080951-uayzps33yn3632fm
---
addons/project/project_view.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 15252fab7b4..f3547e96617 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -423,8 +423,6 @@
states="cancelled,done" context="{'button_reactivate':True}"/>
-
From 49e81d654a87d8ecbf06bf2e5681726ec5ce662c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)"
Date: Fri, 7 Sep 2012 14:03:36 +0530
Subject: [PATCH 044/165] [FIX] project_issue: escalate button near project_id
bzr revid: hmo@tinyerp.com-20120907083336-94r5wefpet2787zt
---
addons/project_issue/project_issue_view.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 140fa921219..45141786a15 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -114,12 +114,13 @@
-
+
-
-
-
-
+
+
+
+
+
From 13dac299fa3e1e2bc3445e306ed39ee452373877 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)"
Date: Fri, 7 Sep 2012 14:55:36 +0530
Subject: [PATCH 045/165] [REVERT] project: remove user group,
long_term_planning.it's confusing. put resource_calendar_id into technical
group.
bzr revid: hmo@tinyerp.com-20120907092536-i7wdp43lamq7k7tk
---
addons/project/project_view.xml | 2 +-
addons/project/security/project_security.xml | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f3547e96617..36341053e80 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -133,7 +133,7 @@
-
+
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 910b571b23b..3afe0f14e7a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -7,11 +7,6 @@
-
- Long Term Planning
-
-
-
Manager
From b10e31d2042821e54f3febc88829cd769843a3fe Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Mon, 10 Sep 2012 16:20:35 +0200
Subject: [PATCH 046/165] [IMP] replaced wiki stuff by html field
bzr revid: nicolas.vanhoren@openerp.com-20120910142035-rzxwsv4nb3jfcf3o
---
addons/document_page/__openerp__.py | 4 -
addons/document_page/document_page_demo.xml | 164 +++++-----
addons/document_page/document_page_view.xml | 2 +-
.../static/src/js/document_page.js | 18 --
.../static/src/lib/wiky/Readme.md | 41 ---
.../static/src/lib/wiky/index.html | 56 ----
.../static/src/lib/wiky/input_complete | 35 --
.../static/src/lib/wiky/wiky.css | 79 -----
.../document_page/static/src/lib/wiky/wiky.js | 303 ------------------
9 files changed, 87 insertions(+), 615 deletions(-)
delete mode 100644 addons/document_page/static/src/js/document_page.js
delete mode 100755 addons/document_page/static/src/lib/wiky/Readme.md
delete mode 100755 addons/document_page/static/src/lib/wiky/index.html
delete mode 100755 addons/document_page/static/src/lib/wiky/input_complete
delete mode 100755 addons/document_page/static/src/lib/wiky/wiky.css
delete mode 100755 addons/document_page/static/src/lib/wiky/wiky.js
diff --git a/addons/document_page/__openerp__.py b/addons/document_page/__openerp__.py
index a88e1d827d7..eec5166b0bf 100644
--- a/addons/document_page/__openerp__.py
+++ b/addons/document_page/__openerp__.py
@@ -44,10 +44,6 @@ Web pages
'auto_install': False,
'certificate': '0086363630317',
'images': [],
- 'js': [
- 'static/src/lib/wiky/wiky.js',
- 'static/src/js/document_page.js'
- ],
'css' : ['static/src/css/document_page.css'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/document_page_demo.xml b/addons/document_page/document_page_demo.xml
index 96984fe2e0b..d97ee0ae1b2 100644
--- a/addons/document_page/document_page_demo.xml
+++ b/addons/document_page/document_page_demo.xml
@@ -24,24 +24,28 @@ Additional ressources
OpenERP 6.1. Functional Demo
-
-The news is out, OpenERP's latest version 6.1. is here. It's more
-user-friendly, even more business oriented and efficient to manage your company
-
-How to discover the latest version 6.1.?
-
-Demo : [http://demo.openerp.com]
-Online: [http://openerp.com/online]
-Download: [http://openerp.com/downloads]
-
-We have also put together a functional demo that presents 6.1. Watch this video
-to learn directly from us what OpenERP 6.1. can do for you. Share it in your
-company, with your clients and implement it now for your business.
-
-==Watch on Youtube!==
-
-[[Video:http://www.youtube.com/embed/7jES2jxKMso ]]
-
+
+
+The news is out, OpenERP's latest version 6.1. is here. It's more
+user-friendly, even more business oriented and efficient to manage your company
+
+How to discover the latest version 6.1.?
+
+Demo :
+Online:
+Download:
+
+We have also put together a functional demo that presents 6.1. Watch this video
+to learn directly from us what OpenERP 6.1. can do for you. Share it in your
+company, with your clients and implement it now for your business.
+
+Watch on Youtube!
+
+
+
+
+]]>
@@ -49,36 +53,40 @@ company, with your clients and implement it now for your business.
Personalise Dashboards
-You like OpenERP, but feel like you want to personalise it more? Now, OpenERP
-goes a step further and lets you customize your dashboard. Thanks to a new
-feature that allows you to customize your dashboard by adding new boards of any
-search view.
-
-==How is it done?==
-
-Step 1: access one search view
-
-Step 2: apply the filter you want to see at each connection to the application
-(eg. on sales, manufacturing, etc)
-
-Step 3: add it into the dashboard in the same space where you can save the filter
-
-Step 4: choose the application you want it visible on and the name of the array
-
-Look at this simple example below from Purchase, where I want to put on the
-application's dashboard "Purchases to Approve". After I access the search view
-and apply the filter for "Purchases to Approve", I can add it immediately to my
-Purchase dashboard.
-
-[[File:http://www.openerp.com/sites/default/files/fileattach/dashboard2_1(1).png ]]
-
-In less than a minute, the search view is visible on the dashboard
-
-[[File:http://www.openerp.com/sites/default/files/fileattach/dashboard2_2.png ]]
-
-Of course, you are free to delete what you don't need or like, but just in case
-you change your mind there is a reset button to return to the default view.
-
+
+You like OpenERP, but feel like you want to personalise it more? Now, OpenERP
+goes a step further and lets you customize your dashboard. Thanks to a new
+feature that allows you to customize your dashboard by adding new boards of any
+search view.
+
+How is it done?
+
+Step 1: access one search view
+
+Step 2: apply the filter you want to see at each connection to the application
+(eg. on sales, manufacturing, etc)
+
+Step 3: add it into the dashboard in the same space where you can save the filter
+
+Step 4: choose the application you want it visible on and the name of the array
+
+Look at this simple example below from Purchase, where I want to put on the
+application's dashboard "Purchases to Approve". After I access the search view
+and apply the filter for "Purchases to Approve", I can add it immediately to my
+Purchase dashboard.
+
+
+
+In less than a minute, the search view is visible on the dashboard
+
+
+
+Of course, you are free to delete what you don't need or like, but just in case
+you change your mind there is a reset button to return to the default view.
+
+
+]]>
@@ -86,36 +94,36 @@ you change your mind there is a reset button to return to the default view.
Touchscreen Point of Sale
-The brand new OpenERP touchscreen point of sale available with 6.1 allows you
-to manage your shop sales very easily. It's fully web based so that you don't
-have to install or deploy any software and all the sales shops can be easily
-consolidated. It works in connected and disconnected modes so that you can
-continue to sell if you lose your internet connection.
-
-[[File:http://www.openerp.com/sites/default/files/fileattach/POS(2).png ]]
-
-==Here's a summary of its main features and benefits:==
-
-100% WEB based
-
-* available for any touchscreen device (ipod, ipad, any tablet)mobile (with portable devices)
-* no installation required
-* no synchronization needed, completely integrated
-* continue working even when your connection is down if you close your browser, data won't be lost
-* fully web based with a clean interface smart interface
-
-You have different options to select your products. You can do it through the
-barcode reader, just browse through the categories you have put in place (ie.
-drinks, snacks, meals, etc.), or text search in case neither of the other
-options work for you. If you need to use the POS for your restaurant, for
-example, your employees can record at the same time multiple tickets without
-having to wait to do one transaction at a time. Along, to facilitate payment,
-the application allows multiple payment methods.
-
-The POS application is so simple and accessible to use that your shop or
-restaurant will never need any other tool to manage orders. Due to its smart
-and user-friendly interface you don't need any training to learn how to use it.
-Think of it as an out-of-the-box solution to boost your business' productivity.
+
+The brand new OpenERP touchscreen point of sale available with 6.1 allows you
+to manage your shop sales very easily. It's fully web based so that you don't
+have to install or deploy any software and all the sales shops can be easily
+consolidated. It works in connected and disconnected modes so that you can
+continue to sell if you lose your internet connection.
+
+
+
+Here's a summary of its main features and benefits:
+
+100% WEB based
+
+- available for any touchscreen device (ipod, ipad, any tablet)mobile (with portable devices)
- no installation required
- no synchronization needed, completely integrated
- continue working even when your connection is down if you close your browser, data won't be lost
- fully web based with a clean interface smart interface
+
+You have different options to select your products. You can do it through the
+barcode reader, just browse through the categories you have put in place (ie.
+drinks, snacks, meals, etc.), or text search in case neither of the other
+options work for you. If you need to use the POS for your restaurant, for
+example, your employees can record at the same time multiple tickets without
+having to wait to do one transaction at a time. Along, to facilitate payment,
+the application allows multiple payment methods.
+
+The POS application is so simple and accessible to use that your shop or
+restaurant will never need any other tool to manage orders. Due to its smart
+and user-friendly interface you don't need any training to learn how to use it.
+Think of it as an out-of-the-box solution to boost your business' productivity.
+
+]]>
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 23c4b8f29c8..63f208c08a7 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -55,7 +55,7 @@
-
+
diff --git a/addons/document_page/static/src/js/document_page.js b/addons/document_page/static/src/js/document_page.js
deleted file mode 100644
index 836803bf700..00000000000
--- a/addons/document_page/static/src/js/document_page.js
+++ /dev/null
@@ -1,18 +0,0 @@
-openerp.document_page = function (openerp) {
- openerp.web.form.widgets.add('text_wiki', 'openerp.web.form.FieldTextWiki');
-
- openerp.web.form.FieldTextWiki = openerp.web.form.FieldText.extend({
- render_value: function() {
- var show_value = openerp.web.format_value(this.get('value'), this, '');
- if (!this.get("effective_readonly")) {
- this.$textarea.val(show_value);
- if (show_value && this.view.options.resize_textareas) {
- this.do_resize(this.view.options.resize_textareas);
- }
- } else {
- var wiki_value = wiky.process(show_value || '');
- this.$el.html(wiki_value);
- }
- },
- });
-};
diff --git a/addons/document_page/static/src/lib/wiky/Readme.md b/addons/document_page/static/src/lib/wiky/Readme.md
deleted file mode 100755
index 5d9bfe175a6..00000000000
--- a/addons/document_page/static/src/lib/wiky/Readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-Wiky.js - a javascript library to convert Wiki Markup language to HTML.
-=======================
-
-(It is buggy, please use with care)
-
-Wiky.js is a javascript library that converts Wiki Markup language to HTML.
-
-
-How to use it
--------------------
-Include wiki.js into your HTML file. Wiky.js has only one function, which is wiky.process(wikitext).
-
-Please see index.html for an example.
-
-*wiky.js does not depend on jQuery, which is included for testing purpose.
-
-
-
-Supported Syntax
--------------------
-* == Heading ==
-* === Subheading ===
-* [http://www.url.com Name of URLs]
-* [[File:http://www.url.com/image.png Alternative Text]]
-* -------------------- (Horizontal line)
-* : (Indentation)
-* # Ordered bullet point
-* * Unordered bullet point
-
-
-
-License
-------------------
-Creative Commons 3.0
-
-
-
-Contributors
--------------------
-Tanin Na Nakorn
-Tanun Niyomjit (Designer)
\ No newline at end of file
diff --git a/addons/document_page/static/src/lib/wiky/index.html b/addons/document_page/static/src/lib/wiky/index.html
deleted file mode 100755
index 97992354fd6..00000000000
--- a/addons/document_page/static/src/lib/wiky/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
Untitled Document
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/document_page/static/src/lib/wiky/input_complete b/addons/document_page/static/src/lib/wiky/input_complete
deleted file mode 100755
index c7e860cccf9..00000000000
--- a/addons/document_page/static/src/lib/wiky/input_complete
+++ /dev/null
@@ -1,35 +0,0 @@
-=== Heading ===
-Some content
-I would like to add another line
-
-== Subheading ==
-Some more content
-Some more lines1
-:A line with indent
-:: A 2-indented line
-:: more
-:back to 1-indented line
-
-This is Taeyeon.
-[[File:http://www.oknation.net/blog/home/blog_data/12/2012/images/ty4.jpg Taeyeon]]
-Taeyeon is so cute.
-
-This is a link:[http://www.google.com Google].
-This is a bold link:'''[http://www.google.com Google]'''.
-This is a bold-italic link:'''''[http://www.google.com Google]'''''.
-This is '''bold''', '''''bold-italic''''', and ''italic''
-
-
-# First
-# second
-## Second-First
-*** First Point
-*** Second Point
-#### z
-#### y
-#### x
-*** Third Point
-## Second-Second [ftp://www.facebook.com FacebookFTP]
-## Second-Third [http://www.google.com Google Here]
-# third
-
diff --git a/addons/document_page/static/src/lib/wiky/wiky.css b/addons/document_page/static/src/lib/wiky/wiky.css
deleted file mode 100755
index 0adc7896df0..00000000000
--- a/addons/document_page/static/src/lib/wiky/wiky.css
+++ /dev/null
@@ -1,79 +0,0 @@
-@charset "UTF-8";
-.wiky_preview_area {
- font-family: "Helvetica Neue", Arial, Helvetica, 'Liberation Sans', FreeSans, sans-serif;
- font-size: 13px;
- line-height: 1.5em;
- color: #666;
- font-weight:350;
- width:600px;
- display:block;
-}
-.wiky_preview_area h2{
- font-size:24px;
- color:#333;
- font-weight:400;
-
- text-shadow:0 1px 0 rgba(000, 000, 000, .4);
-}
-.wiky_preview_area h3{
- font-size:18px;
- color:#555;
- font-weight:400;
-
- text-shadow:0 1px 0 rgba(000, 000, 000, .4);
-}
-.wiky_preview_area img{
- background-repeat: repeat;
- width: 400px;
- -webkit-border-radius: 10px;
- -moz-border-radius: 10px;
- border-radius: 10px;
- -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, .8);
- -moz-box-shadow:0 1px 3px rgba(0, 0, 0, .8);
- box-shadow:0 1px 3px rgba(0, 0, 0, .8);
-}
-.wiky_preview_area a{
- padding:5px;
- font-weight:400;
-
- background: #999; /* for non-css3 browsers */
-
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#000000'); /* for IE */
- background: -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#000)); /* for webkit browsers */
- background: -moz-linear-gradient(top, #ccc, #000); /* for firefox 3.6+ */
-
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-
- -webkit-box-shadow:none;
- -moz-box-shadow:none;
- box-shadow:none;
-
- text-shadow:0 1px 0 rgba(255, 255, 255, 1);
-}
-
-.wiky_preview_area a:hover{
- color:#333;
- padding:5px;
- font-weight:400;
- text-decoration:none;
-
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-
- -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, .3);
- -moz-box-shadow:0 1px 3px rgba(0, 0, 0, .3);
- box-shadow:0 1px 3px rgba(0, 0, 0, .3);
-
- text-shadow:0 1px 0 rgba(255, 255, 255, 1);
-}
-
-
-.wiky_preview_area > ol,
-.wiky_preview_area > ul,
-.wiky_preview_area > ul > li,
-.wiky_preview_area > ol > li {
- list-style: disc inside none;
-}
\ No newline at end of file
diff --git a/addons/document_page/static/src/lib/wiky/wiky.js b/addons/document_page/static/src/lib/wiky/wiky.js
deleted file mode 100755
index 5bc9c6f167d..00000000000
--- a/addons/document_page/static/src/lib/wiky/wiky.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Wiky.js - Javascript library to converts Wiki MarkUp language to HTML.
- * You can do whatever with it. Please give me some credits (Apache License)
- * - Tanin Na Nakorn
- */
-
-var wiky = {};
-
-
-wiky.process = function(wikitext) {
- var lines = wikitext.split(/\r?\n/);
- var start;
- var html = "";
-
- for (var i=0;i
"+line.substring(3,line.length-3)+"";
- }
- else if (line.match(/^==/)!=null && line.match(/==$/)!=null)
- {
- html += ""+line.substring(2,line.length-2)+"
";
- }
- else if (line.match(/^:+/)!=null)
- {
- // find start line and ending line
- start = i;
- while (i < lines.length && lines[i].match(/^:+/)!=null) i++;
- i--;
-
- html += wiky.process_indent(lines,start,i);
- }
- else if (line.match(/^----+(\s*)$/)!=null)
- {
- html += "
";
- }
- else if (line.match(/^(\*+) /)!=null)
- {
- // find start line and ending line
- start = i;
- while (i < lines.length && lines[i].match(/^(\*+|##+):? /)!=null) i++;
- i--;
-
- html += wiky.process_bullet_point(lines,start,i);
- }
- else if (line.match(/^(#+) /)!=null)
- {
- // find start line and ending line
- start = i;
- while (i < lines.length && lines[i].match(/^(#+|\*\*+):? /)!=null) i++;
- i--;
-
- html += wiky.process_bullet_point(lines,start,i);
- }
- else
- {
- html += wiky.process_normal(line);
- }
-
- html += "
\n";
- }
-
- return html;
-};
-
-wiky.process_indent = function(lines,start,end) {
- var html = "";
-
- for(var i=start;i<=end;i++) {
-
- html += "- ";
-
- var this_count = lines[i].match(/^(:+)/)[1].length;
-
- html += wiky.process_normal(lines[i].substring(this_count));
-
- var nested_end = i;
- for (var j=i+1;j<=end;j++) {
- var nested_count = lines[j].match(/^(:+)/)[1].length;
- if (nested_count <= this_count) break;
- else nested_end = j;
- }
-
- if (nested_end > i) {
- html += wiky.process_indent(lines,i+1,nested_end);
- i = nested_end;
- }
-
- html += "
";
- }
-
- html += "
";
- return html;
-};
-
-wiky.process_bullet_point = function(lines,start,end) {
- var html = (lines[start].charAt(0)=='*')?"":"";
-
- for(var i=start;i<=end;i++) {
-
- html += "- ";
-
- var this_count = lines[i].match(/^(\*+|#+) /)[1].length;
-
- html += wiky.process_normal(lines[i].substring(this_count+1));
-
- // continue previous with #:
- {
- var nested_end = i;
- for (var j = i + 1; j <= end; j++) {
- var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length;
-
- if (nested_count < this_count)
- break;
- else {
- if (lines[j].charAt(nested_count) == ':') {
- html += "
" + wiky.process_normal(lines[j].substring(nested_count + 2));
- nested_end = j;
- } else {
- break;
- }
- }
-
- }
-
- i = nested_end;
- }
-
- // nested bullet point
- {
- var nested_end = i;
- for (var j = i + 1; j <= end; j++) {
- var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length;
- if (nested_count <= this_count)
- break;
- else
- nested_end = j;
- }
-
- if (nested_end > i) {
- html += wiky.process_bullet_point(lines, i + 1, nested_end);
- i = nested_end;
- }
- }
-
- // continue previous with #:
- {
- var nested_end = i;
- for (var j = i + 1; j <= end; j++) {
- var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length;
-
- if (nested_count < this_count)
- break;
- else {
- if (lines[j].charAt(nested_count) == ':') {
- html += wiky.process_normal(lines[j].substring(nested_count + 2));
- nested_end = j;
- } else {
- break;
- }
- }
-
- }
-
- i = nested_end;
- }
-
- html += " ";
- }
-
- html += (lines[start].charAt(0)=='*')?"
":"";
- return html;
-};
-
-wiky.process_url = function(txt) {
-
- var index = txt.indexOf(" ");
-
- if (index == -1)
- {
- return "";
- }
- else
- {
- var url = txt.substring(0,index);
- var label = txt.substring(index+1);
- return ""+label+"";
- }
-};
-
-wiky.process_image = function(txt) {
- var index = txt.indexOf(" ");
- var url = txt;
- var label = "";
-
- if (index > -1)
- {
- url = txt.substring(0,index);
- label = txt.substring(index+1);
- }
-
-
- return "";
-};
-
-wiky.process_video = function(url) {
-
- if (url.match(/^(https?:\/\/)?(www.)?youtube.com\//) == null)
- {
- return ""+url+" is an invalid YouTube URL";
- }
- var result;
- if ((result = url.match(/^(https?:\/\/)?(www.)?youtube.com\/watch\?(.*)v=([^&]+)/)) != null)
- {
- url = "http://www.youtube.com/embed/"+result[4];
- }
-
-
- return '';
-};
-
-wiky.process_normal = function(wikitext) {
-
- // Image
- {
- var index = wikitext.indexOf("[[File:");
- var end_index = wikitext.indexOf("]]", index + 7);
- while (index > -1 && end_index > -1) {
-
- wikitext = wikitext.substring(0,index)
- + wiky.process_image(wikitext.substring(index+7,end_index))
- + wikitext.substring(end_index+2);
-
- index = wikitext.indexOf("[[File:");
- end_index = wikitext.indexOf("]]", index + 7);
- }
- }
-
- // Video
- {
- var index = wikitext.indexOf("[[Video:");
- var end_index = wikitext.indexOf("]]", index + 8);
- while (index > -1 && end_index > -1) {
-
- wikitext = wikitext.substring(0,index)
- + wiky.process_video(wikitext.substring(index+8,end_index))
- + wikitext.substring(end_index+2);
-
- index = wikitext.indexOf("[[Video:");
- end_index = wikitext.indexOf("]]", index + 8);
- }
- }
-
-
- // URL
- var protocols = ["http","ftp","news"];
-
- for (var i=0;i -1 && end_index > -1) {
-
- wikitext = wikitext.substring(0,index)
- + wiky.process_url(wikitext.substring(index+1,end_index))
- + wikitext.substring(end_index+1);
-
- index = wikitext.indexOf("["+protocols[i]+"://",end_index+1);
- end_index = wikitext.indexOf("]", index + 1);
-
- }
- }
-
- var count_b = 0;
- var index = wikitext.indexOf("'''");
- while(index > -1) {
-
- if ((count_b%2)==0) wikitext = wikitext.replace(/'''/,"");
- else wikitext = wikitext.replace(/'''/,"");
-
- count_b++;
-
- index = wikitext.indexOf("'''",index);
- }
-
- var count_i = 0;
- var index = wikitext.indexOf("''");
- while(index > -1) {
-
- if ((count_i%2)==0) wikitext = wikitext.replace(/''/,"");
- else wikitext = wikitext.replace(/''/,"");
-
- count_i++;
-
- index = wikitext.indexOf("''",index);
- }
-
- wikitext = wikitext.replace(/<\/b><\/i>/g,"");
-
- return wikitext;
-};
From 06ea53d3ed45363cf645bca0047cd0be6daea1ec Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)"
Date: Tue, 11 Sep 2012 11:56:46 +0530
Subject: [PATCH 047/165] [IMP]add supplier for nebula business which is in
demo for supplier invoice
bzr revid: sgo@tinyerp.com-20120911062646-85v0i5dkimx8f1un
---
openerp/addons/base/res/res_partner_demo.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index eed67483358..06a660dff51 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -313,7 +313,7 @@
Nebula Business
-
+
1
Rosario
From 9adfec126d0e760ff1e6249d3ecc9f476b91eaa7 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)"
Date: Tue, 11 Sep 2012 14:01:43 +0530
Subject: [PATCH 048/165] [IMP]improve the purchase view
bzr revid: rma@tinyerp.com-20120911083143-2typsouj4apih3h4
---
addons/purchase/purchase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 592bf783a64..e7ff94ac1ea 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -318,7 +318,7 @@ class purchase_order(osv.osv):
for po in self.browse(cr, uid, ids, context=context):
pick_ids += [picking.id for picking in po.picking_ids]
- res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+ res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_form')
res_id = res and res[1] or False
return {
From e1c3be41e1d0e9c89f016dbf58a34126a4391c22 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)"
Date: Tue, 11 Sep 2012 14:44:26 +0530
Subject: [PATCH 049/165] [IMP]changed menu name
bzr revid: sgo@tinyerp.com-20120911091426-alnlt4v3c3pg8q2c
---
addons/account/account_menuitem.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 480d5ec76a6..a2fbf11963b 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -30,7 +30,7 @@
-
+
From d0bc4d9ffc8575393571dfd477bc03c272c7d1ad Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)"
Date: Tue, 11 Sep 2012 15:32:48 +0530
Subject: [PATCH 050/165] [IMP]show only one o2m field in payment
bzr revid: sgo@tinyerp.com-20120911100248-0jda0d8mo4gsl0r0
---
addons/account_voucher/voucher_payment_receipt_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index c41ed6d5577..ddfb91528fd 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -328,7 +328,7 @@
-
+
Date: Tue, 11 Sep 2012 16:07:32 +0530
Subject: [PATCH 051/165] [IMP]improve breadcrumb for invoice and draft
bzr revid: sgo@tinyerp.com-20120911103732-vwvs8ieiwx083qft
---
addons/account/account_invoice.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 42d42e7ec1b..acc53598b78 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1095,10 +1095,10 @@ class account_invoice(osv.osv):
if not ids:
return []
types = {
- 'out_invoice': 'CI: ',
- 'in_invoice': 'SI: ',
- 'out_refund': 'OR: ',
- 'in_refund': 'SR: ',
+ 'out_invoice': 'Draft Invoice',
+ 'in_invoice': 'Draft Invoice ',
+ 'out_refund': 'Draft Refund ',
+ 'in_refund': 'Draft Refund',
}
return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
From c85f2c4a54acd424370a36a821d21de36072a921 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)"
Date: Tue, 11 Sep 2012 17:34:14 +0530
Subject: [PATCH 052/165] [ADD] added address fields in def
onchange_partner_address_id
bzr revid: bde@tinyerp.com-20120911120414-b6p6zzumwb84ugt3
---
addons/base_status/base_stage.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 529e70fdb49..f9a9489ac00 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -77,8 +77,16 @@ class base_stage(object):
data = {'value': {'email_from': False, 'phone':False}}
if add:
address = self.pool.get('res.partner').browse(cr, uid, add)
- data['value'] = {'email_from': address and address.email or False ,
- 'phone': address and address.phone or False}
+ data['value'] = {'partner_name': address and address.name or False,
+ 'email_from': address and address.email or False,
+ 'phone': address and address.phone or False,
+ 'street': address and address.street or False,
+ 'street2': address and address.street2 or False,
+ 'city': address and address.city or False,
+ 'state_id': address.state_id and address.state_id.id or False,
+ 'zip': address and address.zip or False,
+ 'country_id': address.country_id and address.country_id.id or False,
+ }
if 'phone' not in self._columns:
del data['value']['phone']
return data
From 54eac9c8511500810e52059a499a55e595259445 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)"
Date: Tue, 11 Sep 2012 19:00:15 +0530
Subject: [PATCH 053/165] [IMP]on create of sale receipt add first sale account
and display lable of bank name and number in customer accounting tab
bzr revid: sgo@tinyerp.com-20120911133015-24z0gr1mnwzk6fwh
---
addons/account/partner_view.xml | 6 ++++--
addons/account_voucher/account_voucher.py | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d83571b314e..90ae9ea989c 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -93,8 +93,10 @@
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8bd00d58832..e1f18236d35 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -482,7 +482,7 @@
hr.employee.leave.tree
- hr.employee
+ hr.holidays.status
From 9dbe22e3612c0c727ad504386f21b7ab1858927a Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)"
Date: Wed, 12 Sep 2012 15:34:35 +0530
Subject: [PATCH 058/165] [IMP] Rename Our first company's blogpost !
bzr revid: fka@tinyerp.com-20120912100435-uo7l8hk2i5ajoesb
---
addons/portal/portal_demo.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 1ace02f3d7d..460954dde3e 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -19,7 +19,7 @@
- Our first company's blogpost !
+ Our company's first blog-post !
mail.group
Date: Wed, 12 Sep 2012 16:21:39 +0530
Subject: [PATCH 059/165] [IMP] change menu name on message in linkedin
bzr revid: fka@tinyerp.com-20120912105139-x2vh6kvzfnvagxoe
---
addons/web_linkedin/static/src/xml/linkedin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 1a8009ab066..4956fd7df5a 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -30,7 +30,7 @@
LinkedIn access was not enabled on this server.
- Please ask your administrator to configure it in Settings > Configuration > Linkedin.
+ Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
\ No newline at end of file
From 885ef0e8bac253e0294ab8498fdee61e99666c14 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)"
Date: Wed, 12 Sep 2012 18:50:01 +0530
Subject: [PATCH 060/165] [IMP]make changes into purchase view
bzr revid: rma@tinyerp.com-20120912132001-l52d44rvte3vgei5
---
addons/account/res_config_view.xml | 2 --
addons/purchase/res_config.py | 3 +++
addons/purchase/res_config_view.xml | 10 ++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index bc8ace5c262..2ff931eda62 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -240,11 +240,9 @@
-
-
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 3d9c858cec5..4fb34afa88d 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -62,6 +62,9 @@ class purchase_config_settings(osv.osv_memory):
help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
You can configure per product if you directly do a Request for Quotation
to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
+ 'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
+ implied_group='purchase.group_analytic_accounting',
+ help="Allows you to specify an analytic account on purchase orders."),
}
_defaults = {
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 00e0b6108e8..824bbdfbc7a 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -77,6 +77,16 @@