diff --git a/de_DE.csv b/de_DE.csv index 0dce703b5d..804dfa4c35 100644 --- a/de_DE.csv +++ b/de_DE.csv @@ -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 diff --git a/purchase_request.py b/purchase_request.py index 949c39a7a2..c113fb70d4 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -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') diff --git a/purchase_request.xml b/purchase_request.xml index 35ef112dbe..91f0ccd6ee 100644 --- a/purchase_request.xml +++ b/purchase_request.xml @@ -3,7 +3,7 @@ - stock.purchase_request + purchase.request form - stock.purchase_request + purchase.request tree Purchase Requests - stock.purchase_request + purchase.request form @@ -74,7 +74,7 @@ action="act_purchase_request_form" id="menu_purchase_request_form"/> - stock.purchase_request.create_purchase.ask_term + purchase.request.create_purchase.ask_term form - stock.purchase_request.create_purchase.ask_party + purchase.request.create_purchase.ask_party form Create Purchase - stock.purchase_request.create_purchase - stock.purchase_request + purchase.request.create_purchase + purchase.request form_action - stock.purchase_request,0 + purchase.request,0 @@ -120,36 +120,46 @@ Purchases purchase.purchase form - [("id", "=", purchase)] + [("id", "=", purchase)] + + + + + + + + + + form_relate - stock.purchase_request,0 + purchase.request,0 - + - + = User/Current Company - + - + @@ -160,7 +170,7 @@ Purchase Request Cron - + @@ -184,7 +194,7 @@ days -1 - stock.purchase_request + purchase.request generate_requests 5