"+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 += "
- ":"
- ";
-
- 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)=='*')?"
- ";
-
- for(var i=start;i<=end;i++) {
-
- html += "
Click to start a new project. -
-+
Projects are used to organize your activities; plan tasks, track issues, invoice timesheets. You can define internal projects (R&D, Improve Sales Process), private projects (My Todos) or customer ones. -
-- You will be able collaborate with internal users on - projects or invite customers to share your activities. +
+ You will be able collaborate with internal users on + projects or invite customers to share your activities.
-
+
- 1
- 2
- 5 @@ -540,7 +537,8 @@
-
@@ -801,7 +799,7 @@
-
+
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 6642dbf485d..85b4bd7001b 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -30,7 +30,7 @@ class project_configuration(osv.osv_memory):
'module_project_mrp': fields.boolean('Generate tasks from sale orders',
help ="""This feature automatically creates project tasks from service products in sale orders.
More precisely, tasks are created for procurement lines with product of type 'Service',
- procurement method 'Make to Order', and supply method 'Produce'.
+ procurement method 'Make to Order', and supply method 'Manufacture'.
This installs the module project_mrp."""),
'module_pad': fields.boolean("Use integrated collaborative note pads on task",
help="""Lets the company customize which Pad installation should be used to link to new pads
@@ -52,7 +52,7 @@ class project_configuration(osv.osv_memory):
'module_project_issue_sheet': fields.boolean("Invoice working time on issues",
help="""Provides timesheet support for the issues/bugs management in project.
This installs the module project_issue_sheet."""),
- 'group_tasks_work_on_tasks': fields.boolean("Compute work activities on tasks",
+ 'group_tasks_work_on_tasks': fields.boolean("Log work activities on tasks",
implied_group='project.group_tasks_work_on_tasks',
help="Allows you to compute work on tasks."),
'group_time_work_estimation_tasks': fields.boolean("Manage time estimation on tasks",
@@ -72,4 +72,9 @@ class project_configuration(osv.osv_memory):
user = self.pool.get('res.users').browse(cr, uid, uid, context)
user.company_id.write({'project_time_mode_id': config.time_unit.id})
+ def onchange_time_estimation_project_timesheet(self, cr, uid, ids, group_time_work_estimation_tasks, module_project_timesheet):
+ if group_time_work_estimation_tasks or module_project_timesheet:
+ return {'value': {'group_tasks_work_on_tasks': True}}
+ return {}
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 56803484adf..207f35da72e 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -29,7 +29,7 @@
-
@@ -50,7 +50,7 @@
-
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6d1d0272ab0..66b3b97b5e8 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -100,8 +100,6 @@
states="open"/>
-
@@ -118,7 +116,11 @@
+ Pricelist Versions
+ ir.actions.act_window
+ product.pricelist.version
+ form
+ [('pricelist_id.type','=','purchase')]
+
+
+
+ action="purchase_pricelist_version_action" id="menu_purchase_pricelist_version_action"
+ parent="menu_purchase_config_pricelist" sequence="2" groups="product.group_purchase_pricelist"/>
+
-
+ action="product.product_price_type_action" id="menu_product_pricelist_action2_purchase_type"
+ parent="menu_purchase_config_pricelist" sequence="60" />
@@ -188,7 +209,7 @@
-
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 21c52b4d2ec..d248ef66160 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,16 +11,6 @@
-
- Picking list
- stock.picking
-
-
-
-
-
Incoming Picking Inherited
@@ -36,63 +26,18 @@
-
-
- stock.picking.in.search
+
+ stock.picking.in.search.inherit
stock.picking.in
+
-
-
-
-
+
+
-
- Incoming Shipments
- stock.picking.in
- ir.actions.act_window
- form
- tree,form,calendar
- [('type','=','in')]
- {'search_default_purchase_id': active_id,'default_type': 'in'}
-
-
-
- tree
-
-
-
- form
-
-
-
- calendar
-
+
Purchase Picking Inherited
purchase.order
@@ -100,8 +45,8 @@
@@ -110,13 +55,13 @@
On Incoming Shipments
- stock.picking
+ stock.picking.in
ir.actions.act_window
form
tree,form,calendar
[('type','=','in')]
{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}
-
+
+ Click to add a pricelist version. +
+ There can be more than one version of a pricelist, each of + these must be valid during a certain period of time. Some + examples of versions: Main Prices, 2010, 2011, Summer Sales, + etc. +
+
@@ -349,7 +370,7 @@
Quotations
ir.actions.act_window
purchase.order
- {'search_default_draft': 1}
+ {}
[('state','in',('draft','sent','confirmed'))]
tree,form,graph,calendar
invoice_method<>'order'
+ invoice_method<>'order' and invoiced
+
+
Here you can track all the product receptions of purchase
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ba85a62ca1d..feaf411cb54 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -771,7 +771,8 @@ class sale_order(osv.osv):
'default_res_id': ids[0],
'default_use_template': True,
'default_template_id': template_id,
- })
+ 'mark_so_as_sent': True
+ })
return {
'view_type': 'form',
'view_mode': 'form',
@@ -1476,15 +1477,14 @@ class sale_order_line(osv.osv):
sale_order_line()
-class mail_message(osv.osv):
- _inherit = 'mail.message'
-
- def _postprocess_sent_message(self, cr, uid, message, context=None):
- if message.model == 'sale.order':
+class mail_compose_message(osv.osv):
+ _inherit = 'mail.compose.message'
+ def send_mail(self, cr, uid, ids, context=None):
+ context = context or {}
+ if context.get('mark_so_as_sent', False) and context.get('default_res_id', False):
wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'sale.order', message.res_id, 'quotation_sent', cr)
- return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
-
-mail_message()
+ wf_service.trg_validate(uid, 'sale.order', context.get('default_res_id', False), 'quotation_sent', cr)
+ return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+mail_compose_message()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index be871b87796..e54ba158b9b 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,8 +9,8 @@
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.