-
+
- (*) A positive delay means that the employee worked less than recorded.
- (*) A negative delay means that the employee worked more than encoded.
+ (*) A positive delay means that the employee worked less than recorded.
+ (*) A negative delay means that the employee worked more than encoded.
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
new file mode 100644
index 00000000000..447b2047f2c
--- /dev/null
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+import sign_in_out
+import print_attendance_error
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
similarity index 100%
rename from addons/hr/wizard/print_attendance_error.py
rename to addons/hr_attendance/wizard/print_attendance_error.py
diff --git a/addons/hr_attendance/wizard/sign_in_out.py b/addons/hr_attendance/wizard/sign_in_out.py
new file mode 100644
index 00000000000..a3e82b9d669
--- /dev/null
+++ b/addons/hr_attendance/wizard/sign_in_out.py
@@ -0,0 +1,194 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import time
+from tools.translate import _
+
+si_so_form ='''
+'''
+
+si_so_fields = {
+ 'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
+ 'state' : {'string' : "Current state", 'type' : 'char', 'required' : True, 'readonly': True},
+}
+
+si_form = '''
+'''
+
+si_fields = {
+ 'success' : {'string' : "Sign in's status", 'type' : 'char', 'required' : True, 'readonly' : True},
+}
+
+so_form = '''
+'''
+
+so_ask_fields = {
+ 'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
+ 'last_time' : {'string' : "Your last sign out", 'type' : 'datetime', 'required' : True},
+}
+
+def _si_check(self, cr, uid, data, context):
+ states = {True : 'si', False: 'si_ask_so'}
+ service = netsvc.LocalService('object_proxy')
+ emp_id = data['form']['emp_id']
+ att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
+ last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+ if last_att:
+ last_att = last_att[0]
+ cond = not last_att or last_att['action'] == 'sign_out'
+ return states[cond]
+
+si_ask_form ='''
+'''
+
+si_ask_fields = {
+ 'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
+ 'last_time' : {'string' : "Your last sign in", 'type' : 'datetime', 'required' : True},
+}
+
+def _so_check(self, cr, uid, data, context):
+ states = {True : 'so', False: 'so_ask_si'}
+ service = netsvc.LocalService('object_proxy')
+ emp_id = data['form']['emp_id']
+ att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
+ last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+ if last_att:
+ last_att = last_att[0]
+ cond = last_att and last_att['action'] == 'sign_in'
+ return states[cond]
+
+class wiz_si_so(wizard.interface):
+ states = {
+ 'init' : {
+ 'actions' : [_get_empid],
+ 'result' : {'type' : 'form', 'arch' : si_so_form, 'fields' : si_so_fields, 'state' : [('end', 'Cancel'),('si_test', 'Sign in'),('so_test', 'Sign out')] }
+ },
+ 'si_test' : {
+ 'actions' : [],
+ 'result' : {'type' : 'choice', 'next_state': _si_check}
+ },
+ 'si_ask_so' : {
+ 'actions' : [],
+ 'result' : {'type' : 'form', 'arch' : so_ask_form, 'fields' : so_ask_fields, 'state' : [('end', 'Cancel'),('si', 'Sign in') ] }
+ },
+ 'si' : {
+ 'actions' : [_sign_in],
+ 'result' : {'type' : 'state', 'state':'end'}
+ },
+ 'so_test' : {
+ 'actions' : [],
+ 'result' : {'type' : 'choice', 'next_state': _so_check }
+ },
+ 'so_ask_si' : {
+ 'actions' : [],
+ 'result' : {'type' : 'form', 'arch' : si_ask_form, 'fields' : si_ask_fields, 'state' : [('end', 'Cancel'),('so', 'Sign out')] }
+ },
+ 'so' : {
+ 'actions' : [_sign_out],
+ 'result' : {'type' : 'state', 'state':'end'}
+ },
+ }
+wiz_si_so('hr.si_so')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index f42dfb11761..6d2be72d4e7 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -10,7 +10,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,76 +55,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -107,13 +89,6 @@
-
-
-
-
-
-
-
@@ -140,7 +115,7 @@
-
+
@@ -148,18 +123,44 @@
- [[ repeatIn(objects,'o') ]]
+ [[ repeatIn(objects,'o') ]]HR Expenses [[ o.name or '' ]]
-
+
- Employee: [[ o.employee_id.name ]]
- Date: [[ time.strftime('%d/%m/%Y', time.strptime(o.date, '%Y-%m-%d')) ]]
- Reference: [[ o.ref ]]
-
+
+
- [[ '%.2f' % (sum_revenue(objects) or 0.0) ]]
+ [[ '%.2f' % (sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
-
+
-
-
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index 4b707196d37..c687b171640 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index ab654cad9b7..00b01f46ed2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -279,7 +279,7 @@
hr.attendance.formhr.attendanceform
-
+
@@ -290,7 +290,7 @@
hr.attendance.treehr.attendancetree
-
+
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 2104baf6670..d7252313333 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6615,7 +6615,7 @@
- Template of the belgian Chart of Accounts
+ Belgian PCMN
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 121ebbe6e1d..170cefd6fbc 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -49,26 +49,28 @@ class mrp_workcenter(osv.osv):
_name = 'mrp.workcenter'
_description = 'Workcenter'
_columns = {
- 'name': fields.char('Name', size=64, required=True),
+ 'name': fields.char('Workcenter Name', size=64, required=True),
'active': fields.boolean('Active'),
'type': fields.selection([('machine','Machine'),('hr','Human Resource'),('tool','Tool')], 'Type', required=True),
- 'code': fields.char('Code', size=8),
- 'timesheet_id': fields.many2one('hr.timesheet.group', 'Timesheet'),
- 'note': fields.text('Description'),
+ 'code': fields.char('Code', size=16),
+ 'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="The normal working time of the workcenter."),
+ 'note': fields.text('Description', help="Description of the workcenter. Explain here what's a cycle according to this workcenter."),
- 'capacity_per_cycle': fields.float('Capacity per Cycle'),
+ 'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operation this workcenter can do in parallel. If this workcenter represent a team of 5 workers, the capacity per cycle is 5."),
- 'time_cycle': fields.float('Time for 1 cycle (hour)'),
- 'time_start': fields.float('Time before prod.'),
- 'time_stop': fields.float('Time after prod.'),
- 'time_efficiency': fields.float('Time Efficiency'),
+ 'time_cycle': fields.float('Time for 1 cycle (hour)', help="Time in hours for doing one cycle."),
+ 'time_start': fields.float('Time before prod.', help="Time in hours for the setup."),
+ 'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."),
+ 'time_efficiency': fields.float('Time Efficiency', help="Factor that multiplies all times expressed in the workcenter."),
'costs_hour': fields.float('Cost per hour'),
- 'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','=','expense')]),
+ 'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
+ help="Complete this only if you want automatic analytic accounting entries on production orders."),
'costs_cycle': fields.float('Cost per cycle'),
- 'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','=','expense')]),
+ 'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
+ help="Complete this only if you want automatic analytic accounting entries on production orders."),
'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
- 'costs_general_account_id': fields.many2one('account.account', 'General Account'),
+ 'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]),
}
_defaults = {
'active': lambda *a: 1,
@@ -93,7 +95,7 @@ class mrp_property(osv.osv):
_description = 'Property'
_columns = {
'name': fields.char('Name', size=64, required=True),
- 'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True),
+ 'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
'description': fields.text('Description'),
}
@@ -113,7 +115,11 @@ class mrp_routing(osv.osv):
'note': fields.text('Description'),
'workcenter_lines': fields.one2many('mrp.routing.workcenter', 'routing_id', 'Workcenters'),
- 'location_id': fields.many2one('stock.location', 'Production Location'),
+ 'location_id': fields.many2one('stock.location', 'Production Location',
+ help="Keep empty if you produce at the location where the finnished products are needed." \
+ "Put a location if you produce at a fixed location. This can be a partner location " \
+ "if you subcontract the manufacturing operations."
+ ),
}
_defaults = {
'active': lambda *a: 1,
@@ -127,8 +133,8 @@ class mrp_routing_workcenter(osv.osv):
'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence'),
- 'cycle_nbr': fields.float('Number of cycle', required=True),
- 'hour_nbr': fields.float('Number of hours', required=True),
+ 'cycle_nbr': fields.float('Number of Cycle', required=True),
+ 'hour_nbr': fields.float('Number of Hours', required=True),
'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True),
'note': fields.text('Description')
}
@@ -145,11 +151,11 @@ class mrp_bom(osv.osv):
'name': fields.char('Name', size=64, required=True),
'code': fields.char('Code', size=16),
'active': fields.boolean('Active'),
- 'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True, help="Use a phantom bill of material in lines that have a sub-bom and that have to be automatically computed in one line, without habing two production orders."),
- 'date_start': fields.date('Valid from'),
- 'date_stop': fields.date('Valid until'),
+ 'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True, help="Use a phantom bill of material in lines that have a sub-bom and that have to be automatically computed in one line, without having two production orders."),
+ 'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
+ 'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."),
'sequence': fields.integer('Sequence'),
- 'position': fields.char('Internal Ref.', size=64),
+ 'position': fields.char('Internal Ref.', size=64, help="Reference to a position in an external plan."),
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_uos_qty': fields.float('Product UOS Qty'),
'product_uos': fields.many2one('product.uom', 'Product UOS'),
@@ -304,6 +310,33 @@ class mrp_production(osv.osv):
_name = 'mrp.production'
_description = 'Production'
_date_name = 'date_planned'
+
+ def _get_sale_order(self,cr,uid,ids,field_name=False):
+ move_obj=self.pool.get('stock.move')
+ def get_parent_move(move_id):
+ move = move_obj.browse(cr,uid,move_id)
+ if move.move_dest_id:
+ return get_parent_move(move.move_dest_id.id)
+ return move_id
+ productions=self.read(cr,uid,ids,['id','move_prod_id'])
+ res={}
+ for production in productions:
+ if production.get('move_prod_id',False):
+ parent_move_line=get_parent_move(production['move_prod_id'][0])
+ if parent_move_line:
+ move = move_obj.browse(cr,uid,parent_move_line)
+ if field_name=='name':
+ res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.name or False
+ if field_name=='client_order_ref':
+ res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
+ return res
+
+ def _sale_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+ return self._get_sale_order(cr,uid,ids,field_name='name')
+
+ def _sale_ref_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+ return self._get_sale_order(cr,uid,ids,field_name='client_order_ref')
+
_columns = {
'name': fields.char('Reference', size=64, required=True),
'origin': fields.char('Origin', size=64),
@@ -332,7 +365,9 @@ class mrp_production(osv.osv):
'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
- 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True)
+ 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True),
+ 'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
+ 'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Ref'),
}
_defaults = {
'priority': lambda *a: '1',
@@ -611,11 +646,9 @@ mrp_production()
class stock_move(osv.osv):
_name = 'stock.move'
_inherit = 'stock.move'
-
_columns = {
- 'production_id': fields.many2one('mrp.production', 'Production', select=True),
- }
-
+ 'production_id': fields.many2one('mrp.production', 'Production', select=True),
+ }
stock_move()
class mrp_production_workcenter_line(osv.osv):
diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index f6eca4722e8..eb97477f687 100644
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -4,5 +4,14 @@
+
+
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 55986cd260c..50cfd1881c6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -406,7 +406,6 @@
-
@@ -440,7 +439,7 @@
-
+
@@ -448,6 +447,8 @@
+
+
@@ -677,7 +678,7 @@
form
-
+
Draft procurements
@@ -706,7 +707,7 @@
tree,form[('state','=','exception')]
-
+
Exceptions procurements to fix
@@ -735,7 +736,7 @@
formform,tree
-
+
diff --git a/addons/mrp/report/__init__.py b/addons/mrp/report/__init__.py
index f55a94f166e..32bb00568ff 100644
--- a/addons/mrp/report/__init__.py
+++ b/addons/mrp/report/__init__.py
@@ -28,6 +28,7 @@
###############################################################################
import price
import workcenter_load
+import order
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
new file mode 100644
index 00000000000..1d801b3aa2e
--- /dev/null
+++ b/addons/mrp/report/order.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from osv import osv
+import pooler
+
+class order(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(order, self).__init__(cr, uid, name, context)
+ self.localcontext.update({
+ 'time': time,
+ })
+
+
+report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order)
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
new file mode 100644
index 00000000000..cc1b0bf34b3
--- /dev/null
+++ b/addons/mrp/report/order.rml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(objects,'o') ]]
+
+
+
+
+
+
+ Production Order N° : [[ o.name ]]
+
+
+
+ Printing date : [[ time.strftime('%d/%m/%Y') ]]
+ Partner Order reference : [[ o.sale_ref or ' ' ]]
+ SO number : [[ o.sale_name or '' ]]
+
+
+
+
+