bzr revid: nel@tinyerp.com-20100615084718-jtmo6qh8l5emrnde
This commit is contained in:
nel@tinyerp.com
2010-06-15 10:47:18 +02:00
14 changed files with 651 additions and 124 deletions
@@ -14,7 +14,7 @@
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field>
<field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field>
<field name="search_view_id" ref="purchase.purchase_order_tree"/>
</record>
<record id="purchase_waiting" model="ir.actions.act_window">
@@ -23,7 +23,7 @@
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
<field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
<field name="search_view_id" ref="purchase.purchase_order_tree"/>
</record>
@@ -38,6 +38,10 @@
<action colspan="4" height="220" name="%(purchase_draft)d" string="Draft Purchase Order" width="510"/>
<action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order in Waiting" width="510"/>
</child1>
<child2>
<action colspan="4" height="220" name="%(purchase.action_purchase_order_report_graph)d" string="Total Qty and Amount by month" />
<action colspan="4" height="220" name="%(purchase.action_purchase_order_by_user_all)d" string="Total Orders Lines by User per month" />
</child2>
</hpaned>
</form>
</field>
+10 -12
View File
@@ -20,19 +20,17 @@
<newline />
<field name="subject" />
<newline />
<field name="body_text" />
<newline />
<!-- <field name="body_html" widget="text_html" />-->
<!--
Removed text_html because it doesnt work in GTK
And TinyMCE messes up the HTML in Web Client
-->
<field name="body_html"/>
<separator string= "Body(Text)" colspan="2"/>
<newline/>
<field name="body_text" nolabel="1" colspan="2"/>
<newline/>
<separator string= "Body(Html)" colspan="2"/>
<newline/>
<field name="body_html" nolabel="1" colspan="2"/>
<newline />
<field name="report" />
<group>
<button icon="gtk-ok" special="cancel" string="OK" />
</group>
<newline/>
<button icon="gtk-ok" special="cancel" string="OK" colspan="2"/>
</form>
</field>
</record>
@@ -44,7 +42,7 @@
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="auto_refresh" eval="1" >
<field name="auto_refresh" eval="1" />
<field name="target">new</field>
<field name="context">{'template_id':active_id}</field>
</record>
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-06-15 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
+52 -35
View File
@@ -27,6 +27,7 @@ from dateutil.relativedelta import relativedelta
from osv import fields, osv
import netsvc
import tools
from tools.translate import _
_intervalTypes = {
'hours': lambda interval: relativedelta(hours=interval),
@@ -278,41 +279,6 @@ class marketing_campaign_activity(osv.osv):
print 'Sending Email Init', activity.name
return self.pool.get('email.template').generate_mail(cr, uid, activity.email_template_id.id, [workitem.res_id], context=context)
#if not template.enforce_from_account:
# self.pool.get('marketing.campaign.workitem').write(cr, uid, [workitem.id], {
# 'error_msg': 'There is no account defined for the email',
# 'state': 'exception'
# })
# return False
#if not workitem.partner_id.email:
# self.pool.get('marketing.campaign.workitem').write(cr, uid, [workitem.id], {
# 'error_msg': "There is no email defined for the partner",
# 'state': 'exception'
# })
# return False
#vals = {
# 'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
# 'email_to': template.email_to,
# 'email_cc': template.email_cc,
# 'email_bcc': template.email_bcc,
# 'subject': template.def_subject,
# 'body_text': template.def_body_text,
# 'body_html': template.def_body_html,
# 'account_id': accounts.id,
# 'state':'na',
# 'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
#}
# # if accounts.use_sign:
# # signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
# # if signature:
# # vals['pem_body_text'] = tools.ustr(vals['pem_body_text'] or '') + signature
# # vals['pem_body_html'] = tools.ustr(vals['pem_body_html'] or '') + signature
##Create partly the mail and later update attachments
#print 'Sending Email', vals
#mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
return True
def process_wi_action(self, cr, uid, activity, workitem, context={}):
context = {}
server_obj = self.pool.get('ir.actions.server')
@@ -470,6 +436,42 @@ class marketing_campaign_workitem(osv.osv):
if workitem_ids:
self.process(cr, uid, workitem_ids, context)
def preview(self, cr, uid, ids, context):
res = {}
wi_obj = self.browse(cr, uid, ids)[0]
if wi_obj.activity_id.type == 'email':
data_obj = self.pool.get('ir.model.data')
data_id = data_obj._get_id(cr, uid, 'email_template', 'email_template_preview_form')
if data_id:
view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
res = {
'name': _('Email Preview'),
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'email_template.preview',
'view_id': False,
'context': context,
'views': [(view_id, 'form')],
'type': 'ir.actions.act_window',
'target': 'new',
'nodestroy':True,
'context': "{'template_id':%d,'rel_model_ref':%d}"%
(wi_obj.activity_id.email_template_id.id,
wi_obj.res_id)
}
elif wi_obj.activity_id.type == 'paper':
datas = {'ids': [wi_obj.res_id],
'model': wi_obj.object_id.model}
res = {
'type' : 'ir.actions.report.xml',
'report_name': wi_obj.activity_id.report_id.report_name,
'datas' : datas,
'nodestroy': True,
}
return res
marketing_campaign_workitem()
class email_template(osv.osv):
@@ -478,6 +480,21 @@ class email_template(osv.osv):
'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
}
email_template()
class email_template_preview(osv.osv_memory):
_inherit = "email_template.preview"
def _default_rel_model(self, cr, uid, context=None):
if 'rel_model_ref' in context :
return context['rel_model_ref']
else :
return False
_defaults = {
'rel_model_ref' : _default_rel_model
}
email_template_preview()
class report_xml(osv.osv):
_inherit = 'ir.actions.report.xml'
@@ -289,7 +289,7 @@
<field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
</group>
<group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
<field name="report_id" attrs="{'required':[('type','=','paper')]}"/>
<field name="report_id" attrs="{'required':[('type','=','paper')]}" context="{'object_id':object_id}"/>
<field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
</group>
<group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
+41
View File
@@ -856,5 +856,46 @@
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
<!-- Display the BoMs in the product form -->
<record model="ir.ui.view" id="view_product_form_expiry">
<field name="name">product.normal.form</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view" />
<field name="type">form</field>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Bill of Materials">
<field name="bom_ids" colspan="4" nolabel="1" widget="one2many_form">
<group colspan="4" col="6">
<field name="name" select="1" colspan="4"/>
<field name="code" select="1" string="BoM Reference" groups="base.group_extended"/>
<newline/>
<field name="product_uom"/>
<field name="product_qty"/>
<field name="routing_id" groups="base.group_extended"/>
<newline/>
<field name="product_uos" groups="product.group_uos"/>
<field name="product_uos_qty" groups="product.group_uos" />
<newline/>
<field name="type" groups="base.group_extended"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
</group>
<field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
<tree string="Components" editable="bottom">
<field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
<field name="product_uom"/>
<field name="product_qty"/>
<field name="name" invisible="1"/>
<field name="date_start"/>
<field name="date_stop"/>
</tree>
</field>
</field>
</page>
</notebook>
</field>
</record>
</data>
</openerp>
+439
View File
@@ -0,0 +1,439 @@
# Hindi translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-06-14 08:48+0000\n"
"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
"Language-Team: Hindi <hi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_startoperation0
msgid "Start Operation"
msgstr "ऑपरेशन प्रारंभ करें"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,state:0
msgid "In Progress"
msgstr "प्रगति में है"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: selection:mrp.production.workcenter.line,state:0
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Pause"
msgstr "ठहरें (Pause)"
#. module: mrp_operations
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_startoperation0
msgid "Operation is started"
msgstr "ऑपरेशन शुरू कर दिया है"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Information"
msgstr "जानकारी"
#. module: mrp_operations
#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
msgid "Start Cancel Operation"
msgstr "आरंभ रद्द संचालन"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
msgid "In Production"
msgstr "उत्पादन में"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
msgid "Operations Code"
msgstr "परिचालन संहिता"
#. module: mrp_operations
#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
msgid "Mrp Operation Process"
msgstr "एमआरपी ऑपरेशन प्रक्रिया"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: field:mrp.production.workcenter.line,state:0
#: field:mrp_operations.operation.code,start_stop:0
msgid "Status"
msgstr "स्थिति"
#. module: mrp_operations
#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
msgid "Start Done Operation"
msgstr ""
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Start"
msgstr "प्रारंभ"
#. module: mrp_operations
#: field:mrp_operations.operation,production_id:0
msgid "Production"
msgstr "उत्पादन"
#. module: mrp_operations
#: view:mrp_operations.operation:0
msgid "Calendar View"
msgstr "कैलेंडर देखना"
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_workorder0
msgid "Work Center"
msgstr "कार्य केंद्र"
#. module: mrp_operations
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action
msgid "Work Order Events Using Bar Codes"
msgstr ""
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Set Draft"
msgstr "Set as Draft"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
#: view:mrp.production.workcenter.line:0
msgid "Work Orders"
msgstr "काम के आदेश"
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
msgid "Start - Stop Codes"
msgstr "शुरू और बंद कोड"
#. module: mrp_operations
#: field:mrp.production.workcenter.line,uom:0
msgid "UOM"
msgstr ""
#. module: mrp_operations
#: view:mrp_operations.operation.code:0
msgid "Production Operation Code"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_planned:0
msgid "Scheduled Date"
msgstr "अनुसूचित तिथि"
#. module: mrp_operations
#: model:process.transition,note:mrp_operations.process_transition_productionstart0
msgid "From production order, create the workorder"
msgstr "उत्पादन से आदेश, कार्य आदेश बनाने के लिए"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Hours by Workcenter"
msgstr ""
#. module: mrp_operations
#: help:mrp.production,allow_reorder:0
msgid ""
"Check this to be able to move independently all production orders, without "
"moving dependent ones."
msgstr ""
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action
msgid "All Work Orders"
msgstr "सभी कार्य आदेश"
#. module: mrp_operations
#: rml:mrp.code.barcode:0
msgid "("
msgstr ""
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Product to Produce"
msgstr ""
#. module: mrp_operations
#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
msgid "Workcenters Barcode"
msgstr "कार्य केंद्र बारकोड"
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_doneoperation0
#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
msgid "Operation is done"
msgstr "ऑपरेशन पूरा हो गया है"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Planned Date"
msgstr ""
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
msgid "Ready to Produce"
msgstr "Ready to Produce"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Cancel"
msgstr "रद्द करना"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: selection:mrp.production.workcenter.line,state:0
msgid "Finished"
msgstr "समाप्त"
#. module: mrp_operations
#: field:mrp.production,allow_reorder:0
msgid "Free Serialisation"
msgstr "नि: शुल्क Serialisation"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action_planning
msgid "Work Orders Planning"
msgstr "कार्य योजना के आदेश"
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_productionorder0
msgid "Production Order"
msgstr "उत्पादन के आदेश"
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_productionorder0
msgid "Production order for any products"
msgstr "किसी भी उत्पाद के लिए उत्पादन के आदेश"
#. module: mrp_operations
#: field:stock.move,move_dest_id_lines:0
msgid "Children Moves"
msgstr ""
#. module: mrp_operations
#: field:mrp_operations.operation.code,name:0
msgid "Operation Name"
msgstr "संचालन नाम"
#. module: mrp_operations
#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_finnished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
msgstr "आखिरी दिनांक"
#. module: mrp_operations
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "संरचना देखने के लिए अमान्य XML!"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Real"
msgstr "वास्तविक"
#. module: mrp_operations
#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
msgid "Workcenter Production start end workflow"
msgstr "Workcenter उत्पादन आरंभ और अंत कार्यप्रवाह"
#. module: mrp_operations
#: help:mrp.production.workcenter.line,delay:0
msgid "This is delay between operation start and stop in this workcenter"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,product:0
msgid "Product"
msgstr "उत्पाद"
#. module: mrp_operations
#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
msgid "From work order, define the cycles and hour for creating product"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,delay:0
msgid "Working Hours"
msgstr "कार्य घंटे"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action
msgid "Future Work Orders"
msgstr "भविष्य के कार्य आदेश"
#. module: mrp_operations
#: field:mrp.production.workcenter.line,production_state:0
msgid "Prod.State"
msgstr ""
#. module: mrp_operations
#: field:mrp_operations.operation,order_date:0
msgid "Order Date"
msgstr "आदेश की तिथि"
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_workorder0
msgid "Production Work Center"
msgstr "उत्पादन कार्य केंद्र"
#. module: mrp_operations
#: model:process.transition,name:mrp_operations.process_transition_productionstart0
msgid "Production start Operation"
msgstr "उत्पादन ऑपरेशन शुरू"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
msgid "Packing Exception"
msgstr "पैकिंग अपवाद"
#. module: mrp_operations
#: field:mrp_operations.operation,workcenter_id:0
msgid "Workcenter"
msgstr "Work center"
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_start:0
#: field:mrp.production.workcenter.line,date_start_date:0
#: field:mrp_operations.operation,date_start:0
msgid "Start Date"
msgstr "प्रारंभ दिनांक"
#. module: mrp_operations
#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
msgid "mrp_operations.operation.code"
msgstr ""
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
#: view:mrp.production.workcenter.line:0
msgid "Operations"
msgstr "संचालन"
#. module: mrp_operations
#: field:mrp_operations.operation,code_id:0
#: field:mrp_operations.operation.code,code:0
msgid "Code"
msgstr "कोड"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
msgid "Confirmed Work Orders"
msgstr "काम के आदेश की पुष्टि की"
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action
msgid "Work Orders to Do"
msgstr ""
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_canceloperation0
msgid "Cancel Operation"
msgstr "संचालन रद्द"
#. module: mrp_operations
#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
msgid "Work start Operation"
msgstr "कार्य संचालन शुरू"
#. module: mrp_operations
#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
msgid "Start/Stop Barcode"
msgstr "शुरू /बंद बारकोड"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Resume"
msgstr "पुनरारंभ"
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_doneoperation0
msgid "Done Operation"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,qty:0
msgid "Qty"
msgstr "मात्रा"
#. module: mrp_operations
#: rml:mrp.code.barcode:0
msgid ")"
msgstr ""
#. module: mrp_operations
#: view:mrp_operations.operation:0
msgid "Production Operation"
msgstr ""
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Done"
msgstr ""
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
msgid "Waiting Goods"
msgstr ""
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Duration"
msgstr ""
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
#: selection:mrp.production.workcenter.line,state:0
msgid "Draft"
msgstr ""
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_canceloperation0
#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
msgid "Operation is cancelled"
msgstr ""
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
#: selection:mrp.production.workcenter.line,state:0
msgid "Canceled"
msgstr ""
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Start working"
msgstr ""
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -164,10 +164,10 @@
<group col="8" colspan="4">
<filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
<separator orientation="vertical"/>
<field name="name">
<field name="code">
<field name="user_id">
<field name="state">
<field name="name"/>
<field name="code"/>
<field name="user_id"/>
<field name="state"/>
</group>
</search>
</field>
@@ -112,6 +112,33 @@
</field>
</record>
<record model="ir.ui.view" id="view_purchase_order_qty_amount_graph">
<field name="name">purchase.order.qty.amount.graph</field>
<field name="model">purchase.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Total Qty and Amount by month" type="bar">
<field name="month"/>
<field name="quantity" operator="+"/>
<field name="price_total" operator="+"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_purchase_order_by_user_graph">
<field name="name">purchase.order.by.user.graph</field>
<field name="model">purchase.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Total Orders Lines by User per month" orientation="vertical" type="bar">
<field name="month" />
<field name="nbr" operator="+"/>
<field name="user_id" group="True" />
</graph>
</field>
</record>
<record id="action_purchase_order_report_all" model="ir.actions.act_window">
<field name="name">Purchase Orders</field>
<field name="res_model">purchase.report</field>
@@ -120,6 +147,23 @@
<field name="context">{'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
</record>
<record id="action_purchase_order_report_graph" model="ir.actions.act_window">
<field name="name">Total Qty and Amount by month</field>
<field name="res_model">purchase.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_purchase_order_qty_amount_graph"></field>
</record>
<record id="action_purchase_order_by_user_all" model="ir.actions.act_window">
<field name="name">Total Orders by User per month</field>
<field name="res_model">purchase.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_purchase_order_by_user_graph"></field>
</record>
<menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
<menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
+30 -34
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 10:48+0000\n"
"Last-Translator: Marcel van der Boom (HS-Development BV) <mrb@hsdev.com>\n"
"PO-Revision-Date: 2010-06-14 13:39+0000\n"
"Last-Translator: Marcel van der Boom (HS-Development BV) <marcel@hsdev.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -44,13 +44,13 @@ msgstr "terp-account"
#. module: stock
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: stock
#: model:ir.module.module,shortdesc:stock.module_meta_information
#: model:ir.ui.menu,name:stock.menu_stock_root
msgid "Inventory Management"
msgstr ""
msgstr "Voorraadbeheer"
#. module: stock
#: selection:stock.location,icon:0
@@ -70,7 +70,7 @@ msgstr "STOCK_MEDIA_FORWARD"
#. module: stock
#: rml:lot.location:0
msgid "Total :"
msgstr ""
msgstr "Totaal :"
#. module: stock
#: selection:stock.location,icon:0
@@ -81,7 +81,7 @@ msgstr "STOCK_ZOOM_100"
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "UoM"
msgstr ""
msgstr "Meeteenheid"
#. module: stock
#: model:ir.actions.wizard,name:stock.return_picking
@@ -109,7 +109,7 @@ msgstr "Paklijst"
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Amount"
msgstr ""
msgstr "Hoeveelheid"
#. module: stock
#: view:stock.picking:0
@@ -141,8 +141,7 @@ msgstr "Relatie"
#. module: stock
#: help:product.product,track_incoming:0
msgid "Force to use a Production Lot during receptions"
msgstr ""
"Forceer om een productie-eenheid te gebruiken tijdens goederenontvangst."
msgstr "Forceer het gebruik van een batchnummer bij goederenontvangst"
#. module: stock
#: field:stock.move,move_history_ids:0
@@ -155,7 +154,7 @@ msgstr "Notatie"
#: field:stock.production.lot.revision,lot_id:0
#: field:stock.report.prodlots,prodlot_id:0
msgid "Production lot"
msgstr "Seriegrootte"
msgstr "Batchnummer"
#. module: stock
#: selection:stock.location,icon:0
@@ -306,7 +305,7 @@ msgstr "STOCK_FLOPPY"
#. module: stock
#: view:stock.production.lot.revision:0
msgid "Production Lot Revisions"
msgstr "Herziening productie-eenheden"
msgstr "Batchnummer herzieningen"
#. module: stock
#: view:stock.location:0
@@ -371,7 +370,7 @@ msgstr "Leveringslocatie"
#: model:ir.actions.act_window,name:stock.action_production_lot_form
#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
msgid "Production Lots"
msgstr "Productie-eenheden"
msgstr "Batchnummers"
#. module: stock
#: rml:stock.picking.list:0
@@ -425,9 +424,7 @@ msgstr "Locatieadres"
#. module: stock
#: help:stock.move,prodlot_id:0
msgid "Production lot is used to put a serial number on the production"
msgstr ""
"Productie-eenheid wordt gebruikt om een serienummer aan de productie toe te "
"voegen."
msgstr "Batchnummers worden gebruikt om productie-eenheden te identificeren."
#. module: stock
#: model:stock.location,name:stock.stock_location_13
@@ -493,8 +490,7 @@ msgstr "Voorraadlocatie"
#. module: stock
#: help:product.product,track_production:0
msgid "Force to use a Production Lot during production order"
msgstr ""
"Forceer deze op een productie-eenheid te gebruiken tijdens de productieorder"
msgstr "Forceer het gebruik van een batchnummer bij productieorders"
#. module: stock
#: selection:stock.location,icon:0
@@ -537,7 +533,7 @@ msgstr "Leveringskalender"
#. module: stock
#: field:product.product,track_incoming:0
msgid "Track Incomming Lots"
msgstr "Traceer inkomende pakketten"
msgstr "Traceer binnenkomende batches"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -552,7 +548,7 @@ msgstr "STOCK_SAVE_AS"
#. module: stock
#: model:ir.model,name:stock.model_stock_report_prodlots
msgid "Stock report by production lots"
msgstr "Voorraadrapport met productie-eenheden"
msgstr "Voorraadrapport met batchnummers"
#. module: stock
#: field:stock.location,stock_virtual:0
@@ -598,7 +594,7 @@ msgstr "Nieuw ontvangstbon aanmaken"
#. module: stock
#: wizard_field:stock.move.track,init,quantity:0
msgid "Quantity per lot"
msgstr "Aantal per eenheid"
msgstr "Aantal per batch"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_move_form2
@@ -661,7 +657,7 @@ msgstr "Verwachte verzenddatum"
#. module: stock
#: rml:stock.picking.list:0
msgid "Shipping Address :"
msgstr ""
msgstr "Afleveradres :"
#. module: stock
#: view:stock.tracking:0
@@ -727,7 +723,7 @@ msgstr "Van"
#. module: stock
#: rml:stock.picking.list:0
msgid "weight"
msgstr ""
msgstr "gewicht"
#. module: stock
#: rml:stock.picking.list:0
@@ -742,7 +738,7 @@ msgstr "Factuurcontrole"
#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot_revision
msgid "Production lot revisions"
msgstr "Heroverweeg productie-eenheden"
msgstr "Batchnummer herzieningen"
#. module: stock
#: view:stock.picking:0
@@ -1554,7 +1550,7 @@ msgstr "Revisiedatum"
#. module: stock
#: rml:stock.picking.list:0
msgid "Lot"
msgstr "Overdoos"
msgstr "Batch"
#. module: stock
#: wizard_view:inventory.merge.stock.zero,init:0
@@ -1628,7 +1624,7 @@ msgstr "Leveringsvoorwaarden"
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Total:"
msgstr ""
msgstr "Totaal:"
#. module: stock
#: selection:stock.location,icon:0
@@ -1731,7 +1727,7 @@ msgstr "Magazijnen"
#. module: stock
#: help:product.product,track_outgoing:0
msgid "Force to use a Production Lot during deliveries"
msgstr "Forceer om productie-eenheiden te gebruiken om te leveren"
msgstr "Forceer het gebruik van batchnummers bij leveringen"
#. module: stock
#: view:stock.picking:0
@@ -1790,7 +1786,7 @@ msgstr "Product eenh."
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Variants"
msgstr ""
msgstr "Varianten"
#. module: stock
#: field:stock.location,posx:0
@@ -1870,7 +1866,7 @@ msgstr "STOCK_MEDIA_PAUSE"
#. module: stock
#: view:product.product:0
msgid "Lots"
msgstr "Aantallen"
msgstr "Batches"
#. module: stock
#: selection:stock.picking,move_type:0
@@ -1880,7 +1876,7 @@ msgstr "Allen te gelijk"
#. module: stock
#: field:product.product,track_outgoing:0
msgid "Track Outging Lots"
msgstr "Uitgaande voorraadeenheden"
msgstr "Traceer uitgaande batches"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1903,7 +1899,7 @@ msgstr "STOCK_FIND"
#. module: stock
#: view:stock.inventory:0
msgid "Lot Inventory"
msgstr "Partijvoorraad"
msgstr "Batchvoorraad"
#. module: stock
#: help:stock.location,chained_auto_packing:0
@@ -2088,7 +2084,7 @@ msgstr "terp-project"
#: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
#: view:stock.report.prodlots:0
msgid "Stock by Lots"
msgstr "In voorraad per verpakkingseenheid"
msgstr "Voorraad per batch"
#. module: stock
#: field:stock.move,auto_validate:0
@@ -2199,7 +2195,7 @@ msgstr "STOCK_REVERT_TO_SAVED"
#. module: stock
#: field:product.product,track_production:0
msgid "Track Production Lots"
msgstr "Traceerd productie-eenheden"
msgstr "Traceer productiebatches"
#. module: stock
#: view:stock.picking:0
@@ -2232,7 +2228,7 @@ msgstr "stock.picking.move.wizard"
#: field:stock.move,prodlot_id:0
#: view:stock.production.lot:0
msgid "Production Lot"
msgstr "Productie-eenheid."
msgstr "Productie batch"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_traceability
+21 -21
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-06-13 15:17+0000\n"
"PO-Revision-Date: 2010-06-14 14:56+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -86,7 +86,7 @@ msgstr "JM"
#. module: stock
#: model:ir.actions.wizard,name:stock.return_picking
msgid "Return packing"
msgstr "Lista przesunięć zwrotnych"
msgstr "Zwrot"
#. module: stock
#: field:product.category,property_stock_journal:0
@@ -103,7 +103,7 @@ msgstr "Wypełnij inwentaryzację dla podanej strefy mag."
#: view:stock.picking:0
#: field:stock.picking.move.wizard,picking_id:0
msgid "Packing list"
msgstr "Lista przesunięć"
msgstr "Pobranie"
#. module: stock
#: rml:lot.stock.overview:0
@@ -206,7 +206,7 @@ msgstr "Wykonaj paczkę (przesunięcie)"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "Packing result"
msgstr "Rezultat listy przesunięć"
msgstr "Rezultat pobrania"
#. module: stock
#: selection:stock.location,icon:0
@@ -708,7 +708,7 @@ msgstr "terp-stock"
#. module: stock
#: rml:stock.picking.list:0
msgid "Packing List:"
msgstr "Lista przesunięć:"
msgstr "Pobranie:"
#. module: stock
#: selection:stock.location,icon:0
@@ -748,7 +748,7 @@ msgstr "Wersja partii produkcyjnej"
#. module: stock
#: view:stock.picking:0
msgid "Packing Done"
msgstr "Listę przesunięć wykonano"
msgstr "Pobranie wykonane"
#. module: stock
#: selection:stock.move,state:0
@@ -762,7 +762,7 @@ msgstr "Oczekiwanie"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
#: model:ir.ui.menu,name:stock.menu_picking_waiting
msgid "Available Packing"
msgstr "Dostępne listy przesunięć"
msgstr "Dostępne pobrania"
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
@@ -815,7 +815,7 @@ msgstr ""
#: model:ir.ui.menu,name:stock.menu_action_picking_all
#: wizard_field:stock.picking.make,init,pickings:0
msgid "Packing"
msgstr "Listy przesunięć"
msgstr "Pobrania"
#. module: stock
#: selection:stock.location,icon:0
@@ -988,7 +988,7 @@ msgstr ""
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "The packing has been successfully made !"
msgstr "Lista przesunięć zostało poprawnie wykonana !"
msgstr "Pobranie wykonano poprawnie !"
#. module: stock
#: field:stock.move,address_id:0
@@ -1158,13 +1158,13 @@ msgstr ""
#. module: stock
#: view:stock.picking:0
msgid "Input Packing List"
msgstr "Lista przesunięć wchodzących"
msgstr "Przyjęcie zewnętrzne"
#. module: stock
#: model:ir.model,name:stock.model_stock_picking
#: field:stock.move,picking_id:0
msgid "Packing List"
msgstr "Lista przesunięć"
msgstr "Pobranie"
#. module: stock
#: selection:stock.location,icon:0
@@ -1205,7 +1205,7 @@ msgstr ""
#. module: stock
#: selection:stock.picking,invoice_state:0
msgid "Not from Packing"
msgstr "Nie z listy przesunięć"
msgstr "Nie z pobrania"
#. module: stock
#: view:stock.location:0
@@ -1299,7 +1299,7 @@ msgstr "Metoda dostawy"
#. module: stock
#: model:ir.actions.wizard,name:stock.partial_picking
msgid "Partial packing"
msgstr "Częściowa lista przesunięć"
msgstr "Pobranie częściowe"
#. module: stock
#: selection:stock.location,icon:0
@@ -1370,7 +1370,7 @@ msgstr "Strefa magazynowa"
#. module: stock
#: field:stock.picking,invoice_state:0
msgid "Invoice Status"
msgstr "Stan faktury"
msgstr "Fakturowanie"
#. module: stock
#: rml:lot.location:0
@@ -1572,7 +1572,7 @@ msgstr "Ilość (JS)"
#: model:ir.actions.act_window,name:stock.action_picking_tree5
#: model:ir.ui.menu,name:stock.menu_action_picking_tree5
msgid "Packing to Process"
msgstr "Listy przesunięć do obróbki"
msgstr "Pobrania do wykonania"
#. module: stock
#: selection:stock.location,icon:0
@@ -1588,12 +1588,12 @@ msgstr "Ustaw jako dostępne"
#: model:ir.actions.wizard,name:stock.make_picking
#: wizard_view:stock.picking.make,init:0
msgid "Make packing"
msgstr "Wykonaj listę przesunięć"
msgstr "Wykonaj pobranie"
#. module: stock
#: field:stock.picking,backorder_id:0
msgid "Back Order"
msgstr "Zamówienie zaległe"
msgstr "Pobranie częściowe"
#. module: stock
#: selection:stock.location,icon:0
@@ -1770,7 +1770,7 @@ msgstr "Zwrot"
#. module: stock
#: field:stock.picking,auto_picking:0
msgid "Auto-Packing"
msgstr "Auto-przesunięcie"
msgstr "Auto-pobranie"
#. module: stock
#: field:stock.move,product_uos:0
@@ -2172,7 +2172,7 @@ msgstr ""
#: model:ir.ui.menu,name:stock.menu_action_picking_tree3
#: model:ir.ui.menu,name:stock.menu_action_picking_tree8
msgid "Confirmed Packing Waiting Availability"
msgstr "Potwierdzone listy przesunięć oczekujące na dostępność"
msgstr "Potwierdzone pobrania oczekujące na dostępność"
#. module: stock
#: field:stock.location,posy:0
@@ -2257,7 +2257,7 @@ msgstr "Data zamówienia"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
msgid "Supplier Invoice"
msgstr "Faktura dostawcy"
msgstr "Faktura od dostawcy"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_location_form
-8
View File
@@ -1428,14 +1428,6 @@ class stock_move(osv.osv):
default = default.copy()
return super(stock_move, self).copy(cr, uid, id, default, context)
def create(self, cr, user, vals, context=None):
# Check that the stock.move is in draft state at creation to force
# passing through button_confirm
if vals.get('state','draft') not in ('draft','done','waiting'):
logger = netsvc.Logger()
logger.notifyChannel("code", netsvc.LOG_WARNING, "All new stock.move must be in state draft at the creation !")
return super(stock_move, self).create(cr, user, vals, context)
def _auto_init(self, cursor, context):
res = super(stock_move, self)._auto_init(cursor, context)
cursor.execute('SELECT indexname \
+1 -5
View File
@@ -240,15 +240,11 @@ class split_in_production_lot(osv.osv_memory):
default_val = {
'product_qty': quantity,
'product_uos_qty': uos_qty,
'state': 'draft'
'state': move.state
}
if quantity_rest > 0:
current_move = move_obj.copy(cr, uid, move.id, default_val)
move_obj.action_confirm(cr, uid, [current_move])
if move.state=='assigned':
move_obj.force_assign(cr, uid, [current_move])
elif move.state<>'confirmed':
move_obj.write(cr, uid, [current_move], {'state': move.state})
new_move.append(current_move)
if quantity_rest == 0:
current_move = move.id