- Confirmed:
-
+ Confirmed:
+ -
-
- Project:
- Category:
-
- i
-
-
-
-
-
-
-
- -
-
-
Project Issue- Feature Tracker Tree
project.issue
@@ -363,22 +342,17 @@
search
-
-
+
-
+
project.project.form.inherited
project.project
@@ -409,7 +380,7 @@
-
+
project.project.kanban.inherited
project.project
@@ -427,7 +398,8 @@
-
+
+
account.analytic.account.issue.form.inherit
account.analytic.account
form
@@ -438,9 +410,10 @@
-
+
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 5957ee284e8..b43cbc51c50 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -50,7 +50,6 @@ class project_issue_report(osv.osv):
'opening_date': fields.date('Date of Opening', readonly=True),
'creation_date': fields.date('Creation Date', readonly=True),
'date_closed': fields.date('Date of Closing', readonly=True),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
'stage_id': fields.many2one('project.task.type', 'Stage'),
'nbr': fields.integer('# of Issues', readonly=True),
'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True),
@@ -86,7 +85,6 @@ class project_issue_report(osv.osv):
c.working_hours_open,
c.working_hours_close,
c.section_id,
- c.categ_id,
c.stage_id,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.company_id as company_id,
@@ -104,7 +102,7 @@ class project_issue_report(osv.osv):
FROM
project_issue c
- WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
+ WHERE c.active= 'true'
)""")
project_issue_report()
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 862f52b1931..c1ae69517c2 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -17,19 +17,18 @@
@@ -52,61 +51,30 @@
search
-
-
-
-
+
diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js
new file mode 100644
index 00000000000..24e5ff7cc49
--- /dev/null
+++ b/addons/project_issue/static/src/js/project_issue.js
@@ -0,0 +1,13 @@
+openerp.portal_project_issue = function(openerp) {
+ openerp.web_kanban.KanbanView.include({
+ on_groups_started: function() {
+ var self = this;
+ self._super.apply(this, arguments);
+
+ if (self.dataset.model === 'project.issue') {
+ // Load project's categories names from m2m field
+ self.project_display_categ_names();
+ }
+ }
+ });
+};
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7d7310465d6..3b814cbab6e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,12 +2,9 @@
-
-
- # ------------------------------------------------------
- # Project User Allocation
- # ------------------------------------------------------
+
+
project.user.allocation.gantt
project.user.allocation
@@ -69,17 +66,13 @@
search
-
-
-
-
@@ -94,9 +87,7 @@
- # ------------------------------------------------------
- # Project Phase
- # ------------------------------------------------------
+
@@ -195,7 +186,7 @@
search
-
-
-
@@ -317,10 +301,7 @@
- # ------------------------------------------------------
- # Project Task
- # ------------------------------------------------------
-
+
phase.task.form2
project.task
@@ -368,16 +349,15 @@
-
+
account.analytic.account.phase.form.inherit
account.analytic.account
form
@@ -393,10 +373,7 @@
- # ------------------------------------------------------
- # Menu Items
- # ------------------------------------------------------
-
+
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 7208885748c..3e627eaf01d 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -47,8 +47,9 @@
search
-
-
+
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 3c223ab6b07..b32d852bc5f 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -29,22 +29,8 @@ class report_timesheet_task_user(osv.osv):
_auto = False
_order = "name"
- def _get_task_hours(self, cr, uid, ids, name,args,context):
- result = {}
- for record in self.browse(cr, uid, ids,context):
- last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
- task_obj = self.pool.get('project.task.work')
- task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
- tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id'])
- total = 0.0
- for hrs in tsk_hrs:
- total += hrs['hours']
- result[record.id] = total
- return result
-
def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
result = {}
- sum = 0.0
for record in self.browse(cr, uid, ids, context):
last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
@@ -63,7 +49,7 @@ class report_timesheet_task_user(osv.osv):
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id': fields.many2one('res.users', 'User',readonly=True),
'timesheet_hrs': fields.function(get_hrs_timesheet, string="Timesheet Hours"),
- 'task_hrs': fields.function(_get_task_hours, string="Task Hours"),
+ 'task_hrs' : fields.float('Task Hours'),
}
def init(self, cr):
@@ -74,7 +60,9 @@ class report_timesheet_task_user(osv.osv):
months.name as name,
r.id as user_id,
to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') as year,
- to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month
+ to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month,
+ (select sum(hours) from project_task_work where user_id = r.id and date between to_date(months.name, 'YYYY/MM/DD') and (to_date(months.name, 'YYYY/MM/DD') + interval '1 month' -
+ interval '1 day') ) as task_hrs
from res_users r,
(select to_char(p.date,'YYYY-MM-01') as name,
to_char(p.date,'MM') as m_id
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 7e79b3793b7..32f8719e9a3 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -30,15 +30,10 @@
search
-
-
-
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 38a858e94d7..313df25a563 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -7,6 +7,7 @@
id="base.menu_purchase_root"
groups="group_purchase_manager,group_purchase_user"
sequence="40"/>
+
@@ -54,12 +55,12 @@
action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories"
parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
-
+
-
+
{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}
- Use this menu to control the invoices to be received from your supplier.
- OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
- Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
-
+
+ Use this menu to control the invoices to be received from your supplier.
+ OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
+ Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
+
-
+
@@ -140,7 +141,7 @@
client_action_multi
-
+
purchase.order.calendar
purchase.order
calendar
@@ -245,7 +246,7 @@
search
-
-
-
-
+
+
+
@@ -300,34 +295,25 @@
search
-
-
-
-
+
+
+
@@ -492,21 +478,16 @@
search
-
-
-
-
+
@@ -559,9 +540,7 @@
parent="menu_procurement_management_invoice"
sequence="72"/>
-
+
procurement.order.form.inherit
@@ -574,6 +553,5 @@
-
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 4cf91053666..aa915c620f5 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,29 +53,16 @@
search
-
-
-
search
-
-
-
-
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c1fc14c29bf..e0b8db4862f 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -134,28 +134,21 @@
search
-
-
-
+
+
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index c481296196c..73cf99bec34 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -99,12 +99,10 @@
search
-
-
+
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 8a0823a8c15..5b388469f3c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -10,23 +10,15 @@
search
-
-
-
@@ -39,12 +31,9 @@
search
-
-
+
@@ -55,19 +44,13 @@
search
-
-
-
+
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 2fc96bd7db5..ced25296fcc 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:34+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-07-31 11:44+0000\n"
+"Last-Translator: gobi \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
-"X-Generator: Launchpad (build 15654)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: sale
#: field:sale.config.picking_policy,timesheet:0
@@ -1491,7 +1491,7 @@ msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүс
#. module: sale
#: selection:sale.order,state:0 selection:sale.report,state:0
msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн алдаа"
+msgstr "Нэхэмжлэлийн сондгойрол"
#. module: sale
#: model:process.node,note:sale.process_node_saleorder0
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 8eb4fc85ce6..1ac6d425530 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -50,53 +50,35 @@
search
-
-
-
-
-
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 84c1a9c96ad..d7bcd5804ee 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -31,6 +31,14 @@ class res_partner(osv.osv):
res[partner.id] = len(partner.sale_order_ids)
return res
+ def copy(self, cr, uid, record_id, default=None, context=None):
+ if default is None:
+ default = {}
+
+ default.update({'sale_order_ids': []})
+
+ super(res_partner, self).copy(cr, uid, record_id, default, context)
+
_columns = {
'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'),
'sale_order_ids': fields.one2many('sale.order','partner_id','Sales Order')
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a73f7744e53..3bb78ae1c04 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -164,7 +164,7 @@
-
@@ -287,14 +287,18 @@
-
@@ -359,26 +363,20 @@
@@ -531,13 +529,12 @@
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 39999a8d1b7..a09325d663d 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -28,7 +28,7 @@ class sale_advance_payment_inv(osv.osv_memory):
_columns = {
'advance_payment_method':fields.selection(
- [('all', 'All'), ('percentage','Percentage'), ('fixed','Fixed Price'),
+ [('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
('lines', 'Some Order Lines')],
'Type', required=True,
help="""Use All to create the final invoice.
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 44e1c1cc23a..aeabdf25de4 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: sale_crm
#: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index d6b7f28d049..6efaea2ac53 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -36,13 +36,14 @@
+
-
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index e9c76e11755..d0b51f8404f 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
#. module: sale_margin
#: sql_constraint:sale.order:0
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index defbc522340..3af69bb025b 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,8 +7,7 @@
search
-
-
@@ -32,11 +31,8 @@
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 04a0959739a..70fb06709f6 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -9,8 +9,8 @@
-
@@ -105,15 +105,15 @@
-
- 
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
-
-
-
- ![]()
+
+ Project Issue Kanban
+ project.issue
+ kanban
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
- # ------------------------------------------------------
- # Feature Requests
- # ------------------------------------------------------
-
+
-
-
- -
+
- Project:
- Category:
-
@@ -268,29 +269,23 @@
-
-
-
+
-
+
Receive Products
stock.move
@@ -136,7 +136,7 @@
Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.
-
+
Receive Products
stock.move
@@ -215,17 +215,5 @@
-
-
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 89cbd9c1340..56d17976aad 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -56,52 +56,33 @@
search
-
-
-
-
search
-
-
-
-
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 69a7829f565..15dafbfdbc1 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -35,14 +35,10 @@
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index ec0860f62c7..03a107b6947 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -6,9 +6,9 @@
IT Suppliers
-
+
Starting Inventory
-
+
+
+
1
Shop 1
- Felix
Shop 1
1
- Shop 2
- Edwin
Shop 2
internal
+ none
Shop 1
+ manual
internal
Shop 2
procurement
+ Internal Shippings
Shop 1
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6fe610012c1..3c08c1eaff0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -79,14 +79,9 @@
search
-
-
-
search
-
-
+
@@ -405,16 +396,10 @@
search
-
-
-
@@ -569,14 +554,9 @@
@@ -683,14 +663,9 @@
-
-
@@ -733,14 +708,16 @@
@@ -866,8 +847,8 @@
search
-
-
-
@@ -941,11 +914,7 @@
stock.picking.out.tree
stock.picking
@@ -971,18 +940,18 @@
form
-
+
-
+
-
+
-
+
@@ -1003,26 +972,20 @@
search
-
-
-
-
@@ -1059,11 +1022,7 @@
-
+
stock.picking.in.tree
stock.picking.in
@@ -1089,7 +1048,7 @@
form
-
+
@@ -1115,25 +1074,19 @@
search
-
-
-
-
@@ -1191,8 +1144,7 @@
+ states="draft,waiting,confirmed,assigned"/>
-
-
stock.move.form
stock.move
@@ -1305,33 +1255,25 @@
-
-
-
@@ -1351,13 +1293,10 @@
- ====================================
- Reception Picking (By Stock Move)
- ====================================
-
-
-
-
+
stock.move.tree2
stock.move
@@ -1377,7 +1316,7 @@
+
-
+
stock.move.tree3
stock.move
tree
@@ -1418,24 +1358,18 @@
-
-
-
@@ -1449,24 +1383,18 @@
-
-
-
-
@@ -1499,9 +1427,7 @@
- # -------------------------------------------------------------
- # Stock incoterms
- # -------------------------------------------------------------
+
stock.incoterms.tree
stock.incoterms
@@ -1639,7 +1565,6 @@
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 49dc048d0ab..4832788927b 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -20,13 +20,16 @@
##############################################################################
from osv import fields, osv
+from tools.translate import _
class stock_location_product(osv.osv_memory):
_name = "stock.location.product"
_description = "Products by Location"
_columns = {
'from_date': fields.datetime('From'),
- 'to_date': fields.datetime('To'),
+ 'to_date': fields.datetime('To'),
+ 'type': fields.selection([('inventory','Analyse Current Inventory'),
+ ('period','Analyse a Period')], 'Analyse Type', required=True),
}
def action_open_window(self, cr, uid, ids, context=None):
@@ -43,7 +46,7 @@ class stock_location_product(osv.osv_memory):
location_products = self.read(cr, uid, ids, ['from_date', 'to_date'], context=context)
if location_products:
return {
- 'name': False,
+ 'name': _('Current Inventory'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'product.product',
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index f0a52933c8a..756c3782ea1 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -7,14 +7,15 @@
form
@@ -208,11 +194,12 @@
subscription.document
form
+ id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
+
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index fb4b232f512..22838058bec 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -277,20 +277,15 @@
search
-
-
-
@@ -553,9 +548,7 @@
@@ -759,11 +752,9 @@
@@ -1180,22 +1171,17 @@
search
-
-
-
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index b0f0ab0198e..d0d4c35a80d 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -176,14 +176,10 @@