Better name: use purchase.request instead of stock.purchase_request

This commit is contained in:
Bertrand Chenal committed 2008-10-10 23:08:19 +02:00
1 parent 902b63d761
commit 74faef0a12
3 files changed
+61 -51

No files matched your search

+24 -24
View File
@@ -7,34 +7,34 @@ field,"stock.order_point,location",0,Location,Ort,0
field,"stock.order_point,max_quantity",0,Maximal Quantity,Maximale Anzahl,0
field,"stock.order_point,min_quantity",0,Minimal Quantity,Minimale Anzahl,0
field,"stock.order_point,product",0,Product,Artikel,0
field,"stock.purchase_request,company",0,Company,Unternehmen,0
field,"stock.purchase_request.create_purchase.ask,company",0,Company,Unternehmen,0
field,"stock.purchase_request.create_purchase.ask,party",0,Supplier,Lieferant,0
field,"stock.purchase_request.create_purchase.ask,payment_term",0,Payment Term,Zahlungsbedingung,0
field,"stock.purchase_request,party",0,Party,Partei,0
field,"stock.purchase_request,product",0,Product,Artikel,0
field,"stock.purchase_request,purchase",0,Purchase,Bestellung,0
field,"stock.purchase_request,purchase_date",0,Best Purchase Date,Bestes Einkaufsdatum,0
field,"stock.purchase_request,purchase_line",0,Purchase Line,Position Bestellung,0
field,"stock.purchase_request,quantity",0,Quantity,Menge,0
field,"stock.purchase_request,state",0,State,Status,0
field,"stock.purchase_request,stock_level",0,Stock at Supply Date,Lagerbestand am Lieferdatum,0
field,"stock.purchase_request,supply_date",0,Expected Supply Date,Voraussichtliches Lieferdatum,0
field,"stock.purchase_request,uom",0,UOM,Maßeinheit,0
field,"stock.purchase_request,warehouse",0,Warehouse,Warenlager,0
field,"purchase.request,company",0,Company,Unternehmen,0
field,"purchase.request.create_purchase.ask,company",0,Company,Unternehmen,0
field,"purchase.request.create_purchase.ask,party",0,Supplier,Lieferant,0
field,"purchase.request.create_purchase.ask,payment_term",0,Payment Term,Zahlungsbedingung,0
field,"purchase.request,party",0,Party,Partei,0
field,"purchase.request,product",0,Product,Artikel,0
field,"purchase.request,purchase",0,Purchase,Bestellung,0
field,"purchase.request,purchase_date",0,Best Purchase Date,Bestes Einkaufsdatum,0
field,"purchase.request,purchase_line",0,Purchase Line,Position Bestellung,0
field,"purchase.request,quantity",0,Quantity,Menge,0
field,"purchase.request,state",0,State,Status,0
field,"purchase.request,stock_level",0,Stock at Supply Date,Lagerbestand am Lieferdatum,0
field,"purchase.request,supply_date",0,Expected Supply Date,Voraussichtliches Lieferdatum,0
field,"purchase.request,uom",0,UOM,Maßeinheit,0
field,"purchase.request,warehouse",0,Warehouse,Warenlager,0
model,"ir.action,name",wizard_create_purchase,Create Purchase,Auftrag erstellen,0
model,"ir.action,name",act_order_point_form,Order Points,Bestellpunkte,0
model,"ir.action,name",act_purchase_request_form,Purchase Requests,Bestellung,0
model,"ir.ui.menu,name",menu_order_point_form,Order Points,Bestellpunkte,0
model,"ir.ui.menu,name",menu_purchase_request_form,Purchase Requests,Bestellungen,0
selection,"stock.purchase_request,state",0,Cancel,Abbrechen,0
selection,"stock.purchase_request,state",0,Done,Erledigt,0
selection,"stock.purchase_request,state",0,Draft,Entwurf,0
selection,"stock.purchase_request,state",0,Purchased,Bestellt,0
selection,"purchase.request,state",0,Cancel,Abbrechen,0
selection,"purchase.request,state",0,Done,Erledigt,0
selection,"purchase.request,state",0,Draft,Entwurf,0
selection,"purchase.request,state",0,Purchased,Bestellt,0
view,stock.order_point,0,Locations,Lagerorte,0
view,stock.order_point,0,Order Point,Bestellpunkt,0
view,stock.purchase_request,0,Purchase Request,Bestellung,0
view,stock.purchase_request,0,Purchase Requests,Bestellung,0
view,stock.purchase_request.create_purchase.ask,0,Create Purchase Request: Missing Payment Term,Auftrag erstellen: Fehlende Zahlungsbedingung,0
wizard_button,"stock.purchase_request.create_purchase,ask_user,end",0,Cancel,Abbrechen,0
wizard_button,"stock.purchase_request.create_purchase,ask_user,init",0,Continue,Fortfahren,0
view,purchase.request,0,Purchase Request,Bestellung,0
view,purchase.request,0,Purchase Requests,Bestellung,0
view,purchase.request.create_purchase.ask,0,Create Purchase Request: Missing Payment Term,Auftrag erstellen: Fehlende Zahlungsbedingung,0
wizard_button,"purchase.request.create_purchase,ask_user,end",0,Cancel,Abbrechen,0
wizard_button,"purchase.request.create_purchase,ask_user,init",0,Continue,Fortfahren,0
1 type name res_id src value fuzzy
7 field stock.order_point,max_quantity 0 Maximal Quantity Maximale Anzahl 0
8 field stock.order_point,min_quantity 0 Minimal Quantity Minimale Anzahl 0
9 field stock.order_point,product 0 Product Artikel 0
10 field stock.purchase_request,company purchase.request,company 0 Company Unternehmen 0
11 field stock.purchase_request.create_purchase.ask,company purchase.request.create_purchase.ask,company 0 Company Unternehmen 0
12 field stock.purchase_request.create_purchase.ask,party purchase.request.create_purchase.ask,party 0 Supplier Lieferant 0
13 field stock.purchase_request.create_purchase.ask,payment_term purchase.request.create_purchase.ask,payment_term 0 Payment Term Zahlungsbedingung 0
14 field stock.purchase_request,party purchase.request,party 0 Party Partei 0
15 field stock.purchase_request,product purchase.request,product 0 Product Artikel 0
16 field stock.purchase_request,purchase purchase.request,purchase 0 Purchase Bestellung 0
17 field stock.purchase_request,purchase_date purchase.request,purchase_date 0 Best Purchase Date Bestes Einkaufsdatum 0
18 field stock.purchase_request,purchase_line purchase.request,purchase_line 0 Purchase Line Position Bestellung 0
19 field stock.purchase_request,quantity purchase.request,quantity 0 Quantity Menge 0
20 field stock.purchase_request,state purchase.request,state 0 State Status 0
21 field stock.purchase_request,stock_level purchase.request,stock_level 0 Stock at Supply Date Lagerbestand am Lieferdatum 0
22 field stock.purchase_request,supply_date purchase.request,supply_date 0 Expected Supply Date Voraussichtliches Lieferdatum 0
23 field stock.purchase_request,uom purchase.request,uom 0 UOM Maßeinheit 0
24 field stock.purchase_request,warehouse purchase.request,warehouse 0 Warehouse Warenlager 0
25 model ir.action,name wizard_create_purchase Create Purchase Auftrag erstellen 0
26 model ir.action,name act_order_point_form Order Points Bestellpunkte 0
27 model ir.action,name act_purchase_request_form Purchase Requests Bestellung 0
28 model ir.ui.menu,name menu_order_point_form Order Points Bestellpunkte 0
29 model ir.ui.menu,name menu_purchase_request_form Purchase Requests Bestellungen 0
30 selection stock.purchase_request,state purchase.request,state 0 Cancel Abbrechen 0
31 selection stock.purchase_request,state purchase.request,state 0 Done Erledigt 0
32 selection stock.purchase_request,state purchase.request,state 0 Draft Entwurf 0
33 selection stock.purchase_request,state purchase.request,state 0 Purchased Bestellt 0
34 view stock.order_point 0 Locations Lagerorte 0
35 view stock.order_point 0 Order Point Bestellpunkt 0
36 view stock.purchase_request purchase.request 0 Purchase Request Bestellung 0
37 view stock.purchase_request purchase.request 0 Purchase Requests Bestellung 0
38 view stock.purchase_request.create_purchase.ask purchase.request.create_purchase.ask 0 Create Purchase Request: Missing Payment Term Auftrag erstellen: Fehlende Zahlungsbedingung 0
39 wizard_button stock.purchase_request.create_purchase,ask_user,end purchase.request.create_purchase,ask_user,end 0 Cancel Abbrechen 0
40 wizard_button stock.purchase_request.create_purchase,ask_user,init purchase.request.create_purchase,ask_user,init 0 Continue Fortfahren 0
+11 -11
View File
@@ -8,7 +8,7 @@ import datetime
# (uom, qty, product, ...).
class PurchaseRequest(OSV):
'Purchase Request'
_name = 'stock.purchase_request'
_name = 'purchase.request'
_description = __doc__
product = fields.Many2One(
@@ -89,7 +89,7 @@ class PurchaseRequest(OSV):
create today to meet product outputs.
"""
order_point_obj = self.pool.get('stock.order_point')
purchase_request_obj = self.pool.get('stock.purchase_request')
purchase_request_obj = self.pool.get('purchase.request')
product_obj = self.pool.get('product.product')
location_obj = self.pool.get('stock.location')
user_obj = self.pool.get('res.user')
@@ -158,7 +158,7 @@ class PurchaseRequest(OSV):
"""
# delete purchase request without a purchase line
uom_obj = self.pool.get('product.uom')
request_obj = self.pool.get('stock.purchase_request')
request_obj = self.pool.get('purchase.request')
product_supplier_obj = self.pool.get('purchase.product_supplier')
req_ids = request_obj.search(
cursor, user, [('purchase_line', '=', False)], context=context)
@@ -375,7 +375,7 @@ PurchaseRequest()
class CreatePurchaseAskTerm(WizardOSV):
_name = 'stock.purchase_request.create_purchase.ask_term'
_name = 'purchase.request.create_purchase.ask_term'
party = fields.Many2One('relationship.party', 'Supplier', readonly=True)
company = fields.Many2One('company.company', 'Company', readonly=True)
payment_term = fields.Many2One(
@@ -384,7 +384,7 @@ class CreatePurchaseAskTerm(WizardOSV):
CreatePurchaseAskTerm()
class CreatePurchaseAskParty(WizardOSV):
_name = 'stock.purchase_request.create_purchase.ask_party'
_name = 'purchase.request.create_purchase.ask_party'
product = fields.Many2One('product.product', 'Product', readonly=True)
company = fields.Many2One('company.company', 'Company', readonly=True)
party = fields.Many2One('relationship.party', 'Supplier', required=True)
@@ -393,7 +393,7 @@ CreatePurchaseAskParty()
class CreatePurchase(Wizard):
'Create Purchase'
_name = 'stock.purchase_request.create_purchase'
_name = 'purchase.request.create_purchase'
states = {
@@ -409,7 +409,7 @@ class CreatePurchase(Wizard):
'actions': ['_set_default_party'],
'result': {
'type': 'form',
'object': 'stock.purchase_request.create_purchase.ask_party',
'object': 'purchase.request.create_purchase.ask_party',
'state': [
('end', 'Cancel', 'tryton-cancel'),
('init', 'Continue', 'tryton-ok', True),
@@ -421,7 +421,7 @@ class CreatePurchase(Wizard):
'actions': ['_set_default_term'],
'result': {
'type': 'form',
'object': 'stock.purchase_request.create_purchase.ask_term',
'object': 'purchase.request.create_purchase.ask_term',
'state': [
('end', 'Cancel', 'tryton-cancel'),
('init', 'Continue', 'tryton-ok', True),
@@ -433,7 +433,7 @@ class CreatePurchase(Wizard):
def _set_default_party(self, cursor, user, data, context=None):
request_obj = self.pool.get('stock.purchase_request')
request_obj = self.pool.get('purchase.request')
requests = request_obj.browse(cursor, user, data['ids'], context=context)
for request in requests:
if request.purchase_line:
@@ -445,7 +445,7 @@ class CreatePurchase(Wizard):
def _set_default_term(self, cursor, user, data, context=None):
request_obj = self.pool.get('stock.purchase_request')
request_obj = self.pool.get('purchase.request')
requests = request_obj.browse(cursor, user, data['ids'], context=context)
for request in requests:
if (not request.party) or request.purchase_line:
@@ -456,7 +456,7 @@ class CreatePurchase(Wizard):
return {'party': request.party.id,'company': request.company.id}
def _create_purchase(self, cursor, user, data, context=None):
request_obj = self.pool.get('stock.purchase_request')
request_obj = self.pool.get('purchase.request')
party_obj = self.pool.get('relationship.party')
purchase_obj = self.pool.get('purchase.purchase')
product_obj = self.pool.get('product.product')
+26 -16
View File
@@ -3,7 +3,7 @@
<tryton>
<data>
<record model="ir.ui.view" id="purchase_request_view_form">
<field name="model">stock.purchase_request</field>
<field name="model">purchase.request</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
@@ -35,7 +35,7 @@
</field>
</record>
<record model="ir.ui.view" id="purchase_request_view_tree">
<field name="model">stock.purchase_request</field>
<field name="model">purchase.request</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<![CDATA[
@@ -56,7 +56,7 @@
<record model="ir.action.act_window" id="act_purchase_request_form">
<field name="name">Purchase Requests</field>
<field name="res_model">stock.purchase_request</field>
<field name="res_model">purchase.request</field>
<field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_purchase_request_form_view1">
@@ -74,7 +74,7 @@
action="act_purchase_request_form" id="menu_purchase_request_form"/>
<record model="ir.ui.view" id="purchase_request_create_purchase_ask_view_form">
<field name="model">stock.purchase_request.create_purchase.ask_term</field>
<field name="model">purchase.request.create_purchase.ask_term</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
@@ -90,7 +90,7 @@
</field>
</record>
<record model="ir.ui.view" id="purchase_request_create_purchase_ask_party">
<field name="model">stock.purchase_request.create_purchase.ask_party</field>
<field name="model">purchase.request.create_purchase.ask_party</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
@@ -107,12 +107,12 @@
</record>
<record model="ir.action.wizard" id="wizard_create_purchase">
<field name="name">Create Purchase</field>
<field name="wiz_name">stock.purchase_request.create_purchase</field>
<field name="model">stock.purchase_request</field>
<field name="wiz_name">purchase.request.create_purchase</field>
<field name="model">purchase.request</field>
</record>
<record model="ir.action.keyword" id="create_purchase_keyword">
<field name="keyword">form_action</field>
<field name="model">stock.purchase_request,0</field>
<field name="model">purchase.request,0</field>
<field name="action" ref="wizard_create_purchase"/>
</record>
@@ -120,36 +120,46 @@
<field name="name">Purchases</field>
<field name="res_model">purchase.purchase</field>
<field name="view_type">form</field>
<field name="domain">[("id", "=", purchase)]</field>
<field name="domain">[("id", "=", purchase)]</field> <!-- FIXME does not work -->
</record>
<record model="ir.action.act_window.view" id="act_purchase_form_view1">
<field name="sequence" eval="20"/>
<field name="view" ref="purchase.purchase_view_tree"/>
<field name="act_window" ref="act_purchase_form"/>
</record>
<record model="ir.action.act_window.view" id="act_purchase_form_view2">
<field name="sequence" eval="10"/>
<field name="view" ref="purchase.purchase_view_form"/>
<field name="act_window" ref="act_purchase_form"/>
</record>
<record model="ir.action.keyword"
id="act_open_purchase_keyword1">
<field name="keyword">form_relate</field>
<field name="model">stock.purchase_request,0</field>
<field name="model">purchase.request,0</field>
<field name="action" ref="act_purchase_form"/>
</record>
<record model="ir.rule.group" id="rule_group_purchase_request">
<field name="model" search="[('model', '=', 'stock.purchase_request')]"/>
<field name="model" search="[('model', '=', 'purchase.request')]"/>
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_purchase_request">
<field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'stock.purchase_request')]"/>
<field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'purchase.request')]"/>
<field name="operator">=</field>
<field name="operand">User/Current Company</field>
<field name="rule_group" ref="rule_group_purchase_request"/>
</record>
<record model="ir.model.access" id="access_purchase_request">
<field name="model" search="[('model', '=', 'stock.purchase_request')]"/>
<field name="model" search="[('model', '=', 'purchase.request')]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="False"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.model.access" id="access_purchase_request_admin">
<field name="model" search="[('model', '=', 'stock.purchase_request')]"/>
<field name="model" search="[('model', '=', 'purchase.request')]"/>
<field name="group" ref="purchase.group_purchase"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
@@ -160,7 +170,7 @@
<field name="name">Purchase Request Cron</field>
</record>
<record model="ir.model.access" id="access_purchase_request_cron">
<field name="model" search="[('model', '=', 'stock.purchase_request')]"/>
<field name="model" search="[('model', '=', 'purchase.request')]"/>
<field name="group" ref="group_purchase_request"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
@@ -184,7 +194,7 @@
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
<field name="model">stock.purchase_request</field>
<field name="model">purchase.request</field>
<field name="function">generate_requests</field>
<field name="priority">5</field>
</record>