|
+
|
,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0aa89ac244d..7a7502a7bde 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,11 +110,11 @@
-
+
-
+
@@ -152,7 +152,7 @@
form
[]
- {"search_default_Current":1,"search_default_Member":1}
+ {"search_default_open":1,"search_default_member":1}
@@ -403,7 +403,7 @@
-
+
@@ -414,7 +414,7 @@
-
+
@@ -440,7 +440,7 @@
tree,form,calendar,gantt,graph
- {"search_default_Current":1,"search_default_My Task":1}
+ {"search_default_current":1,"search_default_my_task":1}
@@ -607,7 +607,7 @@
-
+
@@ -626,7 +626,7 @@
form
tree,form
- {"search_default_My Msg":1}
+ {"search_default_my_msg":1}
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index bd276e175cc..09a4374b156 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -42,9 +42,9 @@
-
+
-
+
@@ -64,7 +64,7 @@
report.project.task.user
form
tree
- {"search_default_My Task":1}
+ {"search_default_my_task":1}
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 8d0601137b5..1fc5c3bce7d 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -14,7 +14,7 @@
tree,calendar
- {"search_default_My Bugs":1,"search_default_Current Bugs":1,"search_default_project_id":project_id}
+ {"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2e19efba8c1..343005d25d7 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -207,10 +207,10 @@
-
+
-
+
@@ -308,10 +308,10 @@
-
+
-
+
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a4e48a7dca5..50e7854b9d1 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -196,7 +196,7 @@
-
+
@@ -205,7 +205,7 @@
-
+
@@ -225,7 +225,7 @@
project.phase
form
tree,form,calendar,gantt
- {"search_default_Current":1,"search_default_My Phase":1}
+ {"search_default_current":1,"search_default_my_phase":1}
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index b087883618f..78c858f43dc 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -6,7 +6,7 @@
Process Node
-->
-
+
@@ -46,9 +46,9 @@
Process Transition
-->
-
+
-
+
@@ -65,35 +65,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 409c5730f57..8029327022d 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -26,7 +26,7 @@ class project_task(osv.osv):
_name = "project.task"
_inherit = "project.task"
_columns = {
- 'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null')
+ 'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
}
def do_close(self, cr, uid, ids, *args):
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 2f592e648b0..3b10af43026 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -163,7 +163,7 @@
-
+
@@ -175,7 +175,7 @@
report.timesheet.task.user
form
tree
- {"search_default_User":1}
+ {"search_default_by_user":1}
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 1e5a355b8f0..06034528a70 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -46,11 +46,11 @@
@@ -58,7 +58,7 @@
string="Quotations"
domain="[('state','=','draft')]"/>
@@ -74,7 +74,7 @@
-
+
@@ -93,7 +93,7 @@
report.purchase.order
form
tree,graph
- {"search_default_This Year":1,"search_default_This Month":1,"search_default_Purchase":1,"search_default_Responsible":1}
+ {"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_user":1}
diff --git a/addons/purchase_tender/__init__.py b/addons/purchase_requisition/__init__.py
similarity index 91%
rename from addons/purchase_tender/__init__.py
rename to addons/purchase_requisition/__init__.py
index 68f1f7ae5bc..866ff813cff 100644
--- a/addons/purchase_tender/__init__.py
+++ b/addons/purchase_requisition/__init__.py
@@ -17,6 +17,6 @@
# along with this program. If not, see .
#
##############################################################################
-import purchase_tender
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+import purchase_requisition
diff --git a/addons/purchase_tender/__terp__.py b/addons/purchase_requisition/__terp__.py
similarity index 84%
rename from addons/purchase_tender/__terp__.py
rename to addons/purchase_requisition/__terp__.py
index a6b3543cbbb..7dfe7815e46 100644
--- a/addons/purchase_tender/__terp__.py
+++ b/addons/purchase_requisition/__terp__.py
@@ -18,20 +18,20 @@
#
##############################################################################
{
- "name" : "Purchase - Purchase Tender",
+ "name" : "Purchase - Purchase Requisition",
"version" : "0.1",
"author" : "Tiny",
"category" : "Generic Modules/Sales & Purchases",
"website" : "http://www.openerp.com",
"description": """
- This module allows you to manage your Purchase Tenders.
- When a purchase order is created, you now have the opportunity to save the related tender.
+ This module allows you to manage your Purchase Requisition.
+ When a purchase order is created, you now have the opportunity to save the related requisition.
This new object will regroup and will allow you to easily keep track and order all your purchase orders.
""",
"depends" : ["purchase","mrp"],
"init_xml" : [],
"demo_xml" : [],
- "update_xml" : ["purchase_tender_view.xml","security/ir.model.access.csv","purchase_tender_sequence.xml"],
+ "update_xml" : ["purchase_requisition_view.xml","security/ir.model.access.csv","purchase_requisition_sequence.xml"],
"active": False,
"installable": True
}
diff --git a/addons/purchase_requisition/i18n/fr_BE.po b/addons/purchase_requisition/i18n/fr_BE.po
new file mode 100644
index 00000000000..964e58391a2
--- /dev/null
+++ b/addons/purchase_requisition/i18n/fr_BE.po
@@ -0,0 +1,134 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * purchase_requisition
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
+"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_requisition
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML incorrect pour l'Architecture des Vues!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Date End"
+msgstr "Date de fin"
+
+#. module: purchase_requisition
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+msgid "Purchase requisition"
+msgstr "Appel d'Offre"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition
+msgid "Purchase requisitions"
+msgstr "Appels d'offre"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_draft
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_draft
+msgid "Draft Purchase requisitions"
+msgstr "Appels d'Offre brouillons"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Etat"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_open
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_open
+msgid "Open Purchase requisitions"
+msgstr "Appels d'offre ouverts"
+
+#. module: purchase_requisition
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle incorrect pour la définition de l'action"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase requisition"
+msgstr "Achat - Appel d'offre"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,name:0
+msgid "requisition Reference"
+msgstr "Référence"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Close"
+msgstr "Clôturé"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_start:0
+msgid "Date Start"
+msgstr "Date de début"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid " This module allows you to manage your Purchase requisitions. When a purchase order is created, you now have the opportunity to save the related requisition. \n"
+" This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
+""
+msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
+" Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
+""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_new
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_new
+msgid "New Purchase requisitions"
+msgstr "Nouveaux Appels d'Offre"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Bons d'achat"
+
diff --git a/addons/purchase_tender/purchase_tender.py b/addons/purchase_requisition/purchase_requisition.py
similarity index 59%
rename from addons/purchase_tender/purchase_tender.py
rename to addons/purchase_requisition/purchase_requisition.py
index db3bec835fd..4a8fc7aadca 100644
--- a/addons/purchase_tender/purchase_tender.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -25,54 +25,56 @@ from osv import orm
import netsvc
import time
-class purchase_tender(osv.osv):
- _name = "purchase.tender"
- _description="Purchase Tender"
+class purchase_requisition(osv.osv):
+ _name = "purchase.requisition"
+ _description="Purchase requisition"
_columns = {
- 'name': fields.char('Tender Reference', size=32,required=True),
- 'date_start': fields.datetime('Date Start'),
- 'date_end': fields.datetime('Date End'),
+ 'name': fields.char('Requisition Reference', size=32,required=True),
+ 'origin': fields.char('Origin', size=32),
+ 'date_start': fields.datetime('Requisition Date'),
+ 'date_end': fields.datetime('Requisition Deadline'),
'user_id': fields.many2one('res.users', 'Responsible'),
- 'exclusive': fields.boolean('Exclusive', help="If the tender is exclusive, it will cancel all purchase orders when you confirm one of them"),
+ 'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', help="If the requisition is exclusive, it will cancel all purchase orders when you confirm one of them", required=True),
'description': fields.text('Description'),
- 'purchase_ids' : fields.one2many('purchase.order','tender_id','Purchase Orders'),
- 'line_ids' : fields.one2many('purchase.tender.line','tender_id','Products to Purchase'),
- 'state': fields.selection([('draft','Draft'),('open','Open'),('close','Close')], 'State', required=True)
+ 'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'),
+ 'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase'),
+ 'state': fields.selection([('draft','Draft'),('open','Open'),('cancel','Cancelled'),('close','Close')], 'State', required=True)
}
_defaults = {
'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
'state': lambda *args: 'open',
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.tender'),
+ 'exclusive': lambda *args: 'multiple',
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
}
-purchase_tender()
+purchase_requisition()
-class purchase_tender_line(osv.osv):
- _name = "purchase.tender.line"
- _description="Purchase Tender Line"
+class purchase_requisition_line(osv.osv):
+ _name = "purchase.requisition.line"
+ _description="Purchase Requisition Line"
_rec_name = 'product_id'
_columns = {
'product_id': fields.many2one('product.product', 'Product'),
'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
'product_qty': fields.float('Date End', digits=(16,2)),
- 'tender_id' : fields.many2one('purchase.tender','Purchase Tender', ondelete='cascade')
+ 'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade')
}
-purchase_tender_line()
+purchase_requisition_line()
class purchase_order(osv.osv):
_inherit = "purchase.order"
_description = "purchase order"
_columns = {
- 'tender_id' : fields.many2one('purchase.tender','Purchase Tender')
+ 'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
}
def wkf_confirm_order(self, cr, uid, ids, context={}):
res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
for po in self.browse(cr, uid, ids, context):
- if po.tender_id and po.tender_id.exclusive:
- for order in po.tender_id.purchase_ids:
+ if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
+ for order in po.requisition_id.purchase_ids:
if order.id<>po.id:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
- self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close'})
+ self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close'})
return res
purchase_order()
@@ -80,10 +82,10 @@ purchase_order()
class product_product(osv.osv):
_inherit = 'product.product'
_columns = {
- 'purchase_tender': fields.boolean('Purchase Tender', help="Check this box so that requisitions generates purchase tenders instead of directly requests for quotations.")
+ 'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that requisitions generates purchase requisitions instead of directly requests for quotations.")
}
_defaults = {
- 'purchase_tender': lambda *args: False
+ 'purchase_requisition': lambda *args: False
}
product_product()
@@ -94,9 +96,11 @@ class mrp_procurement(osv.osv):
res = super(mrp_procurement, self).make_po(cr, uid, ids, context)
for proc_id,po_id in res.items():
procurement = self.browse(cr, uid, proc_id)
- if procurement.product_id.purchase_tender:
- self.pool.get('purchase.tender').create(cr, uid, {
+ if procurement.product_id.purchase_requisition:
+ self.pool.get('purchase.requisition').create(cr, uid, {
'name': procurement.name,
+ 'origin': procurement.name,
+ 'date_end': procurement.date_planned,
'lines_ids': [(0,0,{
'product_id': procurement.product_id.id,
'product_uom_id': procurement.product_uom.id,
@@ -105,4 +109,5 @@ class mrp_procurement(osv.osv):
})],
'purchase_ids': [(6,0,[po_id])]
})
+ return res
mrp_procurement()
diff --git a/addons/purchase_requisition/purchase_requisition_sequence.xml b/addons/purchase_requisition/purchase_requisition_sequence.xml
new file mode 100644
index 00000000000..c0b08ec11d4
--- /dev/null
+++ b/addons/purchase_requisition/purchase_requisition_sequence.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+ Purchase Requisition Order
+ purchase.order.requisition
+
+
+ Purchase Requisition Order
+ purchase.order.requisition
+ TE
+ 5
+
+
+
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
similarity index 69%
rename from addons/purchase_tender/purchase_tender_view.xml
rename to addons/purchase_requisition/purchase_requisition_view.xml
index b64d9c54ae6..e911305df32 100644
--- a/addons/purchase_tender/purchase_tender_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -9,7 +9,7 @@
-
+
@@ -21,21 +21,25 @@
-
+
-
- purchase.tender.form
+
+ purchase.requisition.form
form
- purchase.tender
+ purchase.requisition
-
-
- purchase.tender.tree
+
+ purchase.requisition.tree
tree
- purchase.tender
+ purchase.requisition
-
+
+
-
- Purchase Tenders
+
+ Purchase Requisitions
ir.actions.act_window
- purchase.tender
+ purchase.requisition
form
-
+
product.form.inherit
@@ -93,7 +102,7 @@
-
+
diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
new file mode 100644
index 00000000000..42eeadf77f9
--- /dev/null
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_purchase_requisition","purchase.requisition","model_purchase_requisition",purchase.group_purchase_user,1,1,1,1
+"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line",purchase.group_purchase_user,1,1,1,1
diff --git a/addons/purchase_tender/i18n/fr_BE.po b/addons/purchase_tender/i18n/fr_BE.po
deleted file mode 100644
index 5b9c10ca2cb..00000000000
--- a/addons/purchase_tender/i18n/fr_BE.po
+++ /dev/null
@@ -1,134 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * purchase_tender
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
-"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: purchase_tender
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML incorrect pour l'Architecture des Vues!"
-
-#. module: purchase_tender
-#: field:purchase.tender,date_end:0
-msgid "Date End"
-msgstr "Date de fin"
-
-#. module: purchase_tender
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
-
-#. module: purchase_tender
-#: view:purchase.tender:0
-#: field:purchase.tender,description:0
-msgid "Description"
-msgstr "Description"
-
-#. module: purchase_tender
-#: model:ir.model,name:purchase_tender.model_purchase_tender
-#: field:purchase.order,tender_id:0
-#: view:purchase.tender:0
-msgid "Purchase Tender"
-msgstr "Appel d'Offre"
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_tender
-msgid "Purchase Tenders"
-msgstr "Appels d'offre"
-
-#. module: purchase_tender
-#: selection:purchase.tender,state:0
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: purchase_tender
-#: field:purchase.tender,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_draft
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_draft
-msgid "Draft Purchase Tenders"
-msgstr "Appels d'Offre brouillons"
-
-#. module: purchase_tender
-#: field:purchase.tender,state:0
-msgid "State"
-msgstr "Etat"
-
-#. module: purchase_tender
-#: selection:purchase.tender,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_open
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_open
-msgid "Open Purchase Tenders"
-msgstr "Appels d'offre ouverts"
-
-#. module: purchase_tender
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de modèle incorrect pour la définition de l'action"
-
-#. module: purchase_tender
-#: model:ir.module.module,shortdesc:purchase_tender.module_meta_information
-msgid "Purchase - Purchase Tender"
-msgstr "Achat - Appel d'offre"
-
-#. module: purchase_tender
-#: field:purchase.tender,name:0
-msgid "Tender Reference"
-msgstr "Référence"
-
-#. module: purchase_tender
-#: selection:purchase.tender,state:0
-msgid "Close"
-msgstr "Clôturé"
-
-#. module: purchase_tender
-#: field:purchase.tender,date_start:0
-msgid "Date Start"
-msgstr "Date de début"
-
-#. module: purchase_tender
-#: view:purchase.tender:0
-msgid "Quotations"
-msgstr ""
-
-#. module: purchase_tender
-#: model:ir.module.module,description:purchase_tender.module_meta_information
-msgid " This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. \n"
-" This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
-""
-msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
-" Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
-""
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_new
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_new
-msgid "New Purchase Tenders"
-msgstr "Nouveaux Appels d'Offre"
-
-#. module: purchase_tender
-#: field:purchase.tender,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "Bons d'achat"
-
diff --git a/addons/purchase_tender/purchase_tender_sequence.xml b/addons/purchase_tender/purchase_tender_sequence.xml
deleted file mode 100644
index 222e3f46282..00000000000
--- a/addons/purchase_tender/purchase_tender_sequence.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Purchase Tender Order
- purchase.order.tender
-
-
- Purchase Tender Order
- purchase.order.tender
- TE
- 5
-
-
-
diff --git a/addons/purchase_tender/security/ir.model.access.csv b/addons/purchase_tender/security/ir.model.access.csv
deleted file mode 100644
index 54efce5219f..00000000000
--- a/addons/purchase_tender/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_tender","purchase.tender","model_purchase_tender",,1,1,1,1
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 2a11795109b..8617e8a8f4c 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -13,7 +13,7 @@
-
+
@@ -98,7 +98,7 @@
form
tree,form
- {"search_default_My Resources":1}
+ {"search_default_my_resources":1}
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 106bdd8793d..5da1a96f8d4 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -33,7 +33,7 @@
-
+
@@ -66,8 +66,8 @@
-
-
+
+
@@ -158,8 +158,8 @@
-
-
+
+
@@ -167,7 +167,7 @@
-
+
@@ -200,8 +200,8 @@
-
-
+
+
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 150542e2c7e..fb0ae387000 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -45,11 +45,11 @@
@@ -57,7 +57,7 @@
string="Quotations"
domain="[('state','=','draft')]"/>
@@ -73,7 +73,7 @@
-
+
@@ -91,7 +91,7 @@
sale.report
form
tree,graph
- {"search_default_This Year":1,"search_default_This Month":1,"search_default_Sales":1,"search_default_Salesman":1}
+ {"search_default_this_year":1,"search_default_this_month":1,"search_default_sales":1,"search_default_by_user":1}
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8b77719171a..5428cd1c360 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -776,12 +776,12 @@ class sale_order_line(osv.osv):
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
'invoiced': fields.boolean('Invoiced', readonly=True),
- 'procurement_id': fields.many2one('mrp.procurement', 'Requisition'),
+ 'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
- 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Requisition Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+ 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1e1c3f427ab..fd55e6587a8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -98,11 +98,11 @@
-
+
-
-
+
+
@@ -211,25 +212,25 @@
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
@@ -237,7 +238,7 @@
-
+
@@ -260,7 +261,7 @@
-
+
@@ -280,7 +281,7 @@
sale.order
form
tree,form,calendar,graph
- {"search_default_My Sale":1}
+ {"search_default_my_sale":1}
@@ -368,43 +369,43 @@
-
+
@@ -264,7 +264,7 @@
-
+
@@ -287,7 +287,7 @@
form
- {'full':'1',"search_default_Available":1}
+ {'full':'1',"search_default_available":1}
@@ -304,7 +304,7 @@
-
+
@@ -326,7 +326,7 @@
-
+
@@ -607,7 +607,7 @@
-
+
@@ -639,7 +639,7 @@
-
@@ -656,7 +656,7 @@
-
+
@@ -695,7 +695,7 @@
-
+
@@ -769,7 +769,7 @@
-
+
@@ -778,6 +778,7 @@
name="%(stock.track_line)d"
string="Split in production lots"
type="action" icon="gtk-justify-fill"
+ groups="base.group_extended"
states="draft,waiting,confirmed,assigned" />
-
@@ -851,7 +852,7 @@
-
+
@@ -877,7 +878,7 @@
form
tree,form,calendar
[('type','=','delivery')]
- {'contact_display': 'partner',"search_default_Available":1}
+ {'contact_display': 'partner',"search_default_available":1}
@@ -958,7 +959,7 @@
-
+
@@ -989,7 +990,7 @@
-
@@ -1144,7 +1145,7 @@
-
+
-
@@ -1224,7 +1225,7 @@
-
+
@@ -1250,7 +1251,7 @@
form
tree,form,calendar
[('type','=','in')]
- {'contact_display': 'partner',"search_default_Available":1}
+ {'contact_display': 'partner',"search_default_available":1}
@@ -1280,7 +1281,7 @@
-
+
@@ -1303,7 +1304,7 @@
form
tree,form,calendar
[('type','=','internal')]
- {'contact_display': 'partner',"search_default_Confirmed":1}
+ {'contact_display': 'partner',"search_default_confirmed":1}
@@ -1320,7 +1321,7 @@
-
+
@@ -1368,7 +1369,7 @@
-
@@ -1398,13 +1399,12 @@
-
-
-
+
+
-
-
-
+
+
+
@@ -1439,12 +1439,12 @@
-
+
-
+
@@ -1464,22 +1464,22 @@
-
-
-
+
+
+
-
+
-
@@ -1488,7 +1488,7 @@
-
+
@@ -1513,12 +1513,12 @@
-
+
-
-
+
+
@@ -1539,7 +1539,7 @@
tree,form
[('picking_id','!=',False),('picking_id.type','=','in')]
- {"search_default_To Receive":1}
+ {"search_default_receive":1}
@@ -1568,7 +1568,7 @@
-
+
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_view.xml
index b3730cb4979..bdb62963c09 100644
--- a/addons/stock_location/stock_view.xml
+++ b/addons/stock_location/stock_view.xml
@@ -40,7 +40,7 @@
form
-
+
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 00ebeab629d..eaf89f408e4 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/i18n/ko.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:34+0000\n"
-"Last-Translator: ekodaq \n"
+"PO-Revision-Date: 2010-04-15 00:45+0000\n"
+"Last-Translator: Bundo \n"
"Language-Team: Korean \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_no_autopicking
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
#. module: stock_no_autopicking
#: field:product.product,auto_pick:0
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index cc8f3ca3833..14bf00d8def 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:16+0000\n"
-"Last-Translator: ekodaq \n"
+"PO-Revision-Date: 2010-04-15 01:06+0000\n"
+"Last-Translator: Bundo \n"
"Language-Team: Korean \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription
@@ -62,7 +62,7 @@ msgstr "현재 날짜"
#. module: subscription
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
#. module: subscription
#: selection:subscription.subscription,interval_type:0
|