diff --git a/addons/account/account.py b/addons/account/account.py
index cf50946d516..a6e3c09884a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -509,8 +509,13 @@ class account_account(osv.osv):
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
+
+ if 'company_id' in vals:
+ move_lines = self.pool.get('account.move.line').search(cr, uid, [('account_id', 'in', ids)])
+ if move_lines:
+ raise osv.except_osv(_('Warning !'), _('You cannot modify Company of account as its related record exist in Entry Lines'))
if 'active' in vals and not vals['active']:
- self._check_moves(cr, uid, ids, "write", context)
+ self._check_moves(cr, uid, ids, "write", context=context)
if 'type' in vals.keys():
self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
return super(account_account, self).write(cr, uid, ids, vals, context=context)
@@ -557,42 +562,46 @@ class account_journal(osv.osv):
_name = "account.journal"
_description = "Journal"
_columns = {
- 'name': fields.char('Journal Name', size=64, required=True, translate=True),
- 'code': fields.char('Code', size=16),
- 'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
+ 'name': fields.char('Journal Name', size=64, required=True, translate=True,help="Name of the journal"),
+ 'code': fields.char('Code', size=16,required=True,help="Code of the journal"),
+ 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'),('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
" Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
" Select 'Cash' to be used at the time of making payment."\
" Select 'General' to be used at the time of stock input/output."\
" Select 'Situation' to be used at the time of making vouchers."),
'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
-
'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
-
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the journal without removing it."),
- 'view_id': fields.many2one('account.journal.view', 'View', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
- 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]"),
- 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]"),
+ 'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
+ 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]",help="It acts as a default account for credit amount"),
+ 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]",help="It acts as a default account for debit amount"),
'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
- 'update_posted': fields.boolean('Allow Cancelling Entries'),
+ 'update_posted': fields.boolean('Allow Cancelling Entries',help="Check this box if you want to cancel the entries related to this journal or want to cancel the invoice related to this journal"),
'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True),
'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
- 'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+ 'company_id': fields.many2one('res.company', 'Company', required=True,select=1,help="Company associated with a journal"),
'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
help="The sequence used for invoice numbers in this journal."),
'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
}
_defaults = {
- 'active': lambda *a: 1,
'user_id': lambda self,cr,uid,context: uid,
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
+ def write(self, cr, uid, ids, vals, context=None):
+ obj=[]
+ if 'company_id' in vals:
+ move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
+ if move_lines:
+ raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
+ return super(account_journal, self).write(cr, uid, ids, vals, context=context)
+
def create(self, cr, uid, vals, context={}):
journal_id = super(account_journal, self).create(cr, uid, vals, context)
# journal_name = self.browse(cr, uid, [journal_id])[0].code
@@ -618,6 +627,16 @@ class account_journal(osv.osv):
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
return self.name_get(cr, user, ids, context=context)
+ def onchange_type(self, cr, uid, ids, type):
+ res={}
+ for line in self.browse(cr, uid, ids):
+ if type == 'situation':
+ res= {'value':{'centralisation': True}}
+ else:
+ res= {'value':{'centralisation': False}}
+ return res
+
+
account_journal()
class account_fiscalyear(osv.osv):
@@ -711,7 +730,7 @@ class account_period(osv.osv):
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
- 'company_id': fields.many2one('res.company', 'Company', required=True)
+ 'company_id': fields.related('fiscalyear_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
}
_defaults = {
'state': lambda *a: 'draft',
@@ -784,6 +803,14 @@ class account_period(osv.osv):
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids, context=context)
+ def write(self, cr, uid, ids, vals, context=None):
+ obj=[]
+ if 'company_id' in vals:
+ move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
+ if move_lines:
+ raise osv.except_osv(_('Warning !'), _('You cannot modify company of this period as its related record exist in Entry Lines'))
+ return super(account_period, self).write(cr, uid, ids, vals, context=context)
+
account_period()
class account_journal_period(osv.osv):
@@ -809,7 +836,7 @@ class account_journal_period(osv.osv):
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
- 'company_id' : fields.many2one('res.company', 'Company')
+ 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company')
}
def _check(self, cr, uid, ids, context={}):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 51a020b9b75..6c031955cc9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -220,7 +220,8 @@
-
+
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 7350596c4e3..84dd2c90e7c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -498,9 +498,17 @@ class account_move_line(osv.osv):
return False
return True
+ def _check_company_id(self, cr, uid, ids):
+ lines = self.browse(cr, uid, ids)
+ for l in lines:
+ if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
+ return False
+ return True
+
_constraints = [
(_check_no_view, 'You can not create move line on view account.', ['account_id']),
(_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
+ (_check_company_id,'Company must be same for its related account and period.',['company_id'] ),
]
#TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -574,6 +582,13 @@ class account_move_line(osv.osv):
unmerge = []
total = 0.0
merges_rec = []
+
+ company_list = []
+ for line in self.browse(cr, uid, ids, context=context):
+ if company_list and not line.company_id.id in company_list:
+ raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+ company_list.append(line.company_id.id)
+
for line in self.browse(cr, uid, ids, context):
if line.reconcile_id:
raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
@@ -587,6 +602,7 @@ class account_move_line(osv.osv):
else:
unmerge.append(line.id)
total += (line.debit or 0.0) - (line.credit or 0.0)
+
if not total:
res = self.reconcile(cr, uid, merges+unmerge, context=context)
return res
@@ -604,6 +620,13 @@ class account_move_line(osv.osv):
currency = 0.0
account_id = False
partner_id = False
+
+ company_list = []
+ for line in self.browse(cr, uid, ids, context=context):
+ if company_list and not line.company_id.id in company_list:
+ raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+ company_list.append(line.company_id.id)
+
for line in unrec_lines:
if line.state <> 'valid':
raise osv.except_osv(_('Error'),
@@ -836,7 +859,7 @@ class account_move_line(osv.osv):
if vals.get('date', False):
todo_date = vals['date']
del vals['date']
-
+
for line in self.browse(cr, uid, ids,context=context):
ctx = context.copy()
if ('journal_id' not in ctx):
@@ -848,8 +871,8 @@ class account_move_line(osv.osv):
if line.move_id:
ctx['period_id'] = line.move_id.period_id.id
else:
- ctx['period_id'] = line.period_id.id
- #Check for centralisation
+ ctx['period_id'] = line.period_id.id
+ #Check for centralisation
journal = self.pool.get('account.journal').browse(cr, uid, ctx['journal_id'], context=ctx)
if journal.centralisation:
self._check_moves(cr, uid, context=ctx)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index dc4ad4041f3..94fd5c664ed 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -272,22 +272,19 @@
-
-
+
-
-
+
-
+
-
@@ -296,7 +293,7 @@
-
+
@@ -307,15 +304,19 @@
+
-
-
-
+
+
+
+
+
+
-
+
@@ -957,7 +958,6 @@
-
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 448bb5f1aee..d2a9cba7042 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index d2659e92d1c..5fdf89c5773 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -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-03 20:09+0000\n"
+"PO-Revision-Date: 2010-06-09 15:10+0000\n"
"Last-Translator: Ferdinand @ ChriCar \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-04 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -4904,7 +4904,7 @@ msgstr "Details Finanzkonto"
#. module: account
#: rml:account.overdue:0
msgid "VAT:"
-msgstr "USt.:"
+msgstr "UID:"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index de27e9bfec9..4a6d2d3a2b8 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 1f1aaf4dbb8..862b42608ca 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-29 11:45+0000\n"
-"Last-Translator: digitalsatori \n"
+"PO-Revision-Date: 2010-06-09 16:41+0000\n"
+"Last-Translator: Wei \"oldrev\" Li \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-05-30 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -712,7 +712,7 @@ msgstr "客户欠款金额合计"
#. module: account
#: view:account.move.line:0
msgid "St."
-msgstr ""
+msgstr "结单编码"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_line_open
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 096c19cdd5d..f68e57b4bb4 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -923,13 +923,13 @@ class account_invoice(osv.osv):
account_move_obj = self.pool.get('account.move')
invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
for i in invoices:
- if i['move_id']:
+ if i['move_id']:
account_move_obj.button_cancel(cr, uid, [i['move_id'][0]])
# delete the move this invoice was pointing to
# Note that the corresponding move_lines and move_reconciles
# will be automatically deleted too
account_move_obj.unlink(cr, uid, [i['move_id'][0]])
- if i['payment_ids']:
+ if i['payment_ids']:
account_move_line_obj = self.pool.get('account.move.line')
pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
for move_line in pay_ids:
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index a844d6dec2e..c88290b7021 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -46,7 +46,7 @@ class account_journal(osv.osv):
_inherit="account.journal"
_columns = {
- 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal'),
+ 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"),
}
account_journal()
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 66da81d24f6..56991301ad5 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -2,27 +2,27 @@
-
+ account.chart.formaccount.chartform
-
+ Chart of Accounts
@@ -34,7 +34,7 @@
+ id="menu_action_account_tree2"
+ parent="account.menu_finance_charts" />
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index d83c0c6f2dc..e0c22a0007f 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -1,22 +1,22 @@
-
+ account.invoice.confirm.formaccount.invoice.confirmform
-
-
+
-
+ Confirm Draft Invoicesaccount.invoice.confirmform
@@ -25,7 +25,7 @@
new
-
+ Confirm Draft Invoices
@@ -33,24 +33,24 @@
actionaccount.invoice
-
+
-
+ account.invoice.cancel.formaccount.invoice.cancelform
-
-
+
-
+ Cancel Selected Invoicesaccount.invoice.cancelform
@@ -59,7 +59,7 @@
new
-
+ Cancel Selected Invoices
@@ -67,7 +67,7 @@
actionaccount.invoice
-
+
-
-
\ No newline at end of file
+
+
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 71a0d591768..87d3814df85 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -8,11 +8,11 @@
form
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index ba4a6964bd5..80f23d4494d 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po
index b4be43ac790..a9aa4a7f36b 100644
--- a/addons/account_anglo_saxon/i18n/el.po
+++ b/addons/account_anglo_saxon/i18n/el.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_balance/i18n/el.po b/addons/account_balance/i18n/el.po
index 0d013323c9e..06b70a7e7d9 100644
--- a/addons/account_balance/i18n/el.po
+++ b/addons/account_balance/i18n/el.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: 2010-06-09 03:21+0000\n"
+"PO-Revision-Date: 2010-06-09 03:36+0000\n"
"Last-Translator: Panayiotis Konstantinidis \n"
"Language-Team: Greek \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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
@@ -117,6 +117,25 @@ msgid ""
" 5. You have an option to print the desired report in Landscape format.\n"
" "
msgstr ""
+"Το κομμάτι Ισολογισμών είναι ένα επιπρόσθετο λειτουργικό κομμάτι στο κομμάτι "
+"της Οικονομικής Διαχείρισης\n"
+"\n"
+" Αυτό το κομμάτι σου δίνει διάφορες επιλογές για εκτύπωση ισολογισμών.\n"
+"\n"
+" 1. Μπορείς να συγκρίνεις τους ισολογισμούς διαφόρων ετών.\n"
+"\n"
+" 2. Μπορείς να ορίσεις την απόλυτη ή επί τοις εκατό σύγκριση μεταξύ δύο "
+"ετών.\n"
+"\n"
+" 3. Μπορείς να ορίσεις το ισολογισμό αναφοράς για την επί τοις εκατό "
+"σύγκριση συγκεκριμένων ετών.\n"
+"\n"
+" 4. Μπορείς να επιλέξεις περιόδους ως πραγματική ημερομηνία ή περιόδους "
+"ως ημέρα δημιουργίας.\n"
+"\n"
+" 5. Έχεις δυνατότητα να εκτυπώσεις την επιθυμητή αναφορά σε μορφή "
+"Landscape.\n"
+" "
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -149,7 +168,7 @@ msgstr "Σύνολο:"
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Account Balance -"
-msgstr ""
+msgstr "Ισολογισμός"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,format_perc:0
diff --git a/addons/account_cancel/__init__.py b/addons/account_cancel/__init__.py
new file mode 100644
index 00000000000..49a09e5570e
--- /dev/null
+++ b/addons/account_cancel/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
new file mode 100644
index 00000000000..b38865f04ef
--- /dev/null
+++ b/addons/account_cancel/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+
+{
+ "name" : "Account Cancel",
+ "version" : "1.1",
+ "depends" : ["account"],
+ "author" : "Tiny",
+ "category": 'Generic Modules/Accounting',
+ "description": """
+ Module Add Allow cancelling entries field on form view of account journal if it set to true it allows user to cancel entries & invoices.
+ """,
+ 'website': 'http://www.openerp.com',
+ 'init_xml': [],
+ 'update_xml': ['account_cancel_view.xml' ],
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
+
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
new file mode 100644
index 00000000000..82eae01347c
--- /dev/null
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ account.journal.form
+ account.journal
+ form
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po
index 9ed3156d138..a38c20e7a9e 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/account_coda/i18n/el.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
diff --git a/addons/account_coda/i18n/et.po b/addons/account_coda/i18n/et.po
index ca0c9a210fb..9a173c51337 100644
--- a/addons/account_coda/i18n/et.po
+++ b/addons/account_coda/i18n/et.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 32aaa2a926d..07a1d41c617 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index 1b106512a00..daa8336dcf9 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/i18n/el.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index f732b6ba6c9..876540bedc1 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.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:11+0000\n"
-"Last-Translator: Makis Nicolaou \n"
+"PO-Revision-Date: 2010-06-09 06:03+0000\n"
+"Last-Translator: Panayiotis Konstantinidis \n"
"Language-Team: Greek \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 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -40,7 +40,7 @@ msgstr "Επιλέξτε την Κατάσταση Πληρωμής που θα
#. module: account_payment
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
#. module: account_payment
#: view:payment.line:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 28a412cb5c6..24600a62e0e 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
index 5bb1a2e2399..a963b0b5118 100644
--- a/addons/account_tax_include/__openerp__.py
+++ b/addons/account_tax_include/__openerp__.py
@@ -35,6 +35,7 @@ This module implement the modification on the invoice form.
'init_xml': [],
'update_xml': ['account_tax_include_view.xml'],
'demo_xml': [],
+ 'test': ['test/account_tax_include.yml'],
'installable': True,
'active': False,
'certificate': '0070514190381',
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
index ea07038c8ce..e4c0cb46a55 100644
--- a/addons/account_tax_include/i18n/ru.po
+++ b/addons/account_tax_include/i18n/ru.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/test/account_tax_include.yml b/addons/account_tax_include/test/account_tax_include.yml
new file mode 100644
index 00000000000..a4b0f8531b9
--- /dev/null
+++ b/addons/account_tax_include/test/account_tax_include.yml
@@ -0,0 +1,93 @@
+
+-
+ Creating a tax record
+-
+ !record {model: account.tax, id: account_tax_a0}:
+ amount: 0.10000000000000001
+ applicable_type: 'true'
+ company_id: base.main_company
+ description: a
+ name: a
+ sequence: 1
+ type: percent
+ type_tax_use: all
+
+-
+ Creating a account invoice record with tax excluded
+-
+ !record {model: account.invoice, id: account_invoice_tax_exclude}:
+ account_id: account.a_recv
+ address_contact_id: base.res_partner_address_3000
+ address_invoice_id: base.res_partner_address_3000
+ company_id: base.main_company
+ currency_id: base.EUR
+ invoice_line:
+ - account_id: account.a_sale
+ name: '[PC1] Basic PC'
+ price_unit: 100.0
+ quantity: 1.0
+ invoice_line_tax_id:
+ - account_tax_a0
+ product_id: product.product_product_pc1
+ uos_id: product.product_uom_unit
+ journal_id: account.sales_journal
+ partner_id: base.res_partner_desertic_hispafuentes
+ price_type: tax_excluded
+ reference_type: none
+
+-
+ Performing an osv_memory action button_reset_taxes on module account.invoice
+-
+ !python {model: account.invoice}: |
+ self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_exclude")], {"lang": "en_US", "tz": False,
+ "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
+ "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
+ })
+-
+ Check if tax is excluded in invoice
+-
+ !assert {model: account.invoice, id: account_invoice_tax_exclude, severity: error, string: price type is tax excluded}:
+ - state == "draft"
+ - amount_untaxed == 100.0
+ - amount_tax == 10.0
+ - amount_total == 110.0
+
+-
+ Creating a account invoice record with tax include
+-
+ !record {model: account.invoice, id: account_invoice_tax_include}:
+ account_id: account.a_recv
+ address_contact_id: base.res_partner_address_3000
+ address_invoice_id: base.res_partner_address_3000
+ company_id: base.main_company
+ currency_id: base.EUR
+ invoice_line:
+ - account_id: account.a_sale
+ name: '[PC1] Basic PC'
+ price_unit: 100.0
+ quantity: 1.0
+ invoice_line_tax_id:
+ - account_tax_a0
+ product_id: product.product_product_pc1
+ uos_id: product.product_uom_unit
+ journal_id: account.sales_journal
+ partner_id: base.res_partner_desertic_hispafuentes
+ price_type: tax_included
+ reference_type: none
+
+-
+ Performing an osv_memory action button_reset_taxes on module account.invoice
+-
+ !python {model: account.invoice}: |
+ self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_include")], {"lang": "en_US", "tz": False,
+ "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
+ "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
+ })
+-
+ Check if tax is included in invoice
+-
+ !assert {model: account.invoice, id: account_invoice_tax_include, severity: error, string: price type is tax included}:
+ - state == "draft"
+ - amount_untaxed == 90.91
+ - amount_tax == 9.09
+ - amount_total == 100.00
\ No newline at end of file
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
index b06ebff8a16..20f86c1846e 100644
--- a/addons/account_voucher_payment/i18n/ca.po
+++ b/addons/account_voucher_payment/i18n/ca.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
index 80c07e08abb..d169c1cd6ed 100644
--- a/addons/account_voucher_payment/i18n/es.po
+++ b/addons/account_voucher_payment/i18n/es.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment
diff --git a/addons/account_voucher_payment/i18n/et.po b/addons/account_voucher_payment/i18n/et.po
index 591a7595d36..1541fa67aaf 100644
--- a/addons/account_voucher_payment/i18n/et.po
+++ b/addons/account_voucher_payment/i18n/et.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index c97159e08c4..f9940571143 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -36,7 +36,7 @@
* My Latest Objects (list)
* My Latest Deposits (list)
* Objects Statistics (list)
- * My Objects By Day (list)
+ * My Objects By Day (list)
""",
'author': 'Tiny',
'depends': ['base', 'account', 'hr_attendance'],
@@ -59,13 +59,13 @@
# 'wizard/auction_aie_send_result_view.xml',
'wizard/auction_lots_buyer_map_view.xml',
# 'wizard/auction_lots_numerotate_view.xml',
-
+
'auction_view.xml',
'auction_report.xml',
'auction_wizard.xml',
'board_auction_view.xml',
'board_auction_manager_view.xml',
-
+
],
'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
'installable': True,
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index ca940cf469a..257ff775684 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index eb36642e385..15f3fbc92fe 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
new file mode 100644
index 00000000000..968bb5f6bbf
--- /dev/null
+++ b/addons/auction/test/auction.yml
@@ -0,0 +1,204 @@
+-
+ In order to test the auction module in the Open-ERP I start the process by creating a product.
+-
+ I create a new product furniture.
+-
+ !record {model: product.product, id: product_product_furniture0}:
+ categ_id: product.cat1
+ cost_method: standard
+ mes_type: fixed
+ name: Furniture
+ procure_method: make_to_stock
+ standard_price: 1.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+ volume: 0.0
+ warranty: 0.0
+ weight: 0.0
+ weight_net: 0.0
+-
+ I create a new artist for an object.
+-
+ !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
+ birth_death_dates: 1853-1900
+ name: Vincent van Gogh
+-
+ Now I want to associate an object with the auction so for that I create an auction "Antique furniture exhibition"
+-
+ !record {model: auction.dates, id: auction_dates_antiquefurnitureexhibition0}:
+ acc_expense: account.a_pay
+ acc_income: account.a_recv
+ account_analytic_id: account.analytic_root
+ auction1: '2010-05-20'
+ auction2: '2010-05-21'
+ expo1: '2010-05-18'
+ expo2: '2010-05-19'
+ journal_id: account.expenses_journal
+ journal_seller_id: account.sales_journal
+ name: Antique furniture exhibition
+-
+ An object is being deposited for an auction,I create a seller's deposit record.
+-
+ !record {model: auction.deposit, id: auction_deposit_ad0}:
+ date_dep: '2010-05-18'
+ method: keep
+ name: AD/006
+ partner_id: base.res_partner_4
+-
+ I create a new object wooden-chair which is to be auctioned.
+-
+ !record {model: auction.lots, id: auction_lots_woodenchair0}:
+ ach_uid: base.res_partner_2
+ artist_id: auction_artists_vincentvangogh0
+ auction_id: auction_dates_antiquefurnitureexhibition0
+ bord_vnd_id: auction_deposit_ad0
+ lot_est1: 3000.0
+ lot_est2: 5000.0
+ lot_num: 1
+ name: wooden-chair
+ name2: antique wooden chair
+ obj_num: 1
+ obj_price: 4000.0
+ obj_ret: 5000.0
+ product_id: 'product_product_furniture0'
+ state: draft
+ vnd_lim: 5000.0
+-
+ I create a bid for an object "wooden-chair" which is to be auctioned in Antique furniture exhibition.
+-
+ !record {model: auction.bid, id: auction_bid_bid0}:
+ auction_id: auction_dates_antiquefurnitureexhibition0
+ contact_tel: (+32)2 211 34 83
+ name: bid/001
+ partner_id: auction.partner_record1
+-
+ I create a bid line.
+-
+ !record {model: auction.bid_line, id: auction_bid_line_0}:
+ auction: Antique furniture exhibition
+ bid_id: auction_bid_bid0
+ lot_id: auction.auction_lots_woodenchair0
+ price: 3500.0
+-
+ I create another bid for an object "wooden-chair" bided by a different partner
+-
+ !record {model: auction.bid, id: auction_bid_bid1}:
+ auction_id: auction_dates_antiquefurnitureexhibition0
+ name: bid/002
+ partner_id: base.res_partner_2
+-
+ I create a bid line.
+-
+ !record {model: auction.bid_line, id: auction_bid_line_1}:
+ auction: Antique furniture exhibition
+ bid_id: 'auction_bid_bid1'
+ call: 1
+ lot_id: auction.auction_lots_woodenchair0
+ price: 4000.0
+-
+ I check that buyer price and seller price gets bind with the value
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ assert(auc_id.buyer_price,auc_id.seller_price), _('Buyer price and seller price are not available!')
+-
+ I check that a record gets created in the Seller's Summary.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ auc_deposit_obj=self.pool.get('auction.deposit')
+ rep_sell_obj = self.pool.get('report.seller.auction')
+ ids =rep_sell_obj.search(cr, uid, [('auction', '=', auc_id.auction_id.id),('seller', '=',auc_id.bord_vnd_id.partner_id.id)])
+ assert ids, _('No record found!')
+-
+ I check that a record gets created in the Seller's Revenues.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ auc_deposit_obj=self.pool.get('auction.deposit')
+ rep_sell_obj = self.pool.get('report.seller.auction2')
+ ids =rep_sell_obj.search(cr, uid, [('auction', '=', auc_id.auction_id.id),('seller', '=',auc_id.bord_vnd_id.partner_id.id)])
+ assert ids, _('No record found!')
+-
+ I check that a record gets created in the Buyer's Summary.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id1=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ rep_buy_obj1 = self.pool.get('report.buyer.auction')
+ ids1=rep_buy_obj1.search(cr, uid, [('auction', '=', auc_id1.auction_id.id),('buyer', '=',auc_id1.ach_uid.id)])
+ assert ids1, _('No record found!')
+-
+ I check that a record gets created in the Buyer's Revenue.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id1=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ rep_buy_obj1 = self.pool.get('report.buyer.auction2')
+ ids1=rep_buy_obj1.search(cr, uid, [('auction', '=', auc_id1.auction_id.id),('buyer', '=',auc_id1.ach_uid.id)])
+ assert ids1, _('No record found!')
+-
+ I check that a record gets created in the Auction's Summary.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id2=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ rep_auc_obj1 = self.pool.get('report.auction.view')
+ ids2=rep_auc_obj1.search(cr, uid, [('auction_id', '=', auc_id2.auction_id.id)])
+ assert ids2, _('No record found!')
+-
+ I check that a record gets created in the Auction's Revenues.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id3=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ rep_auc_obj1 = self.pool.get('report.auction.view2')
+ ids3=rep_auc_obj1.search(cr, uid, [('auction', '=', auc_id3.auction_id.id)])
+ assert ids3, _('No record found!')
+-
+ An object has been sold,so I click on the "Sold" button.
+-
+ !python {model: auction.lots}: |
+ self.button_bought(cr, uid, [ref("auction_lots_woodenchair0")], {"lang": "en_US", "tz":
+ False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_lots_woodenchair0")],
+ "active_id": ref("auction.auction_lots_woodenchair0")})
+-
+ I check that the order which was initially in the draft state has transit to sold state.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ assert(auc_id.state == 'sold'), _('State not changed!')
+-
+ Then I click on the Taken Away button.
+-
+ !python {model: auction.lots}: |
+ self.button_taken_away(cr, uid, [ref("auction_lots_woodenchair0")], {"lang":
+ "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_all_objects_menu")],
+ "active_id": ref("auction.auction_all_objects_menu")})
+-
+ I check that the order which was initially in the sold state has transit to taken away state.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ assert(auc_id.state == 'taken_away'), _('State not changed!')
+-
+ I click on the "Close + Create all invoices" button
+-
+ !python {model: auction.dates}: |
+ self.close(cr, uid, [ref("auction.auction_dates_antiquefurnitureexhibition0")],
+ {"lang": "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids":
+ [ref("auction.menu_auction_dates_next1")], "active_id": ref("auction.menu_auction_dates_next1")})
+-
+ I check that a record gets created in the "Supplier Invoices".
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+ assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!')
diff --git a/addons/auction/test/auction_wizard.yml b/addons/auction/test/auction_wizard.yml
new file mode 100644
index 00000000000..0998e7a03a5
--- /dev/null
+++ b/addons/auction/test/auction_wizard.yml
@@ -0,0 +1,248 @@
+-
+ In order to test the wizards of auction module I create a new record.
+-
+ I start the process by creating a new product Paintings.
+-
+ !record {model: product.product, id: product_product_paintings0}:
+ categ_id: product.cat1
+ cost_method: standard
+ mes_type: fixed
+ name: Paintings
+ procure_method: make_to_stock
+ standard_price: 1.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+ volume: 0.0
+ warranty: 0.0
+ weight: 0.0
+ weight_net: 0.0
+-
+ I create a new artist-Picasso's record.
+-
+ !record {model: auction.artists, id: auction_artists_picasso0}:
+ birth_death_dates: 1881-1973
+ name: Picasso
+-
+ Now I want to associate an object with the auction so for that I create an auction "Picasso's painting exhibition"
+-
+ !record {model: auction.dates, id: auction_dates_picassospaintingexhibition0}:
+ acc_expense: account.a_pay
+ acc_income: account.a_recv
+ account_analytic_id: account.analytic_root
+ auction1: '2010-05-24'
+ auction2: '2010-05-25'
+ expo1: '2010-05-21'
+ expo2: '2010-05-22'
+ journal_id: account.expenses_journal
+ journal_seller_id: account.sales_journal
+ name: Picasso's painting exhibition
+-
+ An object is being deposited for an auction,I create a seller's deposit record.
+-
+ !record {model: auction.deposit, id: auction_deposit_ad1}:
+ date_dep: '2010-05-18'
+ method: keep
+ name: AD/007
+ partner_id: base.res_partner_9
+-
+ I create a new object painting which is to be auctioned.
+-
+ !record {model: auction.lots, id: auction_lots_painting0}:
+ ach_login: 'Mr.Chang'
+ artist_id: auction.auction_artists_picasso0
+ auction_id: auction_dates_picassospaintingexhibition0
+ bord_vnd_id: auction_deposit_ad1
+ lot_est1: 2000.0
+ lot_est2: 4000.0
+ lot_num: 2
+ name: painting
+ name2: picasso_painting
+ obj_num: 2
+ obj_price: 3500.0
+ obj_ret: 4000.0
+ product_id: auction.product_product_paintings0
+ state: draft
+ vnd_lim: 4000.0
+-
+ I assign the buyer through "Map buyer user name to Partners" wizard.
+-
+ !record {model: auction.lots.buyer_map, id: auction_lots_buyer_map_0}:
+ ach_login: 'Mr.Chang'
+ ach_uid: base.res_partner_3
+-
+ I click on the "Update" button.
+-
+ !python {model: auction.lots.buyer_map}: |
+ auc_obj=self.pool.get('auction.lots')
+ ids=self.browse(cr, uid, ref("auction_lots_painting0"))
+ self.buyer_map_set(cr, uid, [ref("auction_lots_buyer_map_0")], {"lang": "en_US",
+ "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "active_id": ref("auction_lots_painting0")})
+-
+ I check that the buyer field gets bind with the value.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ assert(auc_id.ach_uid), _('Buyer not assigned!')
+-
+ I mark that a seller has been paid by using the "Mark as paid for seller" wizard.
+-
+ !record {model: auction.payer.sel, id: auction_payer_sel_0}:
+ {}
+-
+ I click on the "Pay" button.
+-
+ !python {model: auction.payer.sel}: |
+ self.payer_sel(cr, uid, [ref("auction_payer_sel_0")], {"lang": "en_US", "tz":
+ False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")], "active_id": ref("auction_lots_painting0")})
+-
+ I check that the Seller paid field is set to True.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ assert(auc_id.paid_vnd == True), _('Seller paid is not marked!')
+-
+ I use the "Mark as taken away" wizard to indicate that an object is taken away.
+-
+ !record {model: auction.lots.able, id: auction_lots_able_0}:
+ {}
+-
+ Then I click on the "Able Taken away" wizard.
+-
+ !python {model: auction.lots.able}: |
+ self.confirm_able(cr, uid, [ref("auction_lots_able_0")], {"lang":"en_US", "tz":
+ False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "active_id": ref("auction_lots_painting0")})
+-
+ I check that Taken away field is set to True.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ assert(auc_id.ach_emp == True), _('Taken away is not marked!')
+-
+ I use the "Unmark as taken away" wizard to unmark the Taken Away field.
+-
+ !record {model: auction.lots.enable, id: auction_lots_enable_0}:
+ confirm_en: 0.0
+-
+ Then I click on the "Enable Taken away" button.
+-
+ !python {model: auction.lots.enable}: |
+ self.confirm_enable(cr, uid, [ref("auction_lots_enable_0")], {"lang": "en_US",
+ "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "active_id": ref("auction_lots_painting0"),})
+-
+ I check that Taken away field is set to False.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ assert(auc_id.ach_emp == False), _('Taken away is marked!')
+-
+ I create statement lines for an object's payment by using the "Pay objects of the buyer" wizard
+-
+ I create a bank statement.
+-
+ !record {model: account.bank.statement, id: account_bank_statement_st0}:
+ balance_end_real: 0.0
+ date: '2010-05-19'
+ journal_id: account.bank_journal
+ name: St. 05/19
+ period_id: account.period_5
+ state: draft
+-
+ I create auction payment record.
+-
+ !record {model: auction.pay.buy, id: auction_pay_buy_0}:
+ amount: 2000.0
+ amount2: 1000.0
+ amount3: 1000.0
+ buyer_id: base.res_partner_2
+ statement_id1: account_bank_statement_st0
+ statement_id2: account_bank_statement_st0
+ statement_id3: account_bank_statement_st0
+ total: 4000.0
+-
+ Then I click "Pay" button.
+-
+ !python {model: auction.pay.buy}: |
+ self.pay_and_reconcile(cr, uid, [ref("auction_pay_buy_0")], {"lang": "en_US", "tz":
+ False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "active_id": ref("auction_lots_painting0"),})
+-
+ I check that a record gets created in the 'auction_statement_line_rel' table
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ cr.execute("select statement from auction_statement_line_rel,auction_lots where auction_lots.id=auction_statement_line_rel.auction_id AND auction_lots.name='painting'")
+ ans=cr.fetchall()
+ assert ans, _('statement_id not found!')
+-
+ I create the seller's invoice by using the "Invoice Seller objects" wizard.
+-
+ !record {model: auction.lots.make.invoice, id: auction_lots_make_invoice_0}:
+ amount: 3500.0
+ number: 2010/002
+ objects: 1
+-
+ Then I click on the "Create Invoices" button.
+-
+ !python {model: auction.lots.make.invoice}: |
+ self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_0")], {"lang": "en_US",
+ "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "tz": False, "active_id": ref("auction_lots_painting0"),})
+-
+ I check that a "Seller Invoice" field gets bind with the value.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!')
+-
+ I create a buyer's invoice by using the "Invoice Buyer objects" wizard.
+-
+ !record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}:
+ amount: 3500.0
+ buyer_id: base.res_partner_3
+ number: 2010/003
+ objects: 1
+-
+ Then I click on the "Create Invoices" button.
+-
+ !python {model: auction.lots.make.invoice.buyer}: |
+ self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_buyer_0")], {"lang":
+ "en_US", "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "tz": False, "active_id": ref("auction_lots_painting0"), })
+-
+ I check that a "Buyer Invoice" field gets bind with the value.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ assert(auc_id.ach_inv_id), _('Seller Invoice has not been created!')
+-
+ In order to change the auction for an object I use the "Change auction date" wizard.
+-
+ !record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}:
+ auction_id: auction.auction_date_2
+-
+ Then I click on the "Move to Auction date" button.
+-
+ !python {model: auction.lots.auction.move}: |
+ self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang":
+ "en_US", "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+ "active_id": ref("auction_lots_painting0"), })
+-
+ I check that a record gets created in the lot history.
+-
+ !python {model: auction.lots}: |
+ from tools.translate import _
+ auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+ auc_lot_his=self.pool.get('auction.lot.history')
+ ids=auc_lot_his.search(cr, uid, [('lot_id', '=', auc_id.id)])
+ assert ids, _('Auction history does not exists!')
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d0c1a57ba84..79c8a0207a3 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -138,7 +138,7 @@
+ parent="base.menu_address_book" sequence="15" />
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index a4ee55061c2..f9b78c86564 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.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: 2010-03-17 14:08+0000\n"
-"Last-Translator: 英华 \n"
+"PO-Revision-Date: 2010-06-09 16:41+0000\n"
+"Last-Translator: Wei \"oldrev\" Li \n"
"Language-Team: Simplified Chinese \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 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
#: field:module.quality.check,final_score:0
msgid "Final Score (%)"
-msgstr ""
+msgstr "最终评分（%）"
#. module: base_module_quality
#: constraint:ir.model:0
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 8b4c87f5583..56742afa154 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 2cf88ec82e1..236c8a46a53 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
new file mode 100644
index 00000000000..6f95fbf0fbc
--- /dev/null
+++ b/addons/claim_from_delivery/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
new file mode 100644
index 00000000000..86d357834ff
--- /dev/null
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -0,0 +1,35 @@
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+{
+ "name" : "Claim from delivery",
+ "version" : "1.0",
+ "author" : "Tiny",
+ "category" : "Enterprise Specific Modules/Food Industries",
+ "depends" : ["base", "crm_claim", "stock"],
+ "init_xml" : [],
+ "demo_xml" : [],
+ "description": '''Create Claim from delivery order:
+''',
+ "update_xml" : ["claim_delivery_view.xml"],
+ "active": False,
+ "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
new file mode 100644
index 00000000000..a1c8be870e2
--- /dev/null
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 7f7ab94616f..618dd55cc21 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -30,19 +30,19 @@ from tools.translate import _
MAX_LEVEL = 15
AVAILABLE_STATES = [
- ('draft', 'Draft'),
- ('open', 'Open'),
- ('cancel', 'Cancelled'),
- ('done', 'Closed'),
+ ('draft', 'Draft'),
+ ('open', 'Open'),
+ ('cancel', 'Cancelled'),
+ ('done', 'Closed'),
('pending', 'Pending'),
]
AVAILABLE_PRIORITIES = [
('1', 'Highest'),
- ('2', 'High'),
- ('3', 'Normal'),
- ('4', 'Low'),
- ('5', 'Lowest'),
+ ('2', 'High'),
+ ('3', 'Normal'),
+ ('4', 'Low'),
+ ('5', 'Lowest'),
]
class crm_case(object):
@@ -107,10 +107,10 @@ class crm_case(object):
"""
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
return user.context_section_id.id or False
-
+
def stage_next(self, cr, uid, ids, context=None):
"""This function computes next stage for case from its current stage
- using available stage for that case type
+ using available stage for that case type
@param self: The object pointer
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@@ -151,7 +151,7 @@ class crm_case(object):
def stage_previous(self, cr, uid, ids, context=None):
"""This function computes previous stage for case from its current stage
- using available stage for that case type
+ using available stage for that case type
@param self: The object pointer
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@@ -177,11 +177,11 @@ class crm_case(object):
@param uid: the current user’s ID for security checks,
@param ids: List of case IDs
@param part: Partner's id
- @email: Partner's email ID
+ @email: Partner's email ID
"""
if not part:
- return {'value': {'partner_address_id': False,
- 'email_from': False,
+ return {'value': {'partner_address_id': False,
+ 'email_from': False,
}}
addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
data = {'partner_address_id': addr['contact']}
@@ -195,13 +195,13 @@ class crm_case(object):
@param uid: the current user’s ID for security checks,
@param ids: List of case IDs
@param add: Id of Partner's address
- @email: Partner's email ID
+ @email: Partner's email ID
"""
if not add:
return {'value': {'email_from': False}}
address = self.pool.get('res.partner.address').browse(cr, uid, add)
return {'value': {'email_from': address.email}}
-
+
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
mailgate_pool = self.pool.get('mailgate.thread')
return mailgate_pool._history(cr, uid, cases, keyword, history=history,\
@@ -209,7 +209,7 @@ class crm_case(object):
details=details, email_from=email_from,\
message_id=message_id, attach=attach, \
context=context)
-
+
def case_open(self, cr, uid, ids, *args):
"""Opens Case
@param self: The object pointer
@@ -265,7 +265,7 @@ class crm_case(object):
if case.section_id.parent_id.user_id:
data['user_id'] = case.section_id.parent_id.user_id.id
else:
- raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
+ raise osv.except_osv(_('Error !'), _('You can not escalate, You are already at the top level regarding your sales-team category.'))
self.write(cr, uid, [case.id], data)
cases = self.browse(cr, uid, ids)
self._history(cr, uid, cases, _('Escalate'))
@@ -317,7 +317,7 @@ class crm_case(object):
self.write(cr, uid, ids, {'state': 'draft', 'active': True})
self._action(cr, uid, cases, 'draft')
return True
-
+
def remind_partner(self, cr, uid, ids, context={}, attach=False):
"""
@@ -350,7 +350,7 @@ class crm_case(object):
src = case.email_from
dest = case.section_id.reply_to
body = ""
- body = case.email_last or case.description
+ body = case.email_last or case.description
if not destination:
src, dest = dest, src
if body and case.user_id.signature:
@@ -381,7 +381,7 @@ class crm_case(object):
# raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
#else:
# raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
- return True
+ return True
def _check(self, cr, uid, ids=False, context={}):
"""
@@ -428,12 +428,12 @@ class crm_case_section(osv.osv):
_order = "name"
_columns = {
- 'name': fields.char('Sales Team', size=64, required=True, translate=True),
- 'code': fields.char('Code', size=8),
+ 'name': fields.char('Sales Team', size=64, required=True, translate=True),
+ 'code': fields.char('Code', size=8),
'active': fields.boolean('Active', help="If the active field is set to \
- true, it will allow you to hide the sales team without removing it."),
- 'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
- 'user_id': fields.many2one('res.users', 'Responsible User'),
+ true, it will allow you to hide the sales team without removing it."),
+ 'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
+ 'user_id': fields.many2one('res.users', 'Responsible User'),
'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
'reply_to': fields.char('Reply-To', size=64, help="The email address put \
in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
@@ -445,8 +445,8 @@ class crm_case_section(osv.osv):
}
_defaults = {
- 'active': lambda *a: 1,
- 'allow_unlink': lambda *a: 1,
+ 'active': lambda *a: 1,
+ 'allow_unlink': lambda *a: 1,
}
_sql_constraints = [
@@ -463,7 +463,7 @@ class crm_case_section(osv.osv):
@param ids: List of Sales team ids
"""
level = 100
-
+
while len(ids):
cr.execute('select distinct parent_id from crm_case_section where id =ANY(%s)', (ids,))
ids = filter(None, map(lambda x: x[0], cr.fetchall()))
@@ -509,9 +509,9 @@ class crm_case_categ(osv.osv):
_description = "Category of case"
_columns = {
- 'name': fields.char('Case Category Name', size=64, required=True, translate=True),
- 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
- 'object_id': fields.many2one('ir.model', 'Object Name'),
+ 'name': fields.char('Case Category Name', size=64, required=True, translate=True),
+ 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ 'object_id': fields.many2one('ir.model', 'Object Name'),
}
def _find_object_id(self, cr, uid, context=None):
@@ -541,9 +541,9 @@ class crm_case_resource_type(osv.osv):
_rec_name = "name"
_columns = {
- 'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
- 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
- 'object_id': fields.many2one('ir.model', 'Object Name'),
+ 'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
+ 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ 'object_id': fields.many2one('ir.model', 'Object Name'),
}
def _find_object_id(self, cr, uid, context=None):
"""Finds id for case object
@@ -572,14 +572,14 @@ class crm_case_stage(osv.osv):
_order = "sequence"
_columns = {
- 'name': fields.char('Stage Name', size=64, required=True, translate=True),
- 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ 'name': fields.char('Stage Name', size=64, required=True, translate=True),
+ 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'sequence': fields.integer('Sequence', help="Gives the sequence order \
- when displaying a list of case stages."),
- 'object_id': fields.many2one('ir.model', 'Object Name'),
- 'probability': fields.float('Probability (%)', required=True),
+ when displaying a list of case stages."),
+ 'object_id': fields.many2one('ir.model', 'Object Name'),
+ 'probability': fields.float('Probability (%)', required=True),
'on_change': fields.boolean('Change Probability Automatically', \
- help="Change Probability on next and previous stages."),
+ help="Change Probability on next and previous stages."),
'requirements': fields.text('Requirements')
}
def _find_object_id(self, cr, uid, context=None):
@@ -594,8 +594,8 @@ class crm_case_stage(osv.osv):
return ids and ids[0]
_defaults = {
- 'sequence': lambda *args: 1,
- 'probability': lambda *args: 0.0,
+ 'sequence': lambda *args: 1,
+ 'probability': lambda *args: 0.0,
'object_id' : _find_object_id
}
@@ -619,7 +619,7 @@ class users(osv.osv):
_inherit = 'res.users'
_description = "Users"
_columns = {
- 'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ 'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
users()
@@ -627,7 +627,7 @@ users()
class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
- 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
res_partner()
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 465c63ae626..a3d7639076f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -48,7 +48,7 @@
@@ -66,6 +66,7 @@
states="open,pending" type="object"
icon="gtk-go-forward" />
+
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 737e6ac633d..a1cdce906af 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -26,10 +26,10 @@
Opportunitiescrm.leadtree,form,graph
- [('type','=','opportunity')]
- {'search_default_current':1, 'default_type': 'opportunity'}
+ ['|',('type','=','opportunity'),('state','=','draft')]
+ {'search_default_user_id':uid,'search_default_current':1}
- {"search_default_user_id":uid}
+ {'search_default_current':1, 'default_type': 'opportunity'}
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index eadc4158d69..5fbfa766cbf 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -82,6 +82,7 @@
+
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 5e399b2e416..a1d6de450b6 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.po
@@ -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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-06-08 18:36+0000\n"
+"PO-Revision-Date: 2010-06-09 22:16+0000\n"
"Last-Translator: lyyser \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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -2100,12 +2100,12 @@ msgstr "Helpdesk'i toed"
#: model:crm.case.section,name:crm.section_support4
#: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
msgid "Fund Raising"
-msgstr ""
+msgstr "Vahendite kogumine"
#. module: crm
#: selection:crm.new.send.mail,init,state:0
msgid "Unchanged"
-msgstr ""
+msgstr "Muutmata"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2114,7 +2114,7 @@ msgstr ""
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Convert To Partner"
-msgstr ""
+msgstr "Muuda partneriks"
#. module: crm
#: field:crm.case.rule,trg_state_from:0
@@ -2140,17 +2140,17 @@ msgstr "Prioriteet"
#. module: crm
#: view:crm.opportunity:0
msgid "Source"
-msgstr ""
+msgstr "Allikas"
#. module: crm
#: field:crm.meeting,location:0
msgid "Location"
-msgstr ""
+msgstr "Asukoht"
#. module: crm
#: view:crm.fundraising:0
msgid "Payment Mode"
-msgstr ""
+msgstr "Makseviis"
#. module: crm
#: help:crm.case.rule,trg_date_range:0
@@ -2165,7 +2165,7 @@ msgstr ""
#: view:crm.job:0
#: view:crm.lead:0
msgid "Stage: "
-msgstr ""
+msgstr "Etapp: "
#. module: crm
#: view:crm.case.section:0
@@ -2196,7 +2196,7 @@ msgstr "Väljad muutmiseks"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead1
msgid "Telesales"
-msgstr ""
+msgstr "Telemüügid"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2223,7 +2223,7 @@ msgstr "Segmenteerimise rida"
#: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
#: view:crm.phonecall:0
msgid "Planned Date"
-msgstr ""
+msgstr "Planeeritud kuupäev"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2258,17 +2258,17 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "July"
-msgstr ""
+msgstr "Juuli"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor1
msgid "Prospecting"
-msgstr ""
+msgstr "Uuring"
#. module: crm
#: field:crm.case,partner_name2:0
msgid "Employee Email"
-msgstr ""
+msgstr "Töötaja e-post"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting
@@ -2278,28 +2278,28 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Job Info"
-msgstr ""
+msgstr "Töö info"
#. module: crm
#: view:crm.meeting:0
msgid "Cancel Meeting"
-msgstr ""
+msgstr "Tühista koosolek"
#. module: crm
#: model:crm.case.section,name:crm.section_support0
msgid "Jobs"
-msgstr ""
+msgstr "Tööd"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Loomise kuupäev"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone3
#: view:crm.phonecall:0
msgid "Not Held"
-msgstr ""
+msgstr "Ära hoia"
#. module: crm
#: field:crm.case.rule,act_mail_to_user:0
@@ -2309,12 +2309,12 @@ msgstr "MAili vastutajale"
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Töökohad - Värbamise vorm"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim1
msgid "Corrective"
-msgstr ""
+msgstr "Korrektiivne"
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity
@@ -2324,7 +2324,7 @@ msgstr ""
#. module: crm
#: view:crm.case:0
msgid "Support Query"
-msgstr ""
+msgstr "Toetuse päring"
#. module: crm
#: view:crm.case.rule:0
@@ -2337,7 +2337,7 @@ msgstr "Saadetava e-kirja mall"
#: field:report.crm.case.section.categ2,month:0
#: field:report.crm.case.section.stage,month:0
msgid "Month"
-msgstr ""
+msgstr "Kuu"
#. module: crm
#: model:crm.case.section,name:crm.section_support2
@@ -2347,13 +2347,13 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
#: model:process.node,name:crm.process_node_leads0
msgid "Leads"
-msgstr ""
+msgstr "Algatused"
#. module: crm
#: wizard_button:crm.new.send.mail,init,send:0
#: wizard_button:crm.send.mail,init,send:0
msgid "Send Email"
-msgstr ""
+msgstr "Saada e-kiri"
#. module: crm
#: wizard_view:crm.new.send.mail,init:0
@@ -2363,7 +2363,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund3
msgid "Credit Card"
-msgstr ""
+msgstr "Krediitkaart"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2388,16 +2388,17 @@ msgstr "Logi"
msgid ""
"This may help associations in their fund raising process and tracking."
msgstr ""
+"See võib aidata assotsiatsioone vahendite kogumise protsessil ja jälgimisel."
#. module: crm
#: view:crm.meeting:0
msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Reseti kui kinnitamatta"
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Support"
-msgstr ""
+msgstr "Helpdesk'i tugi"
#. module: crm
#: field:crm.case,email_cc:0
@@ -2415,7 +2416,7 @@ msgstr "Märkus"
#: field:report.crm.case.section.categ2,delay_close:0
#: field:report.crm.case.section.stage,delay_close:0
msgid "Delay Close"
-msgstr ""
+msgstr "Sulgemise viivitus"
#. module: crm
#: selection:crm.case,priority:0
@@ -2441,7 +2442,7 @@ msgstr "Suletud"
#. module: crm
#: view:crm.job:0
msgid "Candidate Name2"
-msgstr ""
+msgstr "Kandidaadi nimi2"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2452,7 +2453,7 @@ msgstr "loobu"
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet2
msgid "Internal Meeting"
-msgstr ""
+msgstr "Sisemine kohtumine"
#. module: crm
#: view:crm.case:0
@@ -2461,7 +2462,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Events"
-msgstr ""
+msgstr "Sündmused"
#. module: crm
#: help:crm.menu.config_wizard,lead:0
@@ -2469,6 +2470,8 @@ msgid ""
"Allows you to track and manage leads which are pre-sales requests or "
"contacts, the very first contact with a customer request."
msgstr ""
+"Võimaldab sul jälgida ja hallata algatusi, mis on müügi eelsed päringud või "
+"kontaktid. Esimene kontakt kliendipäringuga."
#. module: crm
#: help:crm.case,som:0
@@ -2486,7 +2489,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet1
msgid "Customer Meeting"
-msgstr ""
+msgstr "Kohtumine kliendiga"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc2:0
@@ -2501,7 +2504,7 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Degree"
-msgstr ""
+msgstr "Teaduskraad"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc1:0
@@ -2517,7 +2520,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_phone
#, python-format
msgid "Phone Calls"
-msgstr ""
+msgstr "Telefonikõned"
#. module: crm
#: help:crm.case,active:0
@@ -2529,7 +2532,7 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_menu_config_wizard
msgid "crm.menu.config_wizard"
-msgstr ""
+msgstr "crm.menu.config_wizard"
#. module: crm
#: view:crm.case.history:0
@@ -2539,12 +2542,12 @@ msgstr "Juhtumi Ajalugu"
#. module: crm
#: field:crm.case,partner_phone:0
msgid "Phone"
-msgstr ""
+msgstr "Telefon"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund2
msgid "Cheque"
-msgstr ""
+msgstr "Arve"
#. module: crm
#: field:crm.case,active:0
@@ -2575,12 +2578,12 @@ msgstr ">"
#. module: crm
#: view:crm.job:0
msgid "Candidate Phone"
-msgstr ""
+msgstr "Võimalik telefon"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
msgid "Send Mail"
-msgstr ""
+msgstr "Saada kiri"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2608,7 +2611,7 @@ msgstr ""
#. module: crm
#: model:process.node,note:crm.process_node_opportunities0
msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Kui reaalne projekt/võimalus tuvastatakse"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2630,12 +2633,12 @@ msgstr "Toiming"
#: model:ir.ui.menu,name:crm.menu_crm_case_claims
#, python-format
msgid "Claims"
-msgstr ""
+msgstr "Nõuded"
#. module: crm
#: field:crm.segmentation,som_interval_decrease:0
msgid "Decrease (0>1)"
-msgstr ""
+msgstr "Kahanemine (0>1)"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_case_history_event
@@ -2645,13 +2648,13 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_case_category2
msgid "Category2 of case"
-msgstr ""
+msgstr "Juhtumi kategooria2"
#. module: crm
#: wizard_field:crm.new.send.mail,init,to:0
#: wizard_field:crm.send.mail,init,to:0
msgid "To"
-msgstr ""
+msgstr "Kuni"
#. module: crm
#: view:crm.case.rule:0
@@ -2672,18 +2675,18 @@ msgstr "Üldine"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead2
msgid "Assigned"
-msgstr ""
+msgstr "Omistatud"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead5
msgid "Recycled"
-msgstr ""
+msgstr "Utiliseeritud"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead8
#: model:crm.case.categ,name:crm.categ_oppor8
msgid "Other"
-msgstr ""
+msgstr "Muu"
#. module: crm
#: view:crm.case:0
@@ -2693,7 +2696,7 @@ msgstr ""
#: selection:crm.new.send.mail,init,state:0
#: view:crm.opportunity:0
msgid "Done"
-msgstr ""
+msgstr "Valmis"
#. module: crm
#: field:crm.segmentation,som_interval_max:0
@@ -2703,7 +2706,7 @@ msgstr "Maks intervall"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
msgid "All Opportunities"
-msgstr ""
+msgstr "Kõik võimalused"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2774,23 +2777,23 @@ msgstr "Vastutav"
#: model:crm.case.stage,name:crm.stage_claim4
#: model:crm.case.stage,name:crm.stage_meet3
msgid "Invalid"
-msgstr ""
+msgstr "Vigane"
#. module: crm
#: wizard_button:crm.job.meeting_set,init,order:0
#: wizard_button:crm.phonecall.meeting_set,init,order:0
msgid "Set Meeting"
-msgstr ""
+msgstr "Sea koosolek"
#. module: crm
#: field:crm.menu.config_wizard,meeting:0
msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Koosolekute kalender"
#. module: crm
#: view:crm.case:0
msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Juhtumid staatuse ja hinnangutejärgi"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2799,6 +2802,8 @@ msgid ""
"You can not escalate this case.\n"
"You are already at the top level."
msgstr ""
+"Sa ei saa eskaleerida seda juhtumit.\n"
+"Sa oled juba ülemisel tasemel."
#. module: crm
#: view:crm.lead:0
@@ -2818,18 +2823,18 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Kohtumine algatuste genereerimiseks"
#. module: crm
#: wizard_view:crm.lead.opportunity_set,create_partner:0
#: wizard_view:crm.lead.partner_create,init:0
msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "Oled sa kindel, et soovid luua partnerit selle algatuse põhjal?"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job6
msgid "Refused by Employee"
-msgstr ""
+msgstr "Tagasilükatud töötajapoolt"
#. module: crm
#: field:crm.case,partner_name:0
@@ -2839,7 +2844,7 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_job2
msgid "First Interview"
-msgstr ""
+msgstr "Esimene intervjuu"
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -2847,17 +2852,17 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Month"
-msgstr ""
+msgstr "See kuu"
#. module: crm
#: view:crm.job:0
msgid "Availability (weeks)"
-msgstr ""
+msgstr "Kättesaadavus (nädalad)"
#. module: crm
#: view:crm.opportunity:0
msgid "Opportunities Tree"
-msgstr ""
+msgstr "Võimaluste puu"
#. module: crm
#: help:crm.case,state:0
@@ -2879,7 +2884,7 @@ msgstr ""
#. module: crm
#: selection:crm.email.add.cc,name:0
msgid "Email Address"
-msgstr ""
+msgstr "E-posti aadress"
#. module: crm
#: help:crm.segmentation,som_interval_max:0
@@ -2893,17 +2898,17 @@ msgstr ""
#. module: crm
#: field:crm.case,case_id:0
msgid "Related Case"
-msgstr ""
+msgstr "Seotud juhtum"
#. module: crm
#: field:crm.case.rule,server_action_id:0
msgid "Server Action"
-msgstr ""
+msgstr "Serveri toiming"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
msgid "All Claims"
-msgstr ""
+msgstr "Kõik nõuded"
#. module: crm
#: field:crm.case.log,user_id:0
@@ -2950,7 +2955,7 @@ msgstr "Logide ajalugu"
#: wizard_field:crm.lead.opportunity_set,opportunity,name:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
msgid "Opportunity Summary"
-msgstr ""
+msgstr "Võimalus summaarselt"
#. module: crm
#: view:crm.case:0
@@ -2971,7 +2976,7 @@ msgstr "Juhtumi kirjeldus"
#: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
#: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
msgid "Assign To"
-msgstr ""
+msgstr "Kellele määratud"
#. module: crm
#: field:crm.case,date_action_last:0
@@ -2981,22 +2986,22 @@ msgstr "Viimane toiming"
#. module: crm
#: field:crm.case,duration:0
msgid "Duration"
-msgstr ""
+msgstr "Kestvus"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Juhtumid jaotise, kategooria ja staatusejärgi"
#. module: crm
#: view:crm.job:0
msgid "Candidate Hired"
-msgstr ""
+msgstr "Kandidaat palgatud"
#. module: crm
#: field:crm.menu.config_wizard,jobs:0
msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Töökohad töölevõtmise protsess"
#. module: crm
#: model:ir.ui.menu,name:crm.next_id_52
@@ -3007,12 +3012,12 @@ msgstr "Kõik Juhtumid"
#: code:addons/crm/wizard/crm_lead_wizard.py:0
#, python-format
msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Partner on juba määratud sellele algatusele."
#. module: crm
#: view:crm.lead:0
msgid "Lead Source"
-msgstr ""
+msgstr "Algatuse allikas"
#. module: crm
#: field:report.crm.case.section.categ.categ2,nbr:0
@@ -3020,7 +3025,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,nbr:0
#: field:report.crm.case.section.stage,nbr:0
msgid "# of Cases"
-msgstr ""
+msgstr "# Juhtumid"
#. module: crm
#: selection:crm.meeting,class:0
@@ -3041,7 +3046,7 @@ msgstr "Segmenteerimine"
#. module: crm
#: view:crm.fundraising:0
msgid "Funds Form"
-msgstr ""
+msgstr "Fondide vorm"
#. module: crm
#: view:crm.meeting:0
@@ -3052,17 +3057,17 @@ msgstr ""
#: selection:crm.lead.opportunity_set,create_partner,action:0
#: selection:crm.phonecall.opportunity_set,create_partner,action:0
msgid "Create a new partner"
-msgstr ""
+msgstr "Loo uus partner"
#. module: crm
#: field:crm.case,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Ettevõte"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead3
msgid "In Process"
-msgstr ""
+msgstr "Töös"
#. module: crm
#: selection:crm.segmentation,state:0
@@ -3078,7 +3083,7 @@ msgstr ""
#: wizard_field:crm.job.reschedule_phone_call,init,note:0
#: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
msgid "Goals"
-msgstr ""
+msgstr "Eesmärgid"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
@@ -3089,7 +3094,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.menu_aftersale
msgid "After-Sale Services"
-msgstr ""
+msgstr "Müügijärgsed teenused"
#. module: crm
#: wizard_button:caldav.crm.export,init,end:0
@@ -3097,12 +3102,12 @@ msgstr ""
#: wizard_button:caldav.crm.subscribe,display,end:0
#: view:crm.email.add.cc:0
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#. module: crm
#: wizard_field:caldav.crm.export,init,name:0
msgid "File name"
-msgstr ""
+msgstr "Failinimi"
#. module: crm
#: view:crm.lead:0
@@ -3132,7 +3137,7 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
msgid "All Jobs Requests"
-msgstr ""
+msgstr "Kõik töökohtade päringud"
#. module: crm
#: selection:crm.case,state:0
@@ -3144,12 +3149,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Katkestatud"
#. module: crm
#: view:crm.job:0
msgid "Applied Job"
-msgstr ""
+msgstr "Rakendatud töökohad"
#. module: crm
#: help:crm.meeting,exrule:0
@@ -3161,7 +3166,7 @@ msgstr ""
#. module: crm
#: view:crm.phonecall:0
msgid "Relevant"
-msgstr ""
+msgstr "Asjakohane"
#. module: crm
#: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
@@ -3176,7 +3181,7 @@ msgstr ""
#. module: crm
#: wizard_view:caldav.crm.import,init:0
msgid "Import ICS"
-msgstr ""
+msgstr "Impordi ICS-i"
#. module: crm
#: view:crm.phonecall:0
@@ -3229,7 +3234,7 @@ msgstr "Valikuline avaldis"
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund1
msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "Sotsiaalne rehabilitatsioon ja maaharimine"
#. module: crm
#: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -3240,7 +3245,7 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead1
msgid "New"
-msgstr ""
+msgstr "Uus"
#. module: crm
#: field:crm.case,description:0
@@ -3299,7 +3304,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.next_id_64
msgid "Reporting"
-msgstr ""
+msgstr "Aruandlus"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3330,7 +3335,7 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Expected Salary"
-msgstr ""
+msgstr "Oodatav palk"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3340,12 +3345,12 @@ msgstr "Seadistus"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
msgid "Send New Mail"
-msgstr ""
+msgstr "Saad uus kiri"
#. module: crm
#: constraint:ir.cron:0
msgid "Invalid arguments"
-msgstr ""
+msgstr "Vigased argumendid"
#. module: crm
#: field:crm.meeting,transparent:0
@@ -3355,39 +3360,39 @@ msgstr ""
#. module: crm
#: view:crm.case:0
msgid "My Cases"
-msgstr ""
+msgstr "Minu juhtumid"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead7
#: model:crm.case.categ,name:crm.categ_oppor7
msgid "Word of mouth"
-msgstr ""
+msgstr "Jututurundus"
#. module: crm
#: view:crm.lead:0
msgid "Lead Subject"
-msgstr ""
+msgstr "Algatuse teema"
#. module: crm
#: view:crm.lead:0
#: view:crm.phonecall:0
msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Konverdi võimaluseks"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone1
msgid "Planned"
-msgstr ""
+msgstr "Planeeritud"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet3
msgid "Customer Office"
-msgstr ""
+msgstr "Kliendi kontor"
#. module: crm
#: view:crm.job:0
msgid "Candidate Email"
-msgstr ""
+msgstr "Kandidaadi e-mail"
#. module: crm
#: view:crm.opportunity:0
@@ -3397,7 +3402,7 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Type of Action"
-msgstr ""
+msgstr "Toimingu tüüp"
#. module: crm
#: field:crm.case.rule,act_user_id:0
@@ -3407,7 +3412,7 @@ msgstr "Sea vastutajaks"
#. module: crm
#: view:crm.job:0
msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Koosolek kandidaatidega"
#. module: crm
#: help:crm.segmentation,som_interval:0
@@ -3425,7 +3430,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "December"
-msgstr ""
+msgstr "Detsember"
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -3445,7 +3450,7 @@ msgstr "Maili partnerile"
#. module: crm
#: view:crm.fundraising:0
msgid "Funds Tree"
-msgstr ""
+msgstr "Fondide puu"
#. module: crm
#: field:crm.case.rule,act_method:0
@@ -3455,7 +3460,7 @@ msgstr "Objekti kutse meetod"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
msgid "All Funds"
-msgstr ""
+msgstr "Kõik fondid"
#. module: crm
#: field:crm.case.section,calendar:0
@@ -3467,12 +3472,12 @@ msgstr "Kalender"
#. module: crm
#: model:crm.case.categ,name:crm.categ_job1
msgid "Salesman"
-msgstr ""
+msgstr "Müügimees"
#. module: crm
#: model:crm.case.section,name:crm.section_support_help
msgid "HelpDesk"
-msgstr ""
+msgstr "HelpDesk"
#. module: crm
#: field:crm.case,ref2:0
@@ -3482,19 +3487,19 @@ msgstr "Viide 2"
#. module: crm
#: view:crm.segmentation:0
msgid "Sales Purchase"
-msgstr ""
+msgstr "Müükide ost"
#. module: crm
#: view:crm.job:0
#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
msgid "Schedule Meeting"
-msgstr ""
+msgstr "Planeeri kohtumine"
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund4
msgid "Arts And Culture"
-msgstr ""
+msgstr "Kunstid ja kultuur"
#. module: crm
#: model:crm.case.categ,name:crm.categ_phone2
@@ -3502,7 +3507,7 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
msgid "Outbound"
-msgstr ""
+msgstr "Väljuv"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3513,7 +3518,7 @@ msgstr "Arhiveeri"
#. module: crm
#: view:crm.meeting:0
msgid "Confirmed"
-msgstr ""
+msgstr "Kinnitatud"
#. module: crm
#: selection:crm.segmentation,state:0
@@ -3525,7 +3530,7 @@ msgstr "Ei Tööta"
#: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
msgid "Success Probability"
-msgstr ""
+msgstr "Edu tõenäosus"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3550,7 +3555,7 @@ msgstr "Viivitus pärast päästiku kuupäeva"
#. module: crm
#: view:crm.lead:0
msgid "Lead Details"
-msgstr ""
+msgstr "Algatuse detailid"
#. module: crm
#: field:crm.case.rule,act_section_id:0
@@ -3580,12 +3585,12 @@ msgstr "Pead sisestama Partneri E-Maili kasutamaks seda tegevust!"
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Võibolla pead veenduma kas see partner juba ei eksisteri."
#. module: crm
#: view:crm.job:0
msgid "Qualication"
-msgstr ""
+msgstr "Kfalifikatsioon"
#. module: crm
#: view:crm.meeting:0
@@ -3600,7 +3605,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,user_id:0
#: field:report.crm.case.section.stage,user_id:0
msgid "User"
-msgstr ""
+msgstr "Kasutaja"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
@@ -3615,12 +3620,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "November"
-msgstr ""
+msgstr "November"
#. module: crm
#: model:crm.case.category2,name:crm.category_job2
msgid "Licenced"
-msgstr ""
+msgstr "Litsenseeritud"
#. module: crm
#: field:crm.case.section,parent_id:0
@@ -3636,7 +3641,7 @@ msgstr "Ülemjaotis"
#: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
#: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Planeeri telefonikõne"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3651,12 +3656,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "January"
-msgstr ""
+msgstr "Jaanuar"
#. module: crm
#: model:process.process,name:crm.process_process_contractprocess0
msgid "Contract"
-msgstr ""
+msgstr "Leping"
#. module: crm
#: field:crm.case.section,child_ids:0
@@ -3671,7 +3676,7 @@ msgstr "Planeeritud tulu"
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund3
msgid "Healthcare"
-msgstr ""
+msgstr "Tervishoid"
#. module: crm
#: view:crm.case:0
@@ -3685,7 +3690,7 @@ msgstr ""
#: view:crm.phonecall:0
#: view:crm.phonecall.assign_wizard:0
msgid "Assign"
-msgstr ""
+msgstr "Määra"
#. module: crm
#: field:crm.case,partner_address_id:0
@@ -3695,7 +3700,7 @@ msgstr "Partneri Kontakt"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet1
msgid "Office"
-msgstr ""
+msgstr "Kontor"
#. module: crm
#: model:ir.model,name:crm.model_crm_fundraising
@@ -3705,14 +3710,14 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_case_stage
msgid "Stage of case"
-msgstr ""
+msgstr "Juhtumi staatus"
#. module: crm
#: view:crm.case:0
#: view:crm.fundraising:0
#: view:crm.opportunity:0
msgid "Estimates"
-msgstr ""
+msgstr "Hinnangud"
#. module: crm
#: field:crm.case.section,user_id:0
@@ -3745,12 +3750,12 @@ msgstr "Jaotise Kood"
#: wizard_field:crm.job.meeting_set,init,date:0
#: wizard_field:crm.phonecall.meeting_set,init,date:0
msgid "Meeting date"
-msgstr ""
+msgstr "Koosoleku kuupäev"
#. module: crm
#: selection:crm.meeting,class:0
msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "KONFIDENTSIAALNE"
#. module: crm
#: help:crm.case.rule,act_mail_body:0
@@ -3760,13 +3765,13 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_meet2
msgid "Not fixed"
-msgstr ""
+msgstr "Pole parandatud"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead3
#: model:crm.case.categ,name:crm.categ_oppor3
msgid "Employee"
-msgstr ""
+msgstr "Töötaja"
#. module: crm
#: field:crm.case,email_from:0
@@ -3797,18 +3802,18 @@ msgstr "Kirjeldus"
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "May"
-msgstr ""
+msgstr "Mai"
#. module: crm
#: view:crm.job:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Sisemised märkmed"
#. module: crm
#: help:crm.case.rule,act_remind_user:0
msgid ""
"Check this if you want the rule to send a reminder by email to the user."
-msgstr ""
+msgstr "Märgi see kui soovid reeglit saata meeldetuletus mailiga kasutajale."
#. module: crm
#: view:crm.case:0
@@ -3820,7 +3825,7 @@ msgstr ""
#: view:crm.opportunity:0
#: wizard_field:crm.send.mail,init,cc:0
msgid "CC"
-msgstr ""
+msgstr "Koopia"
#. module: crm
#: field:crm.segmentation.line,operator:0
@@ -3830,7 +3835,7 @@ msgstr ""
#. module: crm
#: wizard_button:caldav.crm.import,init,open:0
msgid "_Import"
-msgstr ""
+msgstr "_Impordi"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3863,19 +3868,19 @@ msgstr "Madalaim"
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "February"
-msgstr ""
+msgstr "Veebruar"
#. module: crm
#: view:crm.phonecall:0
#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Kavanda koosolek"
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on Priority Range"
-msgstr ""
+msgstr "Seisukorrad prioriteedi vahemikus"
#. module: crm
#: help:crm.segmentation,som_interval_decrease:0
@@ -3890,7 +3895,7 @@ msgstr ""
#: wizard_view:crm.new.send.mail,init:0
#: wizard_view:crm.send.mail,init:0
msgid "Mass Mailing"
-msgstr ""
+msgstr "Massi meilimine"
#. module: crm
#: view:crm.case.rule:0
@@ -3903,22 +3908,22 @@ msgstr "E-Mail Toimingud"
#: field:report.crm.case.section.categ2,name:0
#: field:report.crm.case.section.stage,name:0
msgid "Year"
-msgstr ""
+msgstr "Aasta"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund1
msgid "Cash"
-msgstr ""
+msgstr "Kassa"
#. module: crm
#: view:crm.fundraising:0
msgid "Funds by Categories"
-msgstr ""
+msgstr "Fondid kategooria järgi"
#. module: crm
#: model:process.node,note:crm.process_node_leads0
msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Väga esimene kontakt koos uue perspektiiviga"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -3926,17 +3931,17 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "April"
-msgstr ""
+msgstr "Aprill"
#. module: crm
#: model:crm.case.stage,name:crm.stage_meet5
msgid "Future"
-msgstr ""
+msgstr "Tulevik"
#. module: crm
#: wizard_field:caldav.crm.export,init,file_path:0
msgid "Save ICS file"
-msgstr ""
+msgstr "Salvesra ICS fail"
#. module: crm
#: wizard_field:caldav.crm.subscribe,init,url_path:0
@@ -3951,7 +3956,7 @@ msgstr "Juhtumi logid"
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on Timing"
-msgstr ""
+msgstr "Ajastamise olukorrad"
#. module: crm
#: model:ir.model,name:crm.model_crm_helpdesk
@@ -3974,12 +3979,12 @@ msgstr "Järjekord"
#: wizard_view:caldav.crm.import,init:0
#: wizard_field:caldav.crm.import,init,file_path:0
msgid "Select ICS file"
-msgstr ""
+msgstr "Vali ICS fail"
#. module: crm
#: wizard_view:caldav.crm.import,display:0
msgid "Import Message"
-msgstr ""
+msgstr "Impordi sõnum"
#. module: crm
#: field:crm.segmentation.line,expr_name:0
@@ -3995,17 +4000,17 @@ msgstr "Juhtumid jaotisejärgi"
#. module: crm
#: view:crm.job:0
msgid "New Jobs"
-msgstr ""
+msgstr "Uued tööd"
#. module: crm
#: field:crm.menu.config_wizard,fund:0
msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Vahendite kogumise operatsioonid"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead8
msgid "Newsletter"
-msgstr ""
+msgstr "Infoleht"
#~ msgid "Update The Proposed Menus To Be Created"
#~ msgstr "Uuenda Väljapakutud Menüüd Loomiseks"
diff --git a/addons/crm_vertical/i18n/et.po b/addons/crm_vertical/i18n/et.po
index 2fc01790b28..e7ae79b1711 100644
--- a/addons/crm_vertical/i18n/et.po
+++ b/addons/crm_vertical/i18n/et.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_vertical
diff --git a/addons/document_ics/i18n/et.po b/addons/document_ics/i18n/et.po
index aa769e50473..8945068e8a4 100644
--- a/addons/document_ics/i18n/et.po
+++ b/addons/document_ics/i18n/et.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6c46da458c6..1cef7aac6e3 100755
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -102,9 +102,15 @@ class email_template(osv.osv):
}
_columns = {
- 'name' : fields.char('Name of Template', size=100, required=True),
+ 'name' : fields.char('Name', size=100, required=True),
'object_name':fields.many2one('ir.model', 'Model'),
'model_int_name':fields.char('Model Internal Name', size=200,),
+ 'enforce_from_account':fields.many2one(
+ 'email_template.account',
+ string="Enforce From Account",
+ help="Emails will be sent only from this account."),
+ 'from_email' : fields.related('enforce_from_account', 'email_id',
+ type='char', string='From',),
'def_to':fields.char(
'Recepient (To)',
size=250,
@@ -141,7 +147,7 @@ class email_template(osv.osv):
help="The text version of the mail",
translate=True),
'use_sign':fields.boolean(
- 'Use Signature',
+ 'Signature',
help="the signature from the User details"
"will be appened to the mail"),
'file_name':fields.char(
@@ -168,11 +174,6 @@ class email_template(osv.osv):
string="Allowed User Groups",
help="Only users from these groups will be"
" allowed to send mails from this Template"),
- 'enforce_from_account':fields.many2one(
- 'email_template.account',
- string="Enforce From Account",
- help="Emails will be sent only from this account.",
- domain="[('company','=','yes')]"),
'model_object_field':fields.many2one(
'ir.model.fields',
string="Field",
@@ -218,6 +219,7 @@ class email_template(osv.osv):
}
_defaults = {
+ 'template_language' : lambda *a:'mako',
}
_sql_constraints = [
@@ -623,19 +625,6 @@ class email_template_preview(osv.osv_memory):
_name = "email_template.preview"
_description = "Email Template Preview"
- def _get_model_recs(self, cr, uid, context=None):
- if context is None:
- context = {}
- #Fills up the selection box which allows records from the selected object to be displayed
- self.context = context
- if 'active_id' in context.keys():
-# context['active_id'] = 5
- ref_obj_id = self.pool.get('email.template').read(cr, uid, context['active_id'], ['object_name'], context)
- ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id[0], ['model'], context)['model']
- ref_obj_ids = self.pool.get(ref_obj_name).search(cr, uid, [], context=context)
- ref_obj_recs = self.pool.get(ref_obj_name).name_get(cr, uid, ref_obj_ids, context)
- return ref_obj_recs
-
def _default_model(self, cursor, user, context=None):
"""
Returns the default value for model field
@@ -655,7 +644,6 @@ class email_template_preview(osv.osv_memory):
'email.template',
'Template', readonly=True),
'rel_model':fields.many2one('ir.model', 'Model', readonly=True),
- 'rel_model_ref':fields.selection(_get_model_recs, 'Referred Document'),
'to':fields.char('To', size=250, readonly=True),
'cc':fields.char('CC', size=250, readonly=True),
'bcc':fields.char('BCC', size=250, readonly=True),
@@ -668,7 +656,7 @@ class email_template_preview(osv.osv_memory):
'ref_template': lambda self, cr, uid, ctx:ctx['active_id'],
'rel_model': _default_model
}
-
+ # Need to check
def on_change_ref(self, cr, uid, ids, rel_model_ref, context=None):
if context is None:
context = {}
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 2503d19cd10..0bcf3c3d099 100755
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -30,7 +30,7 @@ class email_template_account(osv.osv):
'text/html'
]
_columns = {
- 'name': fields.char('Email Account Desc',
+ 'name': fields.char('Description',
size=64, required=True,
readonly=True, select=True,
states={'draft':[('readonly', False)]}),
@@ -56,22 +56,16 @@ class email_template_account(osv.osv):
size=120, invisible=True,
required=False, readonly=True,
states={'draft':[('readonly', False)]}),
- 'smtptls':fields.boolean('Use TLS',
+ 'smtptls':fields.boolean('TLS',
states={'draft':[('readonly', False)]}, readonly=True),
- 'smtpssl':fields.boolean('Use SSL/TLS (only in python 2.6)',
+ 'smtpssl':fields.boolean('SSL/TLS (only in python 2.6)',
states={'draft':[('readonly', False)]}, readonly=True),
'send_pref':fields.selection([
('html', 'HTML otherwise Text'),
('text', 'Text otherwise HTML'),
('both', 'Both HTML & Text')
], 'Mail Format', required=True),
- 'allowed_groups':fields.many2many(
- 'res.groups',
- 'account_group_rel', 'templ_id', 'group_id',
- string="Allowed User Groups",
- help="Only users from these groups will be" \
- "allowed to send mails from this ID"),
'company':fields.selection([
('yes', 'Yes'),
('no', 'No')
@@ -89,7 +83,7 @@ class email_template_account(osv.osv):
('suspended', 'Suspended'),
('approved', 'Approved')
],
- 'Account Status', required=True, readonly=True),
+ 'Status', required=True, readonly=True),
}
_defaults = {
@@ -102,7 +96,6 @@ class email_template_account(osv.osv):
['name'],
context
)['name'],
- 'smtpssl':lambda * a:True,
'state':lambda * a:'draft',
'user':lambda self, cursor, user, context:user,
'send_pref':lambda * a: 'html',
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 573b03e7027..7a0bc84538f 100755
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -36,9 +36,6 @@
-
-
-
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 1934f4e0227..45eef77729e 100755
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -52,7 +52,6 @@ class email_template_mailbox(osv.osv):
for attid in values['attachments_ids']:
attachment = self.pool.get('ir.attachment').browse(cr, uid, attid, context)#,['datas_fname','datas'])
payload[attachment.datas_fname] = attachment.datas
- print "233333333333333"
result = account_obj.send_mail(cr, uid,
[values['account_id'][0]],
{'To':values.get('email_to', u'') or u'', 'CC':values.get('email_cc', u'') or u'', 'BCC':values.get('email_bcc', u'') or u''},
@@ -153,30 +152,6 @@ class email_template_mailbox(osv.osv):
'folder': lambda * a: 'outbox',
}
- def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
- if context is None:
- context = {}
- if context.get('company', False):
- users_groups = self.pool.get('res.users').browse(cr, uid, uid, context).groups_id
- group_acc_rel = {}
- #get all accounts and get a table of {group1:[account1,account2],group2:[account1]}
- for each_account_id in self.pool.get('email_template.account').search(cr, uid, [('state', '=', 'approved'), ('company', '=', 'yes')], context=context):
- account = self.pool.get('email_template.account').browse(cr, uid, each_account_id, context)
- for each_group in account.allowed_groups:
- if not account.id in group_acc_rel.get(each_group, []):
- groups = group_acc_rel.get(each_group, [])
- groups.append(account.id)
- group_acc_rel[each_group] = groups
- users_company_accounts = []
- for each_group in group_acc_rel.keys():
- if each_group in users_groups:
- for each_account in group_acc_rel[each_group]:
- if not each_account in users_company_accounts:
- users_company_accounts.append(each_account)
- args.append(('account_id', 'in', users_company_accounts))
- return super(osv.osv, self).search(cr, uid, args, offset, limit,
- order, context=context, count=count)
-
email_template_mailbox()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index f94fa886ee6..c521320bf3a 100755
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -53,8 +53,8 @@
-
-
+
+
@@ -62,9 +62,8 @@
-
-
- email_template.mailbox.draftstree
+
+ email_template.mailbox.treeemail_template.mailboxtree
@@ -77,51 +76,6 @@
-
-
- email_template.mailbox.outboxtree
- email_template.mailbox
- tree
-
-
-
-
-
-
-
-
-
-
-
-
- email_template.mailbox.sentboxtree
- email_template.mailbox
- tree
-
-
-
-
-
-
-
-
-
-
-
-
- email_template.mailbox.trashboxtree
- email_template.mailbox
- tree
-
-
-
-
-
-
-
-
-
- email_template.mailbox.search
@@ -150,7 +104,7 @@
email_template.mailboxformform,tree
-
+ {'group_by': [], 'search_default_draft': 1, 'search_default_outbox': 1}
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 8e14a861edc..5158d7a5544 100755
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -62,7 +62,9 @@
+
+
@@ -109,15 +111,7 @@
type="action" colspan="4" target="new" />
-
-
-
-
-
-
-
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index 678759f8938..1267ab58640 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: event
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index b6e0d22d239..bbff4ebbee6 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
index 494111737b1..74d7c8de8d1 100644
--- a/addons/hr/test/test_hr.yml
+++ b/addons/hr/test/test_hr.yml
@@ -1,15 +1,15 @@
- |
- In order to test the hr module in OpenERP, I will create new Employee , Department and Job Position.
+ In order to test hr module in OpenERP, I will create new Employee , Department and Job Position.
-
|
- First I create Department "R & D" in Department form.
+ I create "R & D" Department in Department form.
-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
name: 'R & D '
-
|
- Now, I create a new employee “employee1”.
+ Now, I create a new employee “Mark Johnson”.
select "R & D" Department which I had created.
-
!record {model: hr.employee, id: hr_employee_employee0}:
@@ -22,7 +22,7 @@
department_id: 'hr_department_rd0'
- |
- In order to check the wizard “Employee Hierarchy” I will create new employee “employee2” and select "employee1" as
+ In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as
Manager.
-
!record {model: hr.employee, id: hr_employee_employee1}:
@@ -33,11 +33,11 @@
user_id: base.user_demo
parent_id: 'hr_employee_employee0'
- |
- Now I will open up form view of “employee1” and test the wizard “Employee Hierarchy” so it display the employee
- hierarchy starting from “employee1”.
+ I will open up form view of “Mark Johnson” and test the wizard “Employee Hierarchy” so it display the employee
+ hierarchy starting from “Mark Johnson”.
- |
- Now I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
+ I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
-
!record {model: hr.job, id: hr_job_jea0}:
department_id: 'hr_department_rd0'
@@ -51,17 +51,17 @@
- state == 'open'
- |
- I create Employee for this position in this Job Position form.
+ I create Employee for job position.
-
!record {model: hr.job, id: hr_job_jea0}:
employee_ids:
- address_home_id: base.res_partner_address_1
- name: employee3
+ name: Manuel Lehba
department_id: 'hr_department_rd0'
gender: male
parent_id: 'hr_employee_employee0'
--
- I check that "NO of Employee" is "1"
+- |
+ I check that "Number of Employees" field have some value.
-
!assert {model: hr.job, id: hr_job_jea0}:
- no_of_employee != False
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index c59ba3dcbdb..c0db422b997 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -44,6 +44,7 @@
'wizard/hr_attendance_sign_in_out_view.xml',
],
'demo_xml': ['hr_attendance_demo.xml'],
+ 'test': ['test/test_hr_attendance.yml'],
'installable': True,
'active': False,
'certificate': '0063495605613',
diff --git a/addons/hr_attendance/test/test_hr_attendance.yml b/addons/hr_attendance/test/test_hr_attendance.yml
new file mode 100644
index 00000000000..5c1132525f5
--- /dev/null
+++ b/addons/hr_attendance/test/test_hr_attendance.yml
@@ -0,0 +1,109 @@
+- |
+ In order to test hr_attendance module in OpenERP, I create new attendance and perform Sign In/Sign Out operation.
+
+- |
+ First I create Employee "Mark Johnson".
+-
+ !record {model: hr.employee, id: hr_employee_employee0}:
+ address_home_id: base.res_partner_address_1
+ company_id: base.main_company
+ gender: male
+ name: Mark Johnson
+ user_id: base.user_root
+
+- |
+ Given that I have Attendance Reason "Good Morning" for Sign In.
+-
+ !record {model: hr.action.reason, id: hr_action_reason_goodmorning0}:
+ name: Good Morning
+ action_type: sign_in
+- |
+ I also create another Attendance Reason for Sign Out.
+-
+ !record {model: hr.action.reason, id: hr_action_reason_goodnight0}:
+ name: Good Night
+ action_type: sign_out
+- |
+ Now , When I came in office , I create Atendances and perform "Sign In" action with proper reason.
+-
+ !record {model: hr.attendance, id: hr_attendance_0}:
+ action: sign_in
+ action_desc: 'hr_action_reason_goodmorning0'
+ employee_id: 'hr_employee_employee0'
+ name: '2010-05-18 19:08:08'
+- |
+ I check that Employee is in "Present" state.
+-
+ !assert {model: hr.employee, id: hr_employee_employee0}:
+ - state == 'present'
+
+- |
+ When I left office , I create attendance and perform "Sign Out".
+-
+ !record {model: hr.attendance, id: hr_attendance_1}:
+ action: sign_out
+ employee_id: 'hr_employee_employee0'
+ name: '2010-05-18 19:10:55'
+- |
+ I check that Employee is in "Absent" state.
+-
+ !assert {model: hr.employee, id: hr_employee_employee0}:
+ - state == 'absent'
+
+- |
+ I can also fill my attendance using "Sign In/Sign Out" wizard.
+-
+ !record {model: hr.sign.in.out, id: hr_sign_in_out_markjohnson0}:
+ name: Mark Johnson
+ state: absent
+
+- |
+ I click on "Sign In" button of this wizard to perform present action.
+-
+ !python {model: hr.sign.in.out}: |
+ obj_attendance = self.pool.get('hr.employee')
+ emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "Mark Johnson")])
+ if emp_id:
+ employee = obj_attendance.read(cr, uid, emp_id)[0]
+ self.write(cr, uid, [ref('hr_sign_in_out_markjohnson0')], {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]})
+ self.si_check(cr, uid, [ref("hr_sign_in_out_markjohnson0")], {"active_id": ref("hr_employee_employee0")})
+
+- |
+ I check that Employee is in "Present" state.
+-
+ !assert {model: hr.employee, id: hr_employee_employee0}:
+ - state == 'present'
+
+- |
+ I forgot to "Sign Out" in Yesterday and want to sign in Today using This wizard.
+-
+ !record {model: hr.sign.in.out, id: hr_sign_in_out_markjohnson0}:
+ name: Mark Johnson
+ state: present
+- |
+ I click on "Sign In" button of this wizard. that will Open new form which ask for Last Sign Out date.
+-
+ !python {model: hr.sign.in.out}: |
+ obj_attendance = self.pool.get('hr.employee')
+ emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "Mark Johnson")])
+ if emp_id:
+ employee = obj_attendance.read(cr, uid, emp_id)[0]
+ self.write(cr, uid, [ref('hr_sign_in_out_markjohnson0')], {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]})
+ self.si_check(cr, uid, [ref("hr_sign_in_out_markjohnson0")])
+- |
+ I select Last Sign Out date in "hr sign out ask" wizard.
+-
+ !record {model: hr.sign.in.out.ask, id: hr_sign_in_out_ask_markjohnson0}:
+ last_time: !eval time.strftime('%Y-%m-%d %H:%M:%S')
+ name: Mark Johnson
+- |
+ Now I click on "Sign In" button of this wizard.
+-
+ !python {model: hr.sign.in.out.ask}: |
+ obj_attendance = self.pool.get('hr.employee')
+ emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "Mark Johnson")])
+ if emp_id:
+ employee = obj_attendance.read(cr, uid, emp_id)[0]
+ self.write(cr, uid, [ref('hr_sign_in_out_ask_markjohnson0')], {'emp_id': emp_id[0]})
+ #self.sign_in(cr, uid, [ref("hr_sign_in_out_ask_markjohnson0")], {"active_ids": [ref("hr_attendance.menu_hr_attendance_sigh_in_out")]})
+
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 9ad27298159..2259d699f07 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -33,16 +33,16 @@ class hr_si_so_ask(osv.osv_memory):
'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
}
def _get_empname(self, cr, uid, context=None):
- service = netsvc.LocalService('object_proxy')
- emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+ emp_obj = self.pool.get('hr.employee')
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
if emp_id:
- employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
+ employee = emp_obj.read(cr, uid, emp_id)[0]
return employee['name']
return ''
def _get_empid(self, cr, uid, context=None):
- service = netsvc.LocalService('object_proxy')
- emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+ emp_obj = self.pool.get('hr.employee')
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
if emp_id:
return emp_id[0]
return False
@@ -74,10 +74,10 @@ class hr_sign_in_out(osv.osv_memory):
}
def _get_empid(self, cr, uid, context=None):
- service = netsvc.LocalService('object_proxy')
- emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+ emp_obj = self.pool.get('hr.employee')
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
if emp_id:
- employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
+ employee = emp_obj.read(cr, uid, emp_id)[0]
return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]}
return {}
@@ -88,12 +88,13 @@ class hr_sign_in_out(osv.osv_memory):
return res
def si_check(self, cr, uid, ids, context=None):
- service = netsvc.LocalService('object_proxy')
+
+ att_obj = self.pool.get('hr.attendance')
obj_model = self.pool.get('ir.model.data')
data = self.read(cr, uid, ids, [])[0]
emp_id = data['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)
+ att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
+ last_att = att_obj.read(cr, uid, att_id)
if last_att:
last_att = last_att[0]
cond = not last_att or last_att['action'] == 'sign_out'
@@ -113,12 +114,13 @@ class hr_sign_in_out(osv.osv_memory):
}
def so_check(self, cr, uid, ids, context=None):
- service = netsvc.LocalService('object_proxy')
+
+ att_obj = self.pool.get('hr.attendance')
obj_model = self.pool.get('ir.model.data')
data = self.read(cr, uid, ids, [])[0]
emp_id = data['emp_id']
- att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
- last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+ att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
+ last_att = att_obj.read(cr, uid, att_id)
if last_att:
last_att = last_att[0]
if not att_id and not last_att:
@@ -151,31 +153,31 @@ class hr_sign_in_out(osv.osv_memory):
}
def sign_in(self, cr, uid, data, context=None):
- service = netsvc.LocalService('object_proxy')
+ att_obj = self.pool.get('hr.attendance')
emp_id = data['emp_id']
if 'last_time' in data:
if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
- service.execute(cr.dbname, uid, 'hr.attendance', 'create', {
+ att_obj.create(cr, uid, {
'name': data['last_time'],
'action': 'sign_out',
'employee_id': emp_id
})
try:
- success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_in')
+ success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
except:
raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
return {} # To do: Return Success message
def sign_out(self, cr, uid, data, context=None):
- service = netsvc.LocalService('object_proxy')
+ att_obj = self.pool.get('hr_attendance')
emp_id = data['emp_id']
if 'last_time' in data:
if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
- service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['last_time'], 'action':'sign_in', 'employee_id':emp_id})
+ att_obj.create(cr, uid, {'name':data['last_time'], 'action':'sign_in', 'employee_id':emp_id})
try:
- success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_out')
+ success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
except:
raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
return {} # To do: Return Success message
diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
index 87c44722e2c..cbcc7e67fda 100644
--- a/addons/hr_contract/test/test_hr_contract.yml
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -3,7 +3,7 @@
I will create contract for "Mark Johnson" employee.
- |
- First I create Employee "Mark Johnson"
+ I create Employee "Mark Johnson" to assign contract.
-
!record {model: hr.employee, id: hr_employee_employee0}:
address_home_id: base.res_partner_address_1
@@ -30,9 +30,9 @@
type: gross
- |
- Now I start by create contract for "Mark Johnson".
+ Now I start by creating contract for "Mark Johnson".
Select wage type "Monthly Gross Wage" and Wage period "monthly"
- which I have given.
+ which I had given.
-
!record {model: hr.contract, id: hr_contract_contract0}:
advantages_gross: 0.0
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 6a10f873e3c..84d4ea61b57 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -35,13 +35,14 @@
is done by the manager.Every evaluation filled by the employees can be viewed
in the form of.Implements a dashboard for My Current Evaluations """,
"init_xml" : [],
- "demo_xml" : ["hr_evaluation_demo.xml"],
+ "demo_xml" : ["hr_evaluation_demo.xml",
+ ],
"update_xml" : [
"security/ir.model.access.csv",
"wizard/hr_evaluation_mail_view.xml",
"hr_evaluation_view.xml",
- "report/hr_evaluation_report_view.xml",
- 'board_hr_evaluation_view.xml',],
+ "report/hr_evaluation_report_view.xml"],
+ "test": ["test/test_hr_evaluation.yml"],
"active": False,
"installable": True
}
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 46e439abb22..dcd4fb8ef5c 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_evaluation
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
new file mode 100644
index 00000000000..6e9b11df3bc
--- /dev/null
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -0,0 +1,152 @@
+- |
+ In order to test hr_evaluation module for OpenERP, I will create plan then create evaluation under that plan.
+-
+ |
+ Given that I have "R & D" Department for employee.
+-
+ !record {model: hr.department, id: hr_department_rd0}:
+ manager_id: base.user_root
+ name: 'R & D '
+-
+ |
+ Given that I have Employee “Mark Johnson” which take Interview.
+ select "R & D" Department.
+-
+ !record {model: hr.employee, id: hr_employee_employee0}:
+ address_home_id: base.res_partner_address_1
+ company_id: base.main_company
+ gender: male
+ marital: hr.hr_employee_marital_status_single
+ name: Mark Johnson
+ user_id: base.user_root
+ department_id: 'hr_department_rd0'
+- |
+ I create new employee “Phil Graves ” and select "Mark Johnson" as
+ Manager.
+-
+ !record {model: hr.employee, id: hr_employee_employee1}:
+ address_home_id: base.res_partner_address_3000
+ company_id: base.main_company
+ gender: male
+ name: Phil Graves
+ user_id: base.user_demo
+ parent_id: 'hr_employee_employee0'
+
+- |
+ I Create "Employee Evaluation" survey for Manager's Evaluation Plan.
+-
+ !record {model: 'survey', id: survey_0}:
+ title: 'Employee Evaluation'
+ max_response_limit: 20
+ response_user: 2
+- |
+ I Create "Employee Evaluation" page in "Employee Evaluation" survey.
+-
+ !record {model: 'survey.page', id: survey_employee_page_0}:
+ title: 'Employee Evaluation'
+ survey_id: survey_0
+- |
+ I Create "What is your Name" question in "Employee Evaluation" survey page.
+-
+ !record {model: 'survey.question', id: survey_p_question_0}:
+ question: 'What is your Name?'
+ type: 'single_textbox'
+ sequence: 1
+ page_id: survey_employee_page_0
+- |
+ I Create "What is your gender" Question in "Employee Evaluation" survey page.
+-
+ !record {model: 'survey.question', id: survey_p_question_1}:
+ question: 'What is your gender?'
+ type: multiple_choice_only_one_ans
+ sequence: 2
+ is_require_answer: true
+ page_id: survey_employee_page_0
+- |
+ I Create "Male" answer in question "What is your gender?"
+-
+ !record {model: 'survey.answer', id: survey_p_1_1}:
+ answer: 'Male'
+ sequence: 1
+ question_id : survey_p_question_1
+- |
+ I Create "Female" answer in question "What is your gender?"
+-
+ !record {model: 'survey.answer', id: survey_p_1_2}:
+ answer: 'Female'
+ sequence: 2
+ question_id : survey_p_question_1
+
+- |
+ Now Survey set in open state.
+-
+ !python {model: survey}: |
+ self.survey_open(cr, uid, [ref("survey_0")], context)
+
+- |
+ I creating a Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
+-
+ !record {model: hr_evaluation.plan, id: hr_evaluation_plan_managersplan0}:
+ company_id: base.main_company
+ month_first: 3
+ month_next: 6
+ name: Manager's Plan
+ phase_ids:
+ - action: bottom-up
+ name: Send to Subordinates
+ survey_id: 'survey_0'
+ - action: top-down
+ name: Final Interview with manager
+ sequence: 2
+ survey_id: 'survey_0'
+
+- |
+ Now I create Evaluation for "Phil Graves" Employee under "Manager Evaluation Plan".
+-
+ !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+ date: '2010-06-28'
+ employee_id: 'hr_employee_employee1'
+ plan_id: 'hr_evaluation_plan_managersplan0'
+ progress: 0.0
+ state: draft
+- |
+ I check that Evaluation is in "Draft" state.
+-
+ !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+ - state == 'draft'
+- |
+ I start Evaluation process by click on "Start Evaluation" button.
+-
+ !python {model: hr_evaluation.evaluation}: |
+ self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
+
+- |
+ After that Manager Evaluation plan is In Progress.
+ I close this servey request by giving answer of survey question.
+-
+ !python {model: hr.evaluation.interview}: |
+ self.survey_req_done(cr, uid, [ref('hr_evaluation_evaluation_0')])
+- |
+ I click on "Final Validation" button to finalize Evaluation.
+-
+ !python {model: hr_evaluation.evaluation}: |
+ self.button_final_validation(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")],
+ {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
+
+- |
+ I check that state is "Final Validation".
+-
+ !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+ - state == 'progress'
+- |
+ Give Rating "Meet expectations" by selecting overall Rating.
+-
+ !record {model: hr_evaluation.evaluation, id: hr_evaluation.hr_evaluation_evaluation_0}:
+ rating: '2'
+
+- |
+ I close this Evaluation by click on "Done" button of this wizard.
+-
+ !python {model: hr_evaluation.evaluation}: |
+ self.button_done(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")], {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
+
\ No newline at end of file
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index db500646f00..2ea95b76620 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -34,23 +34,19 @@
red
-
- Sick Leave for Fabien Pinckaers
-
- add
- 7
-
-
-
Doctor Appointment2010-02-01 00:002010-02-03 08:00remove
+ draft3
+
+
+
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 960d12f23bd..68d58b1791b 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -1,6 +1,5 @@
- |
- In order to test the hr_holiday in OpenERP, I will Manage leaves for employee,
- Leave requests.
+ In order to test the hr_holiday in OpenERP, I will Allocate leaves for Employee and manage leaves and leaves requests.
- |
For that First I create new user "user1" to make leave request.
-
@@ -15,7 +14,7 @@
name: user1
password: user1
- |
- Now, I create a new employee “Mark Johnshon” as Manager to validate employee leave.
+ I create a new employee “Mark Johnshon” as Manager to validate employee leave.
-
!record {model: hr.employee, id: hr_employee_employee0}:
address_home_id: base.res_partner_address_1
@@ -24,11 +23,11 @@
name: Mark Johnson
user_id: base.user_root
- |
- create another employee "Brijesh Patel" as "user1" who make leave request.
+ Create another employee "Phil Graves" as "user1" who make leave request.
-
- !record {model: hr.employee, id: hr_employee_brijeshpatel0}:
+ !record {model: hr.employee, id: hr_employee_philgraves0}:
address_home_id: base.res_partner_address_8
- name: Brijesh Patel
+ name: Phil Graves
parent_id: 'hr_employee_employee0'
user_id: 'res_users_user0'
- |
@@ -40,11 +39,11 @@
limit: 1
- |
- After that I allocate leave request for employee "Brijesh Patel".
+ After that I allocate leave request for employee "Phil Graves".
-
!record {model: hr.holidays, id: hr_holidays_allocateleaveforuser0}:
allocation_type: employee
- employee_id: 'hr_employee_brijeshpatel0'
+ employee_id: 'hr_employee_philgraves0'
holiday_status_id: hr_holidays_status_fullleave0
name: Allocate leave for user1
number_of_days_temp: 12.0
@@ -62,13 +61,13 @@
!workflow {model: hr.holidays, action: validate, ref: hr_holidays_allocateleaveforuser0}
- |
- Now employee "Brijesh Patel" want to leave. so, I connect as user1 which is username of this employee and want to make leave request.
+ Now employee "Phil Graves" want to leave. so, I connect as user1 which is username of this employee and want to make leave request.
-
!record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
allocation_type: employee
date_from: '2010-05-20 11:48:00'
date_to: '2010-05-21 11:48:00'
- employee_id: 'hr_employee_brijeshpatel0'
+ employee_id: 'hr_employee_philgraves0'
holiday_status_id: 'hr_holidays_status_fullleave0'
name: I want to leave for go to hospital
notes: I want to leave for go to hospital. so please accept my leave.
@@ -82,12 +81,12 @@
- state == 'draft'
- |
- Now I confirm my leave Request by click on "Confirm" button.
+ I confirm my leave Request by click on "Confirm" button.
-
!workflow {model: hr.holidays, action: confirm, ref: hr_holidays_iwanttoleaveforgotohospital0}
- |
- Now I connect as Admin user and Open Leave request of "Brijesh Patel".
+ I connect as Admin user and Open Leave request of "Phil Graves".
and "validate" it by click on "validate" button.
-
!workflow {model: hr.holidays, action: validate, ref: hr_holidays_iwanttoleaveforgotohospital0}
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index d6653b0d456..95dd87ce280 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -65,9 +65,9 @@ hr_passport()
class hr_payroll_structure(osv.osv):
"""
Salary structure used to defined
- * Basic
- * Allowlance
- * Deductions
+ - Basic
+ - Allowlance
+ - Deductions
"""
_name = 'hr.payroll.structure'
@@ -127,9 +127,9 @@ class hr_contract(osv.osv):
hr_contract()
class payroll_register(osv.osv):
- '''
+ """
Payroll Register
- '''
+ """
_name = 'hr.payroll.register'
_description = 'Payroll Register'
@@ -514,11 +514,14 @@ class contrib_register_line(osv.osv):
contrib_register_line()
class payment_category(osv.osv):
- '''
- Open ERP Model
- '''
+ """
+ Allowance, Deduction Heads
+ House Rent Allowance, Medical Allowance, Food Allowance
+ Professional Tax, Advance TDS, Providend Funds, etc
+ """
+
_name = 'hr.allounce.deduction.categoty'
- _description = 'Allowance Deduction Categoty'
+ _description = 'Allowance Deduction Heads'
_columns = {
'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
@@ -528,14 +531,40 @@ class payment_category(osv.osv):
('deduct','Deduction'),
('other','Others'),
],'Type', select=True),
- 'contribute_per':fields.float('Contribution', digits=(16, int(config['price_accuracy'])), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
- 'contribute':fields.boolean('Contribe by Company ?', help='Is company contribute on this deduction, like Provident Fund'),
- 'include_in_salary':fields.boolean('Included in Salary ?', help='If company contribute on this deduction then should company contribution is also deducted from Employee Salary'),
- 'gratuity':fields.boolean('Use for Gratuity ?', required=False),
- 'line_ids':fields.one2many('hr.allounce.deduction.categoty.line', 'category_id', 'Calculations', required=False),
'base':fields.char('Based on', size=64, required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
'condition':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this head for calculation if condition is true'),
'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
+ 'note': fields.text('Description'),
+ 'user_id':fields.char('User', size=64, required=False, readonly=False),
+ 'state':fields.char('Label', size=64, required=False, readonly=False),
+ 'company_id':fields.many2one('res.company', 'Company', required=False),
+ }
+ _defaults = {
+ 'condition': lambda *a: 'True',
+ 'base': lambda *a:'basic',
+ 'sequence': lambda *a:5,
+ 'company_id': lambda self, cr, uid, context: \
+ self.pool.get('res.users').browse(cr, uid, uid,
+ context=context).company_id.id,
+ }
+payment_category()
+
+class company_contribution(osv.osv):
+ """
+ Company contribution
+ Allows to configure company contribution for some taxes
+ """
+
+ _name = 'company.contribution'
+ _description = "Company Contribution"
+
+ _columns = {
+ 'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Heads', required=False),
+ 'name':fields.char('Name', size=256, required=True, readonly=False),
+ 'code':fields.char('Code', size=64, required=True, readonly=False),
+ 'include_in_salary':fields.boolean('Included in Salary ?', help='If company contribute on this deduction then should company contribution is also deducted from Employee Salary'),
+ 'gratuity':fields.boolean('Use for Gratuity ?', required=False),
+ 'line_ids':fields.one2many('company.contribution.line', 'contribution_id', 'Calculations', required=False),
'register_id':fields.property(
'hr.contibution.register',
type='many2one',
@@ -546,15 +575,11 @@ class payment_category(osv.osv):
help="Contribution register based on company",
required=False
),
- 'note': fields.text('Description'),
- 'user_id':fields.char('User', size=64, required=False, readonly=False),
- 'state':fields.char('Label', size=64, required=False, readonly=False),
- 'company_id':fields.many2one('res.company', 'Company', required=False),
'amount_type':fields.selection([
-# ('per','Percentage (%)'),
('fix','Fixed Amount'),
('func','Function Calculation'),
],'Amount Type', select=True),
+ 'contribute_per':fields.float('Contribution', digits=(16, int(config['price_accuracy'])), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
'account_id':fields.property(
'account.account',
type='many2one',
@@ -565,12 +590,14 @@ class payment_category(osv.osv):
help="Expanse account where company expanse will be encoded",
required=False
),
+ 'company_id':fields.many2one('res.company', 'Company', required=False),
+ 'active':fields.boolean('Active', required=False),
+ 'note': fields.text('Description'),
}
+
_defaults = {
- 'condition': lambda *a: 'True',
- 'base': lambda *a:'basic',
- 'sequence': lambda *a:5,
'amount_type': lambda *a:'fix',
+ 'active': lambda *a:True,
'company_id': lambda self, cr, uid, context: \
self.pool.get('res.users').browse(cr, uid, uid,
context=context).company_id.id,
@@ -583,7 +610,7 @@ class payment_category(osv.osv):
uid: user id of current executer
"""
- line_pool = self.pool.get('hr.allounce.deduction.categoty.line')
+ line_pool = self.pool.get('company.contribution.line')
res = 0
ids = line_pool.search(cr, uid, [('category_id','=',id), ('to_val','>=',value),('from_val','<=',value)])
if not ids:
@@ -593,19 +620,20 @@ class payment_category(osv.osv):
else:
res = line_pool.browse(cr, uid, ids)[0].value
return res
-
-payment_category()
+
+company_contribution()
-class payment_category_line(osv.osv):
- '''
- Allowance Deduction Categoty
- '''
- _name = 'hr.allounce.deduction.categoty.line'
+class company_contribution_line(osv.osv):
+ """
+ Company contribution lines
+ """
+
+ _name = 'company.contribution.line'
_description = 'Allowance Deduction Categoty'
_order = 'sequence'
_columns = {
- 'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Category', required=False),
+ 'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
'name':fields.char('Name', size=64, required=False, readonly=False),
'umo_id':fields.many2one('product.uom', 'Unite', required=False),
'from_val': fields.float('From', digits=(16, int(config['price_accuracy']))),
@@ -616,7 +644,7 @@ class payment_category_line(osv.osv):
'sequence':fields.integer('Sequence'),
'value': fields.float('Value', digits=(16, int(config['price_accuracy']))),
}
-payment_category_line()
+company_contribution_line()
class hr_holidays_status(osv.osv):
_inherit = "hr.holidays.status"
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 30e793df2a6..146462cd970 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -243,133 +243,9 @@
+
-
@@ -382,7 +258,7 @@
-
+
@@ -395,21 +271,22 @@
-
-
- hr.expense.form
- form
-
- hr.expense.expense
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
hr.payslip.line.treehr.payslip.line
@@ -586,11 +463,8 @@
form
-
-
-
hr.payroll.structure.treehr.payroll.structure
@@ -631,7 +505,7 @@
- Employee Functions
+ Salary Structurehr.payroll.structureform
@@ -642,12 +516,13 @@
parent="payroll_configure"
/>
+
hr.allounce.deduction.categoty.formhr.allounce.deduction.categotyform
-
-
+ hr.allounce.deduction.categoty.treehr.allounce.deduction.categotytree
@@ -712,6 +565,79 @@
action="hr_allounce_deduction_tree"
parent="payroll_configure"
/>
+
+
+
+
+ company.contribution.form
+ company.contribution
+ form
+
+
+
+
+
+ company.contribution.tree
+ company.contribution
+ tree
+
+
+
+
+
+
+
+
+
+
+
+ Company Contributions
+ company.contribution
+ form
+
+
+
+
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 42d643f165d..6414f88f5cc 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -61,9 +61,9 @@ class hr_applicant(osv.osv, crm.crm_case):
_columns = {
'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
- 'name': fields.char('Name', size=128, required=True),
- 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
- 'description': fields.text('Description'),
+ 'name': fields.char('Name', size=128, required=True),
+ 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
+ 'description': fields.text('Description'),
'section_id': fields.many2one('crm.case.section', 'Sales Team', \
select=True, help='Sales team to which Case belongs to.\
Define Responsible user and Email account for mail gateway.'),
@@ -77,9 +77,9 @@ class hr_applicant(osv.osv, crm.crm_case):
domain="[('partner_id','=',partner_id)]"),
'create_date': fields.datetime('Creation Date' , readonly=True),
'write_date': fields.datetime('Update Date' , readonly=True),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
- domain="[('section_id','=',section_id),\
- ('object_id.model', '=', 'crm.opportunity')]"),
+# 'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+# domain="[('section_id','=',section_id),\
+# ('object_id.model', '=', 'crm.opportunity')]"),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
@@ -92,28 +92,38 @@ class hr_applicant(osv.osv, crm.crm_case):
'date': fields.datetime('Date'),
'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
'job_id': fields.many2one('hr.job', 'Applied Job'),
- 'salary_proposed': fields.float('Proposed Salary'),
- 'salary_expected': fields.float('Expected Salary'),
+ 'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
+ 'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
'availability': fields.integer('Availability (Days)'),
'partner_name': fields.char("Applicant's Name", size=64),
'partner_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+# 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+ 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
'department_id':fields.many2one('hr.department', 'Department'),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
'response' : fields.integer("Response"),
+ 'reference': fields.char('Reference', size=128),
}
-
+
+ def _get_stage(self, cr, uid, context=None):
+ if context is None:
+ context = {}
+ ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [], context=context)
+ return ids and ids[0] or False
+
_defaults = {
- 'active': lambda *a: 1,
- 'user_id': crm.crm_case._get_default_user,
- 'email_from': crm.crm_case. _get_default_email,
+ 'active': lambda *a: 1,
+ 'stage_id': _get_stage,
+ 'user_id': lambda self, cr, uid, context: uid,
+# 'user_id': crm.crm_case._get_default_user,
+ 'email_from': crm.crm_case. _get_default_email,
'state': lambda *a: 'draft',
- 'section_id': crm.crm_case. _get_section,
- 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
- 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+ 'section_id': crm.crm_case. _get_section,
+ 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+ 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
}
def onchange_job(self,cr, uid, ids, job, context={}):
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 77f15c4afd5..0b75479c6dc 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -34,31 +34,44 @@
Initial Jobs Demand
+ 1First Interview
+ 2Second Interview
+ 3Contract Proposed
+ 4Contract Signed
+ 5Refused by Employee
+ 6Refused by Company
+ 7
+
+
+
+ HR Department
+ HR
+
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5183587e992..673d4de130b 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,26 +76,21 @@
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
index bf5da78c69a..3b865efe113 100644
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -1,10 +1,10 @@
- |
- In order to test hr_recruitment module for OpenERP object, I create applicants form and Manages job positions and the recruitement process.
+ In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitement process.
- |
- I create job possition for employee to manage job position.
+ I create job position for employee to manage job position.
-
|
- First I create Department "R & D" in Department form for which I make recruitment.
+ For that First I create Department "R & D" in Department form for which I make recruitment.
-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 86418433b6b..930877b77c2 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -51,6 +51,7 @@ to set up a management by affair.
],
'demo_xml': ['hr_timesheet_demo.xml'],
+ 'test': ['test/test_hr_timesheet.yml'],
'installable': True,
'active': False,
'certificate': '0071405533469',
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index b1b8ed90ca7..0e366a00be2 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
new file mode 100644
index 00000000000..69079149f03
--- /dev/null
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -0,0 +1,96 @@
+- |
+ In order to test hr_timesheet Module in OpenERP, I make "Sign In or Sign Out for Project" to encode and
+ track time spent on the different projects.
+
+- |
+ Now, I create a new employee “Mark Johnson” to test Timesheet.
+
+-
+ !record {model: hr.employee, id: hr_employee_employee0}:
+ address_home_id: base.res_partner_address_1
+ company_id: base.main_company
+ gender: male
+ marital: hr.hr_employee_marital_status_single
+ name: Mark Johnson
+ user_id: base.user_root
+
+- |
+ I start by "Sign In/Sign Out by Project" wizard and click on "Sign In/Sign Out" button of this wizard.
+-
+ !python {model: hr.sign.in.project}: |
+ self.check_state(cr, uid, [ref("hr_employee_employee0")])
+- |
+ I select start date and Perform start work on project.
+-
+ !record {model: hr.sign.in.project, id: hr_employee_employee0}:
+ name: employee1
+ server_date: '2010-05-20 16:10:59'
+ state: absent
+- |
+ I click on "Start Working" button of this wizard to start work on Project.
+-
+ !python {model: hr.sign.in.project}: |
+ self.sign_in_result(cr, uid, [ref("hr_employee_employee0")], context)
+- |
+ My work is done and I want to stop work.for that I click on "Sign In/Sign Out" button of "Sign In/Sign Out by Project" wizard.
+ Which check state in hr attendace form for user.
+-
+ !python {model: hr.sign.in.project}: |
+ obj_attendance = self.pool.get('hr.employee')
+ emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "employee1")])
+ if emp_id:
+ employee = obj_attendance.read(cr, uid, emp_id)[0]
+ self.write(cr, uid, [ref('hr_employee_employee0')], {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]})
+ self.check_state(cr, uid, [ref("hr_employee_employee0")], {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]
+ })
+
+- |
+ Given that I have product for "Consultancy - Senior Developer".
+
+-
+ !record {model: product.product, id: product_consultant}:
+ categ_id: product.product_category_10
+ default_code: DEV
+ list_price: 75.0
+ name: Consultancy - Senior Developer
+ procure_method: make_to_order
+ purchase_ok: False
+ standard_price: 30.0
+ supply_method: produce
+ type: service
+ uom_id: product.uom_hour
+ uom_po_id: product.uom_hour
+
+- |
+ I assing product and journal to "Mark Johnson"
+-
+ !record {model: hr.employee, id: hr_employee_employee0}:
+ journal_id: analytic_journal
+ product_id: product_consultant
+
+- |
+ This will Open "hr sign out project" form. I select analytical project2 development account.
+-
+ !record {model: hr.sign.out.project, id: hr_employee_employee0}:
+ account_id: account.analytic_project_2_development
+ analytic_amount: 7.0
+ date: '2010-05-21 16:40:00'
+ date_start: '2010-05-19 16:37:00'
+ info: Create Yaml for hr module
+ name: Mark Johnson
+ server_date: '2010-05-19 16:40:15'
+ state: present
+
+- |
+ My work for this project is over and I stop work by click on "Stop Work" button of this wizard.
+-
+ !python {model: hr.sign.out.project}: |
+ emp_obj = self.pool.get('hr.employee')
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid), ('name', '=', 'employee1')])
+ if emp_id:
+ employee = emp_obj.read(cr, uid, emp_id)[0]
+ self.write(cr, uid, [ref('hr_employee_employee0')], {'emp_id': emp_id[0] })
+ #self.sign_out_result(cr, uid, [ref('hr_employee_employee0')])
+
+- |
+ I can see employee timesheet for particular month using "Employee Timesheet" report.
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index a81168a3b68..0b96cc94974 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -45,7 +45,9 @@ reports, eso.""",
'wizard/hr_timesheet_invoice_create_final_view.xml',
'board_hr_timesheet_invoice.xml',
],
- 'demo_xml': ['hr_timesheet_invoice_demo.xml'],
+ 'demo_xml': ['hr_timesheet_invoice_demo.xml',
+ ],
+ 'test': ['test/test_hr_timesheet_invoice.yml'],
'installable': True,
'active': False,
'certificate': '0056091842381',
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index f8b962079b1..6b0acb82ad9 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
new file mode 100644
index 00000000000..431c30d8cb1
--- /dev/null
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -0,0 +1,89 @@
+- |
+ In order to test hr_timesheet_invoice in OpenERP, I create account line to manage invoice based on costs.
+- |
+ In order to test flow, I create analytic line for sednacom analytic account.
+-
+ !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0}:
+ account_id: account.analytic_sednacom
+ amount: -1.0
+ company_id: base.main_company
+ date: '2010-05-30'
+ general_account_id: account.a_expense
+ journal_id: hr_timesheet.analytic_journal
+ name: develop yaml for hr module
+ product_id: hr_timesheet.product_consultant
+ product_uom_id: product.uom_hour
+ to_invoice: hr_timesheet_invoice.timesheet_invoice_factor2
+ unit_amount: 5.00
+ user_id: base.user_root
+
+- |
+ Give partner name and price list in analytic account.
+-
+ !record {model: account.analytic.account, id: account.analytic_sednacom}:
+ partner_id: base.res_partner_9
+ pricelist_id: product.list0
+
+- |
+ I create invoice on analytic Line using "Invoice analytic Line" wizard.
+ Give date , detail of each work , time spend on that work on this wizard.
+-
+ !record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
+ accounts:
+ - account.analytic_sednacom
+ date: 1
+ name: 1
+ price: 1
+ product: hr_timesheet.product_consultant
+ time: 1
+
+- |
+ I click on "Create Invoice" button of "Invoice analytic Line" wizard to create invoice.
+-
+ !python {model: hr.timesheet.invoice.create}: |
+ self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_0")], {"active_ids": [ref("hr_timesheet_invoice.account_analytic_line_developyamlforhrmodule0")]})
+
+- |
+ I check that Invoice is create for this timesheet.
+-
+ !python {model: account.analytic.line}: |
+ exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0]
+
+ analytic_account_obj = self.pool.get('account.analytic.account')
+
+ data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
+
+ account_ids = data['accounts']
+ for account in analytic_account_obj.browse(cr, uid, account_ids, context):
+ partner = account.partner_id.id
+
+ invoice_obj = self.pool.get('account.invoice')
+ invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner)])
+ invoice_id = invoice_obj.browse(cr, uid, invoice_ids)[0]
+
+ for invoice in invoice_id.invoice_line:
+ product = invoice.product_id.id
+
+ product_exp = data['product']
+
+ assert product == product_exp
+- |
+ I creating a final invoice for "Sednacom" analytic account.
+-
+ !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
+ balance_product: hr_timesheet.product_consultant
+ date: 1
+ name: 1
+ price: 1
+ time: 1
+- |
+ I click on "Create Invoice" button to create Invoice.
+-
+ !python {model: hr.timesheet.invoice.create.final}: |
+ self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]})
+
+
+- |
+ I can also make some theoretical revenue reports.
+- |
+ I can also see timesheet profit using Timesheet profit report.
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 89ff5e92697..4cd54f5935d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -71,8 +71,8 @@ class hr_timesheet_invoice_create(osv.osv_memory):
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
res = mod_obj.read(cr, uid, result, ['res_id'])
-
data = self.read(cr, uid, ids, [], context)[0]
+
account_ids = data['accounts']
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id
@@ -119,11 +119,11 @@ class hr_timesheet_invoice_create(osv.osv_memory):
"GROUP BY product_id,to_invoice", (account.id,context['active_ids'],))
for product_id,factor_id,qty in cr.fetchall():
- product = pool.get('product.product').browse(cr, uid, product_id, context2)
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context2)
if not product:
raise osv.except_osv(_('Error'), _('At least one line has no product !'))
factor_name = ''
- factor = pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context2)
+ factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context2)
if not data['product']:
if factor.customer_name:
@@ -131,16 +131,16 @@ class hr_timesheet_invoice_create(osv.osv_memory):
else:
factor_name = product.name
else:
- factor_name = pool.get('product.product').name_get(cr, uid, [data['product']], context=context)[0][1]
+ factor_name = self.pool.get('product.product').name_get(cr, uid, [data['product']], context=context)[0][1]
if account.pricelist_id:
pl = account.pricelist_id.id
- price = pool.get('product.pricelist').price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
+ price = self.pool.get('product.pricelist').price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
else:
price = 0.0
taxes = product.taxes_id
- tax = pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
'price_unit': price,
@@ -159,7 +159,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
#
# Compute for lines
#
- cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id = ANY (%s) AND product_id=%s and to_invoice=%s", (account.id, data['ids'], product_id, factor_id))
+ cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id = %s AND product_id=%s and to_invoice=%s", (account.id, data['id'], product_id, factor_id))
line_ids = cr.dictfetchall()
note = []
@@ -170,7 +170,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
details.append(line['date'])
if data['time']:
if line['product_uom_id']:
- details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
+ details.append("%s %s" % (line['unit_amount'], self.pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
else:
details.append("%s" % (line['unit_amount'], ))
if data['name']:
@@ -180,8 +180,8 @@ class hr_timesheet_invoice_create(osv.osv_memory):
note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
- pool.get('account.invoice.line').create(cr, uid, curr_line)
- cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id =ANY(%s)" ,(last_invoice, account.id,data['ids']))
+ self.pool.get('account.invoice.line').create(cr, uid, curr_line)
+ cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id =%s" ,(last_invoice, account.id,data['id']))
self.pool.get('account.invoice').button_reset_taxes(cr, uid, [last_invoice], context)
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index efc8a658226..9163219e2a6 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -56,7 +56,10 @@ The validation can be configured in the company:
'report/timesheet_report_view.xml',
'board_hr_timesheet_view.xml',
],
- 'demo_xml': ['hr_timesheet_sheet_demo.xml'],
+ 'demo_xml': ['hr_timesheet_sheet_demo.xml',
+
+ ],
+ 'test':['test/test_hr_timesheet_sheet.yml'],
'installable': True,
'active': False,
'certificate': '0073297700829',
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 5ace7f64ebd..c1302a7061d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -151,13 +151,16 @@ class hr_timesheet_sheet(osv.osv):
raise osv.except_osv(_('Error !'), _('You can not duplicate a timesheet !'))
def button_confirm(self, cr, uid, ids, context=None):
+
if context is None:
context = {}
for sheet in self.browse(cr, uid, ids, context=context):
di = sheet.user_id.company_id.timesheet_max_difference
+
if (abs(sheet.total_difference) < di) or not di:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
+
else:
raise osv.except_osv(_('Warning !'), _('Please verify that the total difference of the sheet is lower than %.2f !') %(di,))
return True
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
new file mode 100644
index 00000000000..bb163b3c68e
--- /dev/null
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -0,0 +1,139 @@
+- |
+ In order, to test hr_timesheet_sheet module in OpenERP, I create timesheet and check validation process done by
+ manager.
+
+- |
+ Now, I create a new employee “Mark Johnson” to test Timesheet.
+-
+ !record {model: hr.employee, id: hr_employee_employee0}:
+ address_home_id: base.res_partner_address_1
+ company_id: base.main_company
+ gender: male
+ marital: hr.hr_employee_marital_status_single
+ name: Mark Johnson
+ user_id: base.user_root
+
+- |
+ I create new user "user1".
+-
+ !record {model: res.users, id: res_users_user0}:
+ company_id: base.main_company
+ context_lang: en_US
+ groups_id:
+ - hr.group_hr_user
+ - hr_attendance.group_hr_attendance
+ - base.group_user
+ - base.group_extended
+ - hr.group_hr_manager
+ login: user1
+ name: user1
+ password: user1
+
+- |
+ create another employee "Francline" as "user1".
+-
+ !record {model: hr.employee, id: hr_employee_fracline0}:
+ address_home_id: base.res_partner_address_8
+ name: Francline
+ parent_id: 'hr_employee_employee0'
+ user_id: 'res_users_user0'
+
+- |
+ Given that I have Timesheet journal for employee.
+
+-
+ !record {model: account.analytic.journal, id: analytic_journal}:
+ code: TS
+ name: Timesheet Journal
+ type: general
+
+- |
+ Given that I have product for "Consultancy - Senior Developer".
+-
+ !record {model: product.product, id: product_consultant}:
+ categ_id: product.product_category_10
+ default_code: DEV
+ list_price: 75.0
+ name: Consultancy - Senior Developer
+ procure_method: make_to_order
+ purchase_ok: False
+ standard_price: 30.0
+ supply_method: produce
+ type: service
+ uom_id: product.uom_hour
+ uom_po_id: product.uom_hour
+
+- |
+ I assing product and journal to "Mark Johnson"
+-
+ !record {model: hr.employee, id: hr_employee_employee0}:
+ product_id: product_consultant
+ journal_id: analytic_journal
+- |
+ And also assing product and journal to "francline" employee.
+-
+ !record {model: hr.employee, id: hr_employee_fracline0}:
+ product_id: product_consultant
+ journal_id: analytic_journal
+
+- |
+ I connect as "francline" and create my current timesheet.
+-
+ !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
+ date_current: '2010-05-26'
+ date_from: '2010-05-01'
+ date_to: '2010-05-31'
+ name: Week-22(2010)
+ state: new
+ user_id: 'res_users_user0'
+- |
+ Now , When I came in office , I create Attendances and perform "Sign In" action with proper reason.
+-
+ !record {model: hr.attendance, id: hr_attendance_0}:
+ action: sign_in
+ employee_id: 'hr_employee_fracline0'
+ name: '2010-05-26 10:08:08'
+
+- |
+ When I left office , I create attendance and perform "Sign Out".
+-
+ !record {model: hr.attendance, id: hr_attendance_1}:
+ action: sign_out
+ employee_id: 'hr_employee_fracline0'
+ name: '2010-05-26 15:10:55'
+
+-
+ I create Timesheet Entry for time spend on today work.
+-
+
+ !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet.sheet1}:
+ timesheet_ids:
+ - account_id: account.analytic_sednacom
+ date: '05/26/2010'
+ name: 'Develop yaml for hr module'
+ unit_amount: 5.00
+ amount: -90.00
+ product_id: hr_timesheet.product_consultant
+ general_account_id: account.a_expense
+ user_id: res_users_user0
+ journal_id: hr_timesheet.analytic_journal
+
+- |
+ I confirm my timesheet at end of period by click on "Confirm" button which is signal of workflow.
+-
+ !python {model: hr_timesheet_sheet.sheet}: |
+ uid = ref('res_users_user0')
+ self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')])
+- |
+ I check that state is "Confirmed".
+-
+ !assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
+ - state == 'confirm'
+- |
+ "Mark Johnson" check timesheet and time spend on project by "francline" employee.
+ And then accept it request by click on "Accept" button.
+ If "Maximal difference between timesheet and attendances" is more than 1 then manage can "Refuse" his request.
+-
+ !python {model: hr_timesheet_sheet.sheet}: |
+ #self.write(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {'state': 'done'})
+
\ No newline at end of file
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 57d37c82a61..5e24e999ddb 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index a08b7dbb1b2..32ee1cdc0df 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -21,17 +21,35 @@
view
-
+
+
+ Assets
+ 10
+ view
+
+
+
+
+
+
+ Liabilities
+ 11
+ view
+
+
+
+
+
- 10
+ 100Fixed Assets
-
+ view
- 100
+ 1000Fixed Asset Accountother
@@ -39,15 +57,15 @@
- 11
+ 101Net Current Assets
-
+ view
- 110
+ 1100Current Assetsview
@@ -55,7 +73,7 @@
- 1101
+ 11001Purchased Stocksother
@@ -63,7 +81,7 @@
- 1102
+ 11002Debtorsreceivable
@@ -76,7 +94,7 @@
-->
- 1103
+ 11003Output VATother
@@ -84,7 +102,7 @@
- 1104
+ 11004Bank Current Accountother
@@ -92,7 +110,7 @@
- 1105
+ 11005Cashother
@@ -100,9 +118,9 @@
- 111
+ 110Current Liabilities
-
+ view
@@ -137,17 +155,35 @@
view
-
+
+
+ Income
+ 20
+ view
+
+
+
+
+
+
+ Expense
+ 21
+ view
+
+
+
+
+
- 20
+ 200Revenue
-
+ view
- 200
+ 2001Product Salesother
@@ -159,15 +195,15 @@
-->
- 21
+ 210Cost of Sales
-
+ view
- 210
+ 2100Cost of Goods Soldother
@@ -175,15 +211,15 @@
- 22
+ 211Overheads
-
+ view
- 220
+ 2110Expensesother
diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/account_types.xml
index 51040cadbbd..adecc45c228 100644
--- a/addons/l10n_chart_uk_minimal/account_types.xml
+++ b/addons/l10n_chart_uk_minimal/account_types.xml
@@ -19,17 +19,39 @@
viewnone
-
+
+
+ Income View
+ view
+ income
+
+
+ Expense View
+ expense
+ expense
+
+
+ Asset View
+ asset
+ asset
+
+
+ Liability View
+ liability
+ liability
+ Incomeincomenone
+ incomeExpenseexpensenone
+ expense
@@ -48,6 +70,7 @@
Assetassetbalance
+ asset
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 8605f1e63d3..26d781a4096 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 78f5a742bb6..7d8a46a8a92 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -31,6 +31,7 @@
+
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index aee302283b2..8eb1d1a01f4 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -28,6 +28,8 @@ class marketing_installer(osv.osv_memory):
# Generic modules
'marketing_campaign':fields.boolean('Marketing Campaigns',
help="Helps you to manage marketing campaigns and automate actions and communication steps."),
+ 'marketing_campaign_mailchimp':fields.boolean('Mailchimp Integration',
+ help="This modules integrate mailchimp.com's service with OpenERP to automate mass mailings."),
'crm_profiling':fields.boolean('Profiling Tools',
help="Helps you to perform segmentation within partners and design questionaires.")
}
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 3f29e03c968..4773a190a41 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2004-2010 OpenERP SA ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -18,6 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
+
import time
import base64
from datetime import datetime
@@ -25,7 +26,7 @@ from dateutil.relativedelta import relativedelta
from osv import fields, osv
import netsvc
-import tools
+import tools
_intervalTypes = {
'hours': lambda interval: relativedelta(hours=interval),
@@ -34,184 +35,186 @@ _intervalTypes = {
'years': lambda interval: relativedelta(years=interval),
}
-class marketing_campaign(osv.osv): #{{{
+class marketing_campaign(osv.osv):
_name = "marketing.campaign"
_description = "Marketing Campaign"
-
+
_columns = {
'name': fields.char('Name', size=64, required=True),
- 'object_id': fields.many2one('ir.model', 'Objects', required=True,
+ 'object_id': fields.many2one('ir.model', 'Object', required=True,
help="Choose the Object on which you want \
- this campaign to be run"),
- 'mode':fields.selection([('test', 'Test'),
- ('test_realtime', 'Realtime'),
- ('manual', 'Manual'),
- ('active', 'Active')],
- 'Mode', required=True),
+this campaign to be run"),
+ 'mode':fields.selection([('test', 'Test Directly'),
+ ('test_realtime', 'Test in Realtime'),
+ ('manual', 'With Manual Confirmation'),
+ ('active', 'Normal')],
+ 'Mode', required=True, help= \
+"""Test - It creates and process all the workitems directly (without waiting for the delay on transitions) but do not send emails or produce reports.
+Test in Realtime - It creates and process all the workitems directly but do not send emails or produce reports.
+With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
+Normal - the campaign runs normally and automatically sends all emails and reports"""),
'state': fields.selection([('draft', 'Draft'),
('running', 'Running'),
('done', 'Done'),
('cancelled', 'Cancelled'),],
- 'State',),
- 'activity_ids': fields.one2many('marketing.campaign.activity',
+ 'State',),
+ 'activity_ids': fields.one2many('marketing.campaign.activity',
'campaign_id', 'Activities'),
'fixed_cost': fields.float('Fixed Cost', help="The fixed cost is cost\
- you required for the campaign"),
-
+you required for the campaign"),
}
-
_defaults = {
'state': lambda *a: 'draft',
- 'mode': lambda *a: 'test',
+ 'mode': lambda *a: 'test',
}
def state_running_set(self, cr, uid, ids, *args):
campaign = self.browse(cr, uid, ids[0])
if not campaign.activity_ids :
- raise osv.except_osv("Error", "There is no associate activitity for the campaign")
+ raise osv.except_osv("Error", "There is no activitity in the campaign")
act_ids = [ act_id.id for act_id in campaign.activity_ids]
act_ids = self.pool.get('marketing.campaign.activity').search(cr, uid,
[('id', 'in', act_ids), ('start', '=', True)])
if not act_ids :
- raise osv.except_osv("Error", "There is no associate activitity for the campaign")
- segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
- [('campaign_id', '=', campaign.id),
- ('state', '=', 'draft')])
+ raise osv.except_osv("Error", "There is no starting activitity in the campaign")
self.write(cr, uid, ids, {'state': 'running'})
return True
-
+
def state_done_set(self, cr, uid, ids, *args):
segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
[('campaign_id', 'in', ids),
('state', '=', 'running')])
if segment_ids :
- raise osv.except_osv("Error", "Camapign cannot be done before all segments are done")
+ raise osv.except_osv("Error", "Campaign cannot be marked as done before all segments are done")
self.write(cr, uid, ids, {'state': 'done'})
return True
-
+
def state_cancel_set(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'cancelled'})
return True
-marketing_campaign()#}}}
+marketing_campaign()
-class marketing_campaign_segment(osv.osv): #{{{
+class marketing_campaign_segment(osv.osv):
_name = "marketing.campaign.segment"
_description = "Campaign Segment"
_columns = {
'name': fields.char('Name', size=64,required=True),
- 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
+ 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
required=True),
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object'),
'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
- 'sync_last_date': fields.datetime('Date'),
- 'sync_mode': fields.selection([('create_date', 'Create'),
- ('write_date', 'Write')],
- 'Mode'),
+ 'sync_last_date': fields.datetime('Latest Synchronization'),
+ 'sync_mode': fields.selection([('create_date', 'Sync only on creation'),
+ ('write_date', 'Sync at each modification')],
+ 'Synchronization Mode'),
'state': fields.selection([('draft', 'Draft'),
('running', 'Running'),
('done', 'Done'),
('cancelled', 'Cancelled')],
- 'State',),
- 'date_run': fields.datetime('Running'),
- 'date_done': fields.datetime('Done'),
+ 'State',),
+ 'date_run': fields.datetime('Launching Date'),
+ 'date_done': fields.datetime('End Date'),
}
-
+
_defaults = {
'state': lambda *a: 'draft',
'sync_mode': lambda *a: 'create_date',
}
-
+
def state_running_set(self, cr, uid, ids, *args):
segment = self.browse(cr, uid, ids[0])
curr_date = time.strftime('%Y-%m-%d %H:%M:%S')
vals = {'state': 'running'}
if not segment.date_run:
- vals['date_run'] = time.strftime('%Y-%m-%d %H:%M:%S')
- if not segment.sync_last_date:
- vals['sync_last_date']=curr_date
- if not segment.date_done:
- vals['date_done']= (datetime.now() + _intervalTypes['years'](1) \
- ).strftime('%Y-%m-%d %H:%M:%S')
+ vals['date_run'] = time.strftime('%Y-%m-%d %H:%M:%S')
self.write(cr, uid, ids, vals)
return True
-
+
def state_done_set(self, cr, uid, ids, *args):
- date_done = self.browse(cr, uid, ids[0]).date_done
- if (date_done > time.strftime('%Y-%m-%d %H:%M:%S')):
- raise osv.except_osv("Error", "Segment cannot be closed before end date")
-
wi_ids = self.pool.get("marketing.campaign.workitem").search(cr, uid,
- [('state', 'in', ['inprogress', 'todo']),
- ('segment_id', '=', ids[0])])
- if wi_ids :
- raise osv.except_osv("Error", "Segment cannot be done before all workitems are processed")
- self.write(cr, uid, ids, {'state': 'done'})
+ [('state', '=', 'todo'), ('segment_id', 'in', ids)])
+ self.pool.get("marketing.campaign.workitem").write(cr, uid, wi_ids, {'state':'cancelled'})
+ self.write(cr, uid, ids, {'state': 'done','date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
return True
-
+
def state_cancel_set(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state': 'cancelled'})
+ wi_ids = self.pool.get("marketing.campaign.workitem").search(cr, uid,
+ [('state', '=', 'todo'), ('segment_id', 'in', ids)])
+ self.pool.get("marketing.campaign.workitem").write(cr, uid, wi_ids, {'state':'cancelled'})
+ self.write(cr, uid, ids, {'state': 'cancelled','date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
return True
-
- def process_segment(self, cr, uid, context={}):
- segment_ids = self.search(cr, uid, [('state', '=', 'running')])
+
+ def synchroniz(self, cr, uid, ids, *args):
+ self.process_segment(cr, uid, ids)
+ return True
+
+ def process_segment(self, cr, uid, segment_ids=None, context={}):
+ if not segment_ids:
+ segment_ids = self.search(cr, uid, [('state', '=', 'running')], context=context)
+
action_date = time.strftime('%Y-%m-%d %H:%M:%S')
- last_action_date = (datetime.now() + _intervalTypes['days'](-1) \
- ).strftime('%Y-%m-%d %H:%M:%S')
- for segment in self.browse(cr, uid, segment_ids):
- act_ids = self.pool.get('marketing.campaign.activity').search(cr,
- uid, [('start', '=', True),
- ('campaign_id', '=', segment.campaign_id.id)])
- if (segment.sync_last_date and \
- segment.sync_last_date <= action_date )\
- or not segment.sync_last_date :
- model_obj = self.pool.get(segment.object_id.model)
- object_ids = model_obj.search(cr, uid, [
- (segment.sync_mode, '<=', action_date),
- (segment.sync_mode, '>=', last_action_date)])
- for o_ids in model_obj.read(cr, uid, object_ids) :
- partner_id = 'partner_id' in o_ids and o_ids['partner_id'] \
- or False
- if partner_id:
- for act_id in act_ids:
- wi_vals = {'segment_id': segment.id,
- 'activity_id': act_id,
- 'date': action_date,
- 'partner_id': partner_id[0],
- 'state': 'todo',
- }
- self.pool.get('marketing.campaign.workitem').create(
- cr, uid, wi_vals)
- self.write(cr, uid, segment.id, {'sync_last_date':action_date})
+ campaigns = {}
+ for segment in self.browse(cr, uid, segment_ids, context=context):
+ campaigns[segment.campaign_id.id] = True
+ act_ids = self.pool.get('marketing.campaign.activity').search(cr,
+ uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)])
+
+ model_obj = self.pool.get(segment.object_id.model)
+ criteria = []
+ if segment.sync_last_date:
+ criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
+ if segment.ir_filter_id:
+ criteria += eval(segment.ir_filter_id.domain)
+ object_ids = model_obj.search(cr, uid, criteria, context=context)
+
+ for o_ids in model_obj.browse(cr, uid, object_ids, context=context) :
+ # avoid duplicated workitem for the same resource
+ if segment.sync_mode == 'write_date':
+ segids = self.pool.get('marketing.campaign.workitem').search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)])
+ if segids:
+ continue
+ for act_id in act_ids:
+ wi_vals = {
+ 'segment_id': segment.id,
+ 'activity_id': act_id,
+ 'date': action_date,
+ 'partner_id': o_ids.partner_id and o_ids.partner_id.id or False,
+ 'state': 'todo',
+ 'res_id': o_ids.id
+ }
+ self.pool.get('marketing.campaign.workitem').create(cr, uid, wi_vals)
+ self.write(cr, uid, segment.id, {'sync_last_date':action_date})
+ self.pool.get('marketing.campaign.workitem').process_all(cr, uid, campaigns.keys(), context=context)
return True
-marketing_campaign_segment()#}}}
+marketing_campaign_segment()
-class marketing_campaign_activity(osv.osv): #{{{
+class marketing_campaign_activity(osv.osv):
_name = "marketing.campaign.activity"
_description = "Campaign Activity"
-
+ _actions_type = [('email', 'E-mail'), ('paper', 'Paper'), ('action', 'Action'),
+ ('subcampaign', 'Sub-Campaign')]
_columns = {
'name': fields.char('Name', size=128, required=True),
- 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
+ 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
required = True, ondelete='cascade'),
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object'),
- 'start': fields.boolean('Start',help= "Its necessary to start activity \
- before running campaign"),
- 'condition': fields.char('Condition', size=256, required=True,
- help="Condition that is to be tested before \
- action is executed"),
+ 'start': fields.boolean('Start',help= "This activity is launched when the campaign starts."),
+ 'condition': fields.char('Condition', size=256, required=True,
+ help="Python condition to know if the activity can be launched"),
'type': fields.selection([('email', 'E-mail'),
('paper', 'Paper'),
('action', 'Action'),
('subcampaign', 'Sub-Campaign')],
- 'Type', required=True),
+ 'Type', required=True,
+ help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
'email_template_id': fields.many2one('email.template','Email Template'),
- 'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
+ 'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
'report_directory_id': fields.many2one('document.directory','Directory',
help="Folder is used to store the generated reports"),
'server_action_id': fields.many2one('ir.actions.server', string='Action',
@@ -222,21 +225,27 @@ class marketing_campaign_activity(osv.osv): #{{{
'Next Activities'),
'from_ids': fields.one2many('marketing.campaign.transition',
'activity_to_id',
- 'Previous Activities'),
+ 'Previous Activities'),
'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign'),
'subcampaign_segment_id': fields.many2one('marketing.campaign.segment',
'Sub Campaign Segment'),
'variable_cost': fields.float('Variable Cost'),
'revenue': fields.float('Revenue')
- }
+ }
_defaults = {
'type': lambda *a: 'email',
'condition': lambda *a: 'True',
'object_id' : lambda obj, cr, uid, context : context.get('object_id',False),
}
+ def __init__(self, *args):
+ self._actions = {'paper' : self.process_wi_report,
+ 'email' : self.process_wi_email,
+ 'server_action' : self.process_wi_action,
+ }
+ return super(marketing_campaign_activity, self).__init__(*args)
- def search(self, cr, uid, args, offset=0, limit=None, order=None,
+ def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
if context == None:
context = {}
@@ -247,61 +256,68 @@ class marketing_campaign_activity(osv.osv): #{{{
for activity in segment_obj.campaign_id.activity_ids:
act_ids.append(activity.id)
return act_ids
- return super(marketing_campaign_activity, self).search(cr, uid, args,
+ return super(marketing_campaign_activity, self).search(cr, uid, args,
offset, limit, order, context, count)
- def process(self, cr, uid, act_id, wi_id, context={}):
- activity = self.browse(cr, uid, act_id)
- workitem_obj = self.pool.get('marketing.campaign.workitem')
- workitem = workitem_obj.browse(cr, uid, wi_id)
-
- if activity.type == 'paper' :
- service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
- (report_data, format) = service.create(cr, uid, [], {}, {})
- attach_vals = {
- 'name': '%s_%s_%s'%(activity.report_id.report_name,
- activity.name,workitem.partner_id.name),
- 'datas_fname': '%s.%s'%(activity.report_id.report_name,
- activity.report_id.report_type),
- 'parent_id': activity.report_directory_id.id,
- 'datas': base64.encodestring(report_data),
- 'file_type': format
- }
- self.pool.get('ir.attachment').create(cr, uid, attach_vals)
- elif activity.type == 'email' :
- context = {}
- template = activity.email_template_id
- accounts = template.enforce_from_account
- if not template.enforce_from_account:
- return {'error_msg' : "There is no account defined for the email"}
- if not workitem.partner_id.email:
- return {'error_msg' : "There is no email defined for the partner"}
- vals = {
- 'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
- 'email_to': workitem.partner_id.email,
- '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'
- }
+ def process_wi_report(self, cr, uid, activity, workitem):
+ service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
+ (report_data, format) = service.create(cr, uid, [], {}, {})
+ attach_vals = {
+ 'name': '%s_%s_%s'%(activity.report_id.report_name,
+ activity.name,workitem.partner_id.name),
+ 'datas_fname': '%s.%s'%(activity.report_id.report_name,
+ activity.report_id.report_type),
+ 'parent_id': activity.report_directory_id.id,
+ 'datas': base64.encodestring(report_data),
+ 'file_type': format
+ }
+ self.pool.get('ir.attachment').create(cr, uid, attach_vals)
+ return True
+
+ def process_wi_email(self, cr, uid, activity, workitem):
+ template = activity.email_template_id
+ accounts = template.enforce_from_account
+ if not template.enforce_from_account:
+ return {'error_msg' : "There is no account defined for the email"}
+ if not workitem.partner_id.email:
+ return {'error_msg' : "There is no email defined for the partner"}
+ vals = {
+ 'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
+ 'email_to': workitem.partner_id.email,
+ '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
- mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
- elif activity.type == 'action' :
- server_obj = self.pool.get('ir.actions.server')
- server_obj.run(cr, uid, [activity.server_action_id.id], context)
- #???
- return True
-marketing_campaign_activity()#}}}
+ #Create partly the mail and later update attachments
+ 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 = {}
+ server_obj = self.pool.get('ir.actions.server')
+ server_obj.run(cr, uid, [activity.server_action_id.id], context)
+ return True
+
-class marketing_campaign_transition(osv.osv): #{{{
+ def process(self, cr, uid, act_id, wi_id, context={}):
+ activity = self.browse(cr, uid, act_id)
+ workitem_obj = self.pool.get('marketing.campaign.workitem')
+ workitem = workitem_obj.browse(cr, uid, wi_id)
+ self._actions[activity.type](cr, uid, activity, workitem)
+ return True
+
+marketing_campaign_activity()
+
+class marketing_campaign_transition(osv.osv):
_name = "marketing.campaign.transition"
_description = "Campaign Transition"
_rec_name = "interval_type"
@@ -309,13 +325,13 @@ class marketing_campaign_transition(osv.osv): #{{{
_columns = {
'activity_from_id': fields.many2one('marketing.campaign.activity',
'Source Activity'),
- 'activity_to_id': fields.many2one('marketing.campaign.activity',
+ 'activity_to_id': fields.many2one('marketing.campaign.activity',
'Destination Activity'),
'interval_nbr': fields.integer('Interval No.'),
- 'interval_type': fields.selection([('hours', 'Hours'), ('days', 'Days'),
+ 'interval_type': fields.selection([('hours', 'Hours'), ('days', 'Days'),
('months', 'Months'),
('years','Years')],'Interval Type')
- }
+ }
def default_get(self, cr, uid, fields, context={}):
value = super(marketing_campaign_transition, self).default_get(cr, uid,
@@ -323,57 +339,76 @@ class marketing_campaign_transition(osv.osv): #{{{
if context.has_key('type_id'):
value[context['type_id']] = context['activity_id']
return value
-
-marketing_campaign_transition() #}}}
-class marketing_campaign_workitem(osv.osv): #{{{
+marketing_campaign_transition()
+
+class marketing_campaign_workitem(osv.osv):
_name = "marketing.campaign.workitem"
_description = "Campaign Workitem"
+ def _res_name_get(self, cr, uid, ids, field_name, arg, context=None):
+ res = {}
+ for obj in self.browse(cr, uid, ids, context=context):
+ if obj.res_id:
+ try:
+ res[obj.id] = self.pool.get(obj.object_id.model).name_get(cr, uid, [obj.res_id], context=context)[0][1]
+ except:
+ res[obj.id] = '/'
+ else:
+ res[obj.id] = '/'
+ return res
+
_columns = {
'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
- required=True),
+ required=True),
'activity_id': fields.many2one('marketing.campaign.activity','Activity',
- required=True),
- 'object_id': fields.related('segment_id', 'campaign_id', 'object_id',
- type='many2one', relation='ir.model',
- string='Object'),
- 'res_id': fields.integer('Results'),
+ required=True),
+ 'campaign_id': fields.related('segment_id', 'campaign_id',
+ type='many2one', relation='marketing.campaign', string='Campaign', readonly=True),
+ 'object_id': fields.related('segment_id', 'campaign_id', 'object_id',
+ type='many2one', relation='ir.model', string='Object'),
+ 'res_id': fields.integer('Resource ID'),
+ 'res_name': fields.function(_res_name_get, method=True, string='Resource Name', type="char", size=64),
'date': fields.datetime('Execution Date'),
- 'partner_id': fields.many2one('res.partner', 'Partner',required=True),
- 'state': fields.selection([('todo', 'ToDo'), ('inprogress', 'In Progress'),
+ 'partner_id': fields.many2one('res.partner', 'Partner'),
+ 'state': fields.selection([('todo', 'ToDo'), ('inprogress', 'In Progress'),
('exception', 'Exception'), ('done', 'Done'),
('cancelled', 'Cancelled')], 'State'),
'error_msg' : fields.text('Error Message')
- }
+ }
_defaults = {
- 'state': lambda *a: 'draft',
+ 'state': lambda *a: 'todo',
}
def process_chain(self, cr, uid, workitem_id, context={}):
workitem = self.browse(cr, uid, workitem_id)
- mct_obj = self.pool.get('marketing.campaign.transition')
- process_to_id = mct_obj.search(cr,uid, [
- ('activity_from_id','=', workitem.activity_id.id)])
- for mct_id in mct_obj.browse(cr, uid, process_to_id):
+ for mct_id in workitem.activity_id.to_ids:
+ launch_date = time.strftime('%Y-%m-%d %H:%M:%S')
if mct_id.interval_type and mct_id.interval_nbr :
launch_date = (datetime.now() + _intervalTypes[ \
mct_id.interval_type](mct_id.interval_nbr) \
).strftime('%Y-%m-%d %H:%M:%S')
- launch_date = time.strftime('%Y-%m-%d %H:%M:%S')
- workitem_vals = {'segment_id': workitem.segment_id.id,
- 'activity_id': mct_id.activity_to_id.id,
- 'date': launch_date,
- 'partner_id': workitem.partner_id.id,
- 'state': 'todo',
- }
+ workitem_vals = {
+ 'segment_id': workitem.segment_id.id,
+ 'activity_id': mct_id.activity_to_id.id,
+ 'date': launch_date,
+ 'partner_id': workitem.partner_id.id,
+ 'res_id': workitem.res_id,
+ 'state': 'todo',
+ }
self.create(cr, uid, workitem_vals)
-
+ return True
+
+ def button_cancel(self, cr, uid, workitem_ids, context={}):
+ for wi in self.browse(cr, uid, workitem_ids):
+ if wi.state in ('todo','exception'):
+ self.write(cr, uid, [wi.id], {'state':'cancelled'}, context=context)
+ return True
+
def process(self, cr, uid, workitem_ids, context={}):
for wi in self.browse(cr, uid, workitem_ids):
- if wi.state == 'todo':# we searched the wi which are in todo state
- #then y v keep this filter again
+ if wi.state == 'todo':
eval_context = {
'pool': self.pool,
'cr': cr,
@@ -385,50 +420,53 @@ class marketing_campaign_workitem(osv.osv): #{{{
expr = eval(str(wi.activity_id.condition), eval_context)
if expr:
try :
- res = self.pool.get('marketing.campaign.activity').process(
- cr, uid, wi.activity_id.id, wi.id, context)
- if res :
- self.write(cr, uid, wi.id, {'state': 'done'})
- self.process_chain(cr, uid, wi.id, context)
- else :
- self.write(cr, uid, wi.id, {'state': 'exception',
- 'error_msg': res['error_msg']})
+ if wi.campaign_id.mode in ('manual','active'):
+ self.pool.get('marketing.campaign.activity').process(
+ cr, uid, wi.activity_id.id, wi.id, context)
+ self.write(cr, uid, wi.id, {'state': 'done'})
+ self.process_chain(cr, uid, wi.id, context)
except Exception,e:
self.write(cr, uid, wi.id, {'state': 'exception'})
else :
self.write(cr, uid, wi.id, {'state': 'cancelled'})
-
+
return True
-
- def process_all(self, cr, uid, context={}):
- workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
+
+ def process_all(self, cr, uid, camp_ids=None, context={}):
+ camp_obj = self.pool.get('marketing.campaign')
+ if not camp_ids:
+ camp_ids = camp_obj.search(cr, uid, [('state','=','running')], context=context)
+ for camp in camp_obj.browse(cr, uid, camp_ids, context=context):
+ if camp.mode in ('test_realtime','active'):
+ workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))])
+ elif camp.mode == 'test':
+ workitem_ids = self.search(cr, uid, [('state', '=', 'todo')])
+ else:
+ # manual states are not processed automatically
+ pass
if workitem_ids:
self.process(cr, uid, workitem_ids, context)
-
-marketing_campaign_workitem() #}}}
+
+marketing_campaign_workitem()
class email_template(osv.osv):
_inherit = "email.template"
-
_defaults = {
'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
}
-email_template()
+email_template()
class report_xml(osv.osv):
-
_inherit = 'ir.actions.report.xml'
-
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if not context:
context = {}
if context and 'object_id' in context and context['object_id']:
- model = self.pool.get('ir.model').browse(cr, uid,
+ model = self.pool.get('ir.model').browse(cr, uid,
context['object_id']).model
args.append(('model', '=', model))
return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
-
-report_xml()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+report_xml()
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 7296ebf9c50..8bc5f879321 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -20,33 +20,27 @@
-
-
-
-
- Thanks for showing interest in OpenERP
- info@tinyerp.com
-
-
-
-
-
-
-
- Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,
- mako
-
- For OpenERP OnDemand Free Trial 2010
- crm.lead
-
-
-
+
+
+
+
+ Thanks for showing interest in OpenERP
+ info@tinyerp.com
+
+
+
+
+
+ Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,
+ mako
+ For OpenERP OnDemand Free Trial 2010
+ crm.lead
+
+ Propose to subscribe to the Open ERP Discovery Day on May 2010info@tinyerp.com
-
-
@@ -56,19 +50,15 @@
We really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
- For Open ERP Discovery Day on May 2010crm.lead
-
-
-
+
+
Thanks for subscribing to the Open ERP Discovery Dayinfo@tinyerp.com
-
-
@@ -77,19 +67,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
- For Open ERP Discovery Daycrm.lead
-
-
-
+
+
Thanks for buying the Open ERP bookinfo@tinyerp.com
-
-
@@ -98,19 +84,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
- For Open ERP bookcrm.lead
-
-
+
Propose a free technical training to Gold partnersinfo@tinyerp.com
-
-
@@ -120,19 +102,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
- For technical training to Gold partnerscrm.lead
-
-
+
Propose paid training to Silver partnersinfo@tinyerp.com
-
-
@@ -142,19 +120,15 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
- For training to Silver partnerscrm.lead
-
-
+
Propose gold partnership to silver partnersinfo@tinyerp.com
-
-
@@ -164,73 +138,67 @@
I really appreciate your co-operation on this.
Regards,OpenERP Team,
mako
- For gold partnership to silver partnerscrm.lead
-
-
+
Thanks for subscribing to technical traininginfo@tinyerp.com
-
- Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
Regards,OpenERP Team,mako
- For subscribing to technical trainingcrm.lead
-
-
-
-
- Marketing campaign demo report
- ir.actions.report.xml
- crm.lead
- crm.lead.demo
- marketing_campaign/report/crm_lead_mc_demo_report.rml
- pdf
-
-
-
-
- OpenERP OnDemand Free Trial 2010
-
-
-
-
-
-
- Propose a 1 month free trial for an OnDemand offer
-
-
-
- paper
-
-
-
-
- Thanks for showing interest
-
-
-
-
-
-
+
+
+
+ Marketing campaign demo report
+ ir.actions.report.xml
+ crm.lead
+ crm.lead.demo
+ marketing_campaign/report/crm_lead_mc_demo_report.rml
+ pdf
+
+
+
+
+ OpenERP OnDemand Free Trial 2010
+
+
+
+
+
+
+ Propose a 1 month free trial for an OnDemand offer
+
+
+
+ paper
+
+
+
+
+ Thanks for showing interest
+
+
+
+
+
+ Propose to subscribe to the Open ERP Discovery Day on May 2010
-
-
+
+ Thanks for subscribing to the Open ERP Discovery Day
@@ -244,7 +212,7 @@
paper
-
+
Thanks for buying the Open ERP book
@@ -263,28 +231,28 @@
-
+
Propose gold partnership to silver partners
-
+
Thanks for subscribing to technical training
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -324,15 +292,15 @@
-
-
-
-
- BossList US Associations List-0/90
- create_date
-
- draft
-
-
-
-
+
+
+
+
+ BossList US Associations List-0/90
+ create_date
+
+ draft
+
+
+
+
\ No newline at end of file
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 3e2d7330291..ea25e0d3163 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -14,75 +14,67 @@
form
@@ -122,13 +113,13 @@
-
-
+
+
-
-
+
+
@@ -163,12 +154,12 @@
formtree,form,diagram
- {'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}
+ {'group_by': []}
-
+
+
+ res.partner.form2
+ res.partner
+ form
+
+
+
+
+
+
+ res.partner.tree.form.inherit
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index d23cee8d565..30367ec35f8 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,6 +26,6 @@ import installer
import wizard
import report
import company
-import mrp_procurement
+import procurement
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 78d9c8efff1..96bfebef959 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -26,7 +26,7 @@
"author" : "Tiny",
"website" : "http://www.openerp.com",
"category" : "Generic Modules/Production",
- "depends" : ["mrp_procurement", "stock", "resource", "purchase", "product","process"],
+ "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
"description": """
This is the base module to manage the manufacturing process in Open ERP.
@@ -82,7 +82,7 @@
'report/mrp_production_order_view.xml',
'board_manufacturing_view.xml',
-
+
],
'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml','board_manufacturing_demo.xml'],
'test': [
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index f672fa7b65e..9b7516273a1 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -16,6 +16,7 @@
+
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 496f6ede7dc..7ac7081d791 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.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: 2010-06-08 13:08+0000\n"
+"PO-Revision-Date: 2010-06-10 09:51+0000\n"
"Last-Translator: vir (Open ERP) \n"
"Language-Team: Hindi \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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -81,7 +81,7 @@ msgstr ""
#. module: mrp
#: field:mrp.production,picking_id:0
msgid "Packing list"
-msgstr ""
+msgstr "पैकिंग सूची"
#. module: mrp
#: model:process.node,name:mrp.process_node_stock0
@@ -347,23 +347,23 @@ msgstr ""
#. module: mrp
#: view:mrp.procurement:0
msgid "Details"
-msgstr ""
+msgstr "विवरण"
#. module: mrp
#: model:process.process,name:mrp.process_process_procurementprocess0
msgid "Procurement Process"
-msgstr ""
+msgstr "खरीद प्रक्रिया"
#. module: mrp
#: field:mrp.production,date_planned_date:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "अनुसूचित तिथि"
#. module: mrp
#: selection:mrp.procurement,priority:0
#: selection:mrp.production,priority:0
msgid "Urgent"
-msgstr ""
+msgstr "तत्काल"
#. module: mrp
#: help:mrp.bom,product_rounding:0
@@ -387,7 +387,7 @@ msgstr ""
#. module: mrp
#: field:mrp.procurement,move_id:0
msgid "Reservation"
-msgstr ""
+msgstr "आरक्षण"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action2
@@ -397,12 +397,12 @@ msgstr ""
#. module: mrp
#: wizard_field:product.product.procurement,init,product_id:0
msgid "product"
-msgstr ""
+msgstr "उत्पाद"
#. module: mrp
#: selection:mrp.property,composition:0
msgid "max"
-msgstr ""
+msgstr "अधिकतम"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_producttostockrules0
@@ -412,7 +412,7 @@ msgstr ""
#. module: mrp
#: wizard_button:product_price,init,price:0
msgid "Print product price"
-msgstr ""
+msgstr "प्रिंट उत्पाद मूल्य"
#. module: mrp
#: wizard_view:product.product.procurement,done:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 685d289a194..b4c575bf2b0 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -247,7 +247,7 @@ class mrp_bom(osv.osv):
v['name'] = prod.name
return {'value': v}
return {}
-
+
def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
""" Finds BoM for particular product and product uom.
@param product_id: Selected product.
@@ -460,18 +460,6 @@ class mrp_production(osv.osv):
result[prod.id] = prod.date_planned[:10]
return result
- def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
- """ Finds reference sale order for production order.
- @param field_names: Names of fields.
- @param arg: User defined arguments
- @return: Dictionary of values.
- """
- res = {}
- for f in field_names:
- for order_id in ids:
- res[order_id] = {f:False}
- return res
-
_columns = {
'name': fields.char('Reference', size=64, required=True),
'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."),
@@ -512,8 +500,6 @@ class mrp_production(osv.osv):
'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
- 'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
- 'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
@@ -823,7 +809,7 @@ class mrp_production(osv.osv):
seq_obj = self.pool.get('ir.sequence')
pick_obj = self.pool.get('stock.picking')
move_obj = self.pool.get('stock.move')
- proc_obj = self.pool.get('mrp.procurement')
+ proc_obj = self.pool.get('procurement.order')
wf_service = netsvc.LocalService("workflow")
for production in self.browse(cr, uid, ids):
if not production.product_lines:
@@ -917,7 +903,7 @@ class mrp_production(osv.osv):
'move_id': move_id,
'company_id': production.company_id.id,
})
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
proc_ids.append(proc_id)
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index a7db7109e55..64dd9f2c9e5 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -16,20 +16,5 @@
1
-
-
- Stock orderpoint
- mrp.warehouse.orderpoint
-
-
-
- Stock orderpoint
- mrp.warehouse.orderpoint
- OP/
- 5
- 1
- 1
-
-
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index bcda66e8679..293c8d58aa9 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -248,19 +248,19 @@
-
+
-
+
-
+
@@ -406,18 +406,18 @@
Procurement
-->
-
-
+
-
+
-
+
- mrp.procurement.form.inherit
- mrp.procurement
-
+ procurement.order.form.inherit
+ procurement.order
+ form
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index a9c83b23b7e..0a55ccdd610 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -117,7 +117,7 @@
-
+ producesubflow
@@ -125,20 +125,20 @@
-
+ check_product()
-
+ subflow.cancel
-
+ subflow.done
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 08d66570b1f..16369eef298 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -4,11 +4,11 @@
-
+
-
+
@@ -19,94 +19,94 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 60bf3b562b9..a96a7a7bd4d 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -8,7 +8,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index c053103f476..bb5c36a015a 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -8,7 +8,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/addons/mrp/mrp_procurement.py b/addons/mrp/procurement.py
similarity index 90%
rename from addons/mrp/mrp_procurement.py
rename to addons/mrp/procurement.py
index 84392b329ea..d704afa46d6 100644
--- a/addons/mrp/mrp_procurement.py
+++ b/addons/mrp/procurement.py
@@ -27,17 +27,20 @@ import ir
import netsvc
import time
-class mrp_procurement(osv.osv):
- _inherit = 'mrp.procurement'
+class procurement_order(osv.osv):
+ _inherit = 'procurement.order'
_columns = {
'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
}
def check_produce_product(self, cr, uid, procurement, context=[]):
+ """ Finds the bill of material for the product from procurement order.
+ @return: True or False
+ """
properties = [x.id for x in procurement.property_ids]
bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
if not bom_id:
- cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
+ cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
return False
return True
@@ -45,7 +48,7 @@ class mrp_procurement(osv.osv):
""" This is action which call from workflow to assign production order to procurements
@return: True
"""
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
res = procurement_obj.make_mo(cr, uid, ids, context=context)
res = res.values()
return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
@@ -59,7 +62,7 @@ class mrp_procurement(osv.osv):
production_obj = self.pool.get('mrp.production')
move_obj = self.pool.get('stock.move')
wf_service = netsvc.LocalService("workflow")
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
for procurement in procurement_obj.browse(cr, uid, ids):
res_id = procurement.move_id.id
loc_id = procurement.location_id.id
@@ -88,6 +91,6 @@ class mrp_procurement(osv.osv):
{'location_id': procurement.location_id.id})
return res
-mrp_procurement()
+procurement_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 6a73063e591..ea717bd546c 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,30 +26,6 @@ from tools.translate import _
class product_product(osv.osv):
_inherit = "product.product"
- def get_product_accounts(self, cr, uid, product_id, context={}):
- """ To get the stock input account, stock output account and stock journal related to product.
- @param product_id: product id
- @return: dictionary which contains information regarding stock input account, stock output account and stock journal
- """
- product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False)
-
- stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False
- if not stock_input_acc:
- stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
-
- stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
- if not stock_output_acc:
- stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-
- journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
-
- res = {}
- res.update({'stock_account_input': stock_input_acc})
- res.update({'stock_account_output': stock_output_acc})
- res.update({'stock_journal': journal_id})
-
- return res
-
def do_change_standard_price(self, cr, uid, ids, datas, context={}):
""" Changes the Standard Price of Product and parent products and creates an account move accordingly.
@param datas: dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index af55afce91b..200ca5bb76e 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -265,10 +265,10 @@
[[ formatLang(o.date_planned, date_time = True) ]]
- [[ o.sale_ref or ' ' ]]
+ [[ o.sale_ref or removeParentNode('para')]]
- [[ o.sale_name or '' ]]
+ [[ o.sale_name or removeParentNode('para') ]]
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index d5e00b9cbda..8f58f7179ad 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -7,7 +7,7 @@
"access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1
"access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
-"access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1
+"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
@@ -22,7 +22,7 @@
"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_stock_worker","mrp.procurement stock_worker","model_mrp_procurement","stock.group_stock_user",1,1,1,1
+"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
"access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
"access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 9bcc92e5c81..67efd0d2753 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -28,82 +28,12 @@ import netsvc
import time
-class stock_warehouse_orderpoint(osv.osv):
- """
- Defines Minimum stock rules.
- """
- _name = "stock.warehouse.orderpoint"
- _description = "Minimum Inventory Rule"
-
- _columns = {
- 'name': fields.char('Name', size=32, required=True),
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
- 'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
- 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
- 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
- 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
- 'product_min_qty': fields.float('Min Quantity', required=True,
- help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
- 'product_max_qty': fields.float('Max Quantity', required=True,
- help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
- 'qty_multiple': fields.integer('Qty Multiple', required=True,
- help="The procurement quantity will by rounded up to this multiple."),
- 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement', ondelete="set null"),
- 'company_id': fields.many2one('res.company','Company',required=True),
- }
- _defaults = {
- 'active': lambda *a: 1,
- 'logic': lambda *a: 'max',
- 'qty_multiple': lambda *a: 1,
- 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
- 'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
- 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
- }
- _sql_constraints = [
- ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', _('Qty Multiple must be greater than zero.')),
- ]
-
- def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
- """ Finds location id for changed warehouse.
- @param warehouse_id: Changed id of warehouse.
- @return: Dictionary of values.
- """
- if warehouse_id:
- w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
- v = {'location_id': w.lot_stock_id.id}
- return {'value': v}
- return {}
-
- def onchange_product_id(self, cr, uid, ids, product_id, context={}):
- """ Finds UoM for changed product.
- @param product_id: Changed id of product.
- @return: Dictionary of values.
- """
- if product_id:
- prod = self.pool.get('product.product').browse(cr,uid,product_id)
- v = {'product_uom': prod.uom_id.id}
- return {'value': v}
- return {}
-
- def copy(self, cr, uid, id, default=None,context={}):
- if not default:
- default = {}
- default.update({
- 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
- })
- return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-
-stock_warehouse_orderpoint()
-
class StockMove(osv.osv):
_inherit = 'stock.move'
_columns = {
'production_id': fields.many2one('mrp.production', 'Production', select=True),
- 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
+ 'procurements': fields.one2many('procurement.order', 'move_id', 'Procurements'),
}
def copy(self, cr, uid, id, default=None, context=None):
@@ -118,7 +48,7 @@ class StockMove(osv.osv):
"""
bom_obj = self.pool.get('mrp.bom')
move_obj = self.pool.get('stock.move')
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
product_obj = self.pool.get('product.product')
wf_service = netsvc.LocalService("workflow")
if move.product_id.supply_method == 'produce' and move.product_id.procure_method == 'make_to_order':
@@ -166,7 +96,7 @@ class StockMove(osv.osv):
'move_id': mid,
'company_id': line['company_id'],
})
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
move_obj.write(cr, uid, [move.id], {
'location_id': move.location_dest_id.id,
'auto_validate': True,
@@ -175,7 +105,7 @@ class StockMove(osv.osv):
'state': 'waiting'
})
for m in procurement_obj.search(cr, uid, [('move_id','=',move.id)], context):
- wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
+ wf_service.trg_validate(uid, 'procurement.order', m, 'button_wait_done', cr)
return True
def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):
@@ -231,7 +161,7 @@ class StockPicking(osv.osv):
for move in picking.move_lines:
if move.state == 'done' and move.procurements:
for procurement in move.procurements:
- wf_service.trg_validate(user, 'mrp.procurement',
+ wf_service.trg_validate(user, 'procurement.order',
procurement.id, 'button_check', cursor)
return res
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 5475d54ffd4..4a3e2e3e1da 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -9,6 +9,8 @@
factor: 1.0
name: Litre
rounding: 0.01
+-
+ I create record for product Orange Juice.
-
!record {model: product.product, id: product_product_orangejuice0}:
categ_id: product.cat1
@@ -18,6 +20,8 @@
type: product
uom_id: product_uom_litre0
uom_po_id: product_uom_litre0
+-
+ I create record for product Orange.
-
!record {model: product.product, id: product_product_orange0}:
categ_id: product.cat1
@@ -31,6 +35,8 @@
type: product
uom_id: product.product_uom_kgm
uom_po_id: product.product_uom_kgm
+-
+ I create record for product Sugar.
-
!record {model: product.product, id: product_product_sugar0}:
categ_id: product.cat1
@@ -44,6 +50,8 @@
type: product
uom_id: product.product_uom_kgm
uom_po_id: product.product_uom_kgm
+-
+ I create record for product Water.
-
!record {model: product.product, id: product_product_water0}:
categ_id: product.cat1
@@ -54,7 +62,7 @@
uom_id: product_uom_litre0
uom_po_id: product_uom_litre0
-
- I define the BoM to produce an orange juice
+ I define the BoM to produce an orange juice.
-
!record {model: mrp.bom, id: mrp_bom_orangejuice0}:
company_id: base.main_company
@@ -64,6 +72,8 @@
product_qty: 1.0
product_uom: product_uom_litre0
type: phantom
+-
+ I create bom lines for BoM for Orange Juice.
-
!record {model: mrp.bom, id: mrp_bom_orangejuice0}:
bom_lines:
@@ -92,7 +102,7 @@
product_uom: product_uom_litre0
type: normal
-
- I define Minimum stock rules for my stockable products orange and sugar
+ I define Minimum stock rules for my stockable product "Orange".
-
!record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
company_id: base.main_company
@@ -105,6 +115,8 @@
product_uom: product.product_uom_kgm
qty_multiple: 1
warehouse_id: stock.warehouse0
+-
+ I define Minimum stock rules for my stockable product "Sugar".
-
!record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
company_id: base.main_company
@@ -168,23 +180,23 @@
-
I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
-
- !python {model: mrp.procurement}: |
+ !python {model: procurement.order}: |
from tools.translate import _
proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
assert proc_ids, _('No Procurements!')
-
The scheduler runs.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
- search: "[('origin','=',':MO/00002')]"
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
+ search: "[('state','!=','cofirmed')]"
-
I am checking Internal picking. I see one picking for Orange juice and its
stock moves for Oranges, Sugar and Water made correctly.
-
!python {model: stock.picking}: |
from tools.translate import _
- pick_ids = self.search(cr, uid, [('origin','=',':MO/00002'),('type','=','internal')])
+ pick_ids = self.search(cr, uid, [('type','=','internal')])
assert pick_ids, _('No Internal Pickings!')
-
According to minimum stock rules. I have 2 purchase orders for
@@ -220,11 +232,15 @@
assert pick_ids, _('No Incoming Shipments found!')
-
I receive both the products. My incoming pickings are done.
+-
+ I create record for the incoming picking wizard.
-
!record {model: stock.partial.picking, id: stock_partial_picking0}:
date: '2010-04-30 16:53:36'
partner_id: base.res_partner_asus
address_id: base.res_partner_address_tang
+-
+ I make my pickings done.
-
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 37d0de5c5a9..1fe0f74fa6a 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -4,7 +4,7 @@
-
I am creating products.
-
- Creating a product.product record
+ I create record for product Shirt.
-
!record {model: product.product, id: product_product_shirt0}:
categ_id: product.cat1
@@ -27,7 +27,7 @@
weight: 0.0
weight_net: 0.0
-
- Creating a product.product record
+ I create record for product Cloth.
-
!record {model: product.product, id: product_product_cloth0}:
categ_id: product.cat1
@@ -53,7 +53,7 @@
weight: 0.0
weight_net: 0.0
-
- Creating a product.product record
+ I create record for product Buttons.
-
!record {model: product.product, id: product_product_buttons0}:
categ_id: product.cat1
@@ -81,7 +81,7 @@
-
I am creating bills of material for 'Shirt'.
-
- Creating a mrp.bom record
+ I create bills of material for Shirt.
-
!record {model: mrp.bom, id: mrp_bom_shirt0}:
bom_lines:
@@ -129,7 +129,7 @@
-
I create a procurement order for product Shirt.
-
- !record {model: mrp.procurement, id: mrp_procurement_shirt0}:
+ !record {model: procurement.order, id: procurement_order_shirt0}:
name: 'PROC: Shirt'
product_id: product_product_shirt0
product_qty: 5.00
@@ -138,11 +138,11 @@
-
I confirm the procurement order.
-
- !workflow {model: mrp.procurement, action: button_confirm, ref: mrp_procurement_shirt0}
+ !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_shirt0}
-
I run the procurement.
-
- !workflow {model: mrp.procurement, action: button_check, ref: mrp_procurement_shirt0}
+ !workflow {model: procurement.order, action: button_check, ref: procurement_order_shirt0}
-
I see that there is a manufacturing order for Shirt.
-
@@ -153,15 +153,15 @@
-
I also check that there are two more procurement orders for sub products Cloth and Buttons.
-
- !python {model: mrp.procurement}: |
+ !python {model: procurement.order}: |
from tools.translate import _
proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_cloth0'),ref('product_product_buttons0')])])
assert proc_ids, 'No Procurements.'
-
The scheduler runs.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
search: "[]"
-
I check that there is one purchase order for Cloth.
@@ -216,11 +216,15 @@
from tools.translate import _
pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
assert pick_ids, _('No Incoming Shipments found!')
+-
+ I create record for partial picking.
-
!record {model: stock.partial.picking, id: stock_partial_picking0}:
date: '2010-04-30 16:53:36'
partner_id: base.res_partner_maxtor
address_id: base.res_partner_address_wong
+-
+ I make my picking done.
-
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
@@ -245,17 +249,21 @@
})
pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
-
- I Check incoming shipments for buttons. And receive products.
+ I Check incoming shipments for buttons and receive products.
-
!python {model: stock.picking}: |
from tools.translate import _
pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
assert pick_ids, _('No Incoming Shipments found!')
+-
+ I create record for partial picking.
-
!record {model: stock.partial.picking, id: stock_partial_picking0}:
date: '2010-04-30 16:53:36'
partner_id: base.res_partner_maxtor
address_id: base.res_partner_address_wong
+-
+ I make my picking done.
-
!python {model: stock.partial.picking}: |
pick_obj = self.pool.get('stock.picking')
@@ -282,8 +290,8 @@
-
Run scheduler again.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
search: "[]"
-
Check state of manufacturing order for Shirt.
@@ -303,22 +311,30 @@
wf_service = netsvc.LocalService("workflow")
for p_id in prod_ids:
wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
+-
+ I create record for producing products with quantity 5.00.
-
!record {model: mrp.product.produce, id: mrp_product_produce0}:
product_qty: 5.00
mode: 'consume_produce'
+-
+ I produce 2 products with 5.00 quantities each.
-
!python {model: mrp.product.produce}: |
from tools.translate import _
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+ I create record for remaining products with quantity 35.00.
-
!record {model: stock.move.consume, id: stock_move_consume0}:
product_id: product_product_buttons0
product_qty: 35.00
product_uom: product.product_uom_unit
location_id: stock.stock_location_stock
+-
+ I produce remaining product Buttons with 35.00 quantity.
-
!python {model: stock.move.consume}: |
from tools.translate import _
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 5de26180723..0ceebfab107 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -18,7 +18,7 @@
product_uom: product.product_uom_unit
product_uos_qty: 0.0
-
- Creating a mrp.production.workcenter.line record
+ I create a record for Workcenter line.
-
!record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
cycle: 5.0
@@ -28,7 +28,7 @@
sequence: 0.0
workcenter_id: mrp.mrp_workcenter_0
-
- Creating a mrp.production.product.line record
+ I create second record for Workcenter line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
name: Regular processor config
@@ -38,7 +38,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create third record for Workcenter line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
name: HDD Seagate 7200.8 80GB
@@ -48,7 +48,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create fourth record for Workcenter line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
name: ATX Mid-size Tower
@@ -58,7 +58,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create a record for production line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
name: Mouse
@@ -68,7 +68,7 @@
product_uos_qty: 0.0
production_id: mrp_production_mo0
-
- Creating a mrp.production.product.line record
+ I create second record for production line.
-
!record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
name: Keyboard
@@ -84,15 +84,15 @@
-
I am checking Procurement orders.
-
- !python {model: mrp.procurement}: |
+ !python {model: procurement.order}: |
from tools.translate import _
proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
assert proc_ids, _('No Procurements!')
-
The scheduler runs.
-
- !function {model: mrp.procurement, name: run_scheduler}:
- - model: mrp.procurement
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
search: "[('state','=','confirmed')]"
-
I am checking Internal picking.
@@ -102,7 +102,7 @@
pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
assert pick_ids, _('No Internal Pickings!')
-
- I see that there is a manufacturing order for the subproduct of PC1 with ready state.
+ I see that there is a manufacturing order for the sub product of PC1 with ready state.
-
!python {model: mrp.production}: |
from tools.translate import _
@@ -110,17 +110,21 @@
assert order_ids, _('No manufacturing order!')
-
I start producing that product first. So I marked it as started.
+-
+ I create record for producing products with quantity 5.00.
-
!record {model: mrp.product.produce, id: mrp_product_produce0}:
product_qty: 5.00
mode: 'consume_produce'
+-
+ I produce the product.
-
!python {model: mrp.product.produce}: |
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
-
- Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
+ Now the manufacturing order for subproduct CPU_GEN is done and manufacturing
order for PC1 is in ready state.
-
!python {model: mrp.production}: |
@@ -131,6 +135,8 @@
I start producing the product PC1.
-
!workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+-
+ Finally my production order is done.
-
!python {model: mrp.product.produce}: |
from tools.translate import _
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index d9a862f5ddd..497a81352f3 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -40,7 +40,7 @@
""",
'author': 'Tiny',
- 'depends': ['mrp_procurement'],
+ 'depends': ['procurement'],
'update_xml': ['mrp_jit.xml'],
'demo_xml': [],
'installable': True,
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index bab0d62b495..99f74a19517 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 9c0a2bb4f33..0ce116535c1 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -61,6 +61,7 @@
'process/mrp_operation_process.xml'
],
'demo_xml': ['mrp_operation_data.xml'],
+ 'test': ['test/mrp_operations.yml'],
'installable': True,
'active': False,
'certificate': '0056233813133',
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index e8a97a47d9d..d1e66c92889 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -47,6 +47,9 @@ stock_move()
class mrp_production_workcenter_line(osv.osv):
def _get_date_date(self, cr, uid, ids, field_name, arg, context):
+ """ Finds starting date.
+ @return: Dictionary of values.
+ """
res={}
for op in self.browse(cr, uid, ids, context=context):
if op.date_start:
@@ -54,7 +57,11 @@ class mrp_production_workcenter_line(osv.osv):
else:
res[op.id]=False
return res
+
def _get_date_end(self, cr, uid, ids, field_name, arg, context):
+ """ Finds ending date.
+ @return: Dictionary of values.
+ """
res = {}
for op in self.browse(cr, uid, ids, context=context):
res[op.id]= False
@@ -66,8 +73,10 @@ class mrp_production_workcenter_line(osv.osv):
else:
res[op.id] = op.date_planned
return res
+
_inherit = 'mrp.production.workcenter.line'
_order = "sequence, date_planned"
+
_columns = {
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'State', readonly=True,
help="* When a work order is created it is set in 'Draft' state.\n" \
@@ -90,16 +99,21 @@ class mrp_production_workcenter_line(osv.osv):
'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True),
'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM',readonly=True),
}
+
_defaults = {
'state': lambda *a: 'draft',
'delay': lambda *a: 0.0
}
- def modify_production_order_state(self,cr,uid,ids,action):
+ def modify_production_order_state(self, cr, uid, ids, action):
+ """ Modifies production order state if work order state is changed.
+ @param action: Action to perform.
+ @return: Nothing
+ """
wf_service = netsvc.LocalService("workflow")
- oper_obj=self.browse(cr,uid,ids)[0]
- prod_obj=oper_obj.production_id
- if action=='start':
+ oper_obj = self.browse(cr, uid, ids)[0]
+ prod_obj = oper_obj.production_id
+ if action == 'start':
if prod_obj.state =='confirmed':
self.pool.get('mrp.production').force_production(cr, uid, [prod_obj.id])
wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
@@ -110,12 +124,12 @@ class mrp_production_workcenter_line(osv.osv):
else:
raise osv.except_osv(_('Error!'),_('Production Order Cannot start in [%s] state') % (prod_obj.state,))
else:
- oper_ids=self.search(cr,uid,[('production_id','=',prod_obj.id)])
- obj=self.browse(cr,uid,oper_ids)
- flag=True
+ oper_ids = self.search(cr,uid,[('production_id','=',prod_obj.id)])
+ obj = self.browse(cr,uid,oper_ids)
+ flag = True
for line in obj:
- if line.state!='done':
- flag=False
+ if line.state != 'done':
+ flag = False
if flag:
wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
return
@@ -132,15 +146,24 @@ class mrp_production_workcenter_line(osv.osv):
return result
def action_draft(self, cr, uid, ids):
+ """ Sets state to draft.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'draft'})
return True
def action_start_working(self, cr, uid, ids):
- self.modify_production_order_state(cr,uid,ids,'start')
+ """ Sets state to start working and writes starting date.
+ @return: True
+ """
+ self.modify_production_order_state(cr, uid, ids, 'start')
self.write(cr, uid, ids, {'state':'startworking', 'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
return True
def action_done(self, cr, uid, ids):
+ """ Sets state to done, writes finish date and calculates delay.
+ @return: True
+ """
delay = 0.0
date_now = time.strftime('%Y-%m-%d %H:%M:%S')
obj_line = self.browse(cr, uid, ids[0])
@@ -155,14 +178,23 @@ class mrp_production_workcenter_line(osv.osv):
return True
def action_cancel(self, cr, uid, ids):
+ """ Sets state to cancel.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'cancel'})
return True
def action_pause(self, cr, uid, ids):
+ """ Sets state to pause.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'pause'})
return True
def action_resume(self, cr, uid, ids):
+ """ Sets state to startworking.
+ @return: True
+ """
self.write(cr, uid, ids, {'state':'startworking'})
return True
@@ -175,6 +207,9 @@ class mrp_production(osv.osv):
}
def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
+ """ Calculates planned end date of production order.
+ @return: Dictionary of values
+ """
result = {}
for prod in self.browse(cr, uid, ids, context=context):
result[prod.id] = prod.date_planned
@@ -183,10 +218,13 @@ class mrp_production(osv.osv):
return result
def action_production_end(self, cr, uid, ids):
- obj=self.browse(cr,uid,ids)[0]
+ """ Finishes work order if production order is done.
+ @return: Super method
+ """
+ obj = self.browse(cr, uid, ids)[0]
for workcenter_line in obj.workcenter_lines:
- tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
- return super(mrp_production,self).action_production_end(cr,uid,ids)
+ tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr, uid, [workcenter_line.id])
+ return super(mrp_production,self).action_production_end(cr, uid, ids)
def action_in_production(self, cr, uid, ids):
""" Changes state to In Production and writes starting date.
@@ -199,12 +237,18 @@ class mrp_production(osv.osv):
return super(mrp_production,self).action_in_production(cr, uid, ids)
def action_cancel(self, cr, uid, ids):
- obj=self.browse(cr,uid,ids)[0]
+ """ Cancels work order if production order is canceled.
+ @return: Super method
+ """
+ obj = self.browse(cr, uid, ids)[0]
for workcenter_line in obj.workcenter_lines:
- tmp=self.pool.get('mrp.production.workcenter.line').action_cancel(cr,uid,[workcenter_line.id])
+ tmp = self.pool.get('mrp.production.workcenter.line').action_cancel(cr, uid, [workcenter_line.id])
return super(mrp_production,self).action_cancel(cr,uid,ids)
def _compute_planned_workcenter(self, cr, uid, ids, context={}, mini=False):
+ """ Computes planned and finished dates for work order.
+ @return: Calculated date
+ """
dt_end = DateTime.now()
for po in self.browse(cr, uid, ids, context=context):
dt_end = DateTime.strptime(po.date_start or po.date_planned, '%Y-%m-%d %H:%M:%S')
@@ -241,6 +285,9 @@ class mrp_production(osv.osv):
return dt_end
def _move_pass(self, cr, uid, ids, context={}):
+ """ Calculates start date for stock moves finding interval from resource calendar.
+ @return: True
+ """
for po in self.browse(cr, uid, ids, context):
if po.allow_reorder:
continue
@@ -251,7 +298,7 @@ class mrp_production(osv.osv):
if l.state in ('done','cancel','draft'):
continue
todo += l.move_dest_id_lines
- if l.production_id and (l.production_id.date_finnished>dt):
+ if l.production_id and (l.production_id.date_finnished > dt):
if l.production_id.state not in ('done','cancel'):
for wc in l.production_id.workcenter_lines:
i = self.pool.get('resource.calendar').interval_min_get(
@@ -261,11 +308,14 @@ class mrp_production(osv.osv):
dt, wc.hour or 0.0
)
dt = i[0][0]
- if l.production_id.date_start>dt.strftime('%Y-%m-%d %H:%M:%S'):
+ if l.production_id.date_start > dt.strftime('%Y-%m-%d %H:%M:%S'):
self.write(cr, uid, [l.production_id.id], {'date_start':dt.strftime('%Y-%m-%d %H:%M:%S')}, mini=True)
return True
def _move_futur(self, cr, uid, ids, context={}):
+ """ Calculates start date for stock moves.
+ @return: True
+ """
for po in self.browse(cr, uid, ids, context):
if po.allow_reorder:
continue
@@ -277,8 +327,8 @@ class mrp_production(osv.osv):
break
if l.production_id.state in ('done','cancel'):
break
- if l.production_id and (l.production_id.date_start
+ attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" context="{'return':'return'}" />
@@ -85,6 +85,7 @@
+
@@ -109,12 +110,9 @@
+
-
-
-
-
-
+
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 80c06670243..905e78e6e7a 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -95,7 +95,7 @@
ref('stock.menu_action_picking_tree7'),
ref('stock.menu_action_picking_tree8'),
ref('stock.menu_action_picking_tree9'),
- ref('mrp_procurement.menu_mrp_procurement_action3'),
+ ref('procurement.menu_mrp_procurement_action3'),
ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
@@ -132,7 +132,7 @@
-
+
@@ -206,7 +206,7 @@
-
+
@@ -474,12 +474,12 @@
-
+
-
+
@@ -497,7 +497,7 @@
name="Reporting"
parent="stock.menu_stock_root" groups="base.group_user"/>
-
+
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
index 927584e92ce..7ac787db54c 100644
--- a/addons/point_of_sale/posrule_data2.xml
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -177,7 +177,7 @@
ref('stock.menu_action_picking_tree7'),
ref('stock.menu_action_picking_tree8'),
ref('stock.menu_action_picking_tree9'),
- ref('mrp_procurement.menu_mrp_procurement_action3'),
+ ref('procurement.menu_mrp_procurement_action3'),
ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
@@ -214,7 +214,7 @@
-
+
@@ -557,12 +557,12 @@
-
+
-
+
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 67c94170666..5172e0e70d4 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
deleted file mode 100644
index 9d2b24d69b8..00000000000
--- a/addons/point_of_sale/stock.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
-# $Id$
-#
-# 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 3 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, see .
-#
-##############################################################################
-
-from osv import osv, fields
-import time
-import netsvc
-
-
-class stock_picking(osv.osv):
-
- _inherit = 'stock.picking'
- _columns = {
- 'pos_order': fields.many2one('pos.order', 'Pos order'),
- }
-stock_picking()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index 5d88b75d7ff..5150e10f99f 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -62,6 +62,14 @@ class add_product(osv.osv_memory):
'type': 'ir.actions.act_window',
}
def close_action(self, cr, uid, ids, context):
+ """
+ To get the product and Make the payment .
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return : Return the Make Payment
+ """
record_id = context and context.get('active_id', False)
order_obj= self.pool.get('pos.order')
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index 8b0f4b45fa4..0e3fc88767c 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -37,6 +37,14 @@ class pos_discount(osv.osv_memory):
def view_init(self, cr, uid, fields_list, context=None):
+ """
+ Creates view dynamically and adding fields at runtime.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view with new columns.
+ """
res = super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
record_id = context and context.get('active_id', False) or False
order = self.pool.get('pos.order').browse(cr, uid, record_id)
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index d7cb3414814..aa4d200467a 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -123,7 +123,7 @@ class pos_make_payment(osv.osv_memory):
"""
return result
- def check(self, cr, uid, ids, context=None):
+ def check(self, cr, uid, ids, context):
"""Check the order:
if the order is not paid: continue payment,
@@ -153,8 +153,11 @@ class pos_make_payment(osv.osv_memory):
return self.create_invoice(cr,uid,ids,context)
else:
context.update({'flag': True})
- order_obj.action_paid(cr,uid,[active_id],context)
- order_obj.write(cr, uid, [active_id],{'state':'paid'})
+ order_obj.action_paid(cr,uid,[active_id],context)
+ if context.get('return'):
+ order_obj.write(cr, uid, [active_id],{'state':'done'})
+ else:
+ order_obj.write(cr, uid, [active_id],{'state':'paid'})
return self.print_report(cr, uid, ids, context)
if order.amount_paid > 0.0:
context.update({'flag': True})
@@ -166,6 +169,10 @@ class pos_make_payment(osv.osv_memory):
def create_invoice(self, cr, uid, ids, context):
+
+ """
+ Create a invoice
+ """
wf_service = netsvc.LocalService("workflow")
active_ids = [context and context.get('active_id',False)]
for i in active_ids:
@@ -178,8 +185,6 @@ class pos_make_payment(osv.osv_memory):
}
def print_report(self, cr, uid, ids, context=None):
- if not context:
- context={}
"""
@summary: To get the date and print the report
@param self: The object pointer.
@@ -187,7 +192,9 @@ class pos_make_payment(osv.osv_memory):
@param uid: ID of the user currently logged in
@param context: A standard dictionary
@return : retrun report
- """
+ """
+ if not context:
+ context={}
active_id=context.get('active_id',[])
datas = {'ids' : [active_id]}
res = {}
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
index c2e60a07045..d30ff412887 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -26,9 +26,6 @@ import time
class pos_payment_report_date(osv.osv_memory):
- '''
- Open ERP Model
- '''
_name = 'pos.payment.report.date'
_description = 'POS Payment Report according to date'
def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index c8f32ff8cb0..e58073bdcbd 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -25,9 +25,6 @@ from osv import fields
class pos_payment_report_user(osv.osv_memory):
- '''
- Open ERP Model
- '''
_name = 'pos.payment.report.user'
_description = 'Sales lines by Users'
def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index bf37288f55b..daf63fd6674 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -32,6 +32,14 @@ class pos_receipt(osv.osv_memory):
}
def view_init(self, cr, uid, fields_list, context=None):
+ """
+ Creates view dynamically and adding fields at runtime.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view with new columns.
+ """
order_lst = self. pool.get('pos.order').browse(cr, uid, context['active_id'])
for order in order_lst:
if order.state_2 in ('to_verify'):
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 31d18ef09a5..13a31057d28 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -63,6 +63,14 @@ class pos_return(osv.osv_memory):
return res
def view_init(self, cr, uid, fields_list, context=None):
+ """
+ Creates view dynamically and adding fields at runtime.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view with new columns.
+ """
res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
order_obj=self.pool.get('pos.order')
if not context:
@@ -77,6 +85,18 @@ class pos_return(osv.osv_memory):
return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+
+ """
+ Changes the view dynamically
+
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+
+ @return: New arch of view.
+
+ """
result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
if not context:
context={}
@@ -123,6 +143,15 @@ class pos_return(osv.osv_memory):
def create_returns(self, cr, uid, data, context):
+ """
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+
+ @return: Return the add product form again for adding more product
+
+ """
return {
'name': _('Add Product'),
'view_type': 'form',
@@ -186,6 +215,7 @@ class pos_return(osv.osv_memory):
line_obj.copy(cr,uid,line.id,{'qty':-qty ,
'order_id': new_order,
})
+ order_obj.write(cr,uid, active_id, {'state':'done'})
order_obj.write(cr,uid, new_order, {'state':'done'})
wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
@@ -334,8 +364,9 @@ class add_product(osv.osv_memory):
})
wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
- obj=order_obj.browse(cr,uid, active_ids[0])
-
+ obj=order_obj.browse(cr,uid, active_ids[0])
+ context.update({'return':'return'})
+
if obj.amount_total != obj.amount_paid:
return {
'name': _('Make Payment'),
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index eed215147b5..8f1fa6dd366 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/mrp_procurement/__init__.py b/addons/procurement/__init__.py
similarity index 96%
rename from addons/mrp_procurement/__init__.py
rename to addons/procurement/__init__.py
index 6cb8ad4027b..3420ef1f75e 100644
--- a/addons/mrp_procurement/__init__.py
+++ b/addons/procurement/__init__.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import mrp_procurement
+import procurement
import wizard
import schedulers
import company
\ No newline at end of file
diff --git a/addons/mrp_procurement/__openerp__.py b/addons/procurement/__openerp__.py
similarity index 90%
rename from addons/mrp_procurement/__openerp__.py
rename to addons/procurement/__openerp__.py
index ec1e5677dc1..210dbdc7098 100644
--- a/addons/mrp_procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -33,19 +33,19 @@
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
- 'security/mrp_procurement_security.xml',
- 'mrp_procurement_data.xml',
+ 'security/procurement_security.xml',
+ 'procurement_data.xml',
'wizard/make_procurement_view.xml',
'wizard/mrp_procurement_view.xml',
'wizard/orderpoint_procurement_view.xml',
- 'mrp_procurement_view.xml',
+ 'procurement_view.xml',
'wizard/schedulers_all_view.xml',
- 'mrp_procurement_workflow.xml',
+ 'procurement_workflow.xml',
'process/procurement_process.xml',
"company_view.xml",
'board_mrp_procurement_view.xml',
],
-# 'demo_xml': [],
+ 'demo_xml': ['stock_orderpoint.xml'],
'installable': True,
'active': False,
'certificate': '',
diff --git a/addons/mrp_procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
similarity index 100%
rename from addons/mrp_procurement/board_mrp_procurement_view.xml
rename to addons/procurement/board_mrp_procurement_view.xml
diff --git a/addons/mrp_procurement/company.py b/addons/procurement/company.py
similarity index 100%
rename from addons/mrp_procurement/company.py
rename to addons/procurement/company.py
diff --git a/addons/mrp_procurement/company_view.xml b/addons/procurement/company_view.xml
similarity index 100%
rename from addons/mrp_procurement/company_view.xml
rename to addons/procurement/company_view.xml
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
similarity index 83%
rename from addons/mrp_procurement/process/procurement_process.xml
rename to addons/procurement/process/procurement_process.xml
index 21f953c6a6f..e5b94bb225d 100644
--- a/addons/mrp_procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/procurement/procurement.py
similarity index 93%
rename from addons/mrp_procurement/mrp_procurement.py
rename to addons/procurement/procurement.py
index bb18326af07..4c8ef9e16b6 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/procurement/procurement.py
@@ -62,11 +62,11 @@ mrp_property()
# Produce, Buy or Find products and place a move
# then wizard for picking lists & move
#
-class mrp_procurement(osv.osv):
+class procurement_order(osv.osv):
"""
Procurement Orders
"""
- _name = "mrp.procurement"
+ _name = "procurement.order"
_description = "Procurement"
_order = 'priority,date_planned desc'
_log_create = False
@@ -92,7 +92,7 @@ class mrp_procurement(osv.osv):
'note': fields.text('Note'),
- 'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+ 'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
'state': fields.selection([
@@ -115,7 +115,7 @@ class mrp_procurement(osv.osv):
'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'close_move': lambda *a: 0,
'procure_method': lambda *a: 'make_to_order',
- 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c)
+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c)
}
def unlink(self, cr, uid, ids, context=None):
@@ -176,7 +176,7 @@ class mrp_procurement(osv.osv):
return res
#
- # This method may be overrided by objects that override mrp.procurment
+ # This method may be overrided by objects that override procurement.order
# for computing their own purpose
#
def _quantity_compute_get(self, cr, uid, proc, context={}):
@@ -287,7 +287,7 @@ class mrp_procurement(osv.osv):
if procurement.product_id.product_tmpl_id.supply_method <> 'buy':
return False
if not procurement.product_id.seller_ids:
- cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
+ cr.execute('update procurement_order set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
return False
partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in procurement.product_id.seller_ids if partner_id and partner_id.sequence])
partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
@@ -297,7 +297,7 @@ class mrp_procurement(osv.osv):
return False
address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
if not address_id:
- cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
+ cr.execute('update procurement_order set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
return False
return True
@@ -361,7 +361,7 @@ class mrp_procurement(osv.osv):
ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
if not cr.fetchone()[0]:
- cr.execute('update mrp_procurement set message=%s where id=%s', (_('Stock is not enough and No minimum orderpoint rule defined'), procurement.id))
+ cr.execute('update procurement_order set message=%s where id=%s', (_('Stock is not enough and No minimum orderpoint rule defined'), procurement.id))
return ok
def action_produce_assign_service(self, cr, uid, ids, context={}):
@@ -406,7 +406,7 @@ class mrp_procurement(osv.osv):
self.write(cr, uid, ids, {'state': 'cancel'})
wf_service = netsvc.LocalService("workflow")
for id in ids:
- wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+ wf_service.trg_trigger(uid, 'procurement.order', id, cr)
return True
def action_check_finnished(self, cr, uid, ids):
@@ -442,7 +442,7 @@ class mrp_procurement(osv.osv):
res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
wf_service = netsvc.LocalService("workflow")
for id in ids:
- wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+ wf_service.trg_trigger(uid, 'procurement.order', id, cr)
return res
def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
@@ -455,7 +455,7 @@ class mrp_procurement(osv.osv):
self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
use_new_cursor=use_new_cursor, context=context)
-mrp_procurement()
+procurement_order()
class stock_warehouse_orderpoint(osv.osv):
@@ -463,16 +463,16 @@ class stock_warehouse_orderpoint(osv.osv):
Defines Minimum stock rules.
"""
_name = "stock.warehouse.orderpoint"
- _description = "Orderpoint minimum rule"
-
+ _description = "Minimum Inventory Rule"
+
_columns = {
'name': fields.char('Name', size=32, required=True),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
- 'location_id': fields.many2one('stock.location', 'Location', required=True),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
+ 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
- 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
+ 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_min_qty': fields.float('Min Quantity', required=True,
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
"a procurement to bring the virtual stock to the Max Quantity."),
@@ -481,18 +481,21 @@ class stock_warehouse_orderpoint(osv.osv):
"a procurement to bring the virtual stock to the Max Quantity."),
'qty_multiple': fields.integer('Qty Multiple', required=True,
help="The procurement quantity will by rounded up to this multiple."),
- 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
+ 'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
'active': lambda *a: 1,
'logic': lambda *a: 'max',
'qty_multiple': lambda *a: 1,
- 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+ 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'stock.orderpoint') or '',
'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
}
-
+ _sql_constraints = [
+ ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', _('Qty Multiple must be greater than zero.')),
+ ]
+
def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
""" Finds location id for changed warehouse.
@param warehouse_id: Changed id of warehouse.
@@ -503,7 +506,7 @@ class stock_warehouse_orderpoint(osv.osv):
v = {'location_id': w.lot_stock_id.id}
return {'value': v}
return {}
-
+
def onchange_product_id(self, cr, uid, ids, product_id, context={}):
""" Finds UoM for changed product.
@param product_id: Changed id of product.
@@ -514,14 +517,14 @@ class stock_warehouse_orderpoint(osv.osv):
v = {'product_uom': prod.uom_id.id}
return {'value': v}
return {}
-
+
def copy(self, cr, uid, id, default=None,context={}):
if not default:
default = {}
default.update({
- 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+ 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint') or '',
})
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-
+
stock_warehouse_orderpoint()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/mrp_procurement_data.xml b/addons/procurement/procurement_data.xml
similarity index 50%
rename from addons/mrp_procurement/mrp_procurement_data.xml
rename to addons/procurement/procurement_data.xml
index 256472bd2fd..6a83d525c68 100644
--- a/addons/mrp_procurement/mrp_procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
@@ -10,10 +10,23 @@
days-1
-
+
+
+ Stock orderpoint
+ stock.orderpoint
+
+
+
+ Stock orderpoint
+ stock.orderpoint
+ OP/
+ 5
+ 1
+ 1
+
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/procurement/procurement_view.xml
similarity index 89%
rename from addons/mrp_procurement/mrp_procurement_view.xml
rename to addons/procurement/procurement_view.xml
index 7345dc94f93..e517f289809 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -5,9 +5,9 @@
Procurement
-->
-
- mrp.procurement.tree
- mrp.procurement
+
+ procurement.order.tree
+ procurement.ordertree
@@ -22,9 +22,9 @@
-
- mrp.procurement.form
- mrp.procurement
+
+ procurement.order.form
+ procurement.orderform
-
- mrp.procurement.select
- mrp.procurement
+
+ procurement.order.select
+ procurement.ordersearch
@@ -109,51 +109,51 @@
-
+ Procurement Ordersir.actions.act_window
- mrp.procurement
+ procurement.orderform{'search_default_current':1}
-
+ {'search_default_Current':1}
-
+ Procurementsir.actions.act_window
- mrp.procurement
+ procurement.orderformtree,form
-
+ []{}
-
+ Procurement Exceptionsir.actions.act_window
- mrp.procurement
+ procurement.orderformtree,form[('state','=','exception')]
-
+ Procurement Exceptions to Fixir.actions.act_window
- mrp.procurement
+ procurement.orderformtree,form[('state','=','exception'), ('message', '<>', '')]
-
+ Temporary Procurement Exceptionsir.actions.act_window
- mrp.procurement
+ procurement.orderformtree,form[('state','=','exception'), ('message', '=', '')]
@@ -255,17 +255,17 @@
+ src_model="procurement.order"/>
+ src_model="procurement.order"/>
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
similarity index 98%
rename from addons/mrp_procurement/mrp_procurement_workflow.xml
rename to addons/procurement/procurement_workflow.xml
index 599d11cfe01..17979868a03 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -3,8 +3,8 @@
- mrp.procurement.basic
- mrp.procurement
+ procurement.order.basic
+ procurement.orderTrue
diff --git a/addons/mrp_procurement/schedulers.py b/addons/procurement/schedulers.py
similarity index 87%
rename from addons/mrp_procurement/schedulers.py
rename to addons/procurement/schedulers.py
index 6ebc0f61fad..6a4e2736dbd 100644
--- a/addons/mrp_procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -26,8 +26,8 @@ from mx import DateTime
import time
-class mrp_procurement(osv.osv):
- _inherit = 'mrp.procurement'
+class procurement_order(osv.osv):
+ _inherit = 'procurement.order'
def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None):
'''
@@ -40,11 +40,11 @@ class mrp_procurement(osv.osv):
cr = pooler.get_db(use_new_cursor).cursor()
wf_service = netsvc.LocalService("workflow")
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
if not ids:
ids = procurement_obj.search(cr, uid, [], order="date_planned")
for id in ids:
- wf_service.trg_validate(uid, 'mrp.procurement', id, 'button_restart', cr)
+ wf_service.trg_validate(uid, 'procurement.order', id, 'button_restart', cr)
if use_new_cursor:
cr.commit()
@@ -57,11 +57,11 @@ class mrp_procurement(osv.osv):
report_except = 0
report_later = 0
while True:
- cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by priority,date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
+ cr.execute('select id from procurement_order where state=%s and procure_method=%s order by priority,date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
ids = map(lambda x: x[0], cr.fetchall())
for proc in procurement_obj.browse(cr, uid, ids):
if (maxdate.strftime('%Y-%m-%d') >= proc.date_planned):
- wf_service.trg_validate(uid, 'mrp.procurement', proc.id, 'button_check', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
else:
offset += 1
report_later += 1
@@ -84,7 +84,7 @@ class mrp_procurement(osv.osv):
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
for proc in procurement_obj.browse(cr, uid, ids):
if ((maxdate).strftime('%Y-%m-%d') >= proc.date_planned) :
- wf_service.trg_validate(uid, 'mrp.procurement', proc.id, 'button_check', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
report_ids.append(proc.id)
else:
report_later += 1
@@ -129,7 +129,7 @@ class mrp_procurement(osv.osv):
if not context:
context = {}
product_obj = self.pool.get('product.product')
- proc_obj = self.pool.get('mrp.procurement')
+ proc_obj = self.pool.get('procurement.order')
warehouse_obj = self.pool.get('stock.warehouse')
wf_service = netsvc.LocalService("workflow")
@@ -161,8 +161,8 @@ class mrp_procurement(osv.osv):
'location_id': location_id,
'procure_method': 'make_to_order',
})
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_check', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
use_new_cursor=False, context=None, user_id=False):
@@ -175,7 +175,7 @@ class mrp_procurement(osv.osv):
cr = pooler.get_db(use_new_cursor).cursor()
orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
location_obj = self.pool.get('stock.location')
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
request_obj = self.pool.get('res.request')
wf_service = netsvc.LocalService("workflow")
report = []
@@ -186,8 +186,9 @@ class mrp_procurement(osv.osv):
while ids:
ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
for op in orderpoint_obj.browse(cr, uid, ids):
- if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
- continue
+ if op.procurement_id.state != 'exception':
+ if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
+ continue
prods = location_obj._product_virtual_get(cr, uid,
op.location_id.id, [op.product_id.id],
{'uom': op.product_uom.id})[op.product_id.id]
@@ -217,9 +218,9 @@ class mrp_procurement(osv.osv):
'procure_method': 'make_to_order',
'origin': op.name
})
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id,
+ wf_service.trg_validate(uid, 'procurement.order', proc_id,
'button_confirm', cr)
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id,
+ wf_service.trg_validate(uid, 'procurement.order', proc_id,
'button_check', cr)
orderpoint_obj.write(cr, uid, [op.id],
{'procurement_id': proc_id})
@@ -237,6 +238,6 @@ class mrp_procurement(osv.osv):
cr.commit()
cr.close()
return {}
-mrp_procurement()
+procurement_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/scripts/scheduler.py b/addons/procurement/scripts/scheduler.py
similarity index 94%
rename from addons/mrp_procurement/scripts/scheduler.py
rename to addons/procurement/scripts/scheduler.py
index d95e8246c70..648da5cdddc 100644
--- a/addons/mrp_procurement/scripts/scheduler.py
+++ b/addons/procurement/scripts/scheduler.py
@@ -22,7 +22,7 @@
import xmlrpclib
sock = xmlrpclib.ServerProxy('http://localhost:8069/xmlrpc/wizard')
-wiz_id = sock.create('trunk', 1, 'admin', 'mrp.procurement.compute.all')
+wiz_id = sock.create('trunk', 1, 'admin', 'procurement.order.compute.all')
sock.execute('trunk', 1, 'admin', wiz_id, {'form': {'po_cycle': 1.0, 'po_lead': 1.0, 'user_id': 3, 'schedule_cycle': 1.0, 'picking_lead': 1.0, 'security_lead': 50.0, 'automatic': False}, 'ids': [], 'report_type': 'pdf', 'model': 'ir.ui.menu', 'id': False}, 'compute', {})
diff --git a/addons/mrp_procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
similarity index 51%
rename from addons/mrp_procurement/security/ir.model.access.csv
rename to addons/procurement/security/ir.model.access.csv
index ce022a730b0..f13decfa9f2 100644
--- a/addons/mrp_procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,9 +1,9 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_mrp_property_group","mrp.property.group","model_mrp_property_group",,1,0,0,0
"access_mrp_property","mrp.property","model_mrp_property",,1,0,0,0
-"access_mrp_procurement","mrp.procurement","model_mrp_procurement",,1,0,0,0
+"access_procurement","procurement.order","model_procurement_order",,1,0,0,0
"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint",,1,0,0,0
-"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all",,1,0,0,0
-"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute",,1,0,0,0
+"access_procurement_compute_all","procurement.order.compute.all","model_procurement_order_compute_all",,1,0,0,0
+"access_procurement_orderpoint_compute","procurement.orderpoint.compute","model_procurement_orderpoint_compute",,1,0,0,0
"access_mrp_make_procurement","make.procurement","model_make_procurement",,1,0,0,0
-"access_mrp_make_procurement","mrp.procurement.compute","model_mrp_procurement_compute",,1,0,0,0
+"access_mrp_make_procurement","procurement.order.compute","model_procurement_order_compute",,1,0,0,0
diff --git a/addons/mrp_procurement/security/mrp_procurement_security.xml b/addons/procurement/security/procurement_security.xml
similarity index 75%
rename from addons/mrp_procurement/security/mrp_procurement_security.xml
rename to addons/procurement/security/procurement_security.xml
index a0f2ef431bf..cf32286fd2f 100644
--- a/addons/mrp_procurement/security/mrp_procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -2,9 +2,9 @@
-
- mrp_procurement multi-company
-
+
+ procurement multi-company
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
diff --git a/addons/mrp/mrp_order_point.xml b/addons/procurement/stock_orderpoint.xml
similarity index 100%
rename from addons/mrp/mrp_order_point.xml
rename to addons/procurement/stock_orderpoint.xml
diff --git a/addons/mrp_procurement/wizard/__init__.py b/addons/procurement/wizard/__init__.py
similarity index 100%
rename from addons/mrp_procurement/wizard/__init__.py
rename to addons/procurement/wizard/__init__.py
diff --git a/addons/mrp_procurement/wizard/make_procurement_product.py b/addons/procurement/wizard/make_procurement_product.py
similarity index 92%
rename from addons/mrp_procurement/wizard/make_procurement_product.py
rename to addons/procurement/wizard/make_procurement_product.py
index 96f00b89eb4..a7bea3b247a 100644
--- a/addons/mrp_procurement/wizard/make_procurement_product.py
+++ b/addons/procurement/wizard/make_procurement_product.py
@@ -64,7 +64,7 @@ class make_procurement(osv.osv_memory):
"""
user = self.pool.get('res.users').browse(cr, uid, uid, context).login
wh_obj = self.pool.get('stock.warehouse')
- procurement_obj = self.pool.get('mrp.procurement')
+ procurement_obj = self.pool.get('procurement.order')
wf_service = netsvc.LocalService("workflow")
data_obj = self.pool.get('ir.model.data')
@@ -80,11 +80,11 @@ class make_procurement(osv.osv_memory):
'procure_method':'make_to_order',
})
- wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', procure_id, 'button_confirm', cr)
- id2 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_tree_view')
- id3 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_form_view')
+ id2 = data_obj._get_id(cr, uid, 'procurement', 'procurement_tree_view')
+ id3 = data_obj._get_id(cr, uid, 'procurement', 'procurement_form_view')
if id2:
id2 = data_obj.browse(cr, uid, id2, context=context).res_id
@@ -94,7 +94,7 @@ class make_procurement(osv.osv_memory):
return {
'view_type': 'form',
'view_mode': 'tree,form',
- 'res_model': 'mrp.procurement',
+ 'res_model': 'procurement.order',
'res_id' : procure_id,
'views': [(id3,'form'),(id2,'tree')],
'type': 'ir.actions.act_window',
diff --git a/addons/mrp_procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
similarity index 100%
rename from addons/mrp_procurement/wizard/make_procurement_view.xml
rename to addons/procurement/wizard/make_procurement_view.xml
diff --git a/addons/mrp_procurement/wizard/mrp_procurement.py b/addons/procurement/wizard/mrp_procurement.py
similarity index 95%
rename from addons/mrp_procurement/wizard/mrp_procurement.py
rename to addons/procurement/wizard/mrp_procurement.py
index 1c3f3dd5c8a..466a462a55d 100644
--- a/addons/mrp_procurement/wizard/mrp_procurement.py
+++ b/addons/procurement/wizard/mrp_procurement.py
@@ -23,12 +23,12 @@ import threading
from osv import osv, fields
class procurement_compute(osv.osv_memory):
- _name = 'mrp.procurement.compute'
+ _name = 'procurement.order.compute'
_description = 'Compute Procurement'
def _procure_calculation_procure(self, cr, uid, ids, context):
try:
- proc_obj = self.pool.get('mrp.procurement')
+ proc_obj = self.pool.get('procurement.order')
proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
finally:
cr.close()
diff --git a/addons/mrp_procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
similarity index 87%
rename from addons/mrp_procurement/wizard/mrp_procurement_view.xml
rename to addons/procurement/wizard/mrp_procurement_view.xml
index 817f7011e0c..c1cf71b1abb 100644
--- a/addons/mrp_procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -6,7 +6,7 @@
Compute Procurements
- mrp.procurement.compute
+ procurement.order.computeform
-
-
+
+
diff --git a/addons/mrp_procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
similarity index 96%
rename from addons/mrp_procurement/wizard/orderpoint_procurement.py
rename to addons/procurement/wizard/orderpoint_procurement.py
index 56302660939..ee3207833d3 100644
--- a/addons/mrp_procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -28,7 +28,7 @@ import threading
from osv import fields,osv
class procurement_compute(osv.osv_memory):
- _name = 'mrp.procurement.orderpoint.compute'
+ _name = 'procurement.orderpoint.compute'
_description = 'Automatic Order Point'
_columns = {
@@ -47,7 +47,7 @@ class procurement_compute(osv.osv_memory):
@param ids: List of IDs selected
@param context: A standard dictionary
"""
- proc_obj = self.pool.get('mrp.procurement')
+ proc_obj = self.pool.get('procurement.order')
for proc in self.browse(cr, uid, ids):
proc_obj._procure_orderpoint_confirm(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname, context=context)
diff --git a/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
similarity index 86%
rename from addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
rename to addons/procurement/wizard/orderpoint_procurement_view.xml
index c17bedae84f..a56c46bd299 100644
--- a/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -6,7 +6,7 @@
Compute Stock Minimum Rules Only
- mrp.procurement.orderpoint.compute
+ procurement.orderpoint.computeformCompute Schedulers
- mrp.procurement.compute.all
+ procurement.order.compute.allformStock Weight
2
-
+
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 9f13467c4cb..93a489245c4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -466,8 +466,7 @@
form
@@ -85,5 +84,7 @@
+
+
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index 1907c6695c2..a717e54dcdb 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -26,13 +26,24 @@ import netsvc
import time
from tools.translate import _
class product_margin(osv.osv_memory):
- '''
- Product Margin
- '''
+
_name = 'product.margin'
_description = 'Product Margin'
-
- def action_open_window(self, cr, uid, ids, context):
+ _columns = {
+ 'from_date': fields.date('From'),
+ 'to_date': fields.date('To'),
+ 'invoice_state':fields.selection([
+ ('paid','Paid'),
+ ('open_paid','Open and Paid'),
+ ('draft_open_paid','Draft, Open and Paid'),
+ ],'Invoice State', select=True, required=True),
+ }
+ _defaults = {
+ 'from_date': lambda *a:time.strftime('%Y-01-01'),
+ 'to_date':lambda *a:time.strftime('%Y-12-31'),
+ 'invoice_state': lambda *a:"open_paid",
+ }
+ def action_open_window(self, cr, uid, ids, context=None):
"""
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@@ -65,32 +76,4 @@ class product_margin(osv.osv_memory):
'search_view_id': id['res_id']
}
- def action_cancel(self, cr, uid, ids, context=None):
- """
-
-
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: the ID or list of IDs if we want more than one
-
- @return:
- """
- return {'type':'ir.actions.act_window_close'}
-
- _columns = {
- #TODO : import time required to get currect date
- 'from_date': fields.date('From'),
- #TODO : import time required to get currect date
- 'to_date': fields.date('To'),
- 'invoice_state':fields.selection([
- ('paid','Paid'),
- ('open_paid','Open and Paid'),
- ('draft_open_paid','Draft, Open and Paid'),
- ],'Invoice State', select=True, required=True),
- }
- _defaults = {
- 'from_date': lambda *a:time.strftime('%Y-01-01'),
- 'to_date': lambda *a:time.strftime('%Y-01-01'),
- 'invoice_state': lambda *a:"open_paid",
- }
product_margin()
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 66869e120a5..404022e21fd 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -11,23 +11,22 @@
+
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/addons/product_visible_discount/__init__.py b/addons/product_visible_discount/__init__.py
new file mode 100644
index 00000000000..425f2bec537
--- /dev/null
+++ b/addons/product_visible_discount/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+import product
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
new file mode 100644
index 00000000000..ae977e633ff
--- /dev/null
+++ b/addons/product_visible_discount/__openerp__.py
@@ -0,0 +1,40 @@
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+{
+ "name": "Visible Discount",
+ "version": "1.0",
+ "author": "Tiny",
+ "category": "Generic Modules/Sales & Purchases",
+ "description": """
+ This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
+ To this end, a new check box named "Visible Discount" is added to the pricelist form.
+ Example:
+ For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225
+ If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225
+ If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225
+ """,
+ "depends": ["sale"],
+ "demo_xml": [],
+ "update_xml": ['product_view.xml'],
+ "active": False,
+ "installable": True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/product_visible_discount/i18n/ca.po b/addons/product_visible_discount/i18n/ca.po
new file mode 100644
index 00000000000..abf326c2f2c
--- /dev/null
+++ b/addons/product_visible_discount/i18n/ca.po
@@ -0,0 +1,47 @@
+# Catalan 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 , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-01-04 05:40+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Catalan \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML no vàlid per a la definició de la vista!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Descompte visible"
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
new file mode 100644
index 00000000000..8e4ddbabdaf
--- /dev/null
+++ b/addons/product_visible_discount/i18n/es.po
@@ -0,0 +1,62 @@
+# Spanish 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 , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-01-10 09:18+0000\n"
+"Last-Translator: AlbertoGago \n"
+"Language-Team: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la definición de la vista!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+"\n"
+" Este módulo permite calcular descuentos en las líneas del Pedido de "
+"Ventas y en las de la Factura basados en la lista de precios del proveedor.\n"
+" Para esto, una nueva casilla de selección llamada \"Descuento visible\" "
+"se añade al formulario de la lista de precios.\n"
+" Ejemplo:\n"
+" Para el producto PC1 y el proveedor \"Asustek\": si el precio de "
+"lista es 450 y el precio calculado con la lista de precios de Asustek es "
+"225\n"
+" Si la casilla de selección está activada, en la línea del pedido "
+"aparecerá: precio unicario=450, Descuento=50,00, Precio neto=225\n"
+" Si la casilla de selección está desactivada, en la línea del pedido "
+"y en la factura aparecerá: Precio unitario=225, Descuento=0,00, Precio "
+"neto=225\n"
+" "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Descuento visible"
diff --git a/addons/product_visible_discount/i18n/fr.po b/addons/product_visible_discount/i18n/fr.po
new file mode 100644
index 00000000000..405d8fa00d2
--- /dev/null
+++ b/addons/product_visible_discount/i18n/fr.po
@@ -0,0 +1,62 @@
+# translation of fr_FR.po to Français
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * product_visible_discount
+#
+# Numerigraphe , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr_FR\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-01-19 06:12+0000\n"
+"Last-Translator: Numérigraphe \n"
+"Language-Team: Français\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+"\n"
+" Ce module vous permet de calculer les remises sur les lignes de Commande "
+" et de Facture en se basant sur la liste de prix du partenaire.\n"
+" Pour cela, une nouvelle case à cocher \"Remise visible\" est ajoutée au "
+"formulaire \"Liste de prix\".\n"
+" Par exemple :\n"
+" Pour le produit PC1 et le partenaire \"Asustek\" : si le prix "
+"public=450, et le prix prix calculé en utilisant la liste de prix d'Asustek "
+"est 225\n"
+" Si la case est cochée, on aura sur la ligne de commande : Prix "
+"unitaire=450, Remise=50,00, Prix net=225\n"
+" Si la case N'EST PAS est cochée, on aura sur la ligne de commande : "
+"Prix unitaire=225, Remise=0,00, Prix net=225\n"
+" "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Remise visible"
diff --git a/addons/product_visible_discount/i18n/fr_BE.po b/addons/product_visible_discount/i18n/fr_BE.po
new file mode 100644
index 00000000000..983dd588c65
--- /dev/null
+++ b/addons/product_visible_discount/i18n/fr_BE.po
@@ -0,0 +1,52 @@
+# translation of fr_FR.po to Français
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * product_visible_discount
+#
+# Numerigraphe , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr_FR\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-03-25 12:11:15+0000\n"
+"PO-Revision-Date: 2009-03-25 13:17+0100\n"
+"Last-Translator: Numerigraphe \n"
+"Language-Team: Français\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+"\n"
+" Ce module vous permet de calculer les remises sur les lignes de Commande et de Facture en se basant sur la liste de prix du partenaire.\n"
+" Pour cela, une nouvelle case à cocher \"Remise visible\" est ajoutée au formulaire \"Liste de prix\".\n"
+" Par exemple :\n"
+" Pour le produit PC1 et le partenaire \"Asustek\" : si le prix public=450, et le prix prix calculé en utilisant la liste de prix d'Asustek est 225\n"
+" Si la case est cochée, on aura sur la ligne de commande : Prix unitaire=450, Remise=50,00, Prix net=225\n"
+" Si la case N'EST PAS est cochée, on aura sur la ligne de commande : Prix unitaire=225, Remise=0,00, Prix net=225\n"
+" "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Remise visible"
+
diff --git a/addons/product_visible_discount/i18n/fr_FR.po b/addons/product_visible_discount/i18n/fr_FR.po
new file mode 100644
index 00000000000..983dd588c65
--- /dev/null
+++ b/addons/product_visible_discount/i18n/fr_FR.po
@@ -0,0 +1,52 @@
+# translation of fr_FR.po to Français
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * product_visible_discount
+#
+# Numerigraphe , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr_FR\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-03-25 12:11:15+0000\n"
+"PO-Revision-Date: 2009-03-25 13:17+0100\n"
+"Last-Translator: Numerigraphe \n"
+"Language-Team: Français\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+"\n"
+" Ce module vous permet de calculer les remises sur les lignes de Commande et de Facture en se basant sur la liste de prix du partenaire.\n"
+" Pour cela, une nouvelle case à cocher \"Remise visible\" est ajoutée au formulaire \"Liste de prix\".\n"
+" Par exemple :\n"
+" Pour le produit PC1 et le partenaire \"Asustek\" : si le prix public=450, et le prix prix calculé en utilisant la liste de prix d'Asustek est 225\n"
+" Si la case est cochée, on aura sur la ligne de commande : Prix unitaire=450, Remise=50,00, Prix net=225\n"
+" Si la case N'EST PAS est cochée, on aura sur la ligne de commande : Prix unitaire=225, Remise=0,00, Prix net=225\n"
+" "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Remise visible"
+
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
new file mode 100644
index 00000000000..88d0312efdd
--- /dev/null
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -0,0 +1,52 @@
+# translation of fr_FR.po to Français
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * product_visible_discount
+#
+# Numerigraphe , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr_FR\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-03-25 12:11:15+0000\n"
+"PO-Revision-Date: 2009-03-25 13:17+0100\n"
+"Last-Translator: Numerigraphe \n"
+"Language-Team: Français\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+"\n"
+" Ce module vous permet de calculer les remises sur les lignes de Commande et de Facture en se basant sur la liste de prix du partenaire.\n"
+" Pour cela, une nouvelle case à cocher \"Remise visible\" est ajoutée au formulaire \"Liste de prix\".\n"
+" Par exemple :\n"
+" Pour le produit PC1 et le partenaire \"Asustek\" : si le prix public=450, et le prix prix calculé en utilisant la liste de prix d'Asustek est 225\n"
+" Si la case est cochée, on aura sur la ligne de commande : Prix unitaire=450, Remise=50,00, Prix net=225\n"
+" Si la case N'EST PAS est cochée, on aura sur la ligne de commande : Prix unitaire=225, Remise=0,00, Prix net=225\n"
+" "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr ""
+
diff --git a/addons/product_visible_discount/product.py b/addons/product_visible_discount/product.py
new file mode 100644
index 00000000000..e81dac8668e
--- /dev/null
+++ b/addons/product_visible_discount/product.py
@@ -0,0 +1,149 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# 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 3 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, see .
+#
+##############################################################################
+from osv import fields, osv
+import pooler
+from tools import config
+from osv.osv import except_osv
+from tools.translate import _
+
+class product_pricelist(osv.osv):
+ _name = 'product.pricelist'
+ _inherit = 'product.pricelist'
+
+ _columns ={
+ 'visible_discount':fields.boolean('Visible Discount'),
+ }
+ _defaults = {
+ 'visible_discount': True,
+ }
+
+product_pricelist()
+
+class sale_order_line(osv.osv):
+ _name = "sale.order.line"
+ _inherit = "sale.order.line"
+
+ def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+ uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+ lang=False, update_tax=True,date_order=False,packaging=False,fiscal_position=False, flag=False):
+
+ res=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,
+ uom, qty_uos, uos, name, partner_id,
+ lang, update_tax,date_order,fiscal_position=fiscal_position,flag=flag)
+
+ context = {'lang': lang, 'partner_id': partner_id}
+ result=res['value']
+ pricelist_obj=self.pool.get('product.pricelist')
+ product_obj = self.pool.get('product.product')
+ product_uom_obj = self.pool.get('product.uom')
+ if product:
+ if result.get('price_unit',False):
+ price=result['price_unit']
+ else:
+ return res
+
+ product = product_obj.browse(cr, uid, product, context)
+# product_tmpl_id = product.product_tmpl_id.id
+# pricetype_id = pricelist_obj.browse(cr, uid, pricelist).version_id[0].items_id[0].base
+# field_name = 'list_price'
+# product_read = self.pool.get('product.template').read(cr, uid, product_tmpl_id, [field_name], context)
+# list_price = product_read[field_name]
+ list_price = pricelist_obj.price_get(cr, uid, [pricelist],
+ product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })[pricelist]
+
+ pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
+
+ old_uom = product.uos_id or product.uom_id
+ new_list_price = product_uom_obj._compute_price(cr,
+ uid, old_uom.id, list_price, uom)
+ if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price != 0):
+ discount=(new_list_price-price) / new_list_price * 100
+ result['price_unit'] = new_list_price
+ result['discount'] = discount
+ else:
+ result['discount'] = 0.0
+ return res
+
+sale_order_line()
+
+class account_invoice_line(osv.osv):
+ _name = "account.invoice.line"
+ _inherit = "account.invoice.line"
+
+ def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
+ res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+
+ def get_real_price(res_dict, product_id, pricelist):
+ item_obj = self.pool.get('product.pricelist.item')
+ price_type_obj = self.pool.get('product.price.type')
+ product_obj = self.pool.get('product.product')
+ template_obj = self.pool.get('product.template')
+ field_name = 'list_price'
+
+ if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
+ item = res_dict['item_id'].get(pricelist,False)
+ item_base = item_obj.read(cr, uid, [item], ['base'])[0]['base']
+ if item_base > 0:
+ field_name = price_type_obj.browse(cr, uid, item_base).field
+
+ product_tmpl_id = product_obj.browse(cr, uid, product_id, context).product_tmpl_id.id
+
+ product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+ return product_read[field_name]
+
+ if product:
+ pricelist_obj = self.pool.get('product.pricelist')
+ partner_obj = self.pool.get('res.partner')
+ product = self.pool.get('product.product').browse(cr, uid, product, context=context)
+ result = res['value']
+ pricelist = False
+ real_price = 0.00
+ if type in ('in_invoice', 'in_refund'):
+ if not price_unit and partner_id:
+ pricelist =partner_obj.browse(cr, uid, partner_id).property_product_pricelist_purchase.id
+ if not pricelist:
+ raise osv.except_osv(_('No Purchase Pricelist Found !'),_("You must first define a pricelist for Supplier !"))
+ price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom})[pricelist]
+ price_unit = price_unit_res[pricelist]
+ real_price = get_real_price(price_unit_res, product.id, pricelist)
+ else:
+ if partner_id:
+ pricelist = partner_obj.browse(cr, uid, partner_id).property_product_pricelist.id
+ if not pricelist:
+ raise osv.except_osv(_('No Sale Pricelist Found '),_("You must first define a pricelist for Customer !"))
+ price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom})
+ price_unit = price_unit_res[pricelist]
+
+ real_price = get_real_price(price_unit_res, product.id, pricelist)
+ if pricelist:
+ pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
+ if(len(pricelists)>0 and pricelists[0]['visible_discount'] and real_price != 0):
+ discount=(real_price-price_unit) / real_price * 100
+ result['price_unit'] = real_price
+ result['discount'] = discount
+ else:
+ result['discount']=0.0
+ return res
+
+account_invoice_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_visible_discount/product_view.xml b/addons/product_visible_discount/product_view.xml
new file mode 100644
index 00000000000..76f2d2e43ff
--- /dev/null
+++ b/addons/product_visible_discount/product_view.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ #---------------------------------------------------------
+ # product price list
+ #---------------------------------------------------------
+
+ product.pricelist.tree
+ product.pricelist
+
+
+
+
+
+
+
+
+
+ product.pricelist.form
+ product.pricelist
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index ee5a94208aa..a51a95c5d16 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -47,12 +47,13 @@ automatically created via sale orders.
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['project', 'mrp_procurement', 'sale', 'mrp_jit'],
+ 'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
'init_xml': [],
'update_xml': ['project_mrp_workflow.xml',
#'process/project_mrp_process.xml',
],
'demo_xml': [],
+ 'test': ['test/project_task_procurement.yml'],
'installable': True,
'active': False,
'certificate': '0031976495453',
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index 6287ca3ad30..98b05248a66 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -22,9 +22,9 @@
from osv import fields, osv, orm
import tools
-class mrp_procurement(osv.osv):
- _name = "mrp.procurement"
- _inherit = "mrp.procurement"
+class procurement_order(osv.osv):
+ _name = "procurement.order"
+ _inherit = "procurement.order"
def action_produce_assign_service(self, cr, uid, ids, context={}):
for procurement in self.browse(cr, uid, ids):
@@ -91,7 +91,7 @@ class mrp_procurement(osv.osv):
'project_id': project_id,
},context=context)
return task_id
-mrp_procurement()
+procurement_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 8029327022d..b606bbfe8fa 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', 'Procurement', ondelete='set null')
+ 'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null')
}
def do_close(self, cr, uid, ids, *args):
@@ -35,7 +35,7 @@ class project_task(osv.osv):
for task in tasks:
if task.procurement_id:
wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.done', cr)
+ wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.done', cr)
return res
def do_cancel(self, cr, uid, ids, *args):
@@ -44,7 +44,7 @@ class project_task(osv.osv):
for task in tasks:
if task.procurement_id:
wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.cancel', cr)
+ wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.cancel', cr)
return True
project_task()
diff --git a/addons/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index 43217d69f83..cd242e7f699 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,9 +1,9 @@
-
-
-
+
+
+ subflow.done
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/project_mrp/security/ir.model.access.csv
index 407ab3716a0..7c6e2a7a30c 100644
--- a/addons/project_mrp/security/ir.model.access.csv
+++ b/addons/project_mrp/security/ir.model.access.csv
@@ -1,3 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_procurement_project_user","mrp.procurement project_user","model_mrp_procurement","project.group_project_user",1,1,1,1
-"access_mrp_procurement_project_manager","mrp.procurement project_manager","model_mrp_procurement","project.group_project_manager",1,1,1,1
+"access_procurement_project_user","procurement.order project_user","model_procurement_order","project.group_project_user",1,1,1,1
+"access_procurement_project_manager","procurement.order project_manager","model_procurement_order","project.group_project_manager",1,1,1,1
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
new file mode 100644
index 00000000000..50bc74f82ae
--- /dev/null
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -0,0 +1,75 @@
+-
+ In order to test project_mrp module with OpenERP I want to create sale orders
+ with product type 'service' so when procurement runs one task is created.
+-
+ I create record for a service type product.
+-
+ !record {model: product.product, id: product_product_partnerstraining0}:
+ categ_id: product.product_category_7
+ cost_method: standard
+ mes_type: fixed
+ name: Partners Training
+ procure_method: make_to_order
+ supply_method: produce
+ type: service
+ uom_id: product.uom_day
+ uom_po_id: product.uom_day
+ warranty: 0.0
+-
+ I create a sale order for product Partners Training which has type 'Service'.
+-
+ !record {model: sale.order, id: sale_order_so0}:
+ date_order: '2010-05-21'
+ invoice_quantity: order
+ name: SO006
+ order_policy: manual
+ partner_id: base.res_partner_asus
+ partner_invoice_id: base.res_partner_address_tang
+ partner_order_id: base.res_partner_address_tang
+ partner_shipping_id: base.res_partner_address_tang
+ order_line:
+ - state: draft
+ delay: 7.0
+ name: Partners Training
+ price_unit: 1.0
+ product_id: product_product_partnerstraining0
+ product_uom: product.uom_day
+ product_uom_qty: 5.0
+ th_weight: 0.0
+ type: make_to_order
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+ user_id: base.user_demo
+-
+ I confirm this sale order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+ I check the procurements.
+-
+ !python {model: procurement.order}: |
+ from tools.translate import _
+ orderline_obj = self.pool.get('sale.order.line')
+ line_ids = orderline_obj.search(cr, uid, [('order_id','=', ref('sale_order_so0'))])
+ orders = orderline_obj.browse(cr, uid, line_ids)
+ proc_ids = map(lambda x: x.procurement_id.id, orders)
+ assert proc_ids, _('No Procurements!')
+-
+ The scheduler runs.
+-
+ !function {model: procurement.order, name: run_scheduler}:
+ - model: procurement.order
+ search: "[('state','=','confirmed')]"
+-
+ Now I check the tasks.
+-
+ I see that one task is created for my sale order.
+-
+ !python {model: project.task}: |
+ from tools.translate import _
+ order_obj = self.pool.get('sale.order')
+ order = order_obj.browse(cr, uid, ref('sale_order_so0'))
+ task_id = self.search(cr, uid, [('project_id.name','=', order.name)])
+ assert task_id, _('No Task is created!')
+
\ No newline at end of file
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 56f9b46dbdf..f557997497b 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -35,7 +35,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
+ 'depends': ['base', 'account', 'stock', 'process', 'procurement'],
'init_xml': [],
'update_xml': [
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 5123b27b446..072ed95902f 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 06:10+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-09 22:18+0000\n"
+"Last-Translator: lyyser \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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -606,7 +606,7 @@ msgstr "Kättetoimetamine ja arved"
#. module: purchase
#: field:purchase.order,date_order:0
msgid "Date"
-msgstr ""
+msgstr "Kuupäev"
#. module: purchase
#: help:purchase.order,origin:0
@@ -666,7 +666,7 @@ msgstr "Kui ostukorraldus on heaks kiidetud, loob see pakkimise nimekirja."
#. module: purchase
#: view:purchase.order.line:0
msgid "History"
-msgstr ""
+msgstr "Ajalugu"
#. module: purchase
#: field:purchase.order,state:0
@@ -893,4 +893,4 @@ msgstr "Peale ostukorralduse heaks kiitmist läheb see kliendiarveks"
#. module: purchase
#: view:purchase.order.line:0
msgid "Stock Moves"
-msgstr ""
+msgstr "Lao liikumised"
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 09a529c020e..bc24632a606 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2cfd4247bcf..08507f9dfac 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -698,8 +698,8 @@ class purchase_order_line(osv.osv):
return True
purchase_order_line()
-class mrp_procurement(osv.osv):
- _inherit = 'mrp.procurement'
+class procurement_order(osv.osv):
+ _inherit = 'procurement.order'
_columns = {
'purchase_id': fields.many2one('purchase.order', 'Latest Requisition'),
}
@@ -779,7 +779,7 @@ class mrp_procurement(osv.osv):
res[procurement.id] = purchase_id
self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
return res
-mrp_procurement()
+procurement_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 17fd47b7012..502c33bd5f9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -21,8 +21,6 @@
parent="base.menu_purchase_root" sequence="4"/>
-
@@ -353,9 +351,9 @@
-->
- mrp.procurement.form.inherit
- mrp.procurement
-
+ procurement.order.form.inherit
+ procurement.order
+ form
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index d7684be1875..d14530e5f48 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -180,7 +180,7 @@
-
+ buysubflow
@@ -188,20 +188,20 @@
-
+ check_buy()
-
+ subflow.delivery_done
-
+ subflow.cancel
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 71f2638d628..ff3d4bdcee8 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -69,7 +69,7 @@ class purchase_report(osv.osv):
'quantity': fields.float('# of Products', readonly=True),
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
- 'nbr': fields.integer('# of Lines', readonly=True),
+ 'nbr': fields.integer('# of Ordered Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
@@ -106,7 +106,7 @@ class purchase_report(osv.osv):
extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
extract(epoch from age(s.minimum_planned_date,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
count(*) as nbr,
- sum(l.product_qty*l.price_unit) as price_total,
+ l.price_unit*l.product_qty*u.factor as price_total,
(sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
@@ -118,7 +118,10 @@ class purchase_report(osv.osv):
s.shipped,
l.invoiced,
s.partner_id,
+ l.product_qty,
+ u.factor,
s.location_id,
+ l.price_unit,
s.date_approve,
s.minimum_planned_date,
date_trunc('day',s.minimum_planned_date),
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 468f3892a13..db6cc6273de 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -26,7 +26,6 @@
-
@@ -35,9 +34,10 @@
+
-
+
diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml
index e0b1a8b806c..e7a608b7557 100644
--- a/addons/purchase/test/purchase_from_manual.yml
+++ b/addons/purchase/test/purchase_from_manual.yml
@@ -1,5 +1,5 @@
-
- In order to test the purchase flow,I start by creating a new product 'iPod'
+ In order to test the purchase flow,I start by creating a new product 'iPod'
-
!record {model: product.product, id: product_product_ipod0}:
categ_id: 'product.product_category_3'
@@ -22,14 +22,14 @@
weight: 0.0
weight_net: 0.0
-
- In order to test the purchase flow,I create a new record where "invoice_method" is From Manual
+ In order to test the purchase flow,I create a new record where "invoice_method" is From Manual
-
- Creating an purchase.order record
+ I create purchase order for iPod.
-
!record {model: purchase.order, id: purchase_order_po1}:
company_id: base.main_company
date_order: '2010-05-11'
- invoice_method: order
+ invoice_method: manual
location_id: stock.stock_location_stock
name: PO00010
order_line:
@@ -44,26 +44,21 @@
partner_id: base.res_partner_4
pricelist_id: purchase.list0
-
- Initially purchase order is in the draft state
+ Initially purchase order is in the draft state
-
!assert {model: purchase.order, id: purchase_order_po1}:
- state == 'draft'
-
- Then an order is confirmed by clicking on the "Confirm Purchase Order" button
--
- !python {model: purchase.order}: |
- self.wkf_confirm_order(cr, uid, [ref("purchase_order_po1")])
--
- Performing a workflow action purchase_confirm on module purchase.order
+ I confirm the purchase order.
-
!workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po1}
-
- I check that the order which was initially in the draft state has transit to confirm state.
+ I check that the order which was initially in the draft state has transit to confirm state.
-
!assert {model: purchase.order, id: purchase_order_po1}:
- state == 'confirmed'
-
- I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
+ I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -72,14 +67,14 @@
search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
assert search_ids, _('Purchase order line is not created!')
-
- To check that wizard "Create Invoices" gets opened
+ To check that wizard "Create Invoices" gets opened
-
- Creating a purchase.order.line_invoice record
+ I create purchase order line invoice entry.
-
!record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
{}
-
- Performing an osv_memory action makeInvoices on module purchase.order.line_invoice
+ I create invoice for products in the purchase order.
-
!python {model: purchase.order.line_invoice}: |
pur_obj=self.pool.get('purchase.order')
@@ -89,7 +84,7 @@
ids.append(line.id)
self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
-
- I check that invoice gets created
+ I check that invoice gets created.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -98,7 +93,7 @@
search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
assert search_ids, _('Invoice is not created!')
-
- I check that a record gets created in the Pending Invoices
+ I check that a record gets created in the Pending Invoices.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -107,33 +102,28 @@
ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
assert ids, _('Pending Invoice is not created!')
-
- Then an order is approved by clicking on the "Approved by Supplier" button
--
- !python {model: purchase.order}: |
- self.wkf_approve_order(cr, uid, [ref("purchase_order_po1")])
--
- Performing a workflow action purchase_approve on module purchase.order
+ Supplier approve the purchase order.
-
!workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po1}
-
- I check that the order which was initially in the confirmed state has transit to approved state.
+ I check that the order which was initially in the confirmed state has transit to approved state.
-
!assert {model: purchase.order, id: purchase_order_po1}:
- state == 'approved'
-
- I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved
+ I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved.
-
!python {model: purchase.order}: |
pur_id=self.browse(cr, uid, ref("purchase_order_po1"))
assert(pur_id.date_approve)
-
- I check that an entry gets created in the stock.picking
+ I check that an entry gets created in the stock pickings.
-
!python {model: purchase.order}: |
pur_id=self.browse(cr, uid, ref("purchase_order_po1"))
assert(pur_id.picking_ids)
-
- I check that an entry gets created in the stock.move
+ I check that an entry gets created in the stock moves.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -145,4 +135,4 @@
search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
assert search_id, _('No Incoming Product!')
-
- I check that Traceability moves are created
+ I check that Traceability moves are created.
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index 3e83fc7dfda..a13c687c4a5 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -1,5 +1,5 @@
-
- In order to test the purchase flow,I start by creating a new product 'iPod'
+ In order to test the purchase flow,I start by creating a new product 'iPod'
-
!record {model: product.product, id: product_product_ipod0}:
categ_id: 'product.product_category_3'
@@ -22,9 +22,9 @@
weight: 0.0
weight_net: 0.0
-
- In order to test the purchase flow,I create a new record where "invoice_method" is From Order
+ In order to test the purchase flow,I create a new record where "invoice_method" is From Order.
-
- Creating a purchase.order record
+ I create purchase order for iPod.
-
!record {model: purchase.order, id: purchase_order_po0}:
company_id: base.main_company
@@ -44,26 +44,21 @@
partner_id: base.res_partner_4
pricelist_id: purchase.list0
-
- Initially purchase order is in the draft state
+ Initially purchase order is in the draft state.
-
!assert {model: purchase.order, id: purchase_order_po0}:
- state == 'draft'
-
- Then an order is confirmed by clicking on the "Confirm Purchase Order" button
--
- !python {model: purchase.order}: |
- self.wkf_confirm_order(cr, uid, [ref("purchase_order_po0")])
--
- Performing a workflow action purchase_confirm on module purchase.order
+ I confirm the purchase order for iPod.
-
!workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po0}
-
- I check that the order which was initially in the draft state has transit to confirm state.
+ I check that the order which was initially in the draft state has transit to confirm state.
-
!assert {model: purchase.order, id: purchase_order_po0}:
- state == 'confirmed'
-
- I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
+ I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -72,14 +67,14 @@
search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
assert search_ids, _('Purchase order line is not created!')
-
- To check that wizard "Create Invoices" gets called
+ To check that wizard "Create Invoices" gets called.
-
- Creating a purchase.order.line_invoice record
+ I create purchase order line invoice entry.
-
!record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
{}
-
- Performing an osv_memory action makeInvoices on module purchase.order.line_invoice
+ I create invoice for products in the purchase order.
-
!python {model: purchase.order.line_invoice}: |
pur_obj=self.pool.get('purchase.order')
@@ -89,7 +84,7 @@
ids.append(line.id)
self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
-
- I check that invoice gets created
+ I check that invoice gets created.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -98,7 +93,7 @@
search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
assert search_ids, _('Invoice is not created!')
-
- I check that a record gets created in the Pending Invoices
+ I check that a record gets created in the Pending Invoices.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -107,33 +102,28 @@
ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
assert ids, _('Pending Invoice is not created!')
-
- Then an order is approved by clicking on the "Approved by Supplier" button
--
- !python {model: purchase.order}: |
- self.wkf_approve_order(cr, uid, [ref("purchase_order_po0")])
--
- Performing a workflow action purchase_approve on module purchase.order
+ Supplier approve the purchase order.
-
!workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po0}
-
- I check that the order which was initially in the confirmed state has transit to approved state.
+ I check that the order which was initially in the confirmed state has transit to approved state.
-
!assert {model: purchase.order, id: purchase_order_po0}:
- state == 'approved'
-
- I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved
+ I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved.
-
!python {model: purchase.order}: |
pur_id=self.browse(cr, uid, ref("purchase_order_po0"))
assert(pur_id.date_approve)
-
- I check that an entry gets created in the stock.picking
+ I check that an entry gets created in the pickings.
-
!python {model: purchase.order}: |
pur_id=self.browse(cr, uid, ref("purchase_order_po0"))
assert(pur_id.picking_ids)
-
- I check that an entry gets created in the stock.move
+ I check that an entry gets created in the stock moves.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -145,9 +135,9 @@
search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
assert search_id, _('No Incoming Product!')
-
- I check that Traceability moves are created
+ I check that Traceability moves are created.
-
- I check that an invoice_id field of Delivery&Invoices gets bind with the value
+ I check that an invoice_id field of Delivery&Invoices gets bind with the value.
-
!python {model: purchase.order}: |
pur_id2=self.browse(cr, uid, ref("purchase_order_po0"))
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index f4e9628985d..6250772a872 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -1,5 +1,5 @@
-
- In order to test the purchase flow,I start by creating a new product 'iPod'
+ In order to test the purchase flow,I start by creating a new product 'iPod'
-
!record {model: product.product, id: product_product_ipod0}:
categ_id: 'product.product_category_3'
@@ -22,9 +22,9 @@
weight: 0.0
weight_net: 0.0
-
- In order to test the purchase flow,I create a new record where "invoice_method" is From Picking
+ In order to test the purchase flow,I create a new record where "invoice_method" is From Picking
-
- Creating an purchase.order record
+ I create purchase order for iPod.
-
!record {model: purchase.order, id: purchase_order_po2}:
company_id: base.main_company
@@ -44,17 +44,12 @@
partner_id: base.res_partner_4
pricelist_id: purchase.list0
-
- Initially purchase order is in the draft state
+ Initially purchase order is in the draft state.
-
!assert {model: purchase.order, id: purchase_order_po2}:
- state == 'draft'
-
- Then an order is confirmed by clicking on the "Confirm Purchase Order" button
--
- !python {model: purchase.order}: |
- self.wkf_confirm_order(cr, uid, [ref("purchase_order_po2")])
--
- Performing a workflow action purchase_confirm on module purchase.order
+ I confirm the purchase order for iPod.
-
!workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po2}
-
@@ -63,7 +58,7 @@
!assert {model: purchase.order, id: purchase_order_po2}:
- state == 'confirmed'
-
- I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
+ I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -72,14 +67,14 @@
search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
assert search_ids, _('Purchase order line is not created!')
-
- To check that wizard "Create Invoices" gets opened
+ To check that wizard "Create Invoices" gets opened.
-
- Creating a purchase.order.line_invoice record
+ I create purchase order line invoice entry.
-
!record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
{}
-
- Performing an osv_memory action makeInvoices on module purchase.order.line_invoice
+ I create invoice for products in the purchase order.
-
!python {model: purchase.order.line_invoice}: |
pur_obj=self.pool.get('purchase.order')
@@ -89,7 +84,7 @@
ids.append(line.id)
self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
-
- I check that invoice gets created
+ I check that invoice gets created.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -98,7 +93,7 @@
search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
assert search_ids, _('Invoice is not created!')
-
- I check that a record gets created in the Pending Invoices
+ I check that a record gets created in the Pending Invoices.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -107,12 +102,7 @@
ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
assert ids, _('Pending Invoice is not created!')
-
- Then an order is approved by clicking on the "Approved by Supplier" button
--
- !python {model: purchase.order}: |
- self.wkf_approve_order(cr, uid, [ref("purchase_order_po2")])
--
- Performing a workflow action purchase_approve on module purchase.order
+ Supplier approve the purchase order.
-
!workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po2}
-
@@ -121,19 +111,19 @@
!assert {model: purchase.order, id: purchase_order_po2}:
- state == 'approved'
-
- I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved
+ I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved.
-
!python {model: purchase.order}: |
pur_id=self.browse(cr, uid, ref("purchase_order_po2"))
assert(pur_id.date_approve)
-
- I check that an entry gets created in the stock.picking
+ I check that an entry gets created in the stock.picking.
-
!python {model: purchase.order}: |
pur_id=self.browse(cr, uid, ref("purchase_order_po2"))
assert(pur_id.picking_ids)
-
- I check that an entry gets created in the stock.move
+ I check that an entry gets created related to stock move.
-
!python {model: purchase.order}: |
from tools.translate import _
@@ -145,18 +135,18 @@
search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
assert search_id, _('No Incoming Product!')
-
- I check that Traceability moves are created
+ I check that Traceability moves are created.
-
- Then I create an invoice from picking by clicking on "Create Invoice" wizard
+ Then I create an invoice from picking by clicking on "Create Invoice" wizard
-
- Creating a stock.invoice.onshipping record
+ I create stock invoice on shipping entry.
-
!record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
invoice_date: '2010-05-11'
journal_id: account.bank_journal
type: in_invoice
-
- Performing an osv_memory action create_invoice on module stock.invoice.onshipping
+ I create Invoice.
-
!python {model: stock.invoice.onshipping}: |
pur_obj=self.pool.get('purchase.order')
@@ -167,7 +157,7 @@
"tz": False, "search_default_approved": 1, "active_model": "stock.picking",
"active_ids": ids, "active_id": ids[0], })
-
- I check that an invoice_id field of Delivery&Invoices gets bind with the value
+ I check that an invoice_id field of Delivery&Invoices gets bind with the value.
-
!python {model: purchase.order}: |
pur_id2=self.browse(cr, uid, ref("purchase_order_po2"))
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 85c35b277c5..5aaf3a995e2 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -136,11 +136,11 @@ class product_product(osv.osv):
product_product()
-class mrp_procurement(osv.osv):
- _inherit = 'mrp.procurement'
+class procurement_order(osv.osv):
+ _inherit = 'procurement.order'
def make_po(self, cr, uid, ids, context={}):
sequence_obj=self.pool.get('ir.sequence')
- res = super(mrp_procurement, self).make_po(cr, uid, ids, context)
+ res = super(procurement_order, 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_requisition:
@@ -157,4 +157,4 @@ class mrp_procurement(osv.osv):
'purchase_ids': [(6,0,[po_id])]
})
return res
-mrp_procurement()
+procurement_order()
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 8983d238e0e..0ace2312034 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -59,8 +59,8 @@
-
I launch he scheduler to compute all procurements, and specify all requisitions orders.
-
- !python {model: mrp.procurement.compute.all}: |
- proc_obj = self.pool.get('mrp.procurement')
+ !python {model: procurement.order.compute.all}: |
+ proc_obj = self.pool.get('procurement.order')
proc_obj._procure_confirm(cr,uid)
-
On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index e2cba67fca9..641fd740de3 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -52,8 +52,8 @@
-
I launch he scheduler to compute all procurements, and planify all requisitions orders.
-
- !python {model: mrp.procurement.compute.all}: |
- proc_obj = self.pool.get('mrp.procurement')
+ !python {model: procurement.order.compute.all}: |
+ proc_obj = self.pool.get('procurement.order')
proc_obj._procure_confirm(cr,uid)
-
I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index 62dde41d6fc..cf3556f5c74 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index 0f1647f8d06..38a2e3a382a 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 245730b21cd..e8c68bf5c95 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index ac73360d8b3..84ad5969b7f 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.po
@@ -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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index c9ecd125a04..94f017514f4 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_project/i18n/hr.po b/addons/report_project/i18n/hr.po
index a40056a4f50..3f4f33b86c3 100644
--- a/addons/report_project/i18n/hr.po
+++ b/addons/report_project/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_purchase/i18n/hr.po b/addons/report_purchase/i18n/hr.po
index 0dc383bac14..8d921c1f990 100644
--- a/addons/report_purchase/i18n/hr.po
+++ b/addons/report_purchase/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_sale/i18n/hr.po b/addons/report_sale/i18n/hr.po
index aa5adc5fe71..796a3eccf62 100644
--- a/addons/report_sale/i18n/hr.po
+++ b/addons/report_sale/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
index 6f70f225324..5e5b4fc41ad 100644
--- a/addons/report_task/i18n/es.po
+++ b/addons/report_task/i18n/es.po
@@ -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-04 12:29+0000\n"
+"PO-Revision-Date: 2010-06-09 09:31+0000\n"
"Last-Translator: Jonay \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-09 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_task
@@ -205,7 +205,7 @@ msgstr "Cancelado"
#. module: report_task
#: view:report.timesheet.task.user:0
msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Horario / Informe de horas de trabajo por mes"
#. module: report_task
#: field:report.task.user.pipeline.open,task_progress:0
@@ -250,7 +250,7 @@ msgstr "Fecha límite"
#. module: report_task
#: field:report.timesheet.task.user,timesheet_hrs:0
msgid "Timesheet Hours"
-msgstr ""
+msgstr "Horas del horario"
#. module: report_task
#: view:report.closed.task:0
@@ -265,4 +265,4 @@ msgstr "Abrir"
#. module: report_task
#: field:report.closed.task,planned_hours:0
msgid "Planned Hours"
-msgstr ""
+msgstr "Horas planeadas"
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 71f33623c55..3ad30a6233e 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -26,7 +26,6 @@
import sale
import stock
import product
-#import mrp
import wizard
import report
import company
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 2a804db1707..9cac508b1b8 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -44,7 +44,7 @@
* Top 10 sales of the month
* Cases statistics
* Graph of sales by product
- * Graph of cases of the month
+ * Graph of cases of the month
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
@@ -72,6 +72,8 @@
'test/shipping_manual_sale_order.yml',
'test/prepaid_sale_order.yml',
'test/advance_invoice.yml',
+ 'test/so_make_line_invoice.yml',
+ 'test/so_make_invoice.yml',
'test/sale_procurement.yml',
],
'installable': True,
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index a39cac7c03f..ceaf026717a 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index b947fd04fd9..a00233e6ac7 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -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-09 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 58e4be14d84..1ebbc267de7 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -35,7 +35,7 @@
-
+
@@ -63,12 +63,12 @@
-
-
+
+
-
+
@@ -202,7 +202,7 @@
-
+
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 68f50068ec0..b47d59e5400 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -41,8 +41,12 @@ class sale_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
+
+ 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True),
+ 'product_qty':fields.float('# of Qty', readonly=True),
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'product_uom_qty':fields.float('# of Qty', readonly=True),
+
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 07c66ef91dc..4dd70ac82e1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -39,6 +39,7 @@ class sale_shop(osv.osv):
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
'project_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+ 'company_id': fields.many2one('res.company', 'Company'),
}
sale_shop()
@@ -112,7 +113,7 @@ class sale_order(osv.osv):
LEFT JOIN
stock_picking p on (p.id=m.picking_id)
LEFT JOIN
- mrp_procurement mp on (mp.move_id=m.id)
+ procurement_order mp on (mp.move_id=m.id)
WHERE
p.sale_id = ANY(%s) GROUP BY mp.state, p.sale_id''',(ids,))
for oid, nbr, mp_state in cr.fetchall():
@@ -277,7 +278,7 @@ class sale_order(osv.osv):
'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
- 'company_id': fields.many2one('res.company','Company',select=1),
+ 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
}
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
@@ -422,6 +423,7 @@ class sale_order(osv.osv):
if not journal_ids:
raise osv.except_osv(_('Error !'),
_('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
+
inv = {
'name': order.client_order_ref or order.name,
'origin': order.name,
@@ -439,6 +441,7 @@ class sale_order(osv.osv):
'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
'date_invoice' : context.get('date_invoice',False),
'company_id' : order.company_id.id,
+ 'user_id':order.user_id and order.user_id.id or False
}
inv_obj = self.pool.get('account.invoice')
inv.update(self._inv_get(cr, uid, order))
@@ -658,7 +661,7 @@ class sale_order(osv.osv):
'note': line.notes,
'company_id': order.company_id.id,
})
- proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+ proc_id = self.pool.get('procurement.order').create(cr, uid, {
'name': order.name,
'origin': order.name,
'date_planned': date_planned,
@@ -676,10 +679,10 @@ class sale_order(osv.osv):
'company_id': order.company_id.id,
})
wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
elif line.product_id and line.product_id.product_tmpl_id.type == 'service':
- proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+ proc_id = self.pool.get('procurement.order').create(cr, uid, {
'name': line.name,
'origin': order.name,
'date_planned': date_planned,
@@ -693,7 +696,7 @@ class sale_order(osv.osv):
})
self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
else:
#
# No procurement because no product in the sale.order.line.
@@ -807,7 +810,7 @@ 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', 'Procurement'),
+ 'procurement_id': fields.many2one('procurement.order', 'Procurement'),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
'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)]}),
@@ -856,7 +859,7 @@ class sale_order_line(osv.osv):
return line.product_uos_qty or 0.0
return line.product_uom_qty
else:
- return self.pool.get('mrp.procurement').quantity_get(cr, uid,
+ return self.pool.get('procurement.order').quantity_get(cr, uid,
line.procurement_id.id, context=context)
def _get_line_uom(line):
@@ -865,7 +868,7 @@ class sale_order_line(osv.osv):
return line.product_uos.id
return line.product_uom.id
else:
- return self.pool.get('mrp.procurement').uom_get(cr, uid,
+ return self.pool.get('procurement.order').uom_get(cr, uid,
line.procurement_id.id, context=context)
create_ids = []
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 2be5a50ff81..6c8249131e8 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -16,6 +16,7 @@
+
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index d6ab6a7bc0c..0920cdeebb2 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -206,7 +206,7 @@
-
+
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index dc507edb4a0..95a23024412 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -112,7 +112,7 @@
-
+ done
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c236b669580..6214613c47d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -14,6 +14,7 @@
@@ -54,13 +53,12 @@
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 0c13e83cd84..08ece3f821d 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -23,6 +23,7 @@
+
+ product.valuation.stock.form.inherit
+ product.product
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a3771b4a480..458fc250091 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -10,6 +10,7 @@
+
@@ -18,9 +19,7 @@
-
-
@@ -60,15 +59,10 @@
help="Stock Moves of today"/>
-
-
-
+ domain="[('state','in',('assigned','done','waiting','confirmed'))]"
+ help = "Future Stock-Moves"/>
+
-
-
+
+
-
+
@@ -112,7 +107,7 @@
formtree,graph
- {'search_default_product':1, 'search_default_src_location':1,'search_default_done':1,'group_by':[]}
+ {'search_default_product':1, 'search_default_src_location':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}
@@ -1551,7 +1554,7 @@
- Incoming Products
+ Incoming Packingsstock.moveir.actions.act_windowform
@@ -1761,5 +1764,33 @@
calendar
+
+
+ Outcoming Packings
+ stock.move
+ ir.actions.act_window
+ form
+ tree,form
+ [('picking_id','!=',False),('picking_id.type','=','out')]
+
+ {"search_default_receive":1}
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 6a9bf3ff9f3..38ecddffb91 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -288,6 +288,7 @@
In Order to test the picking I create picking with move lines.
-
!record {model: stock.picking, id: stock_picking_0}:
+ name: test_picking
address_id: res_partner_address_0
company_id: base.main_company
date: '2010-05-11 15:18:52'
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index d83b2c1d140..149b0b04e84 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -34,17 +34,13 @@ class change_standard_price(osv.osv_memory):
}
def default_get(self, cr, uid, fields, context):
- """
- To get default values for the object.
-
+ """ To get default values for the object.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
@param fields: List of fields for which we want default values
@param context: A standard dictionary
-
@return: A dictionary which of fields with values.
-
"""
product_pool = self.pool.get('product.product')
product_obj = product_pool.browse(cr, uid, context.get('active_id', False))
@@ -68,6 +64,16 @@ class change_standard_price(osv.osv_memory):
return res
def onchange_price(self, cr, uid, ids, new_price, context = {}):
+ """ Sets stock input and output account according to the difference
+ of old price and new price.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param new_price: Changed price
+ @param context: A standard dictionary
+ @return: Dictionary of values
+ """
product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
price = product_obj.standard_price
diff = price - new_price
@@ -77,18 +83,14 @@ class change_standard_price(osv.osv_memory):
return {'value' : {'enable_stock_in_out_acc':False}}
def change_price(self, cr, uid, ids, context):
- """
- Changes the Standard Price of Product.
- And creates an account move accordingly.
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: List of IDs selected
- @param context: A standard dictionary
-
- @return:
-
+ """ Changes the Standard Price of Product.
+ And creates an account move accordingly.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return:
"""
rec_id = context and context.get('active_id', False)
assert rec_id, _('Active ID is not set in Context')
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 3247628657a..3742349425c 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -34,21 +34,17 @@ class stock_fill_inventory(osv.osv_memory):
_description = "Fill Inventory"
_columns = {
'location_id': fields.many2one('stock.location', 'Location', required=True),
- 'recursive': fields.boolean("Include all childs for the location"),
- }
+ 'recursive': fields.boolean("Include all children for the location"),
+ }
def fill_inventory(self, cr, uid, ids, context):
- """
- To fill stock inventory according to products available in the selected locations..
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return:
-
+ """ To fill stock inventory according to products available in the selected locations.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return:
"""
inventory_line_obj = self.pool.get('stock.inventory.line')
location_obj = self.pool.get('stock.location')
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 9fe71582c7f..9f91a47c9a5 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -35,17 +35,13 @@ class stock_inventory_line_split(osv.osv_memory):
def default_get(self, cr, uid, fields, context):
- """
- To check the availability of production lot.
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
-
- @return: A dictionary which of fields with values.
-
+ """ To check the availability of production lot.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
"""
record_id = context and context.get('active_id',False)
res = super(stock_inventory_line_split, self).default_get(cr, uid, fields, context=context)
@@ -55,18 +51,14 @@ class stock_inventory_line_split(osv.osv_memory):
return res
def split(self, cr, uid, ids, line_ids, context=None):
- """
- To split stock inventory lines according to production lot
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param line_ids: the ID or list of IDs of inventory lines we want to split
- @param context: A standard dictionary
-
- @return:
-
+ """ To split stock inventory lines according to production lot.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param line_ids: the ID or list of IDs of inventory lines we want to split
+ @param context: A standard dictionary
+ @return:
"""
prodlot_obj = self.pool.get('stock.production.lot')
ir_sequence_obj = self.pool.get('ir.sequence')
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 1c11ad8e2ad..30450e4d253 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -31,22 +31,15 @@ import wizard
class stock_inventory_merge(osv.osv_memory):
_name = "stock.inventory.merge"
_description = "Merge Inventory"
- _columns = {
-
- }
def do_merge(self, cr, uid, ids, context):
- """
- To merge selected Inventories.
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: List of IDs selected
- @param context: A standard dictionary
-
- @return:
-
+ """ To merge selected Inventories.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return:
"""
invent_obj = self.pool.get('stock.inventory')
invent_line_obj = self.pool.get('stock.inventory.line')
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
index 63296b69875..f72e4f088b0 100644
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -32,22 +32,19 @@ import wizard
class inventory_set_stock_zero(osv.osv_memory):
_name = "stock.inventory.set.stock.zero"
_description = "Set Stock to 0"
+
_columns = {
'location_id': fields.many2one('stock.location', 'Location', required=True),
- }
+ }
def do_merge(self, cr, uid, ids, context):
- """
- To set stock to Zero
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return:
-
+ """ To set stock to Zero
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return:
"""
invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index d2b671e9571..377a40f3cb9 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -39,20 +39,16 @@ class stock_invoice_onshipping(osv.osv_memory):
('out_refund', 'Customer Refund'),
('in_refund', 'Supplier Refund')] , 'Type', required=True),
'invoice_date': fields.date('Invoiced date'),
- }
+ }
def _get_type(self, cr, uid, context=None):
- """
- To get invoice type
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return: invoice type
-
+ """ To get invoice type.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: The ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return: Invoice type
"""
if context is None:
context = {}
@@ -80,20 +76,16 @@ class stock_invoice_onshipping(osv.osv_memory):
_defaults = {
'type': _get_type,
- }
+ }
def create_invoice(self, cr, uid, ids, context):
- """
- To create invoice
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return: invoice ids
-
+ """ To create invoice
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return: Invoice ids
"""
result = []
picking_obj = self.pool.get('stock.picking')
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index b41809b67bd..9fe800bb0fe 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -30,16 +30,13 @@ class stock_location_product(osv.osv_memory):
}
def action_open_window(self, cr, uid, ids, context):
- """
- To open location wise product information specific to given duration
-
+ """ To open location wise product information specific to given duration
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
+ @param ids: An ID or list of IDs if we want more than one
@param context: A standard dictionary
-
- @return: invoice type
+ @return: Invoice type
"""
mod_obj = self.pool.get('ir.model.data')
for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index aa7bb42cf8b..bce550e74ff 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -29,24 +29,20 @@ class stock_move_track(osv.osv_memory):
_columns = {
'tracking_prefix': fields.char('Tracking prefix', size=64),
'quantity': fields.float("Quantity per lot")
- }
+ }
_defaults = {
'quantity': lambda *x: 1
- }
+ }
def track_lines(self, cr, uid, ids, context={}):
- """
- To track stock moves lines
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return:
-
+ """ To track stock moves lines
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: An ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return:
"""
datas = self.read(cr, uid, ids)[0]
move_obj = self.pool.get('stock.move')
@@ -67,17 +63,13 @@ class stock_move_consume(osv.osv_memory):
}
def default_get(self, cr, uid, fields, context=None):
- """
- Get default values
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for default value
- @param context: A standard dictionary
-
- @return: default values of fields
-
+ """ Get default values
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for default value
+ @param context: A standard dictionary
+ @return: default values of fields
"""
res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
@@ -93,17 +85,13 @@ class stock_move_consume(osv.osv_memory):
return res
def do_move_consume(self, cr, uid, ids, context={}):
- """
- To move consumed products
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return:
-
+ """ To move consumed products
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return:
"""
move_obj = self.pool.get('stock.move')
move_ids = context['active_ids']
@@ -126,17 +114,13 @@ class stock_move_scrap(osv.osv_memory):
}
def default_get(self, cr, uid, fields, context=None):
- """
- Get default values
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for default value
- @param context: A standard dictionary
-
- @return: default values of fields
-
+ """ Get default values
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for default value
+ @param context: A standard dictionary
+ @return: default values of fields
"""
res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
@@ -158,17 +142,13 @@ class stock_move_scrap(osv.osv_memory):
return res
def move_scrap(self, cr, uid, ids, context={}):
- """
- To move scraped products
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return:
-
+ """ To move scraped products
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return:
"""
move_obj = self.pool.get('stock.move')
move_ids = context['active_ids']
@@ -186,58 +166,52 @@ class split_in_production_lot(osv.osv_memory):
_description = "Split in Production lots"
def default_get(self, cr, uid, fields, context=None):
- """
- Get default values
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for default value
- @param context: A standard dictionary
-
- @return: default values of fields
-
+ """ Get default values
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for default value
+ @param context: A standard dictionary
+ @return: Default values of fields
"""
res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
if 'product_id' in fields:
res.update({'product_id': move.product_id.id})
+ if 'qty' in fields:
+ res.update({'qty': move.product_qty})
return res
_columns = {
+ 'qty': fields.integer('Quantity'),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
- 'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number')
+ 'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number'),
+ 'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Lots Existing Numbers'),
+ 'use_exist' : fields.boolean('Use Exist'),
}
+
def split_lot(self, cr, uid, ids, context=None):
- """
- To split a lot
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return:
-
+ """ To split a lot
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: An ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+ @return:
"""
self.split(cr, uid, ids, context.get('active_ids'), context=context)
return {}
def split(self, cr, uid, ids, move_ids, context=None):
- """
- To split stock moves into production lot
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param move_ids: the ID or list of IDs of stock move we want to split
- @param context: A standard dictionary
-
- @return:
-
+ """ To split stock moves into production lot
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param move_ids: the ID or list of IDs of stock move we want to split
+ @param context: A standard dictionary
+ @return:
"""
prodlot_obj = self.pool.get('stock.production.lot')
ir_sequence_obj = self.pool.get('ir.sequence')
@@ -249,10 +223,12 @@ class split_in_production_lot(osv.osv_memory):
quantity_rest = move.product_qty
uos_qty_rest = move.product_uos_qty
new_move = []
- for line in data.line_ids:
+ if data.use_exist:
+ lines = [l for l in data.line_exist_ids if l]
+ else:
+ lines = [l for l in data.line_ids if l]
+ for line in lines:
quantity = line.quantity
-
-
if quantity <= 0 or move_qty == 0:
continue
quantity_rest -= quantity
@@ -272,20 +248,21 @@ class split_in_production_lot(osv.osv_memory):
if quantity_rest == 0:
current_move = move.id
prodlot_id = False
- if line.use_exist and line.name:
- prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
+ if data.use_exist and line.prodlot_id:
+ prodlot_id = prodlot_obj.search(cr, uid, [('id','=',line.prodlot_id.id)])
if prodlot_id:
- prodlot_id = prodlot_id[0]
+ prodlot_id = prodlot_id[0]
if not prodlot_id:
- sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
- prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix' : line.name},
+ # sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+ prodlot_id = prodlot_obj.create(cr, uid, {'name': line.name},
+ # 'prefix' : line.name},
{'product_id': move.product_id.id})
move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
- ref = '%d' % (move.id)
- if prodlot.ref:
- ref = '%s, %s' % (prodlot.ref, ref)
- prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
+ # ref = '%d' % (move.id)
+ # if prodlot.ref:
+ # ref = '%s, %s' % (prodlot.ref, ref)
+ # prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
update_val = {}
if quantity_rest > 0:
@@ -295,10 +272,24 @@ class split_in_production_lot(osv.osv_memory):
return new_move
split_in_production_lot()
+class stock_move_split_lines_exist(osv.osv_memory):
+ _name = "stock.move.split.lines.exist"
+ _description = "Exist Split lines"
+ _columns = {
+ 'name': fields.char('Tracking serial', size=64),
+ 'quantity': fields.integer('Quantity'),
+ 'lot_id': fields.many2one('stock.move.split', 'Lot'),
+ 'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
+ }
+ _defaults = {
+ 'quantity': lambda *x: 1,
+ }
+
+stock_move_split_lines_exist()
+
class stock_move_split_lines(osv.osv_memory):
_name = "stock.move.split.lines"
_description = "Split lines"
-
_columns = {
'name': fields.char('Tracking serial', size=64),
'quantity': fields.integer('Quantity'),
@@ -306,6 +297,7 @@ class stock_move_split_lines(osv.osv_memory):
'lot_id': fields.many2one('stock.move.split', 'Lot'),
'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
}
+
_defaults = {
'quantity': lambda *x: 1,
'action' : lambda *x: 'split',
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 5f58072f17a..bba27bfe9c7 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -106,18 +106,32 @@